diff options
582 files changed, 19393 insertions, 5798 deletions
diff --git a/Android.bp b/Android.bp index e03f8449891a..25238e8c0881 100644 --- a/Android.bp +++ b/Android.bp @@ -308,6 +308,8 @@ java_defaults { include_dirs: [ "frameworks/av/aidl", "frameworks/native/libs/permission/aidl", + // TODO: remove when moved to the below package + "frameworks/base/packages/ConnectivityT/framework-t/aidl-export", "packages/modules/Connectivity/framework/aidl-export", ], }, @@ -557,6 +559,9 @@ stubs_defaults { include_dirs: [ "frameworks/av/aidl", "frameworks/native/libs/permission/aidl", + // TODO: remove when moved to the below package + "frameworks/base/packages/ConnectivityT/framework-t/aidl-export", + "packages/modules/Connectivity/framework/aidl-export", ], }, // These are libs from framework-internal-utils that are required (i.e. being referenced) diff --git a/apex/jobscheduler/framework/java/android/os/PowerExemptionManager.java b/apex/jobscheduler/framework/java/android/os/PowerExemptionManager.java index afad29c7eebb..c4795f55fc8a 100644 --- a/apex/jobscheduler/framework/java/android/os/PowerExemptionManager.java +++ b/apex/jobscheduler/framework/java/android/os/PowerExemptionManager.java @@ -364,6 +364,11 @@ public class PowerExemptionManager { * @hide */ public static final int REASON_SYSTEM_MODULE = 320; + /** + * Carrier privileged app. + * @hide + */ + public static final int REASON_CARRIER_PRIVILEGED_APP = 321; /** @hide The app requests out-out. */ public static final int REASON_OPT_OUT_REQUESTED = 1000; @@ -440,6 +445,7 @@ public class PowerExemptionManager { REASON_ROLE_DIALER, REASON_ROLE_EMERGENCY, REASON_SYSTEM_MODULE, + REASON_CARRIER_PRIVILEGED_APP, REASON_OPT_OUT_REQUESTED, }) @Retention(RetentionPolicy.SOURCE) @@ -749,6 +755,8 @@ public class PowerExemptionManager { return "ROLE_EMERGENCY"; case REASON_SYSTEM_MODULE: return "SYSTEM_MODULE"; + case REASON_CARRIER_PRIVILEGED_APP: + return "CARRIER_PRIVILEGED_APP"; case REASON_OPT_OUT_REQUESTED: return "REASON_OPT_OUT_REQUESTED"; default: diff --git a/apex/jobscheduler/framework/java/com/android/server/usage/AppStandbyInternal.java b/apex/jobscheduler/framework/java/com/android/server/usage/AppStandbyInternal.java index ddcc74696d94..13ecd25d429a 100644 --- a/apex/jobscheduler/framework/java/com/android/server/usage/AppStandbyInternal.java +++ b/apex/jobscheduler/framework/java/com/android/server/usage/AppStandbyInternal.java @@ -3,6 +3,7 @@ package com.android.server.usage; import android.annotation.CurrentTimeMillisLong; import android.annotation.NonNull; import android.annotation.UserIdInt; +import android.app.ActivityManager.ProcessState; import android.app.usage.AppStandbyInfo; import android.app.usage.UsageStatsManager.ForcedReasons; import android.app.usage.UsageStatsManager.StandbyBuckets; @@ -223,4 +224,12 @@ public interface AppStandbyInternal { * a broadcast. */ long getBroadcastResponseWindowDurationMs(); + + /** + * Returns the process state threshold that should be used for deciding whether or not an app + * is in the background in the context of recording broadcast response stats. Apps whose + * process state is higher than this threshold state should be considered to be in background. + */ + @ProcessState + int getBroadcastResponseFgThresholdState(); } 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 b2ae8ee62bc7..cea19451f005 100644 --- a/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java +++ b/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java @@ -357,6 +357,9 @@ public class JobSchedulerService extends com.android.server.SystemService // Putting RESTRICTED_INDEX after NEVER_INDEX to make it easier for proto dumping // (ScheduledJobStateChanged and JobStatusDumpProto). public static final int RESTRICTED_INDEX = 5; + // Putting EXEMPTED_INDEX after RESTRICTED_INDEX to make it easier for proto dumping + // (ScheduledJobStateChanged and JobStatusDumpProto). + public static final int EXEMPTED_INDEX = 6; private class ConstantsObserver implements DeviceConfig.OnPropertiesChangedListener, EconomyManagerInternal.TareStateChangeListener { @@ -2492,6 +2495,7 @@ public class JobSchedulerService extends com.android.server.SystemService shouldForceBatchJob = mConstants.MIN_READY_NON_ACTIVE_JOBS_COUNT > 1 && job.getEffectiveStandbyBucket() != ACTIVE_INDEX + && job.getEffectiveStandbyBucket() != EXEMPTED_INDEX && !batchDelayExpired; } @@ -2764,7 +2768,7 @@ public class JobSchedulerService extends com.android.server.SystemService return job.getEffectiveStandbyBucket() != RESTRICTED_INDEX ? mConstants.RUNTIME_MIN_EJ_GUARANTEE_MS : Math.min(mConstants.RUNTIME_MIN_EJ_GUARANTEE_MS, 5 * MINUTE_IN_MILLIS); - } else if (job.getEffectivePriority() == JobInfo.PRIORITY_HIGH) { + } else if (job.getEffectivePriority() >= JobInfo.PRIORITY_HIGH) { return mConstants.RUNTIME_MIN_HIGH_PRIORITY_GUARANTEE_MS; } else { return mConstants.RUNTIME_MIN_GUARANTEE_MS; @@ -3086,8 +3090,10 @@ public class JobSchedulerService extends com.android.server.SystemService return FREQUENT_INDEX; } else if (bucket > UsageStatsManager.STANDBY_BUCKET_ACTIVE) { return WORKING_INDEX; - } else { + } else if (bucket > UsageStatsManager.STANDBY_BUCKET_EXEMPTED) { return ACTIVE_INDEX; + } else { + return EXEMPTED_INDEX; } } 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 0eea70106608..0456a9bfeb2e 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 @@ -17,6 +17,7 @@ package com.android.server.job.controllers; 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; import static com.android.server.job.JobSchedulerService.RESTRICTED_INDEX; import static com.android.server.job.JobSchedulerService.WORKING_INDEX; @@ -844,12 +845,15 @@ public final class JobStatus { * exemptions. */ public int getEffectiveStandbyBucket() { + final int actualBucket = getStandbyBucket(); + if (actualBucket == EXEMPTED_INDEX) { + return actualBucket; + } if (uidActive || getJob().isExemptedFromAppStandby()) { // Treat these cases as if they're in the ACTIVE bucket so that they get throttled // like other ACTIVE apps. return ACTIVE_INDEX; } - final int actualBucket = getStandbyBucket(); if (actualBucket != RESTRICTED_INDEX && actualBucket != NEVER_INDEX && mHasMediaBackupExemption) { // Cap it at WORKING_INDEX as media back up jobs are important to the user, and the diff --git a/apex/jobscheduler/service/java/com/android/server/job/controllers/QuotaController.java b/apex/jobscheduler/service/java/com/android/server/job/controllers/QuotaController.java index dd5246aebbb4..c1728a3a8abe 100644 --- a/apex/jobscheduler/service/java/com/android/server/job/controllers/QuotaController.java +++ b/apex/jobscheduler/service/java/com/android/server/job/controllers/QuotaController.java @@ -21,6 +21,7 @@ import static android.text.format.DateUtils.MINUTE_IN_MILLIS; import static android.text.format.DateUtils.SECOND_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.FREQUENT_INDEX; import static com.android.server.job.JobSchedulerService.NEVER_INDEX; import static com.android.server.job.JobSchedulerService.RARE_INDEX; @@ -132,6 +133,7 @@ public final class QuotaController extends StateController { */ public long expirationTimeElapsed; + public long allowedTimePerPeriodMs; public long windowSizeMs; public int jobCountLimit; public int sessionCountLimit; @@ -213,6 +215,7 @@ public final class QuotaController extends StateController { @Override public String toString() { return "expirationTime=" + expirationTimeElapsed + ", " + + "allowedTimePerPeriodMs=" + allowedTimePerPeriodMs + ", " + "windowSizeMs=" + windowSizeMs + ", " + "jobCountLimit=" + jobCountLimit + ", " + "sessionCountLimit=" + sessionCountLimit + ", " @@ -236,6 +239,7 @@ public final class QuotaController extends StateController { if (obj instanceof ExecutionStats) { ExecutionStats other = (ExecutionStats) obj; return this.expirationTimeElapsed == other.expirationTimeElapsed + && this.allowedTimePerPeriodMs == other.allowedTimePerPeriodMs && this.windowSizeMs == other.windowSizeMs && this.jobCountLimit == other.jobCountLimit && this.sessionCountLimit == other.sessionCountLimit @@ -261,6 +265,7 @@ public final class QuotaController extends StateController { public int hashCode() { int result = 0; result = 31 * result + hashLong(expirationTimeElapsed); + result = 31 * result + hashLong(allowedTimePerPeriodMs); result = 31 * result + hashLong(windowSizeMs); result = 31 * result + hashLong(jobCountLimit); result = 31 * result + hashLong(sessionCountLimit); @@ -350,7 +355,15 @@ public final class QuotaController extends StateController { private boolean mIsEnabled; /** How much time each app will have to run jobs within their standby bucket window. */ - private long mAllowedTimePerPeriodMs = QcConstants.DEFAULT_ALLOWED_TIME_PER_PERIOD_MS; + private final long[] mAllowedTimePerPeriodMs = new long[]{ + QcConstants.DEFAULT_ALLOWED_TIME_PER_PERIOD_ACTIVE_MS, + QcConstants.DEFAULT_ALLOWED_TIME_PER_PERIOD_WORKING_MS, + QcConstants.DEFAULT_ALLOWED_TIME_PER_PERIOD_FREQUENT_MS, + QcConstants.DEFAULT_ALLOWED_TIME_PER_PERIOD_RARE_MS, + 0, // NEVER + QcConstants.DEFAULT_ALLOWED_TIME_PER_PERIOD_RESTRICTED_MS, + QcConstants.DEFAULT_ALLOWED_TIME_PER_PERIOD_EXEMPTED_MS + }; /** * The maximum amount of time an app can have its jobs running within a {@link #MAX_PERIOD_MS} @@ -365,12 +378,6 @@ public final class QuotaController extends StateController { private long mQuotaBufferMs = QcConstants.DEFAULT_IN_QUOTA_BUFFER_MS; /** - * {@link #mAllowedTimePerPeriodMs} - {@link #mQuotaBufferMs}. This can be used to determine - * when an app will have enough quota to transition from out-of-quota to in-quota. - */ - private long mAllowedTimeIntoQuotaMs = mAllowedTimePerPeriodMs - mQuotaBufferMs; - - /** * {@link #mMaxExecutionTimeMs} - {@link #mQuotaBufferMs}. This can be used to determine when an * app will have enough quota to transition from out-of-quota to in-quota. */ @@ -450,7 +457,8 @@ public final class QuotaController extends StateController { QcConstants.DEFAULT_WINDOW_SIZE_FREQUENT_MS, QcConstants.DEFAULT_WINDOW_SIZE_RARE_MS, 0, // NEVER - QcConstants.DEFAULT_WINDOW_SIZE_RESTRICTED_MS + QcConstants.DEFAULT_WINDOW_SIZE_RESTRICTED_MS, + QcConstants.DEFAULT_WINDOW_SIZE_EXEMPTED_MS }; /** The maximum period any bucket can have. */ @@ -469,7 +477,8 @@ public final class QuotaController extends StateController { QcConstants.DEFAULT_MAX_JOB_COUNT_FREQUENT, QcConstants.DEFAULT_MAX_JOB_COUNT_RARE, 0, // NEVER - QcConstants.DEFAULT_MAX_JOB_COUNT_RESTRICTED + QcConstants.DEFAULT_MAX_JOB_COUNT_RESTRICTED, + QcConstants.DEFAULT_MAX_JOB_COUNT_EXEMPTED }; /** @@ -487,6 +496,7 @@ public final class QuotaController extends StateController { QcConstants.DEFAULT_MAX_SESSION_COUNT_RARE, 0, // NEVER QcConstants.DEFAULT_MAX_SESSION_COUNT_RESTRICTED, + QcConstants.DEFAULT_MAX_SESSION_COUNT_EXEMPTED, }; /** @@ -506,7 +516,8 @@ public final class QuotaController extends StateController { QcConstants.DEFAULT_EJ_LIMIT_FREQUENT_MS, QcConstants.DEFAULT_EJ_LIMIT_RARE_MS, 0, // NEVER - QcConstants.DEFAULT_EJ_LIMIT_RESTRICTED_MS + QcConstants.DEFAULT_EJ_LIMIT_RESTRICTED_MS, + QcConstants.DEFAULT_EJ_LIMIT_EXEMPTED_MS }; private long mEjLimitAdditionInstallerMs = QcConstants.DEFAULT_EJ_LIMIT_ADDITION_INSTALLER_MS; @@ -823,6 +834,11 @@ public final class QuotaController extends StateController { if (mService.isBatteryCharging()) { return mConstants.RUNTIME_FREE_QUOTA_MAX_LIMIT_MS; } + if (jobStatus.getEffectiveStandbyBucket() == EXEMPTED_INDEX) { + return Math.max(mEJLimitsMs[EXEMPTED_INDEX] / 2, + getTimeUntilEJQuotaConsumedLocked( + jobStatus.getSourceUserId(), jobStatus.getSourcePackageName())); + } if (mTopAppCache.get(jobStatus.getSourceUid()) || isTopStartedJobLocked(jobStatus)) { return Math.max(mEJLimitsMs[ACTIVE_INDEX] / 2, getTimeUntilEJQuotaConsumedLocked( @@ -929,9 +945,11 @@ public final class QuotaController extends StateController { final long minSurplus; if (priority <= JobInfo.PRIORITY_MIN) { - minSurplus = (long) (mAllowedTimePerPeriodMs * mAllowedTimeSurplusPriorityMin); + minSurplus = (long) + (mAllowedTimePerPeriodMs[standbyBucket] * mAllowedTimeSurplusPriorityMin); } else if (priority <= JobInfo.PRIORITY_LOW) { - minSurplus = (long) (mAllowedTimePerPeriodMs * mAllowedTimeSurplusPriorityLow); + minSurplus = (long) + (mAllowedTimePerPeriodMs[standbyBucket] * mAllowedTimeSurplusPriorityLow); } else { minSurplus = 0; } @@ -989,7 +1007,7 @@ public final class QuotaController extends StateController { } private long getRemainingExecutionTimeLocked(@NonNull ExecutionStats stats) { - return Math.min(mAllowedTimePerPeriodMs - stats.executionTimeInWindowMs, + return Math.min(stats.allowedTimePerPeriodMs - stats.executionTimeInWindowMs, mMaxExecutionTimeMs - stats.executionTimeInMaxPeriodMs); } @@ -1068,15 +1086,15 @@ public final class QuotaController extends StateController { if (sessions == null || sessions.size() == 0) { // Regular ACTIVE case. Since the bucket size equals the allowed time, the app jobs can // essentially run until they reach the maximum limit. - if (stats.windowSizeMs == mAllowedTimePerPeriodMs) { + if (stats.windowSizeMs == mAllowedTimePerPeriodMs[standbyBucket]) { return mMaxExecutionTimeMs; } - return mAllowedTimePerPeriodMs; + return mAllowedTimePerPeriodMs[standbyBucket]; } final long startWindowElapsed = nowElapsed - stats.windowSizeMs; final long startMaxElapsed = nowElapsed - MAX_PERIOD_MS; - final long allowedTimePerPeriodMs = getAllowedTimePerPeriodMs(jobPriority); + final long allowedTimePerPeriodMs = getAllowedTimePerPeriodMs(standbyBucket, jobPriority); final long allowedTimeRemainingMs = allowedTimePerPeriodMs - stats.executionTimeInWindowMs; final long maxExecutionTimeRemainingMs = mMaxExecutionTimeMs - stats.executionTimeInMaxPeriodMs; @@ -1087,7 +1105,7 @@ public final class QuotaController extends StateController { // Regular ACTIVE case. Since the bucket size equals the allowed time, the app jobs can // essentially run until they reach the maximum limit. - if (stats.windowSizeMs == mAllowedTimePerPeriodMs) { + if (stats.windowSizeMs == mAllowedTimePerPeriodMs[standbyBucket]) { return calculateTimeUntilQuotaConsumedLocked( sessions, startMaxElapsed, maxExecutionTimeRemainingMs); } @@ -1103,14 +1121,19 @@ public final class QuotaController extends StateController { sessions, startWindowElapsed, allowedTimeRemainingMs)); } - private long getAllowedTimePerPeriodMs(@JobInfo.Priority int jobPriority) { + private long getAllowedTimePerPeriodMs(int standbyBucket, @JobInfo.Priority int jobPriority) { + return getAllowedTimePerPeriodMs(mAllowedTimePerPeriodMs[standbyBucket], jobPriority); + } + + private long getAllowedTimePerPeriodMs(long initialAllowedTime, + @JobInfo.Priority int jobPriority) { if (jobPriority <= JobInfo.PRIORITY_MIN) { - return (long) (mAllowedTimePerPeriodMs * (1 - mAllowedTimeSurplusPriorityMin)); + return (long) (initialAllowedTime * (1 - mAllowedTimeSurplusPriorityMin)); } if (jobPriority <= JobInfo.PRIORITY_LOW) { - return (long) (mAllowedTimePerPeriodMs * (1 - mAllowedTimeSurplusPriorityLow)); + return (long) (initialAllowedTime * (1 - mAllowedTimeSurplusPriorityLow)); } - return mAllowedTimePerPeriodMs; + return initialAllowedTime; } /** @@ -1237,16 +1260,19 @@ public final class QuotaController extends StateController { appStats[standbyBucket] = stats; } if (refreshStatsIfOld) { + final long bucketAllowedTimeMs = mAllowedTimePerPeriodMs[standbyBucket]; final long bucketWindowSizeMs = mBucketPeriodsMs[standbyBucket]; final int jobCountLimit = mMaxBucketJobCounts[standbyBucket]; final int sessionCountLimit = mMaxBucketSessionCounts[standbyBucket]; Timer timer = mPkgTimers.get(userId, packageName); if ((timer != null && timer.isActive()) || stats.expirationTimeElapsed <= sElapsedRealtimeClock.millis() + || stats.allowedTimePerPeriodMs != bucketAllowedTimeMs || stats.windowSizeMs != bucketWindowSizeMs || stats.jobCountLimit != jobCountLimit || stats.sessionCountLimit != sessionCountLimit) { // The stats are no longer valid. + stats.allowedTimePerPeriodMs = bucketAllowedTimeMs; stats.windowSizeMs = bucketWindowSizeMs; stats.jobCountLimit = jobCountLimit; stats.sessionCountLimit = sessionCountLimit; @@ -1272,8 +1298,11 @@ public final class QuotaController extends StateController { } else { stats.inQuotaTimeElapsed = 0; } - final long allowedTimeMinMs = getAllowedTimePerPeriodMs(JobInfo.PRIORITY_MIN); - final long allowedTimeLowMs = getAllowedTimePerPeriodMs(JobInfo.PRIORITY_LOW); + final long allowedTimeMinMs = + getAllowedTimePerPeriodMs(stats.allowedTimePerPeriodMs, JobInfo.PRIORITY_MIN); + final long allowedTimeLowMs = + getAllowedTimePerPeriodMs(stats.allowedTimePerPeriodMs, JobInfo.PRIORITY_LOW); + final long allowedTimeIntoQuotaMs = stats.allowedTimePerPeriodMs - mQuotaBufferMs; Timer timer = mPkgTimers.get(userId, packageName); final long nowElapsed = sElapsedRealtimeClock.millis(); @@ -1287,9 +1316,9 @@ public final class QuotaController extends StateController { // If the timer is active, the value will be stale at the next method call, so // invalidate now. stats.expirationTimeElapsed = nowElapsed; - if (stats.executionTimeInWindowMs >= mAllowedTimeIntoQuotaMs) { + if (stats.executionTimeInWindowMs >= allowedTimeIntoQuotaMs) { stats.inQuotaTimeElapsed = Math.max(stats.inQuotaTimeElapsed, - nowElapsed - mAllowedTimeIntoQuotaMs + stats.windowSizeMs); + nowElapsed - allowedTimeIntoQuotaMs + stats.windowSizeMs); } if (stats.executionTimeInWindowMs >= allowedTimeLowMs) { stats.inQuotaTimeLowElapsed = Math.max(stats.inQuotaTimeLowElapsed, @@ -1346,9 +1375,9 @@ public final class QuotaController extends StateController { stats.executionTimeInWindowMs += session.endTimeElapsed - start; stats.bgJobCountInWindow += session.bgJobCount; - if (stats.executionTimeInWindowMs >= mAllowedTimeIntoQuotaMs) { + if (stats.executionTimeInWindowMs >= allowedTimeIntoQuotaMs) { stats.inQuotaTimeElapsed = Math.max(stats.inQuotaTimeElapsed, - start + stats.executionTimeInWindowMs - mAllowedTimeIntoQuotaMs + start + stats.executionTimeInWindowMs - allowedTimeIntoQuotaMs + stats.windowSizeMs); } if (stats.executionTimeInWindowMs >= allowedTimeLowMs) { @@ -1697,7 +1726,7 @@ public final class QuotaController extends StateController { if (js.setQuotaConstraintSatisfied(nowElapsed, true)) { changedJobs.add(js); } - } else if (realStandbyBucket != ACTIVE_INDEX + } else if (realStandbyBucket != EXEMPTED_INDEX && realStandbyBucket != ACTIVE_INDEX && realStandbyBucket == js.getEffectiveStandbyBucket() && js.getEffectivePriority() >= JobInfo.PRIORITY_DEFAULT) { // An app in the ACTIVE bucket may be out of quota while the job could be in quota @@ -1842,7 +1871,8 @@ public final class QuotaController extends StateController { } } final boolean inRegularQuota = - stats.executionTimeInWindowMs < getAllowedTimePerPeriodMs(minPriority) + stats.executionTimeInWindowMs + < getAllowedTimePerPeriodMs(standbyBucket, minPriority) && stats.executionTimeInMaxPeriodMs < mMaxExecutionTimeMs && isUnderJobCountQuota && isUnderTimingSessionCountQuota; @@ -2921,9 +2951,29 @@ public final class QuotaController extends StateController { /** Prefix to use with all constant keys in order to "sub-namespace" the keys. */ private static final String QC_CONSTANT_PREFIX = "qc_"; + /** + * Previously used keys: + * * allowed_time_per_period_ms -- No longer used after splitting by bucket + */ + + @VisibleForTesting + static final String KEY_ALLOWED_TIME_PER_PERIOD_EXEMPTED_MS = + QC_CONSTANT_PREFIX + "allowed_time_per_period_exempted_ms"; + @VisibleForTesting + static final String KEY_ALLOWED_TIME_PER_PERIOD_ACTIVE_MS = + QC_CONSTANT_PREFIX + "allowed_time_per_period_active_ms"; + @VisibleForTesting + static final String KEY_ALLOWED_TIME_PER_PERIOD_WORKING_MS = + QC_CONSTANT_PREFIX + "allowed_time_per_period_working_ms"; @VisibleForTesting - static final String KEY_ALLOWED_TIME_PER_PERIOD_MS = - QC_CONSTANT_PREFIX + "allowed_time_per_period_ms"; + static final String KEY_ALLOWED_TIME_PER_PERIOD_FREQUENT_MS = + QC_CONSTANT_PREFIX + "allowed_time_per_period_frequent_ms"; + @VisibleForTesting + static final String KEY_ALLOWED_TIME_PER_PERIOD_RARE_MS = + QC_CONSTANT_PREFIX + "allowed_time_per_period_rare_ms"; + @VisibleForTesting + static final String KEY_ALLOWED_TIME_PER_PERIOD_RESTRICTED_MS = + QC_CONSTANT_PREFIX + "allowed_time_per_period_restricted_ms"; @VisibleForTesting static final String KEY_IN_QUOTA_BUFFER_MS = QC_CONSTANT_PREFIX + "in_quota_buffer_ms"; @@ -2934,6 +2984,9 @@ public final class QuotaController extends StateController { static final String KEY_ALLOWED_TIME_SURPLUS_PRIORITY_MIN = QC_CONSTANT_PREFIX + "allowed_time_surplus_priority_min"; @VisibleForTesting + static final String KEY_WINDOW_SIZE_EXEMPTED_MS = + QC_CONSTANT_PREFIX + "window_size_exempted_ms"; + @VisibleForTesting static final String KEY_WINDOW_SIZE_ACTIVE_MS = QC_CONSTANT_PREFIX + "window_size_active_ms"; @VisibleForTesting @@ -2952,6 +3005,9 @@ public final class QuotaController extends StateController { static final String KEY_MAX_EXECUTION_TIME_MS = QC_CONSTANT_PREFIX + "max_execution_time_ms"; @VisibleForTesting + static final String KEY_MAX_JOB_COUNT_EXEMPTED = + QC_CONSTANT_PREFIX + "max_job_count_exempted"; + @VisibleForTesting static final String KEY_MAX_JOB_COUNT_ACTIVE = QC_CONSTANT_PREFIX + "max_job_count_active"; @VisibleForTesting @@ -2973,6 +3029,9 @@ public final class QuotaController extends StateController { static final String KEY_MAX_JOB_COUNT_PER_RATE_LIMITING_WINDOW = QC_CONSTANT_PREFIX + "max_job_count_per_rate_limiting_window"; @VisibleForTesting + static final String KEY_MAX_SESSION_COUNT_EXEMPTED = + QC_CONSTANT_PREFIX + "max_session_count_exempted"; + @VisibleForTesting static final String KEY_MAX_SESSION_COUNT_ACTIVE = QC_CONSTANT_PREFIX + "max_session_count_active"; @VisibleForTesting @@ -2997,6 +3056,9 @@ public final class QuotaController extends StateController { static final String KEY_MIN_QUOTA_CHECK_DELAY_MS = QC_CONSTANT_PREFIX + "min_quota_check_delay_ms"; @VisibleForTesting + static final String KEY_EJ_LIMIT_EXEMPTED_MS = + QC_CONSTANT_PREFIX + "ej_limit_exempted_ms"; + @VisibleForTesting static final String KEY_EJ_LIMIT_ACTIVE_MS = QC_CONSTANT_PREFIX + "ej_limit_active_ms"; @VisibleForTesting @@ -3039,14 +3101,26 @@ public final class QuotaController extends StateController { static final String KEY_EJ_GRACE_PERIOD_TOP_APP_MS = QC_CONSTANT_PREFIX + "ej_grace_period_top_app_ms"; - private static final long DEFAULT_ALLOWED_TIME_PER_PERIOD_MS = + private static final long DEFAULT_ALLOWED_TIME_PER_PERIOD_EXEMPTED_MS = + 10 * 60 * 1000L; // 10 minutes + private static final long DEFAULT_ALLOWED_TIME_PER_PERIOD_ACTIVE_MS = + 10 * 60 * 1000L; // 10 minutes + private static final long DEFAULT_ALLOWED_TIME_PER_PERIOD_WORKING_MS = + 10 * 60 * 1000L; // 10 minutes + private static final long DEFAULT_ALLOWED_TIME_PER_PERIOD_FREQUENT_MS = + 10 * 60 * 1000L; // 10 minutes + private static final long DEFAULT_ALLOWED_TIME_PER_PERIOD_RARE_MS = + 10 * 60 * 1000L; // 10 minutes + private static final long DEFAULT_ALLOWED_TIME_PER_PERIOD_RESTRICTED_MS = 10 * 60 * 1000L; // 10 minutes private static final long DEFAULT_IN_QUOTA_BUFFER_MS = 30 * 1000L; // 30 seconds private static final float DEFAULT_ALLOWED_TIME_SURPLUS_PRIORITY_LOW = .25f; private static final float DEFAULT_ALLOWED_TIME_SURPLUS_PRIORITY_MIN = .5f; + private static final long DEFAULT_WINDOW_SIZE_EXEMPTED_MS = + DEFAULT_ALLOWED_TIME_PER_PERIOD_EXEMPTED_MS; // EXEMPT apps can run jobs at any time private static final long DEFAULT_WINDOW_SIZE_ACTIVE_MS = - DEFAULT_ALLOWED_TIME_PER_PERIOD_MS; // ACTIVE apps can run jobs at any time + DEFAULT_ALLOWED_TIME_PER_PERIOD_ACTIVE_MS; // ACTIVE apps can run jobs at any time private static final long DEFAULT_WINDOW_SIZE_WORKING_MS = 2 * 60 * 60 * 1000L; // 2 hours private static final long DEFAULT_WINDOW_SIZE_FREQUENT_MS = @@ -3060,8 +3134,9 @@ public final class QuotaController extends StateController { private static final long DEFAULT_RATE_LIMITING_WINDOW_MS = MINUTE_IN_MILLIS; private static final int DEFAULT_MAX_JOB_COUNT_PER_RATE_LIMITING_WINDOW = 20; - private static final int DEFAULT_MAX_JOB_COUNT_ACTIVE = + private static final int DEFAULT_MAX_JOB_COUNT_EXEMPTED = 75; // 75/window = 450/hr = 1/session + private static final int DEFAULT_MAX_JOB_COUNT_ACTIVE = DEFAULT_MAX_JOB_COUNT_EXEMPTED; private static final int DEFAULT_MAX_JOB_COUNT_WORKING = // 120/window = 60/hr = 12/session (int) (60.0 * DEFAULT_WINDOW_SIZE_WORKING_MS / HOUR_IN_MILLIS); private static final int DEFAULT_MAX_JOB_COUNT_FREQUENT = // 200/window = 25/hr = 25/session @@ -3069,8 +3144,10 @@ public final class QuotaController extends StateController { private static final int DEFAULT_MAX_JOB_COUNT_RARE = // 48/window = 2/hr = 16/session (int) (2.0 * DEFAULT_WINDOW_SIZE_RARE_MS / HOUR_IN_MILLIS); private static final int DEFAULT_MAX_JOB_COUNT_RESTRICTED = 10; - private static final int DEFAULT_MAX_SESSION_COUNT_ACTIVE = + private static final int DEFAULT_MAX_SESSION_COUNT_EXEMPTED = 75; // 450/hr + private static final int DEFAULT_MAX_SESSION_COUNT_ACTIVE = + DEFAULT_MAX_SESSION_COUNT_EXEMPTED; private static final int DEFAULT_MAX_SESSION_COUNT_WORKING = 10; // 5/hr private static final int DEFAULT_MAX_SESSION_COUNT_FREQUENT = @@ -3081,6 +3158,7 @@ public final class QuotaController extends StateController { private static final int DEFAULT_MAX_SESSION_COUNT_PER_RATE_LIMITING_WINDOW = 20; private static final long DEFAULT_TIMING_SESSION_COALESCING_DURATION_MS = 5000; // 5 seconds private static final long DEFAULT_MIN_QUOTA_CHECK_DELAY_MS = MINUTE_IN_MILLIS; + private static final long DEFAULT_EJ_LIMIT_EXEMPTED_MS = 45 * MINUTE_IN_MILLIS; private static final long DEFAULT_EJ_LIMIT_ACTIVE_MS = 30 * MINUTE_IN_MILLIS; private static final long DEFAULT_EJ_LIMIT_WORKING_MS = DEFAULT_EJ_LIMIT_ACTIVE_MS; private static final long DEFAULT_EJ_LIMIT_FREQUENT_MS = 10 * MINUTE_IN_MILLIS; @@ -3096,8 +3174,39 @@ public final class QuotaController extends StateController { private static final long DEFAULT_EJ_GRACE_PERIOD_TEMP_ALLOWLIST_MS = 3 * MINUTE_IN_MILLIS; private static final long DEFAULT_EJ_GRACE_PERIOD_TOP_APP_MS = 1 * MINUTE_IN_MILLIS; - /** How much time each app will have to run jobs within their standby bucket window. */ - public long ALLOWED_TIME_PER_PERIOD_MS = DEFAULT_ALLOWED_TIME_PER_PERIOD_MS; + /** + * How much time each app in the exempted bucket will have to run jobs within their standby + * bucket window. + */ + public long ALLOWED_TIME_PER_PERIOD_EXEMPTED_MS = + DEFAULT_ALLOWED_TIME_PER_PERIOD_EXEMPTED_MS; + /** + * How much time each app in the active bucket will have to run jobs within their standby + * bucket window. + */ + public long ALLOWED_TIME_PER_PERIOD_ACTIVE_MS = DEFAULT_ALLOWED_TIME_PER_PERIOD_ACTIVE_MS; + /** + * How much time each app in the working set bucket will have to run jobs within their + * standby bucket window. + */ + public long ALLOWED_TIME_PER_PERIOD_WORKING_MS = DEFAULT_ALLOWED_TIME_PER_PERIOD_WORKING_MS; + /** + * How much time each app in the frequent bucket will have to run jobs within their standby + * bucket window. + */ + public long ALLOWED_TIME_PER_PERIOD_FREQUENT_MS = + DEFAULT_ALLOWED_TIME_PER_PERIOD_FREQUENT_MS; + /** + * How much time each app in the rare bucket will have to run jobs within their standby + * bucket window. + */ + public long ALLOWED_TIME_PER_PERIOD_RARE_MS = DEFAULT_ALLOWED_TIME_PER_PERIOD_RARE_MS; + /** + * How much time each app in the restricted bucket will have to run jobs within their + * standby bucket window. + */ + public long ALLOWED_TIME_PER_PERIOD_RESTRICTED_MS = + DEFAULT_ALLOWED_TIME_PER_PERIOD_RESTRICTED_MS; /** * How much time the package should have before transitioning from out-of-quota to in-quota. @@ -3106,7 +3215,7 @@ public final class QuotaController extends StateController { public long IN_QUOTA_BUFFER_MS = DEFAULT_IN_QUOTA_BUFFER_MS; /** - * The percentage of {@link #ALLOWED_TIME_PER_PERIOD_MS} that should not be used by + * The percentage of ALLOWED_TIME_PER_PERIOD_*_MS that should not be used by * {@link JobInfo#PRIORITY_LOW low priority} jobs. In other words, there must be a minimum * surplus of this amount of remaining allowed time before we start running low priority * jobs. @@ -3114,7 +3223,7 @@ public final class QuotaController extends StateController { public float ALLOWED_TIME_SURPLUS_PRIORITY_LOW = DEFAULT_ALLOWED_TIME_SURPLUS_PRIORITY_LOW; /** - * The percentage of {@link #ALLOWED_TIME_PER_PERIOD_MS} that should not be used by + * The percentage of ALLOWED_TIME_PER_PERIOD_*_MS that should not be used by * {@link JobInfo#PRIORITY_MIN low priority} jobs. In other words, there must be a minimum * surplus of this amount of remaining allowed time before we start running min priority * jobs. @@ -3123,35 +3232,42 @@ public final class QuotaController extends StateController { /** * The quota window size of the particular standby bucket. Apps in this standby bucket are - * expected to run only {@link #ALLOWED_TIME_PER_PERIOD_MS} within the past + * expected to run only {@link #ALLOWED_TIME_PER_PERIOD_EXEMPTED_MS} within the past + * WINDOW_SIZE_MS. + */ + public long WINDOW_SIZE_EXEMPTED_MS = DEFAULT_WINDOW_SIZE_EXEMPTED_MS; + + /** + * The quota window size of the particular standby bucket. Apps in this standby bucket are + * expected to run only {@link #ALLOWED_TIME_PER_PERIOD_ACTIVE_MS} within the past * WINDOW_SIZE_MS. */ public long WINDOW_SIZE_ACTIVE_MS = DEFAULT_WINDOW_SIZE_ACTIVE_MS; /** * The quota window size of the particular standby bucket. Apps in this standby bucket are - * expected to run only {@link #ALLOWED_TIME_PER_PERIOD_MS} within the past + * expected to run only {@link #ALLOWED_TIME_PER_PERIOD_WORKING_MS} within the past * WINDOW_SIZE_MS. */ public long WINDOW_SIZE_WORKING_MS = DEFAULT_WINDOW_SIZE_WORKING_MS; /** * The quota window size of the particular standby bucket. Apps in this standby bucket are - * expected to run only {@link #ALLOWED_TIME_PER_PERIOD_MS} within the past + * expected to run only {@link #ALLOWED_TIME_PER_PERIOD_FREQUENT_MS} within the past * WINDOW_SIZE_MS. */ public long WINDOW_SIZE_FREQUENT_MS = DEFAULT_WINDOW_SIZE_FREQUENT_MS; /** * The quota window size of the particular standby bucket. Apps in this standby bucket are - * expected to run only {@link #ALLOWED_TIME_PER_PERIOD_MS} within the past + * expected to run only {@link #ALLOWED_TIME_PER_PERIOD_RARE_MS} within the past * WINDOW_SIZE_MS. */ public long WINDOW_SIZE_RARE_MS = DEFAULT_WINDOW_SIZE_RARE_MS; /** * The quota window size of the particular standby bucket. Apps in this standby bucket are - * expected to run only {@link #ALLOWED_TIME_PER_PERIOD_MS} within the past + * expected to run only {@link #ALLOWED_TIME_PER_PERIOD_RESTRICTED_MS} within the past * WINDOW_SIZE_MS. */ public long WINDOW_SIZE_RESTRICTED_MS = DEFAULT_WINDOW_SIZE_RESTRICTED_MS; @@ -3165,6 +3281,12 @@ public final class QuotaController extends StateController { * The maximum number of jobs an app can run within this particular standby bucket's * window size. */ + public int MAX_JOB_COUNT_EXEMPTED = DEFAULT_MAX_JOB_COUNT_EXEMPTED; + + /** + * The maximum number of jobs an app can run within this particular standby bucket's + * window size. + */ public int MAX_JOB_COUNT_ACTIVE = DEFAULT_MAX_JOB_COUNT_ACTIVE; /** @@ -3204,6 +3326,12 @@ public final class QuotaController extends StateController { * The maximum number of {@link TimingSession TimingSessions} an app can run within this * particular standby bucket's window size. */ + public int MAX_SESSION_COUNT_EXEMPTED = DEFAULT_MAX_SESSION_COUNT_EXEMPTED; + + /** + * The maximum number of {@link TimingSession TimingSessions} an app can run within this + * particular standby bucket's window size. + */ public int MAX_SESSION_COUNT_ACTIVE = DEFAULT_MAX_SESSION_COUNT_ACTIVE; /** @@ -3232,7 +3360,7 @@ public final class QuotaController extends StateController { /** * The maximum number of {@link TimingSession TimingSessions} that can run within the past - * {@link #ALLOWED_TIME_PER_PERIOD_MS}. + * {@link #RATE_LIMITING_WINDOW_MS}. */ public int MAX_SESSION_COUNT_PER_RATE_LIMITING_WINDOW = DEFAULT_MAX_SESSION_COUNT_PER_RATE_LIMITING_WINDOW; @@ -3275,6 +3403,13 @@ public final class QuotaController extends StateController { * standby bucket can only have expedited job sessions totalling EJ_LIMIT (without factoring * in any rewards or free EJs). */ + public long EJ_LIMIT_EXEMPTED_MS = DEFAULT_EJ_LIMIT_EXEMPTED_MS; + + /** + * The total expedited job session limit of the particular standby bucket. Apps in this + * standby bucket can only have expedited job sessions totalling EJ_LIMIT (without factoring + * in any rewards or free EJs). + */ public long EJ_LIMIT_ACTIVE_MS = DEFAULT_EJ_LIMIT_ACTIVE_MS; /** @@ -3358,7 +3493,12 @@ public final class QuotaController extends StateController { public void processConstantLocked(@NonNull DeviceConfig.Properties properties, @NonNull String key) { switch (key) { - case KEY_ALLOWED_TIME_PER_PERIOD_MS: + case KEY_ALLOWED_TIME_PER_PERIOD_EXEMPTED_MS: + case KEY_ALLOWED_TIME_PER_PERIOD_ACTIVE_MS: + case KEY_ALLOWED_TIME_PER_PERIOD_WORKING_MS: + case KEY_ALLOWED_TIME_PER_PERIOD_FREQUENT_MS: + case KEY_ALLOWED_TIME_PER_PERIOD_RARE_MS: + case KEY_ALLOWED_TIME_PER_PERIOD_RESTRICTED_MS: case KEY_ALLOWED_TIME_SURPLUS_PRIORITY_LOW: case KEY_ALLOWED_TIME_SURPLUS_PRIORITY_MIN: case KEY_IN_QUOTA_BUFFER_MS: @@ -3388,6 +3528,15 @@ public final class QuotaController extends StateController { updateEJLimitConstantsLocked(); break; + case KEY_MAX_JOB_COUNT_EXEMPTED: + MAX_JOB_COUNT_EXEMPTED = properties.getInt(key, DEFAULT_MAX_JOB_COUNT_EXEMPTED); + int newExemptedMaxJobCount = + Math.max(MIN_BUCKET_JOB_COUNT, MAX_JOB_COUNT_EXEMPTED); + if (mMaxBucketJobCounts[EXEMPTED_INDEX] != newExemptedMaxJobCount) { + mMaxBucketJobCounts[EXEMPTED_INDEX] = newExemptedMaxJobCount; + mShouldReevaluateConstraints = true; + } + break; case KEY_MAX_JOB_COUNT_ACTIVE: MAX_JOB_COUNT_ACTIVE = properties.getInt(key, DEFAULT_MAX_JOB_COUNT_ACTIVE); int newActiveMaxJobCount = Math.max(MIN_BUCKET_JOB_COUNT, MAX_JOB_COUNT_ACTIVE); @@ -3432,6 +3581,16 @@ public final class QuotaController extends StateController { mShouldReevaluateConstraints = true; } break; + case KEY_MAX_SESSION_COUNT_EXEMPTED: + MAX_SESSION_COUNT_EXEMPTED = + properties.getInt(key, DEFAULT_MAX_SESSION_COUNT_EXEMPTED); + int newExemptedMaxSessionCount = + Math.max(MIN_BUCKET_SESSION_COUNT, MAX_SESSION_COUNT_EXEMPTED); + if (mMaxBucketSessionCounts[EXEMPTED_INDEX] != newExemptedMaxSessionCount) { + mMaxBucketSessionCounts[EXEMPTED_INDEX] = newExemptedMaxSessionCount; + mShouldReevaluateConstraints = true; + } + break; case KEY_MAX_SESSION_COUNT_ACTIVE: MAX_SESSION_COUNT_ACTIVE = properties.getInt(key, DEFAULT_MAX_SESSION_COUNT_ACTIVE); @@ -3579,15 +3738,34 @@ public final class QuotaController extends StateController { // Query the values as an atomic set. final DeviceConfig.Properties properties = DeviceConfig.getProperties( DeviceConfig.NAMESPACE_JOB_SCHEDULER, - KEY_ALLOWED_TIME_PER_PERIOD_MS, KEY_IN_QUOTA_BUFFER_MS, + KEY_ALLOWED_TIME_PER_PERIOD_EXEMPTED_MS, KEY_ALLOWED_TIME_PER_PERIOD_ACTIVE_MS, + KEY_ALLOWED_TIME_PER_PERIOD_WORKING_MS, KEY_ALLOWED_TIME_PER_PERIOD_FREQUENT_MS, + KEY_ALLOWED_TIME_PER_PERIOD_RARE_MS, KEY_ALLOWED_TIME_PER_PERIOD_RESTRICTED_MS, + KEY_IN_QUOTA_BUFFER_MS, KEY_ALLOWED_TIME_SURPLUS_PRIORITY_LOW, KEY_ALLOWED_TIME_SURPLUS_PRIORITY_MIN, - KEY_MAX_EXECUTION_TIME_MS, KEY_WINDOW_SIZE_ACTIVE_MS, + KEY_MAX_EXECUTION_TIME_MS, + KEY_WINDOW_SIZE_EXEMPTED_MS, KEY_WINDOW_SIZE_ACTIVE_MS, KEY_WINDOW_SIZE_WORKING_MS, KEY_WINDOW_SIZE_FREQUENT_MS, KEY_WINDOW_SIZE_RARE_MS, KEY_WINDOW_SIZE_RESTRICTED_MS); - ALLOWED_TIME_PER_PERIOD_MS = - properties.getLong(KEY_ALLOWED_TIME_PER_PERIOD_MS, - DEFAULT_ALLOWED_TIME_PER_PERIOD_MS); + ALLOWED_TIME_PER_PERIOD_EXEMPTED_MS = + properties.getLong(KEY_ALLOWED_TIME_PER_PERIOD_EXEMPTED_MS, + DEFAULT_ALLOWED_TIME_PER_PERIOD_EXEMPTED_MS); + ALLOWED_TIME_PER_PERIOD_ACTIVE_MS = + properties.getLong(KEY_ALLOWED_TIME_PER_PERIOD_ACTIVE_MS, + DEFAULT_ALLOWED_TIME_PER_PERIOD_ACTIVE_MS); + ALLOWED_TIME_PER_PERIOD_WORKING_MS = + properties.getLong(KEY_ALLOWED_TIME_PER_PERIOD_WORKING_MS, + DEFAULT_ALLOWED_TIME_PER_PERIOD_WORKING_MS); + ALLOWED_TIME_PER_PERIOD_FREQUENT_MS = + properties.getLong(KEY_ALLOWED_TIME_PER_PERIOD_FREQUENT_MS, + DEFAULT_ALLOWED_TIME_PER_PERIOD_FREQUENT_MS); + ALLOWED_TIME_PER_PERIOD_RARE_MS = + properties.getLong(KEY_ALLOWED_TIME_PER_PERIOD_RARE_MS, + DEFAULT_ALLOWED_TIME_PER_PERIOD_RARE_MS); + ALLOWED_TIME_PER_PERIOD_RESTRICTED_MS = + properties.getLong(KEY_ALLOWED_TIME_PER_PERIOD_RESTRICTED_MS, + DEFAULT_ALLOWED_TIME_PER_PERIOD_RESTRICTED_MS); ALLOWED_TIME_SURPLUS_PRIORITY_LOW = properties.getFloat(KEY_ALLOWED_TIME_SURPLUS_PRIORITY_LOW, DEFAULT_ALLOWED_TIME_SURPLUS_PRIORITY_LOW); @@ -3598,6 +3776,8 @@ public final class QuotaController extends StateController { DEFAULT_IN_QUOTA_BUFFER_MS); MAX_EXECUTION_TIME_MS = properties.getLong(KEY_MAX_EXECUTION_TIME_MS, DEFAULT_MAX_EXECUTION_TIME_MS); + WINDOW_SIZE_EXEMPTED_MS = properties.getLong(KEY_WINDOW_SIZE_EXEMPTED_MS, + DEFAULT_WINDOW_SIZE_EXEMPTED_MS); WINDOW_SIZE_ACTIVE_MS = properties.getLong(KEY_WINDOW_SIZE_ACTIVE_MS, DEFAULT_WINDOW_SIZE_ACTIVE_MS); WINDOW_SIZE_WORKING_MS = @@ -3618,20 +3798,55 @@ public final class QuotaController extends StateController { mMaxExecutionTimeIntoQuotaMs = mMaxExecutionTimeMs - mQuotaBufferMs; mShouldReevaluateConstraints = true; } - long newAllowedTimeMs = Math.min(mMaxExecutionTimeMs, - Math.max(MINUTE_IN_MILLIS, ALLOWED_TIME_PER_PERIOD_MS)); - if (mAllowedTimePerPeriodMs != newAllowedTimeMs) { - mAllowedTimePerPeriodMs = newAllowedTimeMs; - mAllowedTimeIntoQuotaMs = mAllowedTimePerPeriodMs - mQuotaBufferMs; + long minAllowedTimeMs = Long.MAX_VALUE; + long newAllowedTimeExemptedMs = Math.min(mMaxExecutionTimeMs, + Math.max(MINUTE_IN_MILLIS, ALLOWED_TIME_PER_PERIOD_EXEMPTED_MS)); + minAllowedTimeMs = Math.min(minAllowedTimeMs, newAllowedTimeExemptedMs); + if (mAllowedTimePerPeriodMs[EXEMPTED_INDEX] != newAllowedTimeExemptedMs) { + mAllowedTimePerPeriodMs[EXEMPTED_INDEX] = newAllowedTimeExemptedMs; + mShouldReevaluateConstraints = true; + } + long newAllowedTimeActiveMs = Math.min(mMaxExecutionTimeMs, + Math.max(MINUTE_IN_MILLIS, ALLOWED_TIME_PER_PERIOD_ACTIVE_MS)); + minAllowedTimeMs = Math.min(minAllowedTimeMs, newAllowedTimeActiveMs); + if (mAllowedTimePerPeriodMs[ACTIVE_INDEX] != newAllowedTimeActiveMs) { + mAllowedTimePerPeriodMs[ACTIVE_INDEX] = newAllowedTimeActiveMs; + mShouldReevaluateConstraints = true; + } + long newAllowedTimeWorkingMs = Math.min(mMaxExecutionTimeMs, + Math.max(MINUTE_IN_MILLIS, ALLOWED_TIME_PER_PERIOD_WORKING_MS)); + minAllowedTimeMs = Math.min(minAllowedTimeMs, newAllowedTimeWorkingMs); + if (mAllowedTimePerPeriodMs[WORKING_INDEX] != newAllowedTimeWorkingMs) { + mAllowedTimePerPeriodMs[WORKING_INDEX] = newAllowedTimeWorkingMs; + mShouldReevaluateConstraints = true; + } + long newAllowedTimeFrequentMs = Math.min(mMaxExecutionTimeMs, + Math.max(MINUTE_IN_MILLIS, ALLOWED_TIME_PER_PERIOD_FREQUENT_MS)); + minAllowedTimeMs = Math.min(minAllowedTimeMs, newAllowedTimeFrequentMs); + if (mAllowedTimePerPeriodMs[FREQUENT_INDEX] != newAllowedTimeFrequentMs) { + mAllowedTimePerPeriodMs[FREQUENT_INDEX] = newAllowedTimeFrequentMs; + mShouldReevaluateConstraints = true; + } + long newAllowedTimeRareMs = Math.min(mMaxExecutionTimeMs, + Math.max(MINUTE_IN_MILLIS, ALLOWED_TIME_PER_PERIOD_RARE_MS)); + minAllowedTimeMs = Math.min(minAllowedTimeMs, newAllowedTimeRareMs); + if (mAllowedTimePerPeriodMs[RARE_INDEX] != newAllowedTimeRareMs) { + mAllowedTimePerPeriodMs[RARE_INDEX] = newAllowedTimeRareMs; + mShouldReevaluateConstraints = true; + } + long newAllowedTimeRestrictedMs = Math.min(mMaxExecutionTimeMs, + Math.max(MINUTE_IN_MILLIS, ALLOWED_TIME_PER_PERIOD_RESTRICTED_MS)); + minAllowedTimeMs = Math.min(minAllowedTimeMs, newAllowedTimeRestrictedMs); + if (mAllowedTimePerPeriodMs[RESTRICTED_INDEX] != newAllowedTimeRestrictedMs) { + mAllowedTimePerPeriodMs[RESTRICTED_INDEX] = newAllowedTimeRestrictedMs; mShouldReevaluateConstraints = true; } // Make sure quota buffer is non-negative, not greater than allowed time per period, // and no more than 5 minutes. - long newQuotaBufferMs = Math.max(0, Math.min(mAllowedTimePerPeriodMs, + long newQuotaBufferMs = Math.max(0, Math.min(minAllowedTimeMs, Math.min(5 * MINUTE_IN_MILLIS, IN_QUOTA_BUFFER_MS))); if (mQuotaBufferMs != newQuotaBufferMs) { mQuotaBufferMs = newQuotaBufferMs; - mAllowedTimeIntoQuotaMs = mAllowedTimePerPeriodMs - mQuotaBufferMs; mMaxExecutionTimeIntoQuotaMs = mMaxExecutionTimeMs - mQuotaBufferMs; mShouldReevaluateConstraints = true; } @@ -3652,32 +3867,38 @@ public final class QuotaController extends StateController { mAllowedTimeSurplusPriorityMin = newAllowedTimeSurplusPriorityMin; mShouldReevaluateConstraints = true; } - long newActivePeriodMs = Math.max(mAllowedTimePerPeriodMs, + long newExemptedPeriodMs = Math.max(mAllowedTimePerPeriodMs[EXEMPTED_INDEX], + Math.min(MAX_PERIOD_MS, WINDOW_SIZE_EXEMPTED_MS)); + if (mBucketPeriodsMs[EXEMPTED_INDEX] != newExemptedPeriodMs) { + mBucketPeriodsMs[EXEMPTED_INDEX] = newExemptedPeriodMs; + mShouldReevaluateConstraints = true; + } + long newActivePeriodMs = Math.max(mAllowedTimePerPeriodMs[ACTIVE_INDEX], Math.min(MAX_PERIOD_MS, WINDOW_SIZE_ACTIVE_MS)); if (mBucketPeriodsMs[ACTIVE_INDEX] != newActivePeriodMs) { mBucketPeriodsMs[ACTIVE_INDEX] = newActivePeriodMs; mShouldReevaluateConstraints = true; } - long newWorkingPeriodMs = Math.max(mAllowedTimePerPeriodMs, + long newWorkingPeriodMs = Math.max(mAllowedTimePerPeriodMs[WORKING_INDEX], Math.min(MAX_PERIOD_MS, WINDOW_SIZE_WORKING_MS)); if (mBucketPeriodsMs[WORKING_INDEX] != newWorkingPeriodMs) { mBucketPeriodsMs[WORKING_INDEX] = newWorkingPeriodMs; mShouldReevaluateConstraints = true; } - long newFrequentPeriodMs = Math.max(mAllowedTimePerPeriodMs, + long newFrequentPeriodMs = Math.max(mAllowedTimePerPeriodMs[FREQUENT_INDEX], Math.min(MAX_PERIOD_MS, WINDOW_SIZE_FREQUENT_MS)); if (mBucketPeriodsMs[FREQUENT_INDEX] != newFrequentPeriodMs) { mBucketPeriodsMs[FREQUENT_INDEX] = newFrequentPeriodMs; mShouldReevaluateConstraints = true; } - long newRarePeriodMs = Math.max(mAllowedTimePerPeriodMs, + long newRarePeriodMs = Math.max(mAllowedTimePerPeriodMs[RARE_INDEX], Math.min(MAX_PERIOD_MS, WINDOW_SIZE_RARE_MS)); if (mBucketPeriodsMs[RARE_INDEX] != newRarePeriodMs) { mBucketPeriodsMs[RARE_INDEX] = newRarePeriodMs; mShouldReevaluateConstraints = true; } // Fit in the range [allowed time (10 mins), 1 week]. - long newRestrictedPeriodMs = Math.max(mAllowedTimePerPeriodMs, + long newRestrictedPeriodMs = Math.max(mAllowedTimePerPeriodMs[RESTRICTED_INDEX], Math.min(7 * 24 * 60 * MINUTE_IN_MILLIS, WINDOW_SIZE_RESTRICTED_MS)); if (mBucketPeriodsMs[RESTRICTED_INDEX] != newRestrictedPeriodMs) { mBucketPeriodsMs[RESTRICTED_INDEX] = newRestrictedPeriodMs; @@ -3740,11 +3961,14 @@ public final class QuotaController extends StateController { // Query the values as an atomic set. final DeviceConfig.Properties properties = DeviceConfig.getProperties( DeviceConfig.NAMESPACE_JOB_SCHEDULER, + KEY_EJ_LIMIT_EXEMPTED_MS, KEY_EJ_LIMIT_ACTIVE_MS, KEY_EJ_LIMIT_WORKING_MS, KEY_EJ_LIMIT_FREQUENT_MS, KEY_EJ_LIMIT_RARE_MS, KEY_EJ_LIMIT_RESTRICTED_MS, KEY_EJ_LIMIT_ADDITION_SPECIAL_MS, KEY_EJ_LIMIT_ADDITION_INSTALLER_MS, KEY_EJ_WINDOW_SIZE_MS); + EJ_LIMIT_EXEMPTED_MS = properties.getLong( + KEY_EJ_LIMIT_EXEMPTED_MS, DEFAULT_EJ_LIMIT_EXEMPTED_MS); EJ_LIMIT_ACTIVE_MS = properties.getLong( KEY_EJ_LIMIT_ACTIVE_MS, DEFAULT_EJ_LIMIT_ACTIVE_MS); EJ_LIMIT_WORKING_MS = properties.getLong( @@ -3770,8 +3994,15 @@ public final class QuotaController extends StateController { mShouldReevaluateConstraints = true; } // The limit must be in the range [15 minutes, window size]. + long newExemptLimitMs = Math.max(15 * MINUTE_IN_MILLIS, + Math.min(newWindowSizeMs, EJ_LIMIT_EXEMPTED_MS)); + if (mEJLimitsMs[EXEMPTED_INDEX] != newExemptLimitMs) { + mEJLimitsMs[EXEMPTED_INDEX] = newExemptLimitMs; + mShouldReevaluateConstraints = true; + } + // The limit must be in the range [15 minutes, exempted limit]. long newActiveLimitMs = Math.max(15 * MINUTE_IN_MILLIS, - Math.min(newWindowSizeMs, EJ_LIMIT_ACTIVE_MS)); + Math.min(newExemptLimitMs, EJ_LIMIT_ACTIVE_MS)); if (mEJLimitsMs[ACTIVE_INDEX] != newActiveLimitMs) { mEJLimitsMs[ACTIVE_INDEX] = newActiveLimitMs; mShouldReevaluateConstraints = true; @@ -3823,18 +4054,31 @@ public final class QuotaController extends StateController { pw.println(); pw.println("QuotaController:"); pw.increaseIndent(); - pw.print(KEY_ALLOWED_TIME_PER_PERIOD_MS, ALLOWED_TIME_PER_PERIOD_MS).println(); + pw.print(KEY_ALLOWED_TIME_PER_PERIOD_EXEMPTED_MS, ALLOWED_TIME_PER_PERIOD_EXEMPTED_MS) + .println(); + pw.print(KEY_ALLOWED_TIME_PER_PERIOD_ACTIVE_MS, ALLOWED_TIME_PER_PERIOD_ACTIVE_MS) + .println(); + pw.print(KEY_ALLOWED_TIME_PER_PERIOD_WORKING_MS, ALLOWED_TIME_PER_PERIOD_WORKING_MS) + .println(); + pw.print(KEY_ALLOWED_TIME_PER_PERIOD_FREQUENT_MS, ALLOWED_TIME_PER_PERIOD_FREQUENT_MS) + .println(); + pw.print(KEY_ALLOWED_TIME_PER_PERIOD_RARE_MS, ALLOWED_TIME_PER_PERIOD_RARE_MS) + .println(); + pw.print(KEY_ALLOWED_TIME_PER_PERIOD_RESTRICTED_MS, + ALLOWED_TIME_PER_PERIOD_RESTRICTED_MS).println(); pw.print(KEY_ALLOWED_TIME_SURPLUS_PRIORITY_LOW, ALLOWED_TIME_SURPLUS_PRIORITY_LOW) .println(); pw.print(KEY_ALLOWED_TIME_SURPLUS_PRIORITY_MIN, ALLOWED_TIME_SURPLUS_PRIORITY_MIN) .println(); pw.print(KEY_IN_QUOTA_BUFFER_MS, IN_QUOTA_BUFFER_MS).println(); + pw.print(KEY_WINDOW_SIZE_EXEMPTED_MS, WINDOW_SIZE_EXEMPTED_MS).println(); pw.print(KEY_WINDOW_SIZE_ACTIVE_MS, WINDOW_SIZE_ACTIVE_MS).println(); pw.print(KEY_WINDOW_SIZE_WORKING_MS, WINDOW_SIZE_WORKING_MS).println(); pw.print(KEY_WINDOW_SIZE_FREQUENT_MS, WINDOW_SIZE_FREQUENT_MS).println(); pw.print(KEY_WINDOW_SIZE_RARE_MS, WINDOW_SIZE_RARE_MS).println(); pw.print(KEY_WINDOW_SIZE_RESTRICTED_MS, WINDOW_SIZE_RESTRICTED_MS).println(); pw.print(KEY_MAX_EXECUTION_TIME_MS, MAX_EXECUTION_TIME_MS).println(); + pw.print(KEY_MAX_JOB_COUNT_EXEMPTED, MAX_JOB_COUNT_EXEMPTED).println(); pw.print(KEY_MAX_JOB_COUNT_ACTIVE, MAX_JOB_COUNT_ACTIVE).println(); pw.print(KEY_MAX_JOB_COUNT_WORKING, MAX_JOB_COUNT_WORKING).println(); pw.print(KEY_MAX_JOB_COUNT_FREQUENT, MAX_JOB_COUNT_FREQUENT).println(); @@ -3843,6 +4087,7 @@ public final class QuotaController extends StateController { pw.print(KEY_RATE_LIMITING_WINDOW_MS, RATE_LIMITING_WINDOW_MS).println(); pw.print(KEY_MAX_JOB_COUNT_PER_RATE_LIMITING_WINDOW, MAX_JOB_COUNT_PER_RATE_LIMITING_WINDOW).println(); + pw.print(KEY_MAX_SESSION_COUNT_EXEMPTED, MAX_SESSION_COUNT_EXEMPTED).println(); pw.print(KEY_MAX_SESSION_COUNT_ACTIVE, MAX_SESSION_COUNT_ACTIVE).println(); pw.print(KEY_MAX_SESSION_COUNT_WORKING, MAX_SESSION_COUNT_WORKING).println(); pw.print(KEY_MAX_SESSION_COUNT_FREQUENT, MAX_SESSION_COUNT_FREQUENT).println(); @@ -3854,6 +4099,7 @@ public final class QuotaController extends StateController { TIMING_SESSION_COALESCING_DURATION_MS).println(); pw.print(KEY_MIN_QUOTA_CHECK_DELAY_MS, MIN_QUOTA_CHECK_DELAY_MS).println(); + pw.print(KEY_EJ_LIMIT_EXEMPTED_MS, EJ_LIMIT_EXEMPTED_MS).println(); pw.print(KEY_EJ_LIMIT_ACTIVE_MS, EJ_LIMIT_ACTIVE_MS).println(); pw.print(KEY_EJ_LIMIT_WORKING_MS, EJ_LIMIT_WORKING_MS).println(); pw.print(KEY_EJ_LIMIT_FREQUENT_MS, EJ_LIMIT_FREQUENT_MS).println(); @@ -3875,8 +4121,6 @@ public final class QuotaController extends StateController { private void dump(ProtoOutputStream proto) { final long qcToken = proto.start(ConstantsProto.QUOTA_CONTROLLER); - proto.write(ConstantsProto.QuotaController.ALLOWED_TIME_PER_PERIOD_MS, - ALLOWED_TIME_PER_PERIOD_MS); proto.write(ConstantsProto.QuotaController.IN_QUOTA_BUFFER_MS, IN_QUOTA_BUFFER_MS); proto.write(ConstantsProto.QuotaController.ACTIVE_WINDOW_SIZE_MS, WINDOW_SIZE_ACTIVE_MS); @@ -3946,7 +4190,7 @@ public final class QuotaController extends StateController { //////////////////////// TESTING HELPERS ///////////////////////////// @VisibleForTesting - long getAllowedTimePerPeriodMs() { + long[] getAllowedTimePerPeriodMs() { return mAllowedTimePerPeriodMs; } diff --git a/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java b/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java index 050e3df5b5e1..b843dcaaf680 100644 --- a/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java +++ b/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java @@ -356,6 +356,14 @@ public class AppStandbyController ConstantsObserver.DEFAULT_BROADCAST_RESPONSE_WINDOW_DURATION_MS; /** + * Process state threshold that is used for deciding whether or not an app is in the background + * in the context of recording broadcast response stats. Apps whose process state is higher + * than this threshold state will be considered to be in background. + */ + volatile int mBroadcastResponseFgThresholdState = + ConstantsObserver.DEFAULT_BROADCAST_RESPONSE_FG_THRESHOLD_STATE; + + /** * Whether we should allow apps into the * {@link android.app.usage.UsageStatsManager#STANDBY_BUCKET_RESTRICTED} bucket or not. * If false, any attempts to put an app into the bucket will put the app into the @@ -1788,6 +1796,11 @@ public class AppStandbyController } @Override + public int getBroadcastResponseFgThresholdState() { + return mBroadcastResponseFgThresholdState; + } + + @Override public void flushToDisk() { synchronized (mAppIdleLock) { mAppIdleHistory.writeAppIdleTimes(mInjector.elapsedRealtime()); @@ -2058,6 +2071,10 @@ public class AppStandbyController TimeUtils.formatDuration(mBroadcastResponseWindowDurationMillis, pw); pw.println(); + pw.print(" mBroadcastResponseFgThresholdState="); + pw.print(ActivityManager.procStateToString(mBroadcastResponseFgThresholdState)); + pw.println(); + pw.println(); pw.print("mAppIdleEnabled="); pw.print(mAppIdleEnabled); pw.print(" mAllowRestrictedBucket="); @@ -2491,6 +2508,8 @@ public class AppStandbyController }; private static final String KEY_BROADCAST_RESPONSE_WINDOW_DURATION_MS = "broadcast_response_window_timeout_ms"; + private static final String KEY_BROADCAST_RESPONSE_FG_THRESHOLD_STATE = + "broadcast_response_fg_threshold_state"; public static final long DEFAULT_CHECK_IDLE_INTERVAL_MS = COMPRESS_TIME ? ONE_MINUTE : 4 * ONE_HOUR; public static final long DEFAULT_STRONG_USAGE_TIMEOUT = @@ -2522,6 +2541,8 @@ public class AppStandbyController public static final boolean DEFAULT_CROSS_PROFILE_APPS_SHARE_STANDBY_BUCKETS = true; public static final long DEFAULT_BROADCAST_RESPONSE_WINDOW_DURATION_MS = 2 * ONE_MINUTE; + public static final int DEFAULT_BROADCAST_RESPONSE_FG_THRESHOLD_STATE = + ActivityManager.PROCESS_STATE_TOP; ConstantsObserver(Handler handler) { super(handler); @@ -2644,6 +2665,11 @@ public class AppStandbyController KEY_BROADCAST_RESPONSE_WINDOW_DURATION_MS, DEFAULT_BROADCAST_RESPONSE_WINDOW_DURATION_MS); break; + case KEY_BROADCAST_RESPONSE_FG_THRESHOLD_STATE: + mBroadcastResponseFgThresholdState = properties.getInt( + KEY_BROADCAST_RESPONSE_FG_THRESHOLD_STATE, + DEFAULT_BROADCAST_RESPONSE_FG_THRESHOLD_STATE); + break; default: if (!timeThresholdsUpdated && (name.startsWith(KEY_PREFIX_SCREEN_TIME_THRESHOLD) diff --git a/apex/media/framework/Android.bp b/apex/media/framework/Android.bp index d963e68d80ec..b4edd39894f9 100644 --- a/apex/media/framework/Android.bp +++ b/apex/media/framework/Android.bp @@ -61,6 +61,9 @@ java_library { "test_com.android.media", ], min_sdk_version: "29", + lint: { + strict_updatability_linting: true, + }, visibility: [ "//frameworks/av/apex:__subpackages__", "//frameworks/base", // For framework-all diff --git a/apex/media/service/Android.bp b/apex/media/service/Android.bp index 2714809e0c3d..834e5cbbd330 100644 --- a/apex/media/service/Android.bp +++ b/apex/media/service/Android.bp @@ -47,6 +47,9 @@ java_sdk_library { jarjar_rules: "jarjar_rules.txt", sdk_version: "system_server_current", min_sdk_version: "29", // TODO: We may need to bump this at some point. + lint: { + strict_updatability_linting: true, + }, apex_available: [ "com.android.media", ], diff --git a/boot/hiddenapi/hiddenapi-max-target-o.txt b/boot/hiddenapi/hiddenapi-max-target-o.txt index 9153426b29ab..50e0a1b45c9d 100644 --- a/boot/hiddenapi/hiddenapi-max-target-o.txt +++ b/boot/hiddenapi/hiddenapi-max-target-o.txt @@ -35446,51 +35446,6 @@ Landroid/net/IIpConnectivityMetrics$Stub;->TRANSACTION_removeNetdEventCallback:I Landroid/net/IIpConnectivityMetrics;->addNetdEventCallback(ILandroid/net/INetdEventCallback;)Z Landroid/net/IIpConnectivityMetrics;->logEvent(Landroid/net/ConnectivityMetricsEvent;)I Landroid/net/IIpConnectivityMetrics;->removeNetdEventCallback(I)Z -Landroid/net/IIpSecService$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/net/IIpSecService$Stub$Proxy;->addAddressToTunnelInterface(ILandroid/net/LinkAddress;Ljava/lang/String;)V -Landroid/net/IIpSecService$Stub$Proxy;->allocateSecurityParameterIndex(Ljava/lang/String;ILandroid/os/IBinder;)Landroid/net/IpSecSpiResponse; -Landroid/net/IIpSecService$Stub$Proxy;->applyTransportModeTransform(Landroid/os/ParcelFileDescriptor;II)V -Landroid/net/IIpSecService$Stub$Proxy;->applyTunnelModeTransform(IIILjava/lang/String;)V -Landroid/net/IIpSecService$Stub$Proxy;->closeUdpEncapsulationSocket(I)V -Landroid/net/IIpSecService$Stub$Proxy;->createTransform(Landroid/net/IpSecConfig;Landroid/os/IBinder;Ljava/lang/String;)Landroid/net/IpSecTransformResponse; -Landroid/net/IIpSecService$Stub$Proxy;->createTunnelInterface(Ljava/lang/String;Ljava/lang/String;Landroid/net/Network;Landroid/os/IBinder;Ljava/lang/String;)Landroid/net/IpSecTunnelInterfaceResponse; -Landroid/net/IIpSecService$Stub$Proxy;->deleteTransform(I)V -Landroid/net/IIpSecService$Stub$Proxy;->deleteTunnelInterface(ILjava/lang/String;)V -Landroid/net/IIpSecService$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String; -Landroid/net/IIpSecService$Stub$Proxy;->mRemote:Landroid/os/IBinder; -Landroid/net/IIpSecService$Stub$Proxy;->openUdpEncapsulationSocket(ILandroid/os/IBinder;)Landroid/net/IpSecUdpEncapResponse; -Landroid/net/IIpSecService$Stub$Proxy;->releaseSecurityParameterIndex(I)V -Landroid/net/IIpSecService$Stub$Proxy;->removeAddressFromTunnelInterface(ILandroid/net/LinkAddress;Ljava/lang/String;)V -Landroid/net/IIpSecService$Stub$Proxy;->removeTransportModeTransforms(Landroid/os/ParcelFileDescriptor;)V -Landroid/net/IIpSecService$Stub;-><init>()V -Landroid/net/IIpSecService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/IIpSecService; -Landroid/net/IIpSecService$Stub;->DESCRIPTOR:Ljava/lang/String; -Landroid/net/IIpSecService$Stub;->TRANSACTION_addAddressToTunnelInterface:I -Landroid/net/IIpSecService$Stub;->TRANSACTION_allocateSecurityParameterIndex:I -Landroid/net/IIpSecService$Stub;->TRANSACTION_applyTransportModeTransform:I -Landroid/net/IIpSecService$Stub;->TRANSACTION_applyTunnelModeTransform:I -Landroid/net/IIpSecService$Stub;->TRANSACTION_closeUdpEncapsulationSocket:I -Landroid/net/IIpSecService$Stub;->TRANSACTION_createTransform:I -Landroid/net/IIpSecService$Stub;->TRANSACTION_createTunnelInterface:I -Landroid/net/IIpSecService$Stub;->TRANSACTION_deleteTransform:I -Landroid/net/IIpSecService$Stub;->TRANSACTION_deleteTunnelInterface:I -Landroid/net/IIpSecService$Stub;->TRANSACTION_openUdpEncapsulationSocket:I -Landroid/net/IIpSecService$Stub;->TRANSACTION_releaseSecurityParameterIndex:I -Landroid/net/IIpSecService$Stub;->TRANSACTION_removeAddressFromTunnelInterface:I -Landroid/net/IIpSecService$Stub;->TRANSACTION_removeTransportModeTransforms:I -Landroid/net/IIpSecService;->addAddressToTunnelInterface(ILandroid/net/LinkAddress;Ljava/lang/String;)V -Landroid/net/IIpSecService;->allocateSecurityParameterIndex(Ljava/lang/String;ILandroid/os/IBinder;)Landroid/net/IpSecSpiResponse; -Landroid/net/IIpSecService;->applyTransportModeTransform(Landroid/os/ParcelFileDescriptor;II)V -Landroid/net/IIpSecService;->applyTunnelModeTransform(IIILjava/lang/String;)V -Landroid/net/IIpSecService;->closeUdpEncapsulationSocket(I)V -Landroid/net/IIpSecService;->createTransform(Landroid/net/IpSecConfig;Landroid/os/IBinder;Ljava/lang/String;)Landroid/net/IpSecTransformResponse; -Landroid/net/IIpSecService;->createTunnelInterface(Ljava/lang/String;Ljava/lang/String;Landroid/net/Network;Landroid/os/IBinder;Ljava/lang/String;)Landroid/net/IpSecTunnelInterfaceResponse; -Landroid/net/IIpSecService;->deleteTransform(I)V -Landroid/net/IIpSecService;->deleteTunnelInterface(ILjava/lang/String;)V -Landroid/net/IIpSecService;->openUdpEncapsulationSocket(ILandroid/os/IBinder;)Landroid/net/IpSecUdpEncapResponse; -Landroid/net/IIpSecService;->releaseSecurityParameterIndex(I)V -Landroid/net/IIpSecService;->removeAddressFromTunnelInterface(ILandroid/net/LinkAddress;Ljava/lang/String;)V -Landroid/net/IIpSecService;->removeTransportModeTransforms(Landroid/os/ParcelFileDescriptor;)V Landroid/net/INetd$Stub$Proxy;-><init>(Landroid/os/IBinder;)V Landroid/net/INetd$Stub$Proxy;->addVirtualTunnelInterface(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;II)V Landroid/net/INetd$Stub$Proxy;->bandwidthEnableDataSaver(Z)Z @@ -35914,174 +35869,6 @@ Landroid/net/InterfaceConfiguration;->mFlags:Ljava/util/HashSet; Landroid/net/InterfaceConfiguration;->mHwAddr:Ljava/lang/String; Landroid/net/InterfaceConfiguration;->setHardwareAddress(Ljava/lang/String;)V Landroid/net/InterfaceConfiguration;->validateFlag(Ljava/lang/String;)V -Landroid/net/IpSecAlgorithm;->checkValidOrThrow(Ljava/lang/String;II)V -Landroid/net/IpSecAlgorithm;->CRYPT_NULL:Ljava/lang/String; -Landroid/net/IpSecAlgorithm;->equals(Landroid/net/IpSecAlgorithm;Landroid/net/IpSecAlgorithm;)Z -Landroid/net/IpSecAlgorithm;->isAead()Z -Landroid/net/IpSecAlgorithm;->isAuthentication()Z -Landroid/net/IpSecAlgorithm;->isEncryption()Z -Landroid/net/IpSecAlgorithm;->isUnsafeBuild()Z -Landroid/net/IpSecAlgorithm;->mKey:[B -Landroid/net/IpSecAlgorithm;->mName:Ljava/lang/String; -Landroid/net/IpSecAlgorithm;->mTruncLenBits:I -Landroid/net/IpSecAlgorithm;->TAG:Ljava/lang/String; -Landroid/net/IpSecConfig;-><init>()V -Landroid/net/IpSecConfig;-><init>(Landroid/net/IpSecConfig;)V -Landroid/net/IpSecConfig;-><init>(Landroid/os/Parcel;)V -Landroid/net/IpSecConfig;->CREATOR:Landroid/os/Parcelable$Creator; -Landroid/net/IpSecConfig;->equals(Landroid/net/IpSecConfig;Landroid/net/IpSecConfig;)Z -Landroid/net/IpSecConfig;->getAuthenticatedEncryption()Landroid/net/IpSecAlgorithm; -Landroid/net/IpSecConfig;->getAuthentication()Landroid/net/IpSecAlgorithm; -Landroid/net/IpSecConfig;->getDestinationAddress()Ljava/lang/String; -Landroid/net/IpSecConfig;->getEncapRemotePort()I -Landroid/net/IpSecConfig;->getEncapSocketResourceId()I -Landroid/net/IpSecConfig;->getEncapType()I -Landroid/net/IpSecConfig;->getEncryption()Landroid/net/IpSecAlgorithm; -Landroid/net/IpSecConfig;->getMarkMask()I -Landroid/net/IpSecConfig;->getMarkValue()I -Landroid/net/IpSecConfig;->getMode()I -Landroid/net/IpSecConfig;->getNattKeepaliveInterval()I -Landroid/net/IpSecConfig;->getNetwork()Landroid/net/Network; -Landroid/net/IpSecConfig;->getSourceAddress()Ljava/lang/String; -Landroid/net/IpSecConfig;->getSpiResourceId()I -Landroid/net/IpSecConfig;->mAuthenticatedEncryption:Landroid/net/IpSecAlgorithm; -Landroid/net/IpSecConfig;->mAuthentication:Landroid/net/IpSecAlgorithm; -Landroid/net/IpSecConfig;->mDestinationAddress:Ljava/lang/String; -Landroid/net/IpSecConfig;->mEncapRemotePort:I -Landroid/net/IpSecConfig;->mEncapSocketResourceId:I -Landroid/net/IpSecConfig;->mEncapType:I -Landroid/net/IpSecConfig;->mEncryption:Landroid/net/IpSecAlgorithm; -Landroid/net/IpSecConfig;->mMarkMask:I -Landroid/net/IpSecConfig;->mMarkValue:I -Landroid/net/IpSecConfig;->mMode:I -Landroid/net/IpSecConfig;->mNattKeepaliveInterval:I -Landroid/net/IpSecConfig;->mNetwork:Landroid/net/Network; -Landroid/net/IpSecConfig;->mSourceAddress:Ljava/lang/String; -Landroid/net/IpSecConfig;->mSpiResourceId:I -Landroid/net/IpSecConfig;->setAuthenticatedEncryption(Landroid/net/IpSecAlgorithm;)V -Landroid/net/IpSecConfig;->setAuthentication(Landroid/net/IpSecAlgorithm;)V -Landroid/net/IpSecConfig;->setDestinationAddress(Ljava/lang/String;)V -Landroid/net/IpSecConfig;->setEncapRemotePort(I)V -Landroid/net/IpSecConfig;->setEncapSocketResourceId(I)V -Landroid/net/IpSecConfig;->setEncapType(I)V -Landroid/net/IpSecConfig;->setEncryption(Landroid/net/IpSecAlgorithm;)V -Landroid/net/IpSecConfig;->setMarkMask(I)V -Landroid/net/IpSecConfig;->setMarkValue(I)V -Landroid/net/IpSecConfig;->setMode(I)V -Landroid/net/IpSecConfig;->setNattKeepaliveInterval(I)V -Landroid/net/IpSecConfig;->setNetwork(Landroid/net/Network;)V -Landroid/net/IpSecConfig;->setSourceAddress(Ljava/lang/String;)V -Landroid/net/IpSecConfig;->setSpiResourceId(I)V -Landroid/net/IpSecConfig;->TAG:Ljava/lang/String; -Landroid/net/IpSecManager$IpSecTunnelInterface;-><init>(Landroid/content/Context;Landroid/net/IIpSecService;Ljava/net/InetAddress;Ljava/net/InetAddress;Landroid/net/Network;)V -Landroid/net/IpSecManager$IpSecTunnelInterface;->addAddress(Ljava/net/InetAddress;I)V -Landroid/net/IpSecManager$IpSecTunnelInterface;->getInterfaceName()Ljava/lang/String; -Landroid/net/IpSecManager$IpSecTunnelInterface;->getResourceId()I -Landroid/net/IpSecManager$IpSecTunnelInterface;->mCloseGuard:Ldalvik/system/CloseGuard; -Landroid/net/IpSecManager$IpSecTunnelInterface;->mInterfaceName:Ljava/lang/String; -Landroid/net/IpSecManager$IpSecTunnelInterface;->mLocalAddress:Ljava/net/InetAddress; -Landroid/net/IpSecManager$IpSecTunnelInterface;->mOpPackageName:Ljava/lang/String; -Landroid/net/IpSecManager$IpSecTunnelInterface;->mRemoteAddress:Ljava/net/InetAddress; -Landroid/net/IpSecManager$IpSecTunnelInterface;->mResourceId:I -Landroid/net/IpSecManager$IpSecTunnelInterface;->mService:Landroid/net/IIpSecService; -Landroid/net/IpSecManager$IpSecTunnelInterface;->mUnderlyingNetwork:Landroid/net/Network; -Landroid/net/IpSecManager$IpSecTunnelInterface;->removeAddress(Ljava/net/InetAddress;I)V -Landroid/net/IpSecManager$ResourceUnavailableException;-><init>(Ljava/lang/String;)V -Landroid/net/IpSecManager$SecurityParameterIndex;-><init>(Landroid/net/IIpSecService;Ljava/net/InetAddress;I)V -Landroid/net/IpSecManager$SecurityParameterIndex;->getResourceId()I -Landroid/net/IpSecManager$SecurityParameterIndex;->mCloseGuard:Ldalvik/system/CloseGuard; -Landroid/net/IpSecManager$SecurityParameterIndex;->mDestinationAddress:Ljava/net/InetAddress; -Landroid/net/IpSecManager$SecurityParameterIndex;->mResourceId:I -Landroid/net/IpSecManager$SecurityParameterIndex;->mService:Landroid/net/IIpSecService; -Landroid/net/IpSecManager$SecurityParameterIndex;->mSpi:I -Landroid/net/IpSecManager$SpiUnavailableException;-><init>(Ljava/lang/String;I)V -Landroid/net/IpSecManager$SpiUnavailableException;->mSpi:I -Landroid/net/IpSecManager$Status;->OK:I -Landroid/net/IpSecManager$Status;->RESOURCE_UNAVAILABLE:I -Landroid/net/IpSecManager$Status;->SPI_UNAVAILABLE:I -Landroid/net/IpSecManager$UdpEncapsulationSocket;-><init>(Landroid/net/IIpSecService;I)V -Landroid/net/IpSecManager$UdpEncapsulationSocket;->getResourceId()I -Landroid/net/IpSecManager$UdpEncapsulationSocket;->mCloseGuard:Ldalvik/system/CloseGuard; -Landroid/net/IpSecManager$UdpEncapsulationSocket;->mPfd:Landroid/os/ParcelFileDescriptor; -Landroid/net/IpSecManager$UdpEncapsulationSocket;->mPort:I -Landroid/net/IpSecManager$UdpEncapsulationSocket;->mResourceId:I -Landroid/net/IpSecManager$UdpEncapsulationSocket;->mService:Landroid/net/IIpSecService; -Landroid/net/IpSecManager;-><init>(Landroid/content/Context;Landroid/net/IIpSecService;)V -Landroid/net/IpSecManager;->applyTunnelModeTransform(Landroid/net/IpSecManager$IpSecTunnelInterface;ILandroid/net/IpSecTransform;)V -Landroid/net/IpSecManager;->createIpSecTunnelInterface(Ljava/net/InetAddress;Ljava/net/InetAddress;Landroid/net/Network;)Landroid/net/IpSecManager$IpSecTunnelInterface; -Landroid/net/IpSecManager;->INVALID_RESOURCE_ID:I -Landroid/net/IpSecManager;->maybeHandleServiceSpecificException(Landroid/os/ServiceSpecificException;)V -Landroid/net/IpSecManager;->mContext:Landroid/content/Context; -Landroid/net/IpSecManager;->mService:Landroid/net/IIpSecService; -Landroid/net/IpSecManager;->removeTunnelModeTransform(Landroid/net/Network;Landroid/net/IpSecTransform;)V -Landroid/net/IpSecManager;->rethrowCheckedExceptionFromServiceSpecificException(Landroid/os/ServiceSpecificException;)Ljava/io/IOException; -Landroid/net/IpSecManager;->rethrowUncheckedExceptionFromServiceSpecificException(Landroid/os/ServiceSpecificException;)Ljava/lang/RuntimeException; -Landroid/net/IpSecManager;->TAG:Ljava/lang/String; -Landroid/net/IpSecSpiResponse;-><init>(I)V -Landroid/net/IpSecSpiResponse;-><init>(III)V -Landroid/net/IpSecSpiResponse;-><init>(Landroid/os/Parcel;)V -Landroid/net/IpSecSpiResponse;->CREATOR:Landroid/os/Parcelable$Creator; -Landroid/net/IpSecSpiResponse;->resourceId:I -Landroid/net/IpSecSpiResponse;->spi:I -Landroid/net/IpSecSpiResponse;->status:I -Landroid/net/IpSecSpiResponse;->TAG:Ljava/lang/String; -Landroid/net/IpSecTransform$Builder;->buildTunnelModeTransform(Ljava/net/InetAddress;Landroid/net/IpSecManager$SecurityParameterIndex;)Landroid/net/IpSecTransform; -Landroid/net/IpSecTransform$Builder;->mConfig:Landroid/net/IpSecConfig; -Landroid/net/IpSecTransform$Builder;->mContext:Landroid/content/Context; -Landroid/net/IpSecTransform$NattKeepaliveCallback;-><init>()V -Landroid/net/IpSecTransform$NattKeepaliveCallback;->ERROR_HARDWARE_ERROR:I -Landroid/net/IpSecTransform$NattKeepaliveCallback;->ERROR_HARDWARE_UNSUPPORTED:I -Landroid/net/IpSecTransform$NattKeepaliveCallback;->ERROR_INVALID_NETWORK:I -Landroid/net/IpSecTransform$NattKeepaliveCallback;->onError(I)V -Landroid/net/IpSecTransform$NattKeepaliveCallback;->onStarted()V -Landroid/net/IpSecTransform$NattKeepaliveCallback;->onStopped()V -Landroid/net/IpSecTransform;-><init>(Landroid/content/Context;Landroid/net/IpSecConfig;)V -Landroid/net/IpSecTransform;->activate()Landroid/net/IpSecTransform; -Landroid/net/IpSecTransform;->checkResultStatus(I)V -Landroid/net/IpSecTransform;->ENCAP_ESPINUDP:I -Landroid/net/IpSecTransform;->ENCAP_ESPINUDP_NON_IKE:I -Landroid/net/IpSecTransform;->ENCAP_NONE:I -Landroid/net/IpSecTransform;->equals(Landroid/net/IpSecTransform;Landroid/net/IpSecTransform;)Z -Landroid/net/IpSecTransform;->getConfig()Landroid/net/IpSecConfig; -Landroid/net/IpSecTransform;->getIpSecService()Landroid/net/IIpSecService; -Landroid/net/IpSecTransform;->getResourceId()I -Landroid/net/IpSecTransform;->mCallbackHandler:Landroid/os/Handler; -Landroid/net/IpSecTransform;->mCloseGuard:Ldalvik/system/CloseGuard; -Landroid/net/IpSecTransform;->mConfig:Landroid/net/IpSecConfig; -Landroid/net/IpSecTransform;->mContext:Landroid/content/Context; -Landroid/net/IpSecTransform;->mKeepalive:Landroid/net/ConnectivityManager$PacketKeepalive; -Landroid/net/IpSecTransform;->mKeepaliveCallback:Landroid/net/ConnectivityManager$PacketKeepaliveCallback; -Landroid/net/IpSecTransform;->MODE_TRANSPORT:I -Landroid/net/IpSecTransform;->MODE_TUNNEL:I -Landroid/net/IpSecTransform;->mResourceId:I -Landroid/net/IpSecTransform;->mUserKeepaliveCallback:Landroid/net/IpSecTransform$NattKeepaliveCallback; -Landroid/net/IpSecTransform;->startNattKeepalive(Landroid/net/IpSecTransform$NattKeepaliveCallback;ILandroid/os/Handler;)V -Landroid/net/IpSecTransform;->stopNattKeepalive()V -Landroid/net/IpSecTransform;->TAG:Ljava/lang/String; -Landroid/net/IpSecTransformResponse;-><init>(I)V -Landroid/net/IpSecTransformResponse;-><init>(II)V -Landroid/net/IpSecTransformResponse;-><init>(Landroid/os/Parcel;)V -Landroid/net/IpSecTransformResponse;->CREATOR:Landroid/os/Parcelable$Creator; -Landroid/net/IpSecTransformResponse;->resourceId:I -Landroid/net/IpSecTransformResponse;->status:I -Landroid/net/IpSecTransformResponse;->TAG:Ljava/lang/String; -Landroid/net/IpSecTunnelInterfaceResponse;-><init>(I)V -Landroid/net/IpSecTunnelInterfaceResponse;-><init>(IILjava/lang/String;)V -Landroid/net/IpSecTunnelInterfaceResponse;-><init>(Landroid/os/Parcel;)V -Landroid/net/IpSecTunnelInterfaceResponse;->CREATOR:Landroid/os/Parcelable$Creator; -Landroid/net/IpSecTunnelInterfaceResponse;->interfaceName:Ljava/lang/String; -Landroid/net/IpSecTunnelInterfaceResponse;->resourceId:I -Landroid/net/IpSecTunnelInterfaceResponse;->status:I -Landroid/net/IpSecTunnelInterfaceResponse;->TAG:Ljava/lang/String; -Landroid/net/IpSecUdpEncapResponse;-><init>(I)V -Landroid/net/IpSecUdpEncapResponse;-><init>(IIILjava/io/FileDescriptor;)V -Landroid/net/IpSecUdpEncapResponse;-><init>(Landroid/os/Parcel;)V -Landroid/net/IpSecUdpEncapResponse;->CREATOR:Landroid/os/Parcelable$Creator; -Landroid/net/IpSecUdpEncapResponse;->fileDescriptor:Landroid/os/ParcelFileDescriptor; -Landroid/net/IpSecUdpEncapResponse;->port:I -Landroid/net/IpSecUdpEncapResponse;->resourceId:I -Landroid/net/IpSecUdpEncapResponse;->status:I -Landroid/net/IpSecUdpEncapResponse;->TAG:Ljava/lang/String; Landroid/net/ITetheringStatsProvider$Stub$Proxy;-><init>(Landroid/os/IBinder;)V Landroid/net/ITetheringStatsProvider$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String; Landroid/net/ITetheringStatsProvider$Stub$Proxy;->getTetherStats(I)Landroid/net/NetworkStats; diff --git a/core/api/current.txt b/core/api/current.txt index 9d87f73cf7b8..3db168566870 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -326,6 +326,9 @@ package android { field public static final int allowClearUserData = 16842757; // 0x1010005 field public static final int allowClickWhenDisabled = 16844312; // 0x1010618 field public static final int allowEmbedded = 16843765; // 0x10103f5 + field public static final int allowGameAngleDriver; + field public static final int allowGameDownscaling; + field public static final int allowGameFpsOverride; field public static final int allowNativeHeapPointerTagging = 16844306; // 0x1010612 field public static final int allowParallelSyncs = 16843570; // 0x1010332 field public static final int allowSingleTap = 16843353; // 0x1010259 @@ -729,6 +732,10 @@ package android { field public static final int freezesText = 16843116; // 0x101016c field public static final int fromAlpha = 16843210; // 0x10101ca field public static final int fromDegrees = 16843187; // 0x10101b3 + field public static final int fromExtendBottom; + field public static final int fromExtendLeft; + field public static final int fromExtendRight; + field public static final int fromExtendTop; field public static final int fromId = 16843850; // 0x101044a field public static final int fromScene = 16843741; // 0x10103dd field public static final int fromXDelta = 16843206; // 0x10101c6 @@ -1431,10 +1438,12 @@ package android { field public static final int summaryOn = 16843247; // 0x10101ef field public static final int supportedTypes; field public static final int supportsAssist = 16844016; // 0x10104f0 + field public static final int supportsBatteryGameMode; field public static final int supportsInlineSuggestions = 16844301; // 0x101060d field public static final int supportsLaunchVoiceAssistFromKeyguard = 16844017; // 0x10104f1 field public static final int supportsLocalInteraction = 16844047; // 0x101050f field public static final int supportsMultipleDisplays = 16844182; // 0x1010596 + field public static final int supportsPerformanceGameMode; field public static final int supportsPictureInPicture = 16844023; // 0x10104f7 field public static final int supportsRtl = 16843695; // 0x10103af field public static final int supportsStylusHandwriting; @@ -1574,6 +1583,10 @@ package android { field public static final int titleTextStyle = 16843512; // 0x10102f8 field public static final int toAlpha = 16843211; // 0x10101cb field public static final int toDegrees = 16843188; // 0x10101b4 + field public static final int toExtendBottom; + field public static final int toExtendLeft; + field public static final int toExtendRight; + field public static final int toExtendTop; field public static final int toId = 16843849; // 0x1010449 field public static final int toScene = 16843742; // 0x10103de field public static final int toXDelta = 16843207; // 0x10101c7 @@ -3061,6 +3074,7 @@ package android.accessibilityservice { method public void onSystemActionsChanged(); method public final boolean performGlobalAction(int); method public void setAccessibilityFocusAppearance(int, @ColorInt int); + method public void setAnimationScale(float); method public boolean setCacheEnabled(boolean); method public void setGestureDetectionPassthroughRegion(int, @NonNull android.graphics.Region); method public final void setServiceInfo(android.accessibilityservice.AccessibilityServiceInfo); @@ -3122,6 +3136,11 @@ package android.accessibilityservice { field public static final int GLOBAL_ACTION_ACCESSIBILITY_SHORTCUT = 13; // 0xd field public static final int GLOBAL_ACTION_BACK = 1; // 0x1 field public static final int GLOBAL_ACTION_DISMISS_NOTIFICATION_SHADE = 15; // 0xf + field public static final int GLOBAL_ACTION_DPAD_CENTER = 20; // 0x14 + field public static final int GLOBAL_ACTION_DPAD_DOWN = 17; // 0x11 + field public static final int GLOBAL_ACTION_DPAD_LEFT = 18; // 0x12 + field public static final int GLOBAL_ACTION_DPAD_RIGHT = 19; // 0x13 + field public static final int GLOBAL_ACTION_DPAD_UP = 16; // 0x10 field public static final int GLOBAL_ACTION_HOME = 2; // 0x2 field public static final int GLOBAL_ACTION_KEYCODE_HEADSETHOOK = 10; // 0xa field public static final int GLOBAL_ACTION_LOCK_SCREEN = 8; // 0x8 @@ -4051,7 +4070,7 @@ package android.app { method public int getMaxNumPictureInPictureActions(); method public final android.media.session.MediaController getMediaController(); method @NonNull public android.view.MenuInflater getMenuInflater(); - method @Nullable public android.view.OnBackInvokedDispatcher getOnBackInvokedDispatcher(); + method @NonNull public android.view.OnBackInvokedDispatcher getOnBackInvokedDispatcher(); method public final android.app.Activity getParent(); method @Nullable public android.content.Intent getParentActivityIntent(); method public android.content.SharedPreferences getPreferences(int); @@ -4857,6 +4876,7 @@ package android.app { field public static final int REASON_DEPENDENCY_DIED = 12; // 0xc field public static final int REASON_EXCESSIVE_RESOURCE_USAGE = 9; // 0x9 field public static final int REASON_EXIT_SELF = 1; // 0x1 + field public static final int REASON_FREEZER = 14; // 0xe field public static final int REASON_INITIALIZATION_FAILURE = 7; // 0x7 field public static final int REASON_LOW_MEMORY = 3; // 0x3 field public static final int REASON_OTHER = 13; // 0xd @@ -4952,7 +4972,7 @@ package android.app { method @NonNull @UiContext public final android.content.Context getContext(); method @Nullable public android.view.View getCurrentFocus(); method @NonNull public android.view.LayoutInflater getLayoutInflater(); - method @Nullable public android.view.OnBackInvokedDispatcher getOnBackInvokedDispatcher(); + method @NonNull public android.view.OnBackInvokedDispatcher getOnBackInvokedDispatcher(); method @Nullable public final android.app.Activity getOwnerActivity(); method @Nullable public final android.view.SearchEvent getSearchEvent(); method public final int getVolumeControlStream(); @@ -6931,6 +6951,7 @@ package android.app { method public boolean performGlobalAction(int); method public void revokeRuntimePermission(String, String); method public void revokeRuntimePermissionAsUser(String, String, android.os.UserHandle); + method public void setAnimationScale(float); method public void setOnAccessibilityEventListener(android.app.UiAutomation.OnAccessibilityEventListener); method public boolean setRotation(int); method public void setRunAsMonkey(boolean); @@ -7306,10 +7327,10 @@ package android.app.admin { method @Nullable public java.util.List<java.lang.String> getDelegatePackages(@NonNull android.content.ComponentName, @NonNull String); method @NonNull public java.util.List<java.lang.String> getDelegatedScopes(@Nullable android.content.ComponentName, @NonNull String); method public CharSequence getDeviceOwnerLockScreenInfo(); - method @NonNull public android.graphics.drawable.Drawable getDrawable(@NonNull String, @NonNull String, @NonNull java.util.concurrent.Callable<android.graphics.drawable.Drawable>); - method @NonNull public android.graphics.drawable.Drawable getDrawable(@NonNull String, @NonNull String, @NonNull String, @NonNull java.util.concurrent.Callable<android.graphics.drawable.Drawable>); - method @NonNull public android.graphics.drawable.Drawable getDrawableForDensity(@NonNull String, @NonNull String, int, @NonNull java.util.concurrent.Callable<android.graphics.drawable.Drawable>); - method @NonNull public android.graphics.drawable.Drawable getDrawableForDensity(@NonNull String, @NonNull String, @NonNull String, int, @NonNull java.util.concurrent.Callable<android.graphics.drawable.Drawable>); + method @Nullable public android.graphics.drawable.Drawable getDrawable(@NonNull String, @NonNull String, @NonNull java.util.concurrent.Callable<android.graphics.drawable.Drawable>); + method @Nullable public android.graphics.drawable.Drawable getDrawable(@NonNull String, @NonNull String, @NonNull String, @NonNull java.util.concurrent.Callable<android.graphics.drawable.Drawable>); + method @Nullable public android.graphics.drawable.Drawable getDrawableForDensity(@NonNull String, @NonNull String, int, @NonNull java.util.concurrent.Callable<android.graphics.drawable.Drawable>); + method @Nullable public android.graphics.drawable.Drawable getDrawableForDensity(@NonNull String, @NonNull String, @NonNull String, int, @NonNull java.util.concurrent.Callable<android.graphics.drawable.Drawable>); method public CharSequence getEndUserSessionMessage(@NonNull android.content.ComponentName); method @NonNull public String getEnrollmentSpecificId(); method @Nullable public android.app.admin.FactoryResetProtectionPolicy getFactoryResetProtectionPolicy(@Nullable android.content.ComponentName); @@ -7593,7 +7614,7 @@ package android.app.admin { field public static final String EXTRA_PROVISIONING_LEAVE_ALL_SYSTEM_APPS_ENABLED = "android.app.extra.PROVISIONING_LEAVE_ALL_SYSTEM_APPS_ENABLED"; field public static final String EXTRA_PROVISIONING_LOCALE = "android.app.extra.PROVISIONING_LOCALE"; field public static final String EXTRA_PROVISIONING_LOCAL_TIME = "android.app.extra.PROVISIONING_LOCAL_TIME"; - field public static final String EXTRA_PROVISIONING_LOGO_URI = "android.app.extra.PROVISIONING_LOGO_URI"; + field @Deprecated public static final String EXTRA_PROVISIONING_LOGO_URI = "android.app.extra.PROVISIONING_LOGO_URI"; field @Deprecated public static final String EXTRA_PROVISIONING_MAIN_COLOR = "android.app.extra.PROVISIONING_MAIN_COLOR"; field public static final String EXTRA_PROVISIONING_MODE = "android.app.extra.PROVISIONING_MODE"; field public static final String EXTRA_PROVISIONING_SENSORS_PERMISSION_GRANT_OPT_OUT = "android.app.extra.PROVISIONING_SENSORS_PERMISSION_GRANT_OPT_OUT"; @@ -9806,7 +9827,6 @@ package android.content { field public static final String STATUS_BAR_SERVICE = "statusbar"; field public static final String STORAGE_SERVICE = "storage"; field public static final String STORAGE_STATS_SERVICE = "storagestats"; - field public static final String SUPPLEMENTAL_PROCESS_SERVICE = "supplemental_process"; field public static final String SYSTEM_HEALTH_SERVICE = "systemhealth"; field public static final String TELECOM_SERVICE = "telecom"; field public static final String TELEPHONY_IMS_SERVICE = "telephony_ims"; @@ -23299,7 +23319,7 @@ package android.media { ctor public RouteDiscoveryPreference.Builder(@NonNull android.media.RouteDiscoveryPreference); method @NonNull public android.media.RouteDiscoveryPreference build(); method @NonNull public android.media.RouteDiscoveryPreference.Builder setAllowedPackages(@NonNull java.util.List<java.lang.String>); - method @NonNull public android.media.RouteDiscoveryPreference.Builder setDeduplicationPackageOrder(@Nullable java.util.List<java.lang.String>); + method @NonNull public android.media.RouteDiscoveryPreference.Builder setDeduplicationPackageOrder(@NonNull java.util.List<java.lang.String>); method @NonNull public android.media.RouteDiscoveryPreference.Builder setPreferredFeatures(@NonNull java.util.List<java.lang.String>); method @NonNull public android.media.RouteDiscoveryPreference.Builder setRequiredFeatures(@NonNull java.util.List<java.lang.String>); method @NonNull public android.media.RouteDiscoveryPreference.Builder setShouldPerformActiveScan(boolean); @@ -26374,75 +26394,6 @@ package android.net { method @NonNull public android.net.Ikev2VpnProfile.Builder setProxy(@Nullable android.net.ProxyInfo); } - public final class IpSecAlgorithm implements android.os.Parcelable { - ctor public IpSecAlgorithm(@NonNull String, @NonNull byte[]); - ctor public IpSecAlgorithm(@NonNull String, @NonNull byte[], int); - method public int describeContents(); - method @NonNull public byte[] getKey(); - method @NonNull public String getName(); - method @NonNull public static java.util.Set<java.lang.String> getSupportedAlgorithms(); - method public int getTruncationLengthBits(); - method public void writeToParcel(android.os.Parcel, int); - field public static final String AUTH_AES_CMAC = "cmac(aes)"; - field public static final String AUTH_AES_XCBC = "xcbc(aes)"; - field public static final String AUTH_CRYPT_AES_GCM = "rfc4106(gcm(aes))"; - field public static final String AUTH_CRYPT_CHACHA20_POLY1305 = "rfc7539esp(chacha20,poly1305)"; - field public static final String AUTH_HMAC_MD5 = "hmac(md5)"; - field public static final String AUTH_HMAC_SHA1 = "hmac(sha1)"; - field public static final String AUTH_HMAC_SHA256 = "hmac(sha256)"; - field public static final String AUTH_HMAC_SHA384 = "hmac(sha384)"; - field public static final String AUTH_HMAC_SHA512 = "hmac(sha512)"; - field @NonNull public static final android.os.Parcelable.Creator<android.net.IpSecAlgorithm> CREATOR; - field public static final String CRYPT_AES_CBC = "cbc(aes)"; - field public static final String CRYPT_AES_CTR = "rfc3686(ctr(aes))"; - } - - public final class IpSecManager { - method @NonNull public android.net.IpSecManager.SecurityParameterIndex allocateSecurityParameterIndex(@NonNull java.net.InetAddress) throws android.net.IpSecManager.ResourceUnavailableException; - method @NonNull public android.net.IpSecManager.SecurityParameterIndex allocateSecurityParameterIndex(@NonNull java.net.InetAddress, int) throws android.net.IpSecManager.ResourceUnavailableException, android.net.IpSecManager.SpiUnavailableException; - method public void applyTransportModeTransform(@NonNull java.net.Socket, int, @NonNull android.net.IpSecTransform) throws java.io.IOException; - method public void applyTransportModeTransform(@NonNull java.net.DatagramSocket, int, @NonNull android.net.IpSecTransform) throws java.io.IOException; - method public void applyTransportModeTransform(@NonNull java.io.FileDescriptor, int, @NonNull android.net.IpSecTransform) throws java.io.IOException; - method @NonNull public android.net.IpSecManager.UdpEncapsulationSocket openUdpEncapsulationSocket(int) throws java.io.IOException, android.net.IpSecManager.ResourceUnavailableException; - method @NonNull public android.net.IpSecManager.UdpEncapsulationSocket openUdpEncapsulationSocket() throws java.io.IOException, android.net.IpSecManager.ResourceUnavailableException; - method public void removeTransportModeTransforms(@NonNull java.net.Socket) throws java.io.IOException; - method public void removeTransportModeTransforms(@NonNull java.net.DatagramSocket) throws java.io.IOException; - method public void removeTransportModeTransforms(@NonNull java.io.FileDescriptor) throws java.io.IOException; - field public static final int DIRECTION_IN = 0; // 0x0 - field public static final int DIRECTION_OUT = 1; // 0x1 - } - - public static final class IpSecManager.ResourceUnavailableException extends android.util.AndroidException { - } - - public static final class IpSecManager.SecurityParameterIndex implements java.lang.AutoCloseable { - method public void close(); - method public int getSpi(); - } - - public static final class IpSecManager.SpiUnavailableException extends android.util.AndroidException { - method public int getSpi(); - } - - public static final class IpSecManager.UdpEncapsulationSocket implements java.lang.AutoCloseable { - method public void close() throws java.io.IOException; - method public java.io.FileDescriptor getFileDescriptor(); - method public int getPort(); - } - - public final class IpSecTransform implements java.lang.AutoCloseable { - method public void close(); - } - - public static class IpSecTransform.Builder { - ctor public IpSecTransform.Builder(@NonNull android.content.Context); - method @NonNull public android.net.IpSecTransform buildTransportModeTransform(@NonNull java.net.InetAddress, @NonNull android.net.IpSecManager.SecurityParameterIndex) throws java.io.IOException, android.net.IpSecManager.ResourceUnavailableException, android.net.IpSecManager.SpiUnavailableException; - method @NonNull public android.net.IpSecTransform.Builder setAuthenticatedEncryption(@NonNull android.net.IpSecAlgorithm); - method @NonNull public android.net.IpSecTransform.Builder setAuthentication(@NonNull android.net.IpSecAlgorithm); - method @NonNull public android.net.IpSecTransform.Builder setEncryption(@NonNull android.net.IpSecAlgorithm); - method @NonNull public android.net.IpSecTransform.Builder setIpv4Encapsulation(@NonNull android.net.IpSecManager.UdpEncapsulationSocket, int); - } - public class LocalServerSocket implements java.io.Closeable { ctor public LocalServerSocket(String) throws java.io.IOException; ctor public LocalServerSocket(java.io.FileDescriptor) throws java.io.IOException; @@ -31417,6 +31368,9 @@ package android.os { method @Nullable public byte[] createByteArray(); method @Nullable public char[] createCharArray(); method @Nullable public double[] createDoubleArray(); + method @Nullable public <T> T createFixedArray(@NonNull Class<T>, @NonNull int...); + method @Nullable public <T, S extends android.os.IInterface> T createFixedArray(@NonNull Class<T>, @NonNull java.util.function.Function<android.os.IBinder,S>, @NonNull int...); + method @Nullable public <T, S extends android.os.Parcelable> T createFixedArray(@NonNull Class<T>, @NonNull android.os.Parcelable.Creator<S>, @NonNull int...); method @Nullable public float[] createFloatArray(); method @Nullable public int[] createIntArray(); method @Nullable public <T extends android.os.IInterface> T[] createInterfaceArray(@NonNull java.util.function.IntFunction<T[]>, @NonNull java.util.function.Function<android.os.IBinder,T>); @@ -31458,6 +31412,9 @@ package android.os { method public void readException(); method public void readException(int, String); method public android.os.ParcelFileDescriptor readFileDescriptor(); + method public <T> void readFixedArray(@NonNull T); + method public <T, S extends android.os.IInterface> void readFixedArray(@NonNull T, @NonNull java.util.function.Function<android.os.IBinder,S>); + method public <T, S extends android.os.Parcelable> void readFixedArray(@NonNull T, @NonNull android.os.Parcelable.Creator<S>); method public float readFloat(); method public void readFloatArray(@NonNull float[]); method @Deprecated @Nullable public java.util.HashMap readHashMap(@Nullable ClassLoader); @@ -31501,6 +31458,7 @@ package android.os { method public void setDataCapacity(int); method public void setDataPosition(int); method public void setDataSize(int); + method public void setPropagateAllowBlocking(); method public void unmarshall(@NonNull byte[], int, int); method public void writeArray(@Nullable Object[]); method public void writeBinderArray(@Nullable android.os.IBinder[]); @@ -31518,6 +31476,7 @@ package android.os { method public void writeDoubleArray(@Nullable double[]); method public void writeException(@NonNull Exception); method public void writeFileDescriptor(@NonNull java.io.FileDescriptor); + method public <T> void writeFixedArray(@Nullable T, int, @NonNull int...); method public void writeFloat(float); method public void writeFloatArray(@Nullable float[]); method public void writeInt(int); @@ -41213,6 +41172,7 @@ package android.telephony { field public static final String KEY_IMS_CONFERENCE_SIZE_LIMIT_INT = "ims_conference_size_limit_int"; field public static final String KEY_IMS_DTMF_TONE_DELAY_INT = "ims_dtmf_tone_delay_int"; field public static final String KEY_IS_IMS_CONFERENCE_SIZE_ENFORCED_BOOL = "is_ims_conference_size_enforced_bool"; + field public static final String KEY_IS_OPPORTUNISTIC_SUBSCRIPTION_BOOL = "is_opportunistic_subscription_bool"; field public static final String KEY_LTE_ENABLED_BOOL = "lte_enabled_bool"; field public static final String KEY_LTE_RSRQ_THRESHOLDS_INT_ARRAY = "lte_rsrq_thresholds_int_array"; field public static final String KEY_LTE_RSSNR_THRESHOLDS_INT_ARRAY = "lte_rssnr_thresholds_int_array"; @@ -41297,6 +41257,7 @@ package android.telephony { field public static final String KEY_SIM_NETWORK_UNLOCK_ALLOW_DISMISS_BOOL = "sim_network_unlock_allow_dismiss_bool"; field public static final String KEY_SMDP_SERVER_ADDRESS_STRING = "smdp_server_address_string"; 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_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"; @@ -41340,6 +41301,7 @@ package android.telephony { field public static final String KEY_WFC_EMERGENCY_ADDRESS_CARRIER_APP_STRING = "wfc_emergency_address_carrier_app_string"; field public static final String KEY_WORLD_MODE_ENABLED_BOOL = "world_mode_enabled_bool"; field public static final String KEY_WORLD_PHONE_BOOL = "world_phone_bool"; + field public static final String REMOVE_GROUP_UUID_STRING = "00000000-0000-0000-0000-000000000000"; field public static final int SERVICE_CLASS_NONE = 0; // 0x0 field public static final int SERVICE_CLASS_VOICE = 1; // 0x1 field public static final int USSD_OVER_CS_ONLY = 2; // 0x2 @@ -48945,7 +48907,7 @@ package android.view { } public interface OnBackInvokedDispatcherOwner { - method @Nullable public android.view.OnBackInvokedDispatcher getOnBackInvokedDispatcher(); + method @NonNull public android.view.OnBackInvokedDispatcher getOnBackInvokedDispatcher(); } public interface OnReceiveContentListener { @@ -49373,7 +49335,7 @@ package android.view { field @NonNull public static final android.os.Parcelable.Creator<android.view.VerifiedMotionEvent> CREATOR; } - @UiThread public class View implements android.view.accessibility.AccessibilityEventSource android.graphics.drawable.Drawable.Callback android.view.KeyEvent.Callback android.view.OnBackInvokedDispatcherOwner { + @UiThread public class View implements android.view.accessibility.AccessibilityEventSource android.graphics.drawable.Drawable.Callback android.view.KeyEvent.Callback { ctor public View(android.content.Context); ctor public View(android.content.Context, @Nullable android.util.AttributeSet); ctor public View(android.content.Context, @Nullable android.util.AttributeSet, int); @@ -49577,7 +49539,6 @@ package android.view { method @IdRes public int getNextFocusLeftId(); method @IdRes public int getNextFocusRightId(); method @IdRes public int getNextFocusUpId(); - method @Nullable public android.view.OnBackInvokedDispatcher getOnBackInvokedDispatcher(); method public android.view.View.OnFocusChangeListener getOnFocusChangeListener(); method @ColorInt public int getOutlineAmbientShadowColor(); method public android.view.ViewOutlineProvider getOutlineProvider(); @@ -51661,6 +51622,7 @@ package android.view.accessibility { method public boolean isSelected(); method public boolean isShowingHintText(); method public boolean isTextEntryKey(); + method public boolean isTextSelectable(); method public boolean isVisibleToUser(); method @Deprecated public static android.view.accessibility.AccessibilityNodeInfo obtain(android.view.View); method @Deprecated public static android.view.accessibility.AccessibilityNodeInfo obtain(android.view.View, int); @@ -51724,6 +51686,7 @@ package android.view.accessibility { method public void setStateDescription(@Nullable CharSequence); method public void setText(CharSequence); method public void setTextEntryKey(boolean); + method public void setTextSelectable(boolean); method public void setTextSelection(int, int); method public void setTooltipText(@Nullable CharSequence); method public void setTouchDelegateInfo(@NonNull android.view.accessibility.AccessibilityNodeInfo.TouchDelegateInfo); diff --git a/core/api/module-lib-current.txt b/core/api/module-lib-current.txt index df61a968ffc0..9737cde48b4d 100644 --- a/core/api/module-lib-current.txt +++ b/core/api/module-lib-current.txt @@ -54,6 +54,21 @@ package android.app { method public void onCanceled(@NonNull android.app.PendingIntent); } + public class PropertyInvalidatedCache<Query, Result> { + ctor public PropertyInvalidatedCache(int, int, @NonNull String, @NonNull String, @NonNull android.app.PropertyInvalidatedCache.QueryHandler<Query,Result>); + method public final void disableForCurrentProcess(); + method public final void invalidateCache(); + method public static void invalidateCache(int, @NonNull String); + method @Nullable public final Result query(@NonNull Query); + field public static final int MODULE_BLUETOOTH = 2; // 0x2 + } + + public abstract static class PropertyInvalidatedCache.QueryHandler<Q, R> { + ctor public PropertyInvalidatedCache.QueryHandler(); + method @Nullable public abstract R apply(@NonNull Q); + method public boolean shouldBypassCache(@NonNull Q); + } + public class StatusBarManager { method @RequiresPermission(android.Manifest.permission.STATUS_BAR) public void setExpansionDisabledForSimNetworkLock(boolean); } @@ -63,9 +78,9 @@ package android.app { package android.app.admin { public class DevicePolicyManager { - method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public void acknowledgeNewUserDisclaimer(); + method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.INTERACT_ACROSS_USERS}) public void acknowledgeNewUserDisclaimer(); method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.INTERACT_ACROSS_USERS}) public android.os.UserHandle getLogoutUser(); - method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public int logoutUser(); + method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.INTERACT_ACROSS_USERS}) public int logoutUser(); field public static final String ACTION_SHOW_NEW_USER_DISCLAIMER = "android.app.action.SHOW_NEW_USER_DISCLAIMER"; } @@ -124,8 +139,14 @@ package android.content { package android.content.pm { + public class ApplicationInfo extends android.content.pm.PackageItemInfo implements android.os.Parcelable { + method @NonNull public java.util.List<android.content.pm.SharedLibraryInfo> getSharedLibraryInfos(); + } + public abstract class PackageManager { method @NonNull public String getPermissionControllerPackageName(); + method @NonNull public String getSupplementalProcessPackageName(); + field public static final int MATCH_STATIC_SHARED_AND_SDK_LIBRARIES = 67108864; // 0x4000000 } } @@ -176,7 +197,7 @@ package android.media { method public void adjustSuggestedStreamVolumeForUid(int, int, int, @NonNull String, int, int, int); method @NonNull public java.util.List<android.bluetooth.BluetoothCodecConfig> getHwOffloadFormatsSupportedForA2dp(); method @NonNull public java.util.List<android.bluetooth.BluetoothLeAudioCodecConfig> getHwOffloadFormatsSupportedForLeAudio(); - method @RequiresPermission("android.permission.BLUETOOTH_STACK") public void handleBluetoothActiveDeviceChanged(@Nullable android.bluetooth.BluetoothDevice, @Nullable android.bluetooth.BluetoothDevice, @NonNull android.media.BtProfileConnectionInfo); + method @RequiresPermission("android.permission.BLUETOOTH_STACK") public void handleBluetoothActiveDeviceChanged(@Nullable android.bluetooth.BluetoothDevice, @Nullable android.bluetooth.BluetoothDevice, @NonNull android.media.BluetoothProfileConnectionInfo); method @RequiresPermission("android.permission.BLUETOOTH_STACK") public void setA2dpSuspended(boolean); method @RequiresPermission("android.permission.BLUETOOTH_STACK") public void setBluetoothHeadsetProperties(@NonNull String, boolean, boolean); method @RequiresPermission("android.permission.BLUETOOTH_STACK") public void setHfpEnabled(boolean); @@ -186,18 +207,18 @@ package android.media { field public static final int FLAG_FROM_KEY = 4096; // 0x1000 } - public final class BtProfileConnectionInfo implements android.os.Parcelable { - method @NonNull public static android.media.BtProfileConnectionInfo a2dpInfo(boolean, int); - method @NonNull public static android.media.BtProfileConnectionInfo a2dpSinkInfo(int); + public final class BluetoothProfileConnectionInfo implements android.os.Parcelable { + method @NonNull public static android.media.BluetoothProfileConnectionInfo createA2dpInfo(boolean, int); + method @NonNull public static android.media.BluetoothProfileConnectionInfo createA2dpSinkInfo(int); + method @NonNull public static android.media.BluetoothProfileConnectionInfo createHearingAidInfo(boolean); + method @NonNull public static android.media.BluetoothProfileConnectionInfo createLeAudioInfo(boolean, boolean); method public int describeContents(); - method public boolean getIsLeOutput(); method public int getProfile(); - method public boolean getSuppressNoisyIntent(); method public int getVolume(); - method @NonNull public static android.media.BtProfileConnectionInfo hearingAidInfo(boolean); - method @NonNull public static android.media.BtProfileConnectionInfo leAudio(boolean, boolean); + method public boolean isLeOutput(); + method public boolean isSuppressNoisyIntent(); method public void writeToParcel(@NonNull android.os.Parcel, int); - field @NonNull public static final android.os.Parcelable.Creator<android.media.BtProfileConnectionInfo> CREATOR; + field @NonNull public static final android.os.Parcelable.Creator<android.media.BluetoothProfileConnectionInfo> CREATOR; } public class MediaMetadataRetriever implements java.lang.AutoCloseable { @@ -262,14 +283,6 @@ package android.net { field @NonNull public static final android.os.Parcelable.Creator<android.net.EthernetNetworkSpecifier> CREATOR; } - public final class IpSecManager { - field public static final int DIRECTION_FWD = 2; // 0x2 - } - - public static final class IpSecManager.UdpEncapsulationSocket implements java.lang.AutoCloseable { - method public int getResourceId(); - } - public class LocalSocket implements java.io.Closeable { ctor public LocalSocket(@NonNull java.io.FileDescriptor); } diff --git a/core/api/removed.txt b/core/api/removed.txt index 311b110f1997..07639fbf5378 100644 --- a/core/api/removed.txt +++ b/core/api/removed.txt @@ -513,7 +513,7 @@ package android.util { package android.view { - @UiThread public class View implements android.view.accessibility.AccessibilityEventSource android.graphics.drawable.Drawable.Callback android.view.KeyEvent.Callback android.view.OnBackInvokedDispatcherOwner { + @UiThread public class View implements android.view.accessibility.AccessibilityEventSource android.graphics.drawable.Drawable.Callback android.view.KeyEvent.Callback { method protected void initializeFadingEdge(android.content.res.TypedArray); method protected void initializeScrollbars(android.content.res.TypedArray); } diff --git a/core/api/system-current.txt b/core/api/system-current.txt index a00b3d1183e4..b2f57248402f 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -76,6 +76,7 @@ package android { field public static final String BIND_TRANSLATION_SERVICE = "android.permission.BIND_TRANSLATION_SERVICE"; field public static final String BIND_TRUST_AGENT = "android.permission.BIND_TRUST_AGENT"; field public static final String BIND_TV_REMOTE_SERVICE = "android.permission.BIND_TV_REMOTE_SERVICE"; + field public static final String BIND_WALLPAPER_EFFECTS_GENERATION_SERVICE = "android.permission.BIND_WALLPAPER_EFFECTS_GENERATION_SERVICE"; field public static final String BLUETOOTH_MAP = "android.permission.BLUETOOTH_MAP"; field public static final String BRICK = "android.permission.BRICK"; field public static final String BRIGHTNESS_SLIDER_USAGE = "android.permission.BRIGHTNESS_SLIDER_USAGE"; @@ -165,6 +166,7 @@ package android { field public static final String MANAGE_CONTENT_SUGGESTIONS = "android.permission.MANAGE_CONTENT_SUGGESTIONS"; field public static final String MANAGE_DEBUGGING = "android.permission.MANAGE_DEBUGGING"; field public static final String MANAGE_DEVICE_ADMINS = "android.permission.MANAGE_DEVICE_ADMINS"; + field public static final String MANAGE_ETHERNET_NETWORKS = "android.permission.MANAGE_ETHERNET_NETWORKS"; field public static final String MANAGE_FACTORY_RESET_PROTECTION = "android.permission.MANAGE_FACTORY_RESET_PROTECTION"; field public static final String MANAGE_GAME_ACTIVITY = "android.permission.MANAGE_GAME_ACTIVITY"; field public static final String MANAGE_GAME_MODE = "android.permission.MANAGE_GAME_MODE"; @@ -191,6 +193,7 @@ package android { field public static final String MANAGE_USB = "android.permission.MANAGE_USB"; field public static final String MANAGE_USERS = "android.permission.MANAGE_USERS"; field public static final String MANAGE_USER_OEM_UNLOCK_STATE = "android.permission.MANAGE_USER_OEM_UNLOCK_STATE"; + field public static final String MANAGE_WALLPAPER_EFFECTS_GENERATION = "android.permission.MANAGE_WALLPAPER_EFFECTS_GENERATION"; field public static final String MANAGE_WEAK_ESCROW_TOKEN = "android.permission.MANAGE_WEAK_ESCROW_TOKEN"; field public static final String MANAGE_WIFI_AUTO_JOIN = "android.permission.MANAGE_WIFI_AUTO_JOIN"; field public static final String MANAGE_WIFI_COUNTRY_CODE = "android.permission.MANAGE_WIFI_COUNTRY_CODE"; @@ -203,6 +206,7 @@ package android { field public static final String MODIFY_PARENTAL_CONTROLS = "android.permission.MODIFY_PARENTAL_CONTROLS"; field public static final String MODIFY_QUIET_MODE = "android.permission.MODIFY_QUIET_MODE"; field public static final String MODIFY_SETTINGS_OVERRIDEABLE_BY_RESTORE = "android.permission.MODIFY_SETTINGS_OVERRIDEABLE_BY_RESTORE"; + field public static final String MODIFY_TOUCH_MODE_STATE = "android.permission.MODIFY_TOUCH_MODE_STATE"; field public static final String MOVE_PACKAGE = "android.permission.MOVE_PACKAGE"; field public static final String NETWORK_AIRPLANE_MODE = "android.permission.NETWORK_AIRPLANE_MODE"; field public static final String NETWORK_CARRIER_PROVISIONING = "android.permission.NETWORK_CARRIER_PROVISIONING"; @@ -907,6 +911,19 @@ package android.app { method @RequiresPermission(android.Manifest.permission.STATUS_BAR) public int getNavBarModeOverride(); method @RequiresPermission(android.Manifest.permission.STATUS_BAR) public void setDisabledForSetup(boolean); method @RequiresPermission(android.Manifest.permission.STATUS_BAR) public void setNavBarModeOverride(int); + method @RequiresPermission(android.Manifest.permission.MEDIA_CONTENT_CONTROL) public void updateMediaTapToTransferReceiverDisplay(int, @NonNull android.media.MediaRoute2Info); + method @RequiresPermission(android.Manifest.permission.MEDIA_CONTENT_CONTROL) public void updateMediaTapToTransferSenderDisplay(int, @NonNull android.media.MediaRoute2Info, @Nullable java.util.concurrent.Executor, @Nullable Runnable); + field public static final int MEDIA_TRANSFER_RECEIVER_STATE_CLOSE_TO_SENDER = 0; // 0x0 + field public static final int MEDIA_TRANSFER_RECEIVER_STATE_FAR_FROM_SENDER = 1; // 0x1 + field public static final int MEDIA_TRANSFER_SENDER_STATE_ALMOST_CLOSE_TO_END_CAST = 1; // 0x1 + field public static final int MEDIA_TRANSFER_SENDER_STATE_ALMOST_CLOSE_TO_START_CAST = 0; // 0x0 + field public static final int MEDIA_TRANSFER_SENDER_STATE_FAR_FROM_RECEIVER = 8; // 0x8 + field public static final int MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_RECEIVER_FAILED = 6; // 0x6 + field public static final int MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_RECEIVER_SUCCEEDED = 4; // 0x4 + field public static final int MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_RECEIVER_TRIGGERED = 2; // 0x2 + field public static final int MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_THIS_DEVICE_FAILED = 7; // 0x7 + field public static final int MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_THIS_DEVICE_SUCCEEDED = 5; // 0x5 + field public static final int MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_THIS_DEVICE_TRIGGERED = 3; // 0x3 field public static final int NAV_BAR_MODE_OVERRIDE_KIDS = 1; // 0x1 field public static final int NAV_BAR_MODE_OVERRIDE_NONE = 0; // 0x0 } @@ -1062,8 +1079,8 @@ package android.app.admin { method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.QUERY_ADMIN_POLICY}) public java.util.List<java.lang.String> getPermittedInputMethodsForCurrentUser(); method @Nullable public android.content.ComponentName getProfileOwner() throws java.lang.IllegalArgumentException; method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS}) public String getProfileOwnerNameAsUser(int) throws java.lang.IllegalArgumentException; - method @NonNull public String getString(@NonNull String, @NonNull java.util.concurrent.Callable<java.lang.String>); - method @NonNull public String getString(@NonNull String, @NonNull java.util.concurrent.Callable<java.lang.String>, @NonNull java.lang.Object...); + method @Nullable public String getString(@NonNull String, @NonNull java.util.concurrent.Callable<java.lang.String>); + method @Nullable public String getString(@NonNull String, @NonNull java.util.concurrent.Callable<java.lang.String>, @NonNull java.lang.Object...); method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS}) public int getUserProvisioningState(); method public boolean isDeviceManaged(); method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public boolean isDeviceProvisioned(); @@ -1187,6 +1204,15 @@ package android.app.admin { field public static final String WORK_PROFILE_PAUSED_TITLE = "MediaProvider.WORK_PROFILE_PAUSED_TITLE"; } + public static final class DevicePolicyResources.Strings.PermissionController { + field public static final String BACKGROUND_ACCESS_DISABLED_BY_ADMIN_MESSAGE = "PermissionController.BACKGROUND_ACCESS_DISABLED_BY_ADMIN_MESSAGE"; + field public static final String BACKGROUND_ACCESS_ENABLED_BY_ADMIN_MESSAGE = "PermissionController.BACKGROUND_ACCESS_ENABLED_BY_ADMIN_MESSAGE"; + field public static final String FOREGROUND_ACCESS_ENABLED_BY_ADMIN_MESSAGE = "PermissionController.FOREGROUND_ACCESS_ENABLED_BY_ADMIN_MESSAGE"; + field public static final String HOME_MISSING_WORK_PROFILE_SUPPORT_MESSAGE = "PermissionController.HOME_MISSING_WORK_PROFILE_SUPPORT_MESSAGE"; + field public static final String LOCATION_AUTO_GRANTED_MESSAGE = "PermissionController.LOCATION_AUTO_GRANTED_MESSAGE"; + field public static final String WORK_PROFILE_DEFAULT_APPS_TITLE = "PermissionController.WORK_PROFILE_DEFAULT_APPS_TITLE"; + } + public final class DevicePolicyStringResource implements android.os.Parcelable { ctor public DevicePolicyStringResource(@NonNull android.content.Context, @NonNull String, @StringRes int); method public int describeContents(); @@ -1199,6 +1225,7 @@ package android.app.admin { public final class FullyManagedDeviceProvisioningParams implements android.os.Parcelable { method public boolean canDeviceOwnerGrantSensorsPermissions(); method public int describeContents(); + method @NonNull public android.os.PersistableBundle getAdminExtras(); method @NonNull public android.content.ComponentName getDeviceAdminComponentName(); method public long getLocalTime(); method @Nullable public java.util.Locale getLocale(); @@ -1212,6 +1239,7 @@ package android.app.admin { public static final class FullyManagedDeviceProvisioningParams.Builder { ctor public FullyManagedDeviceProvisioningParams.Builder(@NonNull android.content.ComponentName, @NonNull String); method @NonNull public android.app.admin.FullyManagedDeviceProvisioningParams build(); + method @NonNull public android.app.admin.FullyManagedDeviceProvisioningParams.Builder setAdminExtras(@NonNull android.os.PersistableBundle); method @NonNull public android.app.admin.FullyManagedDeviceProvisioningParams.Builder setCanDeviceOwnerGrantSensorsPermissions(boolean); method @NonNull public android.app.admin.FullyManagedDeviceProvisioningParams.Builder setLeaveAllSystemAppsEnabled(boolean); method @NonNull public android.app.admin.FullyManagedDeviceProvisioningParams.Builder setLocalTime(long); @@ -1222,6 +1250,7 @@ package android.app.admin { public final class ManagedProfileProvisioningParams implements android.os.Parcelable { method public int describeContents(); method @Nullable public android.accounts.Account getAccountToMigrate(); + method @NonNull public android.os.PersistableBundle getAdminExtras(); method @NonNull public String getOwnerName(); method @NonNull public android.content.ComponentName getProfileAdminComponentName(); method @Nullable public String getProfileName(); @@ -1236,6 +1265,7 @@ package android.app.admin { ctor public ManagedProfileProvisioningParams.Builder(@NonNull android.content.ComponentName, @NonNull String); method @NonNull public android.app.admin.ManagedProfileProvisioningParams build(); method @NonNull public android.app.admin.ManagedProfileProvisioningParams.Builder setAccountToMigrate(@Nullable android.accounts.Account); + method @NonNull public android.app.admin.ManagedProfileProvisioningParams.Builder setAdminExtras(@NonNull android.os.PersistableBundle); method @NonNull public android.app.admin.ManagedProfileProvisioningParams.Builder setKeepingAccountOnMigration(boolean); method @NonNull public android.app.admin.ManagedProfileProvisioningParams.Builder setLeaveAllSystemAppsEnabled(boolean); method @NonNull public android.app.admin.ManagedProfileProvisioningParams.Builder setOrganizationOwnedProvisioning(boolean); @@ -2540,6 +2570,107 @@ package android.app.usage { } +package android.app.wallpapereffectsgeneration { + + public final class CameraAttributes implements android.os.Parcelable { + method public int describeContents(); + method @NonNull public float[] getAnchorPointInOutputUvSpace(); + method @NonNull public float[] getAnchorPointInWorldSpace(); + method public float getCameraOrbitPitchDegrees(); + method public float getCameraOrbitYawDegrees(); + method public float getDollyDistanceInWorldSpace(); + method public float getFrustumFarInWorldSpace(); + method public float getFrustumNearInWorldSpace(); + method public float getVerticalFovDegrees(); + method public void writeToParcel(@NonNull android.os.Parcel, int); + field @NonNull public static final android.os.Parcelable.Creator<android.app.wallpapereffectsgeneration.CameraAttributes> CREATOR; + } + + public static final class CameraAttributes.Builder { + ctor public CameraAttributes.Builder(@NonNull float[], @NonNull float[]); + method @NonNull public android.app.wallpapereffectsgeneration.CameraAttributes build(); + method @NonNull public android.app.wallpapereffectsgeneration.CameraAttributes.Builder setCameraOrbitPitchDegrees(@FloatRange(from=-90.0F, to=90.0f) float); + method @NonNull public android.app.wallpapereffectsgeneration.CameraAttributes.Builder setCameraOrbitYawDegrees(@FloatRange(from=-180.0F, to=180.0f) float); + method @NonNull public android.app.wallpapereffectsgeneration.CameraAttributes.Builder setDollyDistanceInWorldSpace(float); + method @NonNull public android.app.wallpapereffectsgeneration.CameraAttributes.Builder setFrustumFarInWorldSpace(@FloatRange(from=0.0f) float); + method @NonNull public android.app.wallpapereffectsgeneration.CameraAttributes.Builder setFrustumNearInWorldSpace(@FloatRange(from=0.0f) float); + method @NonNull public android.app.wallpapereffectsgeneration.CameraAttributes.Builder setVerticalFovDegrees(@FloatRange(from=0.0f, to=180.0f, fromInclusive=false) float); + } + + public final class CinematicEffectRequest implements android.os.Parcelable { + ctor public CinematicEffectRequest(@NonNull String, @NonNull android.graphics.Bitmap); + method public int describeContents(); + method @NonNull public android.graphics.Bitmap getBitmap(); + method @NonNull public String getTaskId(); + method public void writeToParcel(@NonNull android.os.Parcel, int); + field @NonNull public static final android.os.Parcelable.Creator<android.app.wallpapereffectsgeneration.CinematicEffectRequest> CREATOR; + } + + public final class CinematicEffectResponse implements android.os.Parcelable { + method public int describeContents(); + method @Nullable public android.app.wallpapereffectsgeneration.CameraAttributes getEndKeyFrame(); + method public int getImageContentType(); + method @Nullable public android.app.wallpapereffectsgeneration.CameraAttributes getStartKeyFrame(); + method public int getStatusCode(); + method @NonNull public String getTaskId(); + method @NonNull public java.util.List<android.app.wallpapereffectsgeneration.TexturedMesh> getTexturedMeshes(); + method public void writeToParcel(@NonNull android.os.Parcel, int); + field public static final int CINEMATIC_EFFECT_STATUS_ERROR = 2; // 0x2 + field public static final int CINEMATIC_EFFECT_STATUS_NOT_READY = 3; // 0x3 + field public static final int CINEMATIC_EFFECT_STATUS_OK = 1; // 0x1 + field public static final int CINEMATIC_EFFECT_STATUS_PENDING = 4; // 0x4 + field public static final int CINEMATIC_EFFECT_STATUS_TOO_MANY_REQUESTS = 5; // 0x5 + field public static final int CINEMATIC_EFFECT_STATUS_UNKNOWN = 0; // 0x0 + field @NonNull public static final android.os.Parcelable.Creator<android.app.wallpapereffectsgeneration.CinematicEffectResponse> CREATOR; + field public static final int IMAGE_CONTENT_TYPE_LANDSCAPE = 2; // 0x2 + field public static final int IMAGE_CONTENT_TYPE_OTHER = 3; // 0x3 + field public static final int IMAGE_CONTENT_TYPE_PEOPLE_PORTRAIT = 1; // 0x1 + field public static final int IMAGE_CONTENT_TYPE_UNKNOWN = 0; // 0x0 + } + + public static final class CinematicEffectResponse.Builder { + ctor public CinematicEffectResponse.Builder(int, @NonNull String); + method @NonNull public android.app.wallpapereffectsgeneration.CinematicEffectResponse build(); + method @NonNull public android.app.wallpapereffectsgeneration.CinematicEffectResponse.Builder setEndKeyFrame(@Nullable android.app.wallpapereffectsgeneration.CameraAttributes); + method @NonNull public android.app.wallpapereffectsgeneration.CinematicEffectResponse.Builder setImageContentType(int); + method @NonNull public android.app.wallpapereffectsgeneration.CinematicEffectResponse.Builder setStartKeyFrame(@Nullable android.app.wallpapereffectsgeneration.CameraAttributes); + method @NonNull public android.app.wallpapereffectsgeneration.CinematicEffectResponse.Builder setTexturedMeshes(@NonNull java.util.List<android.app.wallpapereffectsgeneration.TexturedMesh>); + } + + public final class TexturedMesh implements android.os.Parcelable { + method public int describeContents(); + method @NonNull public android.graphics.Bitmap getBitmap(); + method @NonNull public int[] getIndices(); + method @NonNull public int getIndicesLayoutType(); + method @NonNull public float[] getVertices(); + method @NonNull public int getVerticesLayoutType(); + method public void writeToParcel(@NonNull android.os.Parcel, int); + field @NonNull public static final android.os.Parcelable.Creator<android.app.wallpapereffectsgeneration.TexturedMesh> CREATOR; + field public static final int INDICES_LAYOUT_TRIANGLES = 1; // 0x1 + field public static final int INDICES_LAYOUT_UNDEFINED = 0; // 0x0 + field public static final int VERTICES_LAYOUT_POSITION3_UV2 = 1; // 0x1 + field public static final int VERTICES_LAYOUT_UNDEFINED = 0; // 0x0 + } + + public static final class TexturedMesh.Builder { + ctor public TexturedMesh.Builder(@NonNull android.graphics.Bitmap); + method @NonNull public android.app.wallpapereffectsgeneration.TexturedMesh build(); + method @NonNull public android.app.wallpapereffectsgeneration.TexturedMesh.Builder setIndices(@NonNull int[]); + method @NonNull public android.app.wallpapereffectsgeneration.TexturedMesh.Builder setIndicesLayoutType(int); + method @NonNull public android.app.wallpapereffectsgeneration.TexturedMesh.Builder setVertices(@NonNull float[]); + method @NonNull public android.app.wallpapereffectsgeneration.TexturedMesh.Builder setVerticesLayoutType(int); + } + + public final class WallpaperEffectsGenerationManager { + method @RequiresPermission(android.Manifest.permission.MANAGE_WALLPAPER_EFFECTS_GENERATION) public void generateCinematicEffect(@NonNull android.app.wallpapereffectsgeneration.CinematicEffectRequest, @NonNull java.util.concurrent.Executor, @NonNull android.app.wallpapereffectsgeneration.WallpaperEffectsGenerationManager.CinematicEffectListener); + } + + public static interface WallpaperEffectsGenerationManager.CinematicEffectListener { + method public void onCinematicEffectGenerated(@NonNull android.app.wallpapereffectsgeneration.CinematicEffectResponse); + } + +} + package android.apphibernation { public class AppHibernationManager { @@ -2696,8 +2827,8 @@ package android.content { field public static final String APP_PREDICTION_SERVICE = "app_prediction"; field public static final String BACKUP_SERVICE = "backup"; field public static final String BATTERY_STATS_SERVICE = "batterystats"; - field @Deprecated public static final int BIND_ALLOW_BACKGROUND_ACTIVITY_STARTS = 1048576; // 0x100000 - field public static final int BIND_ALLOW_FOREGROUND_SERVICE_STARTS_FROM_BACKGROUND = 262144; // 0x40000 + field public static final int BIND_ALLOW_BACKGROUND_ACTIVITY_STARTS = 1048576; // 0x100000 + field @Deprecated public static final int BIND_ALLOW_FOREGROUND_SERVICE_STARTS_FROM_BACKGROUND = 262144; // 0x40000 field public static final String CLOUDSEARCH_SERVICE = "cloudsearch"; field public static final String CONTENT_SUGGESTIONS_SERVICE = "content_suggestions"; field public static final String CONTEXTHUB_SERVICE = "contexthub"; @@ -2728,6 +2859,7 @@ package android.content { field public static final String UI_TRANSLATION_SERVICE = "ui_translation"; field public static final String UWB_SERVICE = "uwb"; field public static final String VR_SERVICE = "vrmanager"; + field public static final String WALLPAPER_EFFECTS_GENERATION_SERVICE = "wallpaper_effects_generation"; field public static final String WIFI_NL80211_SERVICE = "wifinl80211"; field @Deprecated public static final String WIFI_RTT_SERVICE = "rttmanager"; field public static final String WIFI_SCANNING_SERVICE = "wifiscanner"; @@ -3699,6 +3831,7 @@ package android.hardware.hdmi { method public void sendKeyEvent(int, boolean); method public void sendVendorCommand(int, byte[], boolean); method public void setVendorCommandListener(@NonNull android.hardware.hdmi.HdmiControlManager.VendorCommandListener); + method public void setVendorCommandListener(@NonNull android.hardware.hdmi.HdmiControlManager.VendorCommandListener, int); } public static interface HdmiClient.OnDeviceSelectedListener { @@ -7820,7 +7953,7 @@ package android.media.tv.tuner.frontend { public class FrontendStatus { method public int getAgc(); - method @NonNull public android.media.tv.tuner.frontend.Atsc3PlpInfo[] getAllAtsc3PlpInfo(); + method @NonNull public java.util.List<android.media.tv.tuner.frontend.Atsc3PlpInfo> getAllAtsc3PlpInfo(); method @NonNull public android.media.tv.tuner.frontend.FrontendStatus.Atsc3PlpTuningInfo[] getAtsc3PlpTuningInfo(); method public int getBandwidth(); method public int getBer(); @@ -8204,23 +8337,6 @@ package android.net { method public void release(); } - public final class IpSecManager { - method @RequiresPermission(android.Manifest.permission.MANAGE_IPSEC_TUNNELS) public void applyTunnelModeTransform(@NonNull android.net.IpSecManager.IpSecTunnelInterface, int, @NonNull android.net.IpSecTransform) throws java.io.IOException; - method @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_IPSEC_TUNNELS) public android.net.IpSecManager.IpSecTunnelInterface createIpSecTunnelInterface(@NonNull java.net.InetAddress, @NonNull java.net.InetAddress, @NonNull android.net.Network) throws java.io.IOException, android.net.IpSecManager.ResourceUnavailableException; - } - - public static final class IpSecManager.IpSecTunnelInterface implements java.lang.AutoCloseable { - method @RequiresPermission(android.Manifest.permission.MANAGE_IPSEC_TUNNELS) public void addAddress(@NonNull java.net.InetAddress, int) throws java.io.IOException; - method public void close(); - method @NonNull public String getInterfaceName(); - method @RequiresPermission(android.Manifest.permission.MANAGE_IPSEC_TUNNELS) public void removeAddress(@NonNull java.net.InetAddress, int) throws java.io.IOException; - method @RequiresPermission(android.Manifest.permission.MANAGE_IPSEC_TUNNELS) public void setUnderlyingNetwork(@NonNull android.net.Network) throws java.io.IOException; - } - - public static class IpSecTransform.Builder { - method @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_IPSEC_TUNNELS) public android.net.IpSecTransform buildTunnelModeTransform(@NonNull java.net.InetAddress, @NonNull android.net.IpSecManager.SecurityParameterIndex) throws java.io.IOException, android.net.IpSecManager.ResourceUnavailableException, android.net.IpSecManager.SpiUnavailableException; - } - public final class MatchAllNetworkSpecifier extends android.net.NetworkSpecifier implements android.os.Parcelable { ctor public MatchAllNetworkSpecifier(); method public int describeContents(); @@ -9003,6 +9119,7 @@ package android.os { } public static class Build.VERSION { + field @NonNull public static final java.util.Set<java.lang.String> KNOWN_CODENAMES; field @NonNull public static final String PREVIEW_SDK_FINGERPRINT; } @@ -10280,6 +10397,8 @@ package android.provider { } public static final class Settings.Secure extends android.provider.Settings.NameValueTable { + method public static int getIntForUser(@NonNull android.content.ContentResolver, @NonNull String, int, int); + method @Nullable public static String getStringForUser(@NonNull android.content.ContentResolver, @NonNull String, int); method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public static boolean putString(@NonNull android.content.ContentResolver, @NonNull String, @Nullable String, @Nullable String, boolean); method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public static void resetToDefaults(@NonNull android.content.ContentResolver, @Nullable String); field @Deprecated public static final String ACCESSIBILITY_DISPLAY_MAGNIFICATION_NAVBAR_ENABLED = "accessibility_display_magnification_navbar_enabled"; @@ -10631,6 +10750,8 @@ package android.service.attention { method @Nullable public final android.os.IBinder onBind(@NonNull android.content.Intent); method public abstract void onCancelAttentionCheck(@NonNull android.service.attention.AttentionService.AttentionCallback); method public abstract void onCheckAttention(@NonNull android.service.attention.AttentionService.AttentionCallback); + method public void onStartProximityUpdates(@NonNull android.service.attention.AttentionService.ProximityCallback); + method public void onStopProximityUpdates(); field public static final int ATTENTION_FAILURE_CAMERA_PERMISSION_ABSENT = 6; // 0x6 field public static final int ATTENTION_FAILURE_CANCELLED = 3; // 0x3 field public static final int ATTENTION_FAILURE_PREEMPTED = 4; // 0x4 @@ -10638,6 +10759,7 @@ package android.service.attention { field public static final int ATTENTION_FAILURE_UNKNOWN = 2; // 0x2 field public static final int ATTENTION_SUCCESS_ABSENT = 0; // 0x0 field public static final int ATTENTION_SUCCESS_PRESENT = 1; // 0x1 + field public static final double PROXIMITY_UNKNOWN = -1.0; field public static final String SERVICE_INTERFACE = "android.service.attention.AttentionService"; } @@ -10646,6 +10768,10 @@ package android.service.attention { method public void onSuccess(int, long); } + public static final class AttentionService.ProximityCallback { + method public void onProximityUpdate(double); + } + } package android.service.autofill { @@ -11055,7 +11181,7 @@ package android.service.games { public class GameService extends android.app.Service { ctor public GameService(); - method public final void createGameSession(@IntRange(from=0) int); + method @RequiresPermission(android.Manifest.permission.MANAGE_GAME_ACTIVITY) public final void createGameSession(@IntRange(from=0) int); method @Nullable public final android.os.IBinder onBind(@Nullable android.content.Intent); method public void onConnected(); method public void onDisconnected(); @@ -11069,6 +11195,7 @@ package android.service.games { method public void onCreate(); method public void onDestroy(); method public void onGameTaskFocusChanged(boolean); + method public void onTransientSystemBarVisibilityFromRevealGestureChanged(boolean); method @RequiresPermission(android.Manifest.permission.MANAGE_GAME_ACTIVITY) public final boolean restartGame(); method public void setTaskOverlayView(@NonNull android.view.View, @NonNull android.view.ViewGroup.LayoutParams); method public void takeScreenshot(@NonNull java.util.concurrent.Executor, @NonNull android.service.games.GameSession.ScreenshotCallback); @@ -11498,6 +11625,7 @@ package android.service.trust { method @Deprecated public final void grantTrust(CharSequence, long, boolean); method public final void grantTrust(CharSequence, long, int); method public final void isEscrowTokenActive(long, android.os.UserHandle); + method public final void lockUser(); method public final android.os.IBinder onBind(android.content.Intent); method public boolean onConfigure(java.util.List<android.os.PersistableBundle>); method public void onDeviceLocked(); @@ -11508,13 +11636,16 @@ package android.service.trust { method public void onEscrowTokenStateReceived(long, int); method public void onTrustTimeout(); method public void onUnlockAttempt(boolean); + method public void onUserRequestedUnlock(); method public final void removeEscrowToken(long, android.os.UserHandle); method public final void revokeTrust(); method public final void setManagingTrust(boolean); method public final void showKeyguardErrorMessage(@NonNull CharSequence); method public final void unlockUserWithToken(long, byte[], android.os.UserHandle); field public static final int FLAG_GRANT_TRUST_DISMISS_KEYGUARD = 2; // 0x2 + field public static final int FLAG_GRANT_TRUST_DISPLAY_MESSAGE = 8; // 0x8 field public static final int FLAG_GRANT_TRUST_INITIATED_BY_USER = 1; // 0x1 + field public static final int FLAG_GRANT_TRUST_TEMPORARY_AND_RENEWABLE = 4; // 0x4 field public static final String SERVICE_INTERFACE = "android.service.trust.TrustAgentService"; field public static final int TOKEN_STATE_ACTIVE = 1; // 0x1 field public static final int TOKEN_STATE_INACTIVE = 0; // 0x0 @@ -11690,6 +11821,17 @@ package android.service.wallpaper { } +package android.service.wallpapereffectsgeneration { + + public abstract class WallpaperEffectsGenerationService extends android.app.Service { + ctor public WallpaperEffectsGenerationService(); + method @NonNull public final android.os.IBinder onBind(@NonNull android.content.Intent); + method public abstract void onGenerateCinematicEffect(@NonNull android.app.wallpapereffectsgeneration.CinematicEffectRequest); + method public final void returnCinematicEffectResponse(@NonNull android.app.wallpapereffectsgeneration.CinematicEffectResponse); + } + +} + package android.service.watchdog { public abstract class ExplicitHealthCheckService extends android.app.Service { @@ -14577,6 +14719,7 @@ package android.telephony.ims { field @NonNull public static final android.os.Parcelable.Creator<android.telephony.ims.RcsClientConfiguration> CREATOR; field public static final String RCS_PROFILE_1_0 = "UP_1.0"; field public static final String RCS_PROFILE_2_3 = "UP_2.3"; + field public static final String RCS_PROFILE_2_4 = "UP_2.4"; } public final class RcsContactPresenceTuple implements android.os.Parcelable { diff --git a/core/api/system-lint-baseline.txt b/core/api/system-lint-baseline.txt index e17a9bb1512c..1b45e88584fe 100644 --- a/core/api/system-lint-baseline.txt +++ b/core/api/system-lint-baseline.txt @@ -1,11 +1,5 @@ // Baseline format: 1.0 ArrayReturn: android.view.contentcapture.ViewNode#getAutofillOptions(): - - - -BuilderSetStyle: android.net.IpSecTransform.Builder#buildTunnelModeTransform(java.net.InetAddress, android.net.IpSecManager.SecurityParameterIndex): - Builder methods names should use setFoo() / addFoo() / clearFoo() style: method android.net.IpSecTransform.Builder.buildTunnelModeTransform(java.net.InetAddress,android.net.IpSecManager.SecurityParameterIndex) - ExecutorRegistration: android.media.MediaPlayer#setOnRtpRxNoticeListener(android.content.Context, android.media.MediaPlayer.OnRtpRxNoticeListener, android.os.Handler): Registration methods should have overload that accepts delivery Executor: `setOnRtpRxNoticeListener` @@ -15,8 +9,6 @@ GenericException: android.app.prediction.AppPredictor#finalize(): GenericException: android.hardware.location.ContextHubClient#finalize(): -GenericException: android.net.IpSecManager.IpSecTunnelInterface#finalize(): - GenericException: android.service.autofill.augmented.FillWindow#finalize(): diff --git a/core/api/test-current.txt b/core/api/test-current.txt index 15148a93cbe7..9d6fc0e67f03 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -2,7 +2,6 @@ package android { public static final class Manifest.permission { - field public static final String ACCESS_KEYGUARD_SECURE_STORAGE = "android.permission.ACCESS_KEYGUARD_SECURE_STORAGE"; field public static final String ACCESS_NOTIFICATIONS = "android.permission.ACCESS_NOTIFICATIONS"; field public static final String ACTIVITY_EMBEDDING = "android.permission.ACTIVITY_EMBEDDING"; field public static final String APPROVE_INCIDENT_REPORTS = "android.permission.APPROVE_INCIDENT_REPORTS"; @@ -279,6 +278,7 @@ package android.app { } public final class GameManager { + method @RequiresPermission(android.Manifest.permission.MANAGE_GAME_MODE) public boolean isAngleEnabled(@NonNull String); method public void setGameServiceProvider(@Nullable String); } @@ -288,8 +288,8 @@ package android.app { } public class KeyguardManager { - method @RequiresPermission(anyOf={android.Manifest.permission.SET_AND_VERIFY_LOCKSCREEN_CREDENTIALS, android.Manifest.permission.ACCESS_KEYGUARD_SECURE_STORAGE}) public boolean checkLock(int, @Nullable byte[]); - method @RequiresPermission(anyOf={android.Manifest.permission.SET_AND_VERIFY_LOCKSCREEN_CREDENTIALS, android.Manifest.permission.ACCESS_KEYGUARD_SECURE_STORAGE}) public boolean setLock(int, @Nullable byte[], int, @Nullable byte[]); + method @RequiresPermission(anyOf={android.Manifest.permission.SET_AND_VERIFY_LOCKSCREEN_CREDENTIALS, "android.permission.ACCESS_KEYGUARD_SECURE_STORAGE"}) public boolean checkLock(int, @Nullable byte[]); + method @RequiresPermission(anyOf={android.Manifest.permission.SET_AND_VERIFY_LOCKSCREEN_CREDENTIALS, "android.permission.ACCESS_KEYGUARD_SECURE_STORAGE"}) public boolean setLock(int, @Nullable byte[], int, @Nullable byte[]); } public class LocaleManager { @@ -356,6 +356,32 @@ package android.app { ctor public PictureInPictureUiState(boolean); } + public class PropertyInvalidatedCache<Query, Result> { + ctor public PropertyInvalidatedCache(int, int, @NonNull String, @NonNull String, @NonNull android.app.PropertyInvalidatedCache.QueryHandler<Query,Result>); + method @NonNull public static String createPropertyName(int, @NonNull String); + method public final void disableForCurrentProcess(); + method public static void disableForTestMode(); + method public final void disableInstance(); + method public final void disableSystemWide(); + method public final void forgetDisableLocal(); + method public boolean getDisabledState(); + method public final void invalidateCache(); + method public static void invalidateCache(int, @NonNull String); + method public final boolean isDisabled(); + method @Nullable public final Result query(@NonNull Query); + method public static void setTestMode(boolean); + method public void testPropertyName(); + field public static final int MODULE_BLUETOOTH = 2; // 0x2 + field public static final int MODULE_SYSTEM = 1; // 0x1 + field public static final int MODULE_TEST = 0; // 0x0 + } + + public abstract static class PropertyInvalidatedCache.QueryHandler<Q, R> { + ctor public PropertyInvalidatedCache.QueryHandler(); + method @Nullable public abstract R apply(@NonNull Q); + method public boolean shouldBypassCache(@NonNull Q); + } + public class StatusBarManager { method public void cancelRequestAddTile(@NonNull String); method public void clickNotification(@Nullable String, int, int, boolean); @@ -472,6 +498,7 @@ package android.app.admin { method @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_DEVICE_ADMINS) public java.util.Set<java.lang.String> getPolicyExemptApps(); method public boolean isCurrentInputMethodSetByOwner(); method public boolean isFactoryResetProtectionPolicySupported(); + method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.INTERACT_ACROSS_USERS}) public boolean isNewUserDisclaimerAcknowledged(); method @RequiresPermission(anyOf={android.Manifest.permission.MARK_DEVICE_ORGANIZATION_OWNED, android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS}, conditional=true) public void markProfileOwnerOnOrganizationOwnedDevice(@NonNull android.content.ComponentName); method @NonNull public static String operationSafetyReasonToString(int); method @NonNull public static String operationToString(int); @@ -585,15 +612,6 @@ package android.app.prediction { } -package android.app.trust { - - public class TrustManager { - method @RequiresPermission(android.Manifest.permission.ACCESS_KEYGUARD_SECURE_STORAGE) public void enableTrustAgentForUserForTest(@NonNull android.content.ComponentName, int); - method @RequiresPermission(android.Manifest.permission.ACCESS_KEYGUARD_SECURE_STORAGE) public void reportUserRequestedUnlock(int); - } - -} - package android.app.usage { public class NetworkStatsManager { @@ -784,6 +802,7 @@ package android.content.pm { method @NonNull public String getPermissionControllerPackageName(); method @NonNull public abstract String getServicesSystemSharedLibraryPackageName(); method @NonNull public abstract String getSharedSystemSharedLibraryPackageName(); + method @NonNull public String getSupplementalProcessPackageName(); method @Nullable public String getSystemTextClassifierPackageName(); method @Nullable public String getWellbeingPackageName(); method public void holdLock(android.os.IBinder, int); @@ -1588,10 +1607,6 @@ package android.net { method public void setIncludeTestInterfaces(boolean); } - public final class IpSecManager { - field public static final int INVALID_SECURITY_PARAMETER_INDEX = 0; // 0x0 - } - public class NetworkPolicyManager { method public boolean getRestrictBackground(); method @RequiresPermission(android.Manifest.permission.OBSERVE_NETWORK_POLICY) public boolean isUidNetworkingBlocked(int, boolean); @@ -1722,8 +1737,11 @@ package android.os { public final class Parcel { method public boolean allowSquashing(); + method public int getFlags(); method public int readExceptionCode(); method public void restoreAllowSquashing(boolean); + field public static final int FLAG_IS_REPLY_FROM_BLOCKING_ALLOWED_OBJECT = 1; // 0x1 + field public static final int FLAG_PROPAGATE_ALLOW_BLOCKING = 2; // 0x2 } public class ParcelFileDescriptor implements java.io.Closeable android.os.Parcelable { @@ -2374,14 +2392,6 @@ package android.service.quicksettings { } -package android.service.trust { - - public class TrustAgentService extends android.app.Service { - method public void onUserRequestedUnlock(); - } - -} - package android.service.voice { public class AlwaysOnHotwordDetector implements android.service.voice.HotwordDetector { @@ -2730,6 +2740,7 @@ package android.view { method @NonNull public android.view.Display.Mode getDefaultMode(); method @NonNull public int[] getReportedHdrTypes(); method @NonNull public android.graphics.ColorSpace[] getSupportedWideColorGamut(); + method @Nullable public android.view.Display.Mode getSystemPreferredDisplayMode(); method public int getType(); method @Nullable public android.view.Display.Mode getUserPreferredDisplayMode(); method public boolean hasAccess(int); @@ -2805,7 +2816,7 @@ package android.view { method public void setView(@NonNull android.view.View, @NonNull android.view.WindowManager.LayoutParams); } - @UiThread public class View implements android.view.accessibility.AccessibilityEventSource android.graphics.drawable.Drawable.Callback android.view.KeyEvent.Callback android.view.OnBackInvokedDispatcherOwner { + @UiThread public class View implements android.view.accessibility.AccessibilityEventSource android.graphics.drawable.Drawable.Callback android.view.KeyEvent.Callback { method public android.view.View getTooltipView(); method public boolean isAutofilled(); method public static boolean isDefaultFocusHighlightEnabled(); diff --git a/core/java/android/accessibilityservice/AccessibilityService.java b/core/java/android/accessibilityservice/AccessibilityService.java index 6b0aef84f14b..50473f1d8c84 100644 --- a/core/java/android/accessibilityservice/AccessibilityService.java +++ b/core/java/android/accessibilityservice/AccessibilityService.java @@ -571,6 +571,31 @@ public abstract class AccessibilityService extends Service { */ public static final int GLOBAL_ACTION_DISMISS_NOTIFICATION_SHADE = 15; + /** + * Action to trigger dpad up keyevent. + */ + public static final int GLOBAL_ACTION_DPAD_UP = 16; + + /** + * Action to trigger dpad down keyevent. + */ + public static final int GLOBAL_ACTION_DPAD_DOWN = 17; + + /** + * Action to trigger dpad left keyevent. + */ + public static final int GLOBAL_ACTION_DPAD_LEFT = 18; + + /** + * Action to trigger dpad right keyevent. + */ + public static final int GLOBAL_ACTION_DPAD_RIGHT = 19; + + /** + * Action to trigger dpad center keyevent. + */ + public static final int GLOBAL_ACTION_DPAD_CENTER = 20; + private static final String LOG_TAG = "AccessibilityService"; /** @@ -2328,10 +2353,16 @@ public abstract class AccessibilityService extends Service { * @param action The action to perform. * @return Whether the action was successfully performed. * + * Perform actions using ids like the id constants referenced below: * @see #GLOBAL_ACTION_BACK * @see #GLOBAL_ACTION_HOME * @see #GLOBAL_ACTION_NOTIFICATIONS * @see #GLOBAL_ACTION_RECENTS + * @see #GLOBAL_ACTION_DPAD_UP + * @see #GLOBAL_ACTION_DPAD_DOWN + * @see #GLOBAL_ACTION_DPAD_LEFT + * @see #GLOBAL_ACTION_DPAD_RIGHT + * @see #GLOBAL_ACTION_DPAD_CENTER */ public final boolean performGlobalAction(int action) { IAccessibilityServiceConnection connection = @@ -3089,6 +3120,33 @@ public abstract class AccessibilityService extends Service { } } + /** + * Sets the system settings values that control the scaling factor for animations. The scale + * controls the animation playback speed for animations that respect these settings. Animations + * that do not respect the settings values will not be affected by this function. A lower scale + * value results in a faster speed. A value of <code>0</code> disables animations entirely. When + * animations are disabled services receive window change events more quickly which can reduce + * the potential by confusion by reducing the time during which windows are in transition. + * + * @see AccessibilityEvent#TYPE_WINDOWS_CHANGED + * @see AccessibilityEvent#TYPE_WINDOW_STATE_CHANGED + * @see android.provider.Settings.Global#WINDOW_ANIMATION_SCALE + * @see android.provider.Settings.Global#TRANSITION_ANIMATION_SCALE + * @see android.provider.Settings.Global#ANIMATOR_DURATION_SCALE + * @param scale The scaling factor for all animations. + */ + public void setAnimationScale(float scale) { + final IAccessibilityServiceConnection connection = + AccessibilityInteractionClient.getInstance(this).getConnection(mConnectionId); + if (connection != null) { + try { + connection.setAnimationScale(scale); + } catch (RemoteException re) { + throw new RuntimeException(re); + } + } + } + private static class AccessibilityContext extends ContextWrapper { private final int mConnectionId; diff --git a/core/java/android/accessibilityservice/IAccessibilityServiceConnection.aidl b/core/java/android/accessibilityservice/IAccessibilityServiceConnection.aidl index 2cc15b40106b..0d6b19941afe 100644 --- a/core/java/android/accessibilityservice/IAccessibilityServiceConnection.aidl +++ b/core/java/android/accessibilityservice/IAccessibilityServiceConnection.aidl @@ -144,4 +144,6 @@ interface IAccessibilityServiceConnection { void onDoubleTap(int displayId); void onDoubleTapAndHold(int displayId); + + void setAnimationScale(float scale); } diff --git a/core/java/android/accessibilityservice/TouchInteractionController.java b/core/java/android/accessibilityservice/TouchInteractionController.java index bb2b8d45fd61..735df805b872 100644 --- a/core/java/android/accessibilityservice/TouchInteractionController.java +++ b/core/java/android/accessibilityservice/TouchInteractionController.java @@ -376,7 +376,7 @@ public final class TouchInteractionController { throw new IllegalStateException( "State transitions are not allowed without first adding a callback."); } - if (mState != STATE_TOUCH_INTERACTING) { + if (mState != STATE_TOUCH_INTERACTING && mState != STATE_DRAGGING) { throw new IllegalStateException( "State transitions are not allowed in " + stateToString(mState)); } diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index 530666b8f1d7..90c56ae63374 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -6139,6 +6139,10 @@ public class Activity extends ContextThemeWrapper * you to specify a custom animation even when starting an activity from * outside the context of the current top activity. * + * <p>Af of {@link android.os.Build.VERSION_CODES#S} application can only specify + * a transition animation when the transition happens within the same task. System + * default animation is used for cross-task transition animations. + * * @param enterAnim A resource ID of the animation resource to use for * the incoming activity. Use 0 for no animation. * @param exitAnim A resource ID of the animation resource to use for @@ -8742,17 +8746,15 @@ public class Activity extends ContextThemeWrapper * Returns the {@link OnBackInvokedDispatcher} instance associated with the window that this * activity is attached to. * - * Returns null if the activity is not attached to a window with a decor. + * @throws IllegalStateException if this Activity is not visual. */ - @Nullable + @NonNull @Override public OnBackInvokedDispatcher getOnBackInvokedDispatcher() { - if (mWindow != null) { - View decorView = mWindow.getDecorView(); - if (decorView != null) { - return decorView.getOnBackInvokedDispatcher(); - } + if (mWindow == null) { + throw new IllegalStateException("OnBackInvokedDispatcher are not available on " + + "non-visual activities"); } - return null; + return ((OnBackInvokedDispatcherOwner) mWindow).getOnBackInvokedDispatcher(); } } diff --git a/core/java/android/app/ActivityManagerInternal.java b/core/java/android/app/ActivityManagerInternal.java index cce7dd338b3d..a58ceaa99022 100644 --- a/core/java/android/app/ActivityManagerInternal.java +++ b/core/java/android/app/ActivityManagerInternal.java @@ -215,6 +215,14 @@ public abstract class ActivityManagerInternal { public abstract boolean isSystemReady(); /** + * Returns package name given pid. + * + * @param pid The pid we are searching package name for. + */ + @Nullable + public abstract String getPackageNameByPid(int pid); + + /** * Sets if the given pid has an overlay UI or not. * * @param pid The pid we are setting overlay UI for. diff --git a/core/java/android/app/ApplicationExitInfo.java b/core/java/android/app/ApplicationExitInfo.java index 9039bbdf62cf..60e22f4ecd12 100644 --- a/core/java/android/app/ApplicationExitInfo.java +++ b/core/java/android/app/ApplicationExitInfo.java @@ -156,6 +156,12 @@ public final class ApplicationExitInfo implements Parcelable { public static final int REASON_OTHER = 13; /** + * Application process was killed by App Freezer, for example, because it receives + * sync binder transactions while being frozen. + */ + public static final int REASON_FREEZER = 14; + + /** * Application process kills subreason is unknown. * * For internal use only. @@ -487,6 +493,7 @@ public final class ApplicationExitInfo implements Parcelable { REASON_USER_STOPPED, REASON_DEPENDENCY_DIED, REASON_OTHER, + REASON_FREEZER, }) @Retention(RetentionPolicy.SOURCE) public @interface Reason {} @@ -1138,6 +1145,8 @@ public final class ApplicationExitInfo implements Parcelable { return "DEPENDENCY DIED"; case REASON_OTHER: return "OTHER KILLS BY SYSTEM"; + case REASON_FREEZER: + return "FREEZER"; default: return "UNKNOWN"; } diff --git a/core/java/android/app/ApplicationPackageManager.java b/core/java/android/app/ApplicationPackageManager.java index b1956effb093..20ffa254a9bf 100644 --- a/core/java/android/app/ApplicationPackageManager.java +++ b/core/java/android/app/ApplicationPackageManager.java @@ -863,6 +863,18 @@ public class ApplicationPackageManager extends PackageManager { } } + /** + * @hide + */ + @Override + public String getSupplementalProcessPackageName() { + try { + return mPM.getSupplementalProcessPackageName(); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + @Override public boolean addPermission(PermissionInfo info) { return getPermissionManager().addPermission(info, false); diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java index f3315a8dc089..8181a74e8f95 100644 --- a/core/java/android/app/ContextImpl.java +++ b/core/java/android/app/ContextImpl.java @@ -1997,7 +1997,8 @@ class ContextImpl extends Context { private boolean bindServiceCommon(Intent service, ServiceConnection conn, int flags, String instanceName, Handler handler, Executor executor, UserHandle user) { - // Keep this in sync with DevicePolicyManager.bindDeviceAdminServiceAsUser. + // Keep this in sync with DevicePolicyManager.bindDeviceAdminServiceAsUser and + // ActivityManagerService.LocalService.startAndBindSupplementalProcessService IServiceConnection sd; if (conn == null) { throw new IllegalArgumentException("connection is null"); @@ -2023,10 +2024,10 @@ class ContextImpl extends Context { flags |= BIND_WAIVE_PRIORITY; } service.prepareToLeaveProcess(this); - int res = ActivityManager.getService().bindIsolatedService( - mMainThread.getApplicationThread(), getActivityToken(), service, - service.resolveTypeIfNeeded(getContentResolver()), - sd, flags, instanceName, getOpPackageName(), user.getIdentifier()); + int res = ActivityManager.getService().bindServiceInstance( + mMainThread.getApplicationThread(), getActivityToken(), service, + service.resolveTypeIfNeeded(getContentResolver()), + sd, flags, instanceName, getOpPackageName(), user.getIdentifier()); if (res < 0) { throw new SecurityException( "Not allowed to bind to service " + service); diff --git a/core/java/android/app/Dialog.java b/core/java/android/app/Dialog.java index a7fb83bfcf5e..4b42ddc383b2 100644 --- a/core/java/android/app/Dialog.java +++ b/core/java/android/app/Dialog.java @@ -1449,15 +1449,9 @@ public class Dialog implements DialogInterface, Window.Callback, * * Returns null if the dialog is not attached to a window with a decor. */ - @Nullable + @NonNull @Override public OnBackInvokedDispatcher getOnBackInvokedDispatcher() { - if (mWindow != null) { - View decorView = mWindow.getDecorView(); - if (decorView != null) { - return decorView.getOnBackInvokedDispatcher(); - } - } - return null; + return ((OnBackInvokedDispatcherOwner) mWindow).getOnBackInvokedDispatcher(); } } diff --git a/core/java/android/app/GameManager.java b/core/java/android/app/GameManager.java index 289b3486b7fe..040399ecb83b 100644 --- a/core/java/android/app/GameManager.java +++ b/core/java/android/app/GameManager.java @@ -181,14 +181,18 @@ public final class GameManager { /** * Returns if ANGLE is enabled for a given package and user ID. * <p> + * ANGLE (Almost Native Graphics Layer Engine) can translate OpenGL ES commands to Vulkan + * commands. Enabling ANGLE may improve the performance and/or reduce the power consumption of + * applications. * The caller must have {@link android.Manifest.permission#MANAGE_GAME_MODE}. * * @hide */ + @TestApi @RequiresPermission(Manifest.permission.MANAGE_GAME_MODE) - public @GameMode boolean getAngleEnabled(@NonNull String packageName) { + public @GameMode boolean isAngleEnabled(@NonNull String packageName) { try { - return mService.getAngleEnabled(packageName, mContext.getUserId()); + return mService.isAngleEnabled(packageName, mContext.getUserId()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } diff --git a/core/java/android/app/IActivityManager.aidl b/core/java/android/app/IActivityManager.aidl index 82c419affac2..7c48a5738e51 100644 --- a/core/java/android/app/IActivityManager.aidl +++ b/core/java/android/app/IActivityManager.aidl @@ -169,7 +169,7 @@ interface IActivityManager { int bindService(in IApplicationThread caller, in IBinder token, in Intent service, in String resolvedType, in IServiceConnection connection, int flags, in String callingPackage, int userId); - int bindIsolatedService(in IApplicationThread caller, in IBinder token, in Intent service, + int bindServiceInstance(in IApplicationThread caller, in IBinder token, in Intent service, in String resolvedType, in IServiceConnection connection, int flags, in String instanceName, in String callingPackage, int userId); void updateServiceGroup(in IServiceConnection connection, int group, int importance); @@ -679,6 +679,10 @@ interface IActivityManager { */ boolean isAppFreezerSupported(); + /** + * Return whether the app freezer is enabled (true) or not (false) by this system. + */ + boolean isAppFreezerEnabled(); /** * Kills uid with the reason of permission change. diff --git a/core/java/android/app/IGameManagerService.aidl b/core/java/android/app/IGameManagerService.aidl index 3ea0767661bb..7035ac078334 100644 --- a/core/java/android/app/IGameManagerService.aidl +++ b/core/java/android/app/IGameManagerService.aidl @@ -26,7 +26,7 @@ interface IGameManagerService { int getGameMode(String packageName, int userId); void setGameMode(String packageName, int gameMode, int userId); int[] getAvailableGameModes(String packageName); - boolean getAngleEnabled(String packageName, int userId); + boolean isAngleEnabled(String packageName, int userId); void setGameState(String packageName, in GameState gameState, int userId); GameModeInfo getGameModeInfo(String packageName, int userId); void setGameServiceProvider(String packageName); diff --git a/core/java/android/app/PropertyInvalidatedCache.java b/core/java/android/app/PropertyInvalidatedCache.java index ec8d989c61d4..715de14345f7 100644 --- a/core/java/android/app/PropertyInvalidatedCache.java +++ b/core/java/android/app/PropertyInvalidatedCache.java @@ -16,7 +16,11 @@ package android.app; +import android.annotation.IntDef; import android.annotation.NonNull; +import android.annotation.Nullable; +import android.annotation.SystemApi; +import android.annotation.TestApi; import android.os.Handler; import android.os.Looper; import android.os.Message; @@ -27,9 +31,10 @@ import android.text.TextUtils; import android.util.Log; import com.android.internal.annotations.GuardedBy; -import com.android.internal.annotations.VisibleForTesting; import com.android.internal.util.FastPrintWriter; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; import java.io.FileOutputStream; import java.io.IOException; import java.io.PrintWriter; @@ -104,17 +109,21 @@ import java.util.concurrent.atomic.AtomicLong; * <pre> * public class ActivityThread { * ... + * private final PropertyInvalidatedCache.QueryHandler<Integer, Birthday> mBirthdayQuery = + * new PropertyInvalidatedCache.QueryHandler<Integer, Birthday>() { + * {@literal @}Override + * public Birthday apply(Integer) { + * return GetService("birthdayd").getUserBirthday(userId); + * } + * }; * private static final int BDAY_CACHE_MAX = 8; // Maximum birthdays to cache * private static final String BDAY_CACHE_KEY = "cache_key.birthdayd"; * private final PropertyInvalidatedCache<Integer, Birthday%> mBirthdayCache = new - * PropertyInvalidatedCache<Integer, Birthday%>(BDAY_CACHE_MAX, BDAY_CACHE_KEY) { - * {@literal @}Override - * protected Birthday recompute(Integer userId) { - * return GetService("birthdayd").getUserBirthday(userId); - * } - * }; + * PropertyInvalidatedCache<Integer, Birthday%>( + * BDAY_CACHE_MAX, MODULE_SYSTEM, "getUserBirthday", mBirthdayQuery); + * * public void disableUserBirthdayCache() { - * mBirthdayCache.disableLocal(); + * mBirthdayCache.disableForCurrentProcess(); * } * public void invalidateUserBirthdayCache() { * mBirthdayCache.invalidateCache(); @@ -221,10 +230,124 @@ import java.util.concurrent.atomic.AtomicLong; * * @param <Query> The class used to index cache entries: must be hashable and comparable * @param <Result> The class holding cache entries; use a boxed primitive if possible - * - * {@hide} + * @hide */ -public abstract class PropertyInvalidatedCache<Query, Result> { +@SystemApi(client=SystemApi.Client.MODULE_LIBRARIES) +@TestApi +public class PropertyInvalidatedCache<Query, Result> { + /** + * This is a configuration class that customizes a cache instance. + * @hide + */ + @SystemApi(client=SystemApi.Client.MODULE_LIBRARIES) + @TestApi + public static abstract class QueryHandler<Q,R> { + /** + * Compute a result given a query. The semantics are those of Functor. + */ + public abstract @Nullable R apply(@NonNull Q query); + + /** + * Return true if a query should not use the cache. The default implementation + * always uses the cache. + */ + public boolean shouldBypassCache(@NonNull Q query) { + return false; + } + }; + + /** + * The system properties used by caches should be of the form <prefix>.<module>.<api>, + * where the prefix is "cache_key", the module is one of the constants below, and the + * api is any string. The ability to write the property (which happens during + * invalidation) depends on SELinux rules; these rules are defined against + * <prefix>.<module>. Therefore, the module chosen for a cache property must match + * the permissions granted to the processes that contain the corresponding caches. + * @hide + */ + @IntDef(prefix = { "MODULE_" }, value = { + MODULE_TEST, + MODULE_SYSTEM, + MODULE_BLUETOOTH + }) + @Retention(RetentionPolicy.SOURCE) + public @interface Module {} + + /** + * The module used for unit tests and cts tests. It is expected that no process in + * the system has permissions to write properties with this module. + * @hide + */ + @TestApi + public static final int MODULE_TEST = 0; + + /** + * The module used for system server/framework caches. This is not visible outside + * the system processes. + * @hide + */ + @TestApi + public static final int MODULE_SYSTEM = 1; + + /** + * The module used for bluetooth caches. + * @hide + */ + @SystemApi(client=SystemApi.Client.MODULE_LIBRARIES) + @TestApi + public static final int MODULE_BLUETOOTH = 2; + + // A static array mapping module constants to strings. + private final static String[] sModuleNames = + { "test", "system_server", "bluetooth" }; + + /** + * Construct a system property that matches the rules described above. The module is + * one of the permitted values above. The API is a string that is a legal Java simple + * identifier. The api is modified to conform to the system property style guide by + * replacing every upper case letter with an underscore and the lower case equivalent. + * There is no requirement that the apiName be the name of an actual API. + * + * Be aware that SystemProperties has a maximum length which is private to the + * implementation. The current maximum is 92 characters. If this method creates a + * property name that is too long, SystemProperties.set() will fail without a good + * error message. + * @hide + */ + @TestApi + public static @NonNull String createPropertyName(@Module int module, @NonNull String apiName) { + char[] api = apiName.toCharArray(); + int upper = 0; + for (int i = 0; i < api.length; i++) { + if (Character.isUpperCase(api[i])) { + upper++; + } + } + char[] suffix = new char[api.length + upper]; + int j = 0; + for (int i = 0; i < api.length; i++) { + if (Character.isJavaIdentifierPart(api[i])) { + if (Character.isUpperCase(api[i])) { + suffix[j++] = '_'; + suffix[j++] = Character.toLowerCase(api[i]); + } else { + suffix[j++] = api[i]; + } + } else { + throw new IllegalArgumentException("invalid api name"); + } + } + + String moduleName = null; + try { + moduleName = sModuleNames[module]; + } catch (ArrayIndexOutOfBoundsException e) { + throw new IllegalArgumentException("invalid module " + module); + } + + return "cache_key." + moduleName + "." + new String(suffix); + } + /** * Reserved nonce values. Use isReservedNonce() to test for a reserved value. Note * that all values cause the cache to be skipped. @@ -335,6 +458,25 @@ public abstract class PropertyInvalidatedCache<Query, Result> { */ private final String mCacheName; + /** + * The function that computes a Result, given a Query. This function is called on a + * cache miss. + */ + private QueryHandler<Query, Result> mComputer; + + /** + * A default function that delegates to the deprecated recompute() method. + */ + private static class DefaultComputer<Query, Result> extends QueryHandler<Query, Result> { + final PropertyInvalidatedCache<Query, Result> mCache; + DefaultComputer(PropertyInvalidatedCache<Query, Result> cache) { + mCache = cache; + } + public Result apply(Query query) { + return mCache.recompute(query); + } + } + @GuardedBy("mLock") private final LinkedHashMap<Query, Result> mCache; @@ -359,8 +501,13 @@ public abstract class PropertyInvalidatedCache<Query, Result> { * property name. New clients should prefer the constructor that takes an explicit * cache name. * + * TODO(216112648): deprecate this as a public interface, in favor of the four-argument + * constructor. + * * @param maxEntries Maximum number of entries to cache; LRU discard * @param propertyName Name of the system property holding the cache invalidation nonce. + * + * @hide */ public PropertyInvalidatedCache(int maxEntries, @NonNull String propertyName) { this(maxEntries, propertyName, propertyName); @@ -369,32 +516,73 @@ public abstract class PropertyInvalidatedCache<Query, Result> { /** * Make a new property invalidated cache. * + * TODO(216112648): deprecate this as a public interface, in favor of the four-argument + * constructor. + * * @param maxEntries Maximum number of entries to cache; LRU discard * @param propertyName Name of the system property holding the cache invalidation nonce * @param cacheName Name of this cache in debug and dumpsys + * @hide */ public PropertyInvalidatedCache(int maxEntries, @NonNull String propertyName, @NonNull String cacheName) { mPropertyName = propertyName; mCacheName = cacheName; mMaxEntries = maxEntries; - mCache = new LinkedHashMap<Query, Result>( + mComputer = new DefaultComputer<>(this); + mCache = createMap(); + registerCache(); + } + + /** + * Make a new property invalidated cache. The key is computed from the module and api + * parameters. + * + * @param maxEntries Maximum number of entries to cache; LRU discard + * @param module The module under which the cache key should be placed. + * @param api The api this cache front-ends. The api must be a Java identifier but + * need not be an actual api. + * @param cacheName Name of this cache in debug and dumpsys + * @param computer The code to compute values that are not in the cache. + * @hide + */ + @SystemApi(client=SystemApi.Client.MODULE_LIBRARIES) + @TestApi + public PropertyInvalidatedCache(int maxEntries, @Module int module, @NonNull String api, + @NonNull String cacheName, @NonNull QueryHandler<Query, Result> computer) { + mPropertyName = createPropertyName(module, api); + mCacheName = cacheName; + mMaxEntries = maxEntries; + mComputer = computer; + mCache = createMap(); + registerCache(); + } + + // Create a map. This should be called only from the constructor. + private LinkedHashMap<Query, Result> createMap() { + return new LinkedHashMap<Query, Result>( 2 /* start small */, 0.75f /* default load factor */, true /* LRU access order */) { + @GuardedBy("mLock") @Override protected boolean removeEldestEntry(Map.Entry eldest) { final int size = size(); if (size > mHighWaterMark) { mHighWaterMark = size; } - if (size > maxEntries) { + if (size > mMaxEntries) { mMissOverflow++; return true; } return false; } - }; + }; + } + + // Register the map in the global list. If the cache is disabled globally, disable it + // now. + private void registerCache() { synchronized (sCorkLock) { sCaches.put(this, null); if (sDisabledKeys.contains(mCacheName)) { @@ -418,8 +606,9 @@ public abstract class PropertyInvalidatedCache<Query, Result> { /** * Enable or disable testing. The testing property map is cleared every time this * method is called. + * @hide */ - @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE) + @TestApi public static void setTestMode(boolean mode) { sTesting = mode; synchronized (sTestingPropertyMap) { @@ -431,13 +620,22 @@ public abstract class PropertyInvalidatedCache<Query, Result> { * Enable testing the specific cache key. Only keys in the map are subject to testing. * There is no method to stop testing a property name. Just disable the test mode. */ - @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE) - public static void testPropertyName(@NonNull String name) { + private static void testPropertyName(@NonNull String name) { synchronized (sTestingPropertyMap) { sTestingPropertyMap.put(name, (long) NONCE_UNSET); } } + /** + * Enable testing the specific cache key. Only keys in the map are subject to testing. + * There is no method to stop testing a property name. Just disable the test mode. + * @hide + */ + @TestApi + public void testPropertyName() { + testPropertyName(mPropertyName); + } + // Read the system property associated with the current cache. This method uses the // handle for faster reading. private long getCurrentNonce() { @@ -490,6 +688,9 @@ public abstract class PropertyInvalidatedCache<Query, Result> { /** * Forget all cached values. + * TODO(216112648) remove this as a public API. Clients should invalidate caches, not clear + * them. + * @hide */ public final void clear() { synchronized (mLock) { @@ -505,22 +706,29 @@ public abstract class PropertyInvalidatedCache<Query, Result> { * Fetch a result from scratch in case it's not in the cache at all. Called unlocked: may * block. If this function returns null, the result of the cache query is null. There is no * "negative cache" in the query: we don't cache null results at all. + * TODO(216112648): deprecate this as a public interface, in favor of an instance of + * QueryHandler. + * @hide */ - public abstract @NonNull Result recompute(@NonNull Query query); + public Result recompute(@NonNull Query query) { + return mComputer.apply(query); + } /** * Return true if the query should bypass the cache. The default behavior is to * always use the cache but the method can be overridden for a specific class. + * TODO(216112648): deprecate this as a public interface, in favor of an instance of + * QueryHandler. + * @hide */ public boolean bypass(@NonNull Query query) { - return false; + return mComputer.shouldBypassCache(query); } /** - * Determines if a pair of responses are considered equal. Used to determine whether a - * cache is inadvertently returning stale results when VERIFY is set to true. Some - * existing clients override this method, but it is now deprecated in favor of a valid - * equals() method on the Result class. + * Determines if a pair of responses are considered equal. Used to determine whether + * a cache is inadvertently returning stale results when VERIFY is set to true. + * @hide */ public boolean resultEquals(Result cachedResult, Result fetchedResult) { // If a service crashes and returns a null result, the cached value remains valid. @@ -541,6 +749,7 @@ public abstract class PropertyInvalidatedCache<Query, Result> { * the meantime (if the nonce has changed in the meantime, we drop the cache and try the * whole query again), or 3) null, which causes the old value to be removed from the cache * and null to be returned as the result of the cache query. + * @hide */ protected Result refresh(Result oldResult, Query query) { return oldResult; @@ -551,7 +760,7 @@ public abstract class PropertyInvalidatedCache<Query, Result> { * testing. To disable a cache in normal code, use disableLocal(). * @hide */ - @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE) + @TestApi public final void disableInstance() { synchronized (mLock) { mDisabled = true; @@ -580,9 +789,10 @@ public abstract class PropertyInvalidatedCache<Query, Result> { * disabled remain disabled (the "disabled" setting is sticky). However, new caches * with this name will not be disabled. It is not an error if the cache name is not * found in the list of disabled caches. + * @hide */ - @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE) - public final void clearDisableLocal() { + @TestApi + public final void forgetDisableLocal() { synchronized (sCorkLock) { sDisabledKeys.remove(mCacheName); } @@ -592,25 +802,43 @@ public abstract class PropertyInvalidatedCache<Query, Result> { * Disable this cache in the current process, and all other caches that use the same * name. This does not affect caches that have a different name but use the same * property. + * TODO(216112648) Remove this in favor of disableForCurrentProcess(). + * @hide */ public final void disableLocal() { + disableForCurrentProcess(); + } + + /** + * Disable this cache in the current process, and all other caches that use the same + * name. This does not affect caches that have a different name but use the same + * property. + * @hide + */ + @SystemApi(client=SystemApi.Client.MODULE_LIBRARIES) + @TestApi + public final void disableForCurrentProcess() { disableLocal(mCacheName); } /** - * Return whether the cache is disabled in this process. + * Return whether a cache instance is disabled. + * @hide */ - @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE) - public final boolean isDisabledLocal() { + @TestApi + public final boolean isDisabled() { return mDisabled || !sEnabled; } /** * Get a value from the cache or recompute it. + * @hide */ - public @NonNull Result query(@NonNull Query query) { + @SystemApi(client=SystemApi.Client.MODULE_LIBRARIES) + @TestApi + public final @Nullable Result query(@NonNull Query query) { // Let access to mDisabled race: it's atomic anyway. - long currentNonce = (!isDisabledLocal()) ? getCurrentNonce() : NONCE_DISABLED; + long currentNonce = (!isDisabled()) ? getCurrentNonce() : NONCE_DISABLED; if (bypass(query)) { currentNonce = NONCE_BYPASS; } @@ -724,8 +952,9 @@ public abstract class PropertyInvalidatedCache<Query, Result> { * When multiple caches share a single property value, using an instance method on one of * the cache objects to invalidate all of the cache objects becomes confusing and you should * just use the static version of this function. + * @hide */ - @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE) + @TestApi public final void disableSystemWide() { disableSystemWide(mPropertyName); } @@ -746,16 +975,33 @@ public abstract class PropertyInvalidatedCache<Query, Result> { /** * Non-static convenience version of invalidateCache() for situations in which only a single * PropertyInvalidatedCache is keyed on a particular property value. + * @hide */ + @SystemApi(client=SystemApi.Client.MODULE_LIBRARIES) + @TestApi public final void invalidateCache() { invalidateCache(mPropertyName); } /** + * Invalidate caches in all processes that are keyed for the module and api. + * @hide + */ + @SystemApi(client=SystemApi.Client.MODULE_LIBRARIES) + @TestApi + public static void invalidateCache(@Module int module, @NonNull String api) { + invalidateCache(createPropertyName(module, api)); + } + + /** * Invalidate PropertyInvalidatedCache caches in all processes that are keyed on * {@var name}. This function is synchronous: caches are invalidated upon return. * + * TODO(216112648) make this method private in favor of the two-argument (module, api) + * override. + * * @param name Name of the cache-key property to invalidate + * @hide */ public static void invalidateCache(@NonNull String name) { if (!sEnabled) { @@ -824,6 +1070,7 @@ public abstract class PropertyInvalidatedCache<Query, Result> { * corkInvalidations() and uncorkInvalidations() must be called in pairs. * * @param name Name of the cache-key property to cork + * @hide */ public static void corkInvalidations(@NonNull String name) { if (!sEnabled) { @@ -871,6 +1118,7 @@ public abstract class PropertyInvalidatedCache<Query, Result> { * transitioning it to normal operation (unless explicitly disabled system-wide). * * @param name Name of the cache-key property to uncork + * @hide */ public static void uncorkInvalidations(@NonNull String name) { if (!sEnabled) { @@ -916,6 +1164,7 @@ public abstract class PropertyInvalidatedCache<Query, Result> { * The auto-cork delay is configurable but it should not be too long. The purpose of * the delay is to minimize the number of times a server writes to the system property * when invalidating the cache. One write every 50ms does not hurt system performance. + * @hide */ public static final class AutoCorker { public static final int DEFAULT_AUTO_CORK_DELAY_MS = 50; @@ -1043,6 +1292,8 @@ public abstract class PropertyInvalidatedCache<Query, Result> { * Return the query as a string, to be used in debug messages. New clients should not * override this, but should instead add the necessary toString() method to the Query * class. + * TODO(216112648) add a method in the QueryHandler and deprecate this API. + * @hide */ protected @NonNull String queryToString(@NonNull Query query) { return Objects.toString(query); @@ -1054,8 +1305,9 @@ public abstract class PropertyInvalidatedCache<Query, Result> { * process does not have privileges to write SystemProperties. Once disabled it is not * possible to re-enable caching in the current process. If a client wants to * temporarily disable caching, use the corking mechanism. + * @hide */ - @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE) + @TestApi public static void disableForTestMode() { Log.d(TAG, "disabling all caches in the process"); sEnabled = false; @@ -1064,10 +1316,11 @@ public abstract class PropertyInvalidatedCache<Query, Result> { /** * Report the disabled status of this cache instance. The return value does not * reflect status of the property key. + * @hide */ - @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE) + @TestApi public boolean getDisabledState() { - return isDisabledLocal(); + return isDisabled(); } /** @@ -1133,7 +1386,8 @@ public abstract class PropertyInvalidatedCache<Query, Result> { } /** - * Dumps the contents of every cache in the process to the provided ParcelFileDescriptor. + * Dumps contents of every cache in the process to the provided ParcelFileDescriptor. + * @hide */ public static void dumpCacheInfo(@NonNull ParcelFileDescriptor pfd, @NonNull String[] args) { ArrayList<PropertyInvalidatedCache> activeCaches; @@ -1174,6 +1428,7 @@ public abstract class PropertyInvalidatedCache<Query, Result> { /** * Trim memory by clearing all the caches. + * @hide */ public static void onTrimMemory() { for (PropertyInvalidatedCache pic : getActiveCaches()) { diff --git a/core/java/android/app/StatusBarManager.java b/core/java/android/app/StatusBarManager.java index 56c301f30d5f..8fcb07f578e8 100644 --- a/core/java/android/app/StatusBarManager.java +++ b/core/java/android/app/StatusBarManager.java @@ -16,6 +16,7 @@ package android.app; +import android.Manifest; import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; @@ -27,6 +28,7 @@ import android.compat.annotation.UnsupportedAppUsage; import android.content.ComponentName; import android.content.Context; import android.graphics.drawable.Icon; +import android.media.MediaRoute2Info; import android.os.Binder; import android.os.Build; import android.os.Bundle; @@ -39,6 +41,7 @@ import android.view.View; import com.android.internal.statusbar.IAddTileResultCallback; import com.android.internal.statusbar.IStatusBarService; +import com.android.internal.statusbar.IUndoMediaTransferCallback; import com.android.internal.statusbar.NotificationVisibility; import java.lang.annotation.Retention; @@ -338,6 +341,166 @@ public class StatusBarManager { @Retention(RetentionPolicy.SOURCE) public @interface NavBarModeOverride {} + /** + * State indicating that this sender device is close to a receiver device, so the user can + * potentially *start* a cast to the receiver device if the user moves their device a bit + * closer. + * <p> + * Important notes: + * <ul> + * <li>This state represents that the device is close enough to inform the user that + * transferring is an option, but the device is *not* close enough to actually initiate a + * transfer yet.</li> + * <li>This state is for *starting* a cast. It should be used when this device is currently + * playing media locally and the media should be transferred to be played on the receiver + * device instead.</li> + * </ul> + * + * @hide + */ + @SystemApi + public static final int MEDIA_TRANSFER_SENDER_STATE_ALMOST_CLOSE_TO_START_CAST = 0; + + /** + * State indicating that this sender device is close to a receiver device, so the user can + * potentially *end* a cast on the receiver device if the user moves this device a bit closer. + * <p> + * Important notes: + * <ul> + * <li>This state represents that the device is close enough to inform the user that + * transferring is an option, but the device is *not* close enough to actually initiate a + * transfer yet.</li> + * <li>This state is for *ending* a cast. It should be used when media is currently being + * played on the receiver device and the media should be transferred to play locally + * instead.</li> + * </ul> + * + * @hide + */ + @SystemApi + public static final int MEDIA_TRANSFER_SENDER_STATE_ALMOST_CLOSE_TO_END_CAST = 1; + + /** + * State indicating that a media transfer from this sender device to a receiver device has been + * started. + * <p> + * Important note: This state is for *starting* a cast. It should be used when this device is + * currently playing media locally and the media has started being transferred to the receiver + * device instead. + * + * @hide + */ + @SystemApi + public static final int MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_RECEIVER_TRIGGERED = 2; + + /** + * State indicating that a media transfer from the receiver and back to this sender device + * has been started. + * <p> + * Important note: This state is for *ending* a cast. It should be used when media is currently + * being played on the receiver device and the media has started being transferred to play + * locally instead. + * + * @hide + */ + @SystemApi + public static final int MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_THIS_DEVICE_TRIGGERED = 3; + + /** + * State indicating that a media transfer from this sender device to a receiver device has + * finished successfully. + * <p> + * Important note: This state is for *starting* a cast. It should be used when this device had + * previously been playing media locally and the media has successfully been transferred to the + * receiver device instead. + * + * @hide + */ + @SystemApi + public static final int MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_RECEIVER_SUCCEEDED = 4; + + /** + * State indicating that a media transfer from the receiver and back to this sender device has + * finished successfully. + * <p> + * Important note: This state is for *ending* a cast. It should be used when media was + * previously being played on the receiver device and has been successfully transferred to play + * locally on this device instead. + * + * @hide + */ + @SystemApi + public static final int MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_THIS_DEVICE_SUCCEEDED = 5; + + /** + * State indicating that the attempted transfer to the receiver device has failed. + * + * @hide + */ + @SystemApi + public static final int MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_RECEIVER_FAILED = 6; + + /** + * State indicating that the attempted transfer back to this device has failed. + * + * @hide + */ + @SystemApi + public static final int MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_THIS_DEVICE_FAILED = 7; + + /** + * State indicating that this sender device is no longer close to the receiver device. + * + * @hide + */ + @SystemApi + public static final int MEDIA_TRANSFER_SENDER_STATE_FAR_FROM_RECEIVER = 8; + + /** @hide */ + @IntDef(prefix = {"MEDIA_TRANSFER_SENDER_STATE_"}, value = { + MEDIA_TRANSFER_SENDER_STATE_ALMOST_CLOSE_TO_START_CAST, + MEDIA_TRANSFER_SENDER_STATE_ALMOST_CLOSE_TO_END_CAST, + MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_RECEIVER_TRIGGERED, + MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_THIS_DEVICE_TRIGGERED, + MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_RECEIVER_SUCCEEDED, + MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_THIS_DEVICE_SUCCEEDED, + MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_RECEIVER_FAILED, + MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_THIS_DEVICE_FAILED, + MEDIA_TRANSFER_SENDER_STATE_FAR_FROM_RECEIVER, + }) + @Retention(RetentionPolicy.SOURCE) + public @interface MediaTransferSenderState {} + + /** + * State indicating that this receiver device is close to a sender device, so the user can + * potentially start or end a cast to the receiver device if the user moves the sender device a + * bit closer. + * <p> + * Important note: This state represents that the device is close enough to inform the user that + * transferring is an option, but the device is *not* close enough to actually initiate a + * transfer yet. + * + * @hide + */ + @SystemApi + public static final int MEDIA_TRANSFER_RECEIVER_STATE_CLOSE_TO_SENDER = 0; + + /** + * State indicating that this receiver device is no longer close to the sender device. + * + * @hide + */ + @SystemApi + public static final int MEDIA_TRANSFER_RECEIVER_STATE_FAR_FROM_SENDER = 1; + + /** @hide */ + @IntDef(prefix = {"MEDIA_TRANSFER_RECEIVER_STATE_"}, value = { + MEDIA_TRANSFER_RECEIVER_STATE_CLOSE_TO_SENDER, + MEDIA_TRANSFER_RECEIVER_STATE_FAR_FROM_SENDER, + }) + @Retention(RetentionPolicy.SOURCE) + public @interface MediaTransferReceiverState {} + @UnsupportedAppUsage private Context mContext; private IStatusBarService mService; @@ -789,6 +952,81 @@ public class StatusBarManager { return navBarModeOverride; } + /** + * Notifies the system of a new media tap-to-transfer state for the <b>sender</b> device. + * + * <p>The callback should only be provided for the {@link + * MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_RECEIVER_SUCCEEDED} or {@link + * MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_THIS_DEVICE_SUCCEEDED} states, since those are the + * only states where an action can be un-done. + * + * @param displayState the new state for media tap-to-transfer. + * @param routeInfo the media route information for the media being transferred. + * @param undoExecutor an executor to run the callback on and must be provided if the + * callback is non-null. + * @param undoCallback a callback that will be triggered if the user elects to undo a media + * transfer. + * + * @throws IllegalArgumentException if an undo callback is provided for states that are not a + * succeeded state. + * @throws IllegalArgumentException if an executor is not provided when a callback is. + * + * @hide + */ + @SystemApi + @RequiresPermission(Manifest.permission.MEDIA_CONTENT_CONTROL) + public void updateMediaTapToTransferSenderDisplay( + @MediaTransferSenderState int displayState, + @NonNull MediaRoute2Info routeInfo, + @Nullable Executor undoExecutor, + @Nullable Runnable undoCallback + ) { + Objects.requireNonNull(routeInfo); + if (displayState != MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_RECEIVER_SUCCEEDED + && displayState != MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_THIS_DEVICE_SUCCEEDED + && undoCallback != null) { + throw new IllegalArgumentException( + "The undoCallback should only be provided when the state is a " + + "transfer succeeded state"); + } + if (undoCallback != null && undoExecutor == null) { + throw new IllegalArgumentException( + "You must pass an executor when you pass an undo callback"); + } + IStatusBarService svc = getService(); + try { + UndoCallback callbackProxy = null; + if (undoExecutor != null) { + callbackProxy = new UndoCallback(undoExecutor, undoCallback); + } + svc.updateMediaTapToTransferSenderDisplay(displayState, routeInfo, callbackProxy); + } catch (RemoteException e) { + e.rethrowFromSystemServer(); + } + } + + /** + * Notifies the system of a new media tap-to-transfer state for the <b>receiver</b> device. + * + * @param displayState the new state for media tap-to-transfer. + * @param routeInfo the media route information for the media being transferred. + * + * @hide + */ + @SystemApi + @RequiresPermission(Manifest.permission.MEDIA_CONTENT_CONTROL) + public void updateMediaTapToTransferReceiverDisplay( + @MediaTransferReceiverState int displayState, + @NonNull MediaRoute2Info routeInfo) { + Objects.requireNonNull(routeInfo); + IStatusBarService svc = getService(); + try { + svc.updateMediaTapToTransferReceiverDisplay(displayState, routeInfo); + } catch (RemoteException e) { + e.rethrowFromSystemServer(); + } + } + /** @hide */ public static String windowStateToString(int state) { if (state == WINDOW_STATE_HIDING) return "WINDOW_STATE_HIDING"; @@ -1071,4 +1309,29 @@ public class StatusBarManager { mExecutor.execute(() -> mCallback.accept(userResponse)); } } + + /** + * @hide + */ + static final class UndoCallback extends IUndoMediaTransferCallback.Stub { + @NonNull + private final Executor mExecutor; + @NonNull + private final Runnable mCallback; + + UndoCallback(@NonNull Executor executor, @NonNull Runnable callback) { + mExecutor = executor; + mCallback = callback; + } + + @Override + public void onUndoTriggered() { + final long callingIdentity = Binder.clearCallingIdentity(); + try { + mExecutor.execute(mCallback); + } finally { + restoreCallingIdentity(callingIdentity); + } + } + } } diff --git a/core/java/android/app/SystemServiceRegistry.java b/core/java/android/app/SystemServiceRegistry.java index bbdd7050cb07..4187ba0a10a5 100644 --- a/core/java/android/app/SystemServiceRegistry.java +++ b/core/java/android/app/SystemServiceRegistry.java @@ -51,6 +51,8 @@ import android.app.usage.IUsageStatsManager; import android.app.usage.NetworkStatsManager; import android.app.usage.StorageStatsManager; import android.app.usage.UsageStatsManager; +import android.app.wallpapereffectsgeneration.IWallpaperEffectsGenerationManager; +import android.app.wallpapereffectsgeneration.WallpaperEffectsGenerationManager; import android.apphibernation.AppHibernationManager; import android.appwidget.AppWidgetManager; import android.bluetooth.BluetoothFrameworkInitializer; @@ -137,12 +139,10 @@ import android.net.ConnectivityFrameworkInitializer; import android.net.ConnectivityFrameworkInitializerTiramisu; import android.net.EthernetManager; import android.net.IEthernetManager; -import android.net.IIpSecService; import android.net.INetworkPolicyManager; import android.net.INetworkStatsService; import android.net.IPacProxyManager; import android.net.IVpnManager; -import android.net.IpSecManager; import android.net.NetworkPolicyManager; import android.net.NetworkScoreManager; import android.net.NetworkWatchlistManager; @@ -439,15 +439,6 @@ public final class SystemServiceRegistry { return new VcnManager(ctx, service); }}); - registerService(Context.IPSEC_SERVICE, IpSecManager.class, - new CachedServiceFetcher<IpSecManager>() { - @Override - public IpSecManager createService(ContextImpl ctx) throws ServiceNotFoundException { - IBinder b = ServiceManager.getService(Context.IPSEC_SERVICE); - IIpSecService service = IIpSecService.Stub.asInterface(b); - return new IpSecManager(ctx, service); - }}); - registerService(Context.COUNTRY_DETECTOR, CountryDetector.class, new StaticServiceFetcher<CountryDetector>() { @Override @@ -1297,6 +1288,20 @@ public final class SystemServiceRegistry { } }); + registerService(Context.WALLPAPER_EFFECTS_GENERATION_SERVICE, + WallpaperEffectsGenerationManager.class, + new CachedServiceFetcher<WallpaperEffectsGenerationManager>() { + @Override + public WallpaperEffectsGenerationManager createService(ContextImpl ctx) + throws ServiceNotFoundException { + IBinder b = ServiceManager.getService( + Context.WALLPAPER_EFFECTS_GENERATION_SERVICE); + return b == null ? null : + new WallpaperEffectsGenerationManager( + IWallpaperEffectsGenerationManager.Stub.asInterface(b)); + } + }); + registerService(Context.VR_SERVICE, VrManager.class, new CachedServiceFetcher<VrManager>() { @Override public VrManager createService(ContextImpl ctx) throws ServiceNotFoundException { diff --git a/core/java/android/app/UiAutomation.java b/core/java/android/app/UiAutomation.java index 00903a880834..b41b5f005f1f 100644 --- a/core/java/android/app/UiAutomation.java +++ b/core/java/android/app/UiAutomation.java @@ -780,6 +780,33 @@ public final class UiAutomation { } /** + * Sets the system settings values that control the scaling factor for animations. The scale + * controls the animation playback speed for animations that respect these settings. Animations + * that do not respect the settings values will not be affected by this function. A lower scale + * value results in a faster speed. A value of <code>0</code> disables animations entirely. When + * animations are disabled services receive window change events more quickly which can reduce + * the potential by confusion by reducing the time during which windows are in transition. + * + * @see AccessibilityEvent#TYPE_WINDOWS_CHANGED + * @see AccessibilityEvent#TYPE_WINDOW_STATE_CHANGED + * @see android.provider.Settings.Global#WINDOW_ANIMATION_SCALE + * @see android.provider.Settings.Global#TRANSITION_ANIMATION_SCALE + * @see android.provider.Settings.Global#ANIMATOR_DURATION_SCALE + * @param scale The scaling factor for all animations. + */ + public void setAnimationScale(float scale) { + final IAccessibilityServiceConnection connection = + AccessibilityInteractionClient.getInstance().getConnection(mConnectionId); + if (connection != null) { + try { + connection.setAnimationScale(scale); + } catch (RemoteException re) { + throw new RuntimeException(re); + } + } + } + + /** * A request for WindowManagerService to wait until all animations have completed and input * information has been sent from WindowManager to native InputManager. * diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 8b5eb933219d..6cd991bc49b8 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -633,7 +633,7 @@ public class DevicePolicyManager { * #ACTION_ROLE_HOLDER_PROVISION_MANAGED_DEVICE_FROM_TRUSTED_SOURCE} to signal that an update * to the role holder is required. * - * <p>This result code must be accompanied by {@link #EXTRA_ROLE_HOLDER_STATE}. + * <p>This result code can be accompanied by {@link #EXTRA_ROLE_HOLDER_STATE}. * * @hide */ @@ -641,15 +641,19 @@ public class DevicePolicyManager { public static final int RESULT_UPDATE_ROLE_HOLDER = 2; /** - * A {@link Bundle} extra which describes the state of the role holder at the time when it - * returns {@link #RESULT_UPDATE_ROLE_HOLDER}. + * A {@link PersistableBundle} extra which the role holder can use to describe its own state + * when it returns {@link #RESULT_UPDATE_ROLE_HOLDER}. * - * <p>After the update completes, the role holder's {@link - * #ACTION_ROLE_HOLDER_PROVISION_MANAGED_PROFILE} or {@link + * <p>If {@link #RESULT_UPDATE_ROLE_HOLDER} was accompanied by this extra, after the update + * completes, the role holder's {@link #ACTION_ROLE_HOLDER_PROVISION_MANAGED_PROFILE} or {@link * #ACTION_ROLE_HOLDER_PROVISION_MANAGED_DEVICE_FROM_TRUSTED_SOURCE} intent will be relaunched, * which will contain this extra. It is the role holder's responsibility to restore its * state from this extra. * + * <p>The content of this {@link PersistableBundle} is entirely up to the role holder. It + * should contain anything the role holder needs to restore its original state when it gets + * restarted. + * * @hide */ @SystemApi @@ -1326,7 +1330,10 @@ public class DevicePolicyManager { * * <p>Use in an intent with action {@link #ACTION_PROVISION_MANAGED_PROFILE} or * {@link #ACTION_PROVISION_MANAGED_DEVICE} + * + * @deprecated Logo customization is no longer supported in the provisioning flow. */ + @Deprecated public static final String EXTRA_PROVISIONING_LOGO_URI = "android.app.extra.PROVISIONING_LOGO_URI"; @@ -3552,7 +3559,8 @@ public class DevicePolicyManager { * * @hide */ - @RequiresPermission(android.Manifest.permission.MANAGE_USERS) + @RequiresPermission(anyOf = {android.Manifest.permission.MANAGE_USERS, + android.Manifest.permission.INTERACT_ACROSS_USERS}) @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) public void acknowledgeNewUserDisclaimer() { if (mService != null) { @@ -3565,6 +3573,25 @@ public class DevicePolicyManager { } /** + * Checks whether the new managed user disclaimer was viewed by the current user. + * + * @hide + */ + @RequiresPermission(anyOf = {android.Manifest.permission.MANAGE_USERS, + android.Manifest.permission.INTERACT_ACROSS_USERS}) + @TestApi + public boolean isNewUserDisclaimerAcknowledged() { + if (mService != null) { + try { + return mService.isNewUserDisclaimerAcknowledged(); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + return false; + } + + /** * Return true if the given administrator component is currently active (enabled) in the system. * * @param admin The administrator component to check for. @@ -10109,7 +10136,9 @@ public class DevicePolicyManager { /** * Called by a profile owner of secondary user that is affiliated with the device to stop the - * calling user and switch back to primary user. + * calling user and switch back to primary user (when the user was + * {@link #switchUser(ComponentName, UserHandle)} switched to) or stop the user (when it was + * {@link #startUserInBackground(ComponentName, UserHandle) started in background}. * * <p>Notice that on devices running with * {@link UserManager#isHeadlessSystemUserMode() headless system user mode}, there is no primary @@ -10137,12 +10166,17 @@ public class DevicePolicyManager { } /** - * Same as {@link #logoutUser(ComponentName)}, but called by system (like Settings), not admin. + * Similar to {@link #logoutUser(ComponentName)}, except: + * + * <ul> + * <li>Called by system (like Settings), not admin. + * <li>It logs out the current user, not the caller. + * </ul> * * @hide */ @RequiresPermission(anyOf = {android.Manifest.permission.MANAGE_USERS, - android.Manifest.permission.CREATE_USERS}) + android.Manifest.permission.INTERACT_ACROSS_USERS}) @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) public @UserOperationResult int logoutUser() { // TODO(b/214336184): add CTS test @@ -10154,7 +10188,10 @@ public class DevicePolicyManager { } /** * Gets the user a {@link #logoutUser(ComponentName)} call would switch to, - * or {@code null} if the current user is not in a session. + * or {@code null} if the current user is not in a session (i.e., if it was not + * {@link #switchUser(ComponentName, UserHandle) switched} or + * {@link #startUserInBackground(ComponentName, UserHandle) started in background} by the + * device admin. * * @hide */ @@ -15014,7 +15051,7 @@ public class DevicePolicyManager { * @param defaultDrawableLoader To get the default drawable if no updated drawable was set for * the provided params. */ - @NonNull + @Nullable public Drawable getDrawable( @NonNull @DevicePolicyResources.UpdatableDrawableId String drawableId, @NonNull @DevicePolicyResources.UpdatableDrawableStyle String drawableStyle, @@ -15042,7 +15079,7 @@ public class DevicePolicyManager { * @param defaultDrawableLoader To get the default drawable if no updated drawable was set for * the provided params. */ - @NonNull + @Nullable public Drawable getDrawable( @NonNull @DevicePolicyResources.UpdatableDrawableId String drawableId, @NonNull @DevicePolicyResources.UpdatableDrawableStyle String drawableStyle, @@ -15099,7 +15136,7 @@ public class DevicePolicyManager { * @param defaultDrawableLoader To get the default drawable if no updated drawable was set for * the provided params. */ - @NonNull + @Nullable public Drawable getDrawableForDensity( @NonNull @DevicePolicyResources.UpdatableDrawableId String drawableId, @NonNull @DevicePolicyResources.UpdatableDrawableStyle String drawableStyle, @@ -15132,7 +15169,7 @@ public class DevicePolicyManager { * @param defaultDrawableLoader To get the default drawable if no updated drawable was set for * the provided params. */ - @NonNull + @Nullable public Drawable getDrawableForDensity( @NonNull @DevicePolicyResources.UpdatableDrawableId String drawableId, @NonNull @DevicePolicyResources.UpdatableDrawableStyle String drawableStyle, @@ -15254,7 +15291,7 @@ public class DevicePolicyManager { * @hide */ @SystemApi - @NonNull + @Nullable public String getString( @NonNull @DevicePolicyResources.UpdatableStringId String stringId, @NonNull Callable<String> defaultStringLoader) { @@ -15300,7 +15337,7 @@ public class DevicePolicyManager { * @hide */ @SystemApi - @NonNull + @Nullable @SuppressLint("SamShouldBeLast") public String getString( @NonNull @DevicePolicyResources.UpdatableStringId String stringId, diff --git a/core/java/android/app/admin/DevicePolicyResources.java b/core/java/android/app/admin/DevicePolicyResources.java index cf349b04425a..ac39cb4f1e23 100644 --- a/core/java/android/app/admin/DevicePolicyResources.java +++ b/core/java/android/app/admin/DevicePolicyResources.java @@ -93,6 +93,12 @@ import static android.app.admin.DevicePolicyResources.Strings.MediaProvider.BLOC import static android.app.admin.DevicePolicyResources.Strings.MediaProvider.SWITCH_TO_PERSONAL_MESSAGE; import static android.app.admin.DevicePolicyResources.Strings.MediaProvider.SWITCH_TO_WORK_MESSAGE; import static android.app.admin.DevicePolicyResources.Strings.MediaProvider.WORK_PROFILE_PAUSED_MESSAGE; +import static android.app.admin.DevicePolicyResources.Strings.PermissionController.BACKGROUND_ACCESS_DISABLED_BY_ADMIN_MESSAGE; +import static android.app.admin.DevicePolicyResources.Strings.PermissionController.BACKGROUND_ACCESS_ENABLED_BY_ADMIN_MESSAGE; +import static android.app.admin.DevicePolicyResources.Strings.PermissionController.FOREGROUND_ACCESS_ENABLED_BY_ADMIN_MESSAGE; +import static android.app.admin.DevicePolicyResources.Strings.PermissionController.HOME_MISSING_WORK_PROFILE_SUPPORT_MESSAGE; +import static android.app.admin.DevicePolicyResources.Strings.PermissionController.LOCATION_AUTO_GRANTED_MESSAGE; +import static android.app.admin.DevicePolicyResources.Strings.PermissionController.WORK_PROFILE_DEFAULT_APPS_TITLE; import static android.app.admin.DevicePolicyResources.Strings.Settings.ACCESSIBILITY_CATEGORY_PERSONAL; import static android.app.admin.DevicePolicyResources.Strings.Settings.ACCESSIBILITY_CATEGORY_WORK; import static android.app.admin.DevicePolicyResources.Strings.Settings.ACCESSIBILITY_PERSONAL_ACCOUNT_TITLE; @@ -117,8 +123,8 @@ import static android.app.admin.DevicePolicyResources.Strings.Settings.ADMIN_ACT import static android.app.admin.DevicePolicyResources.Strings.Settings.ADMIN_CAN_LOCK_DEVICE; import static android.app.admin.DevicePolicyResources.Strings.Settings.ADMIN_CAN_SEE_APPS_WARNING; import static android.app.admin.DevicePolicyResources.Strings.Settings.ADMIN_CAN_SEE_BUG_REPORT_WARNING; -import static android.app.admin.DevicePolicyResources.Strings.Settings.ADMIN_CAN_SEE_SECURITY_LOGS_WARNING; import static android.app.admin.DevicePolicyResources.Strings.Settings.ADMIN_CAN_SEE_NETWORK_LOGS_WARNING; +import static android.app.admin.DevicePolicyResources.Strings.Settings.ADMIN_CAN_SEE_SECURITY_LOGS_WARNING; import static android.app.admin.DevicePolicyResources.Strings.Settings.ADMIN_CAN_SEE_USAGE_WARNING; import static android.app.admin.DevicePolicyResources.Strings.Settings.ADMIN_CAN_SEE_WORK_DATA_WARNING; import static android.app.admin.DevicePolicyResources.Strings.Settings.ADMIN_CAN_WIPE_DEVICE; @@ -500,7 +506,13 @@ public final class DevicePolicyResources { WORK_PROFILE_PRIVACY_POLICY_INFO, CONNECTED_APPS_SEARCH_KEYWORDS, WORK_PROFILE_UNIFICATION_SEARCH_KEYWORDS, ACCOUNTS_SEARCH_KEYWORDS, CONTROLLED_BY_ADMIN_SUMMARY, WORK_PROFILE_USER_LABEL, WORK_CATEGORY_HEADER, - PERSONAL_CATEGORY_HEADER + PERSONAL_CATEGORY_HEADER, + + // PermissionController Strings + WORK_PROFILE_DEFAULT_APPS_TITLE, HOME_MISSING_WORK_PROFILE_SUPPORT_MESSAGE, + BACKGROUND_ACCESS_DISABLED_BY_ADMIN_MESSAGE, BACKGROUND_ACCESS_ENABLED_BY_ADMIN_MESSAGE, + BACKGROUND_ACCESS_ENABLED_BY_ADMIN_MESSAGE, FOREGROUND_ACCESS_ENABLED_BY_ADMIN_MESSAGE, + LOCATION_AUTO_GRANTED_MESSAGE }) public @interface UpdatableStringId { } @@ -690,11 +702,13 @@ public final class DevicePolicyResources { private static Set<String> buildStringsSet() { Set<String> strings = new HashSet<>(); + strings.addAll(Settings.buildStringsSet()); strings.addAll(Launcher.buildStringsSet()); strings.addAll(SystemUi.buildStringsSet()); strings.addAll(Core.buildStringsSet()); strings.addAll(DocumentsUi.buildStringsSet()); strings.addAll(MediaProvider.buildStringsSet()); + strings.addAll(PermissionController.buildStringsSet()); return strings; } @@ -2854,5 +2868,71 @@ public final class DevicePolicyResources { return strings; } } + + /** + * Class containing the identifiers used to update device management-related system strings + * in the PermissionController module. + */ + public static final class PermissionController { + + private PermissionController() { + } + + private static final String PREFIX = "PermissionController."; + + /** + * Title for settings page to show default apps for work. + */ + public static final String WORK_PROFILE_DEFAULT_APPS_TITLE = + PREFIX + "WORK_PROFILE_DEFAULT_APPS_TITLE"; + + /** + * Summary indicating that a home role holder app is missing work profile support. + */ + public static final String HOME_MISSING_WORK_PROFILE_SUPPORT_MESSAGE = + PREFIX + "HOME_MISSING_WORK_PROFILE_SUPPORT_MESSAGE"; + + /** + * Summary of a permission switch in Settings when the background access is denied by an + * admin. + */ + public static final String BACKGROUND_ACCESS_DISABLED_BY_ADMIN_MESSAGE = + PREFIX + "BACKGROUND_ACCESS_DISABLED_BY_ADMIN_MESSAGE"; + + /** + * Summary of a permission switch in Settings when the background access is enabled by + * an admin. + */ + public static final String BACKGROUND_ACCESS_ENABLED_BY_ADMIN_MESSAGE = + PREFIX + "BACKGROUND_ACCESS_ENABLED_BY_ADMIN_MESSAGE"; + + /** + * Summary of a permission switch in Settings when the foreground access is enabled by + * an admin. + */ + public static final String FOREGROUND_ACCESS_ENABLED_BY_ADMIN_MESSAGE = + PREFIX + "FOREGROUND_ACCESS_ENABLED_BY_ADMIN_MESSAGE"; + + /** + * Body of the notification shown to notify the user that the location permission has + * been granted to an app, accepts app name as a param. + */ + public static final String LOCATION_AUTO_GRANTED_MESSAGE = + PREFIX + "LOCATION_AUTO_GRANTED_MESSAGE"; + + /** + * @hide + */ + static Set<String> buildStringsSet() { + Set<String> strings = new HashSet<>(); + strings.add(WORK_PROFILE_DEFAULT_APPS_TITLE); + strings.add(HOME_MISSING_WORK_PROFILE_SUPPORT_MESSAGE); + strings.add(BACKGROUND_ACCESS_DISABLED_BY_ADMIN_MESSAGE); + strings.add(BACKGROUND_ACCESS_ENABLED_BY_ADMIN_MESSAGE); + strings.add(FOREGROUND_ACCESS_ENABLED_BY_ADMIN_MESSAGE); + strings.add(LOCATION_AUTO_GRANTED_MESSAGE); + return strings; + } + } } } diff --git a/core/java/android/app/admin/FullyManagedDeviceProvisioningParams.java b/core/java/android/app/admin/FullyManagedDeviceProvisioningParams.java index 8c232c012f50..1f7ae4ad35de 100644 --- a/core/java/android/app/admin/FullyManagedDeviceProvisioningParams.java +++ b/core/java/android/app/admin/FullyManagedDeviceProvisioningParams.java @@ -25,6 +25,7 @@ import android.annotation.SystemApi; import android.content.ComponentName; import android.os.Parcel; import android.os.Parcelable; +import android.os.PersistableBundle; import android.stats.devicepolicy.DevicePolicyEnums; import java.util.Locale; @@ -52,6 +53,7 @@ public final class FullyManagedDeviceProvisioningParams implements Parcelable { @SuppressLint("UseIcu") @Nullable private final Locale mLocale; private final boolean mDeviceOwnerCanGrantSensorsPermissions; + @NonNull private final PersistableBundle mAdminExtras; private FullyManagedDeviceProvisioningParams( @NonNull ComponentName deviceAdminComponentName, @@ -60,7 +62,8 @@ public final class FullyManagedDeviceProvisioningParams implements Parcelable { @Nullable String timeZone, long localTime, @Nullable @SuppressLint("UseIcu") Locale locale, - boolean deviceOwnerCanGrantSensorsPermissions) { + boolean deviceOwnerCanGrantSensorsPermissions, + @NonNull PersistableBundle adminExtras) { this.mDeviceAdminComponentName = requireNonNull(deviceAdminComponentName); this.mOwnerName = requireNonNull(ownerName); this.mLeaveAllSystemAppsEnabled = leaveAllSystemAppsEnabled; @@ -69,6 +72,7 @@ public final class FullyManagedDeviceProvisioningParams implements Parcelable { this.mLocale = locale; this.mDeviceOwnerCanGrantSensorsPermissions = deviceOwnerCanGrantSensorsPermissions; + this.mAdminExtras = adminExtras; } private FullyManagedDeviceProvisioningParams( @@ -78,14 +82,16 @@ public final class FullyManagedDeviceProvisioningParams implements Parcelable { @Nullable String timeZone, long localTime, @Nullable String localeStr, - boolean deviceOwnerCanGrantSensorsPermissions) { + boolean deviceOwnerCanGrantSensorsPermissions, + @Nullable PersistableBundle adminExtras) { this(deviceAdminComponentName, ownerName, leaveAllSystemAppsEnabled, timeZone, localTime, getLocale(localeStr), - deviceOwnerCanGrantSensorsPermissions); + deviceOwnerCanGrantSensorsPermissions, + adminExtras); } @Nullable @@ -151,6 +157,15 @@ public final class FullyManagedDeviceProvisioningParams implements Parcelable { } /** + * Returns a copy of the admin extras bundle. + * + * @see DevicePolicyManager#EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE + */ + public @NonNull PersistableBundle getAdminExtras() { + return new PersistableBundle(mAdminExtras); + } + + /** * Logs the provisioning params using {@link DevicePolicyEventLogger}. * * @hide @@ -188,6 +203,7 @@ public final class FullyManagedDeviceProvisioningParams implements Parcelable { @Nullable private Locale mLocale; // Default to allowing control over sensor permission grants. boolean mDeviceOwnerCanGrantSensorsPermissions = true; + @NonNull private PersistableBundle mAdminExtras; /** * Initialize a new {@link Builder} to construct a @@ -262,6 +278,17 @@ public final class FullyManagedDeviceProvisioningParams implements Parcelable { } /** + * Sets a {@link PersistableBundle} that contains admin-specific extras. + */ + @NonNull + public Builder setAdminExtras(@NonNull PersistableBundle adminExtras) { + mAdminExtras = adminExtras != null + ? new PersistableBundle(adminExtras) + : new PersistableBundle(); + return this; + } + + /** * Combines all of the attributes that have been set on this {@code Builder} * * @return a new {@link FullyManagedDeviceProvisioningParams} object. @@ -275,7 +302,8 @@ public final class FullyManagedDeviceProvisioningParams implements Parcelable { mTimeZone, mLocalTime, mLocale, - mDeviceOwnerCanGrantSensorsPermissions); + mDeviceOwnerCanGrantSensorsPermissions, + mAdminExtras); } } @@ -298,6 +326,7 @@ public final class FullyManagedDeviceProvisioningParams implements Parcelable { + ", mLocale=" + (mLocale == null ? "null" : mLocale) + ", mDeviceOwnerCanGrantSensorsPermissions=" + mDeviceOwnerCanGrantSensorsPermissions + + ", mAdminExtras=" + mAdminExtras + '}'; } @@ -310,6 +339,7 @@ public final class FullyManagedDeviceProvisioningParams implements Parcelable { dest.writeLong(mLocalTime); dest.writeString(mLocale == null ? null : mLocale.toLanguageTag()); dest.writeBoolean(mDeviceOwnerCanGrantSensorsPermissions); + dest.writePersistableBundle(mAdminExtras); } @NonNull @@ -324,6 +354,7 @@ public final class FullyManagedDeviceProvisioningParams implements Parcelable { long localtime = in.readLong(); String locale = in.readString(); boolean deviceOwnerCanGrantSensorsPermissions = in.readBoolean(); + PersistableBundle adminExtras = in.readPersistableBundle(); return new FullyManagedDeviceProvisioningParams( componentName, @@ -332,7 +363,8 @@ public final class FullyManagedDeviceProvisioningParams implements Parcelable { timeZone, localtime, locale, - deviceOwnerCanGrantSensorsPermissions); + deviceOwnerCanGrantSensorsPermissions, + adminExtras); } @Override diff --git a/core/java/android/app/admin/IDevicePolicyManager.aidl b/core/java/android/app/admin/IDevicePolicyManager.aidl index 927ee0c20eaf..a7a51f8f6caa 100644 --- a/core/java/android/app/admin/IDevicePolicyManager.aidl +++ b/core/java/android/app/admin/IDevicePolicyManager.aidl @@ -272,6 +272,7 @@ interface IDevicePolicyManager { int getLogoutUserId(); List<UserHandle> getSecondaryUsers(in ComponentName who); void acknowledgeNewUserDisclaimer(); + boolean isNewUserDisclaimerAcknowledged(); void enableSystemApp(in ComponentName admin, in String callerPackage, in String packageName); int enableSystemAppWithIntent(in ComponentName admin, in String callerPackage, in Intent intent); diff --git a/core/java/android/app/admin/ManagedProfileProvisioningParams.java b/core/java/android/app/admin/ManagedProfileProvisioningParams.java index ccbef7321be6..f91d60a6a9fa 100644 --- a/core/java/android/app/admin/ManagedProfileProvisioningParams.java +++ b/core/java/android/app/admin/ManagedProfileProvisioningParams.java @@ -23,8 +23,10 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; import android.content.ComponentName; +import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; +import android.os.PersistableBundle; import android.stats.devicepolicy.DevicePolicyEnums; /** @@ -49,7 +51,7 @@ public final class ManagedProfileProvisioningParams implements Parcelable { private final boolean mLeaveAllSystemAppsEnabled; private final boolean mOrganizationOwnedProvisioning; private final boolean mKeepAccountOnMigration; - + @NonNull private final PersistableBundle mAdminExtras; private ManagedProfileProvisioningParams( @NonNull ComponentName profileAdminComponentName, @@ -58,7 +60,8 @@ public final class ManagedProfileProvisioningParams implements Parcelable { @Nullable Account accountToMigrate, boolean leaveAllSystemAppsEnabled, boolean organizationOwnedProvisioning, - boolean keepAccountOnMigration) { + boolean keepAccountOnMigration, + @NonNull PersistableBundle adminExtras) { this.mProfileAdminComponentName = requireNonNull(profileAdminComponentName); this.mOwnerName = requireNonNull(ownerName); this.mProfileName = profileName; @@ -66,6 +69,7 @@ public final class ManagedProfileProvisioningParams implements Parcelable { this.mLeaveAllSystemAppsEnabled = leaveAllSystemAppsEnabled; this.mOrganizationOwnedProvisioning = organizationOwnedProvisioning; this.mKeepAccountOnMigration = keepAccountOnMigration; + this.mAdminExtras = adminExtras; } /** @@ -124,6 +128,15 @@ public final class ManagedProfileProvisioningParams implements Parcelable { } /** + * Returns a copy of the admin extras bundle. + * + * @see DevicePolicyManager#EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE + */ + public @NonNull PersistableBundle getAdminExtras() { + return new PersistableBundle(mAdminExtras); + } + + /** * Logs the provisioning params using {@link DevicePolicyEventLogger}. * * @hide @@ -160,6 +173,7 @@ public final class ManagedProfileProvisioningParams implements Parcelable { private boolean mLeaveAllSystemAppsEnabled; private boolean mOrganizationOwnedProvisioning; private boolean mKeepingAccountOnMigration; + @Nullable private PersistableBundle mAdminExtras; /** * Initialize a new {@link Builder) to construct a {@link ManagedProfileProvisioningParams}. @@ -235,6 +249,17 @@ public final class ManagedProfileProvisioningParams implements Parcelable { } /** + * Sets a {@link Bundle} that contains admin-specific extras. + */ + @NonNull + public Builder setAdminExtras(@NonNull PersistableBundle adminExtras) { + mAdminExtras = adminExtras != null + ? new PersistableBundle(adminExtras) + : new PersistableBundle(); + return this; + } + + /** * Combines all of the attributes that have been set on this {@code Builder}. * * @return a new {@link ManagedProfileProvisioningParams} object. @@ -248,7 +273,8 @@ public final class ManagedProfileProvisioningParams implements Parcelable { mAccountToMigrate, mLeaveAllSystemAppsEnabled, mOrganizationOwnedProvisioning, - mKeepingAccountOnMigration); + mKeepingAccountOnMigration, + mAdminExtras); } } @@ -270,6 +296,7 @@ public final class ManagedProfileProvisioningParams implements Parcelable { + ", mLeaveAllSystemAppsEnabled=" + mLeaveAllSystemAppsEnabled + ", mOrganizationOwnedProvisioning=" + mOrganizationOwnedProvisioning + ", mKeepAccountOnMigration=" + mKeepAccountOnMigration + + ", mAdminExtras=" + mAdminExtras + '}'; } @@ -282,6 +309,7 @@ public final class ManagedProfileProvisioningParams implements Parcelable { dest.writeBoolean(mLeaveAllSystemAppsEnabled); dest.writeBoolean(mOrganizationOwnedProvisioning); dest.writeBoolean(mKeepAccountOnMigration); + dest.writePersistableBundle(mAdminExtras); } public static final @NonNull Creator<ManagedProfileProvisioningParams> CREATOR = @@ -295,6 +323,7 @@ public final class ManagedProfileProvisioningParams implements Parcelable { boolean leaveAllSystemAppsEnabled = in.readBoolean(); boolean organizationOwnedProvisioning = in.readBoolean(); boolean keepAccountMigrated = in.readBoolean(); + PersistableBundle adminExtras = in.readPersistableBundle(); return new ManagedProfileProvisioningParams( componentName, @@ -303,7 +332,8 @@ public final class ManagedProfileProvisioningParams implements Parcelable { account, leaveAllSystemAppsEnabled, organizationOwnedProvisioning, - keepAccountMigrated); + keepAccountMigrated, + adminExtras); } @Override diff --git a/core/java/android/app/trust/ITrustManager.aidl b/core/java/android/app/trust/ITrustManager.aidl index 7956a35c7b3d..edabccf23c2c 100644 --- a/core/java/android/app/trust/ITrustManager.aidl +++ b/core/java/android/app/trust/ITrustManager.aidl @@ -17,7 +17,6 @@ package android.app.trust; import android.app.trust.ITrustListener; -import android.content.ComponentName; import android.hardware.biometrics.BiometricSourceType; /** @@ -30,7 +29,6 @@ interface ITrustManager { void reportUserRequestedUnlock(int userId); void reportUnlockLockout(int timeoutMs, int userId); void reportEnabledTrustAgentsChanged(int userId); - void enableTrustAgentForUserForTest(in ComponentName componentName, int userId); void registerTrustListener(in ITrustListener trustListener); void unregisterTrustListener(in ITrustListener trustListener); void reportKeyguardShowingChanged(); diff --git a/core/java/android/app/trust/TrustManager.java b/core/java/android/app/trust/TrustManager.java index fba2d3e03769..70b7de0767e4 100644 --- a/core/java/android/app/trust/TrustManager.java +++ b/core/java/android/app/trust/TrustManager.java @@ -16,14 +16,10 @@ package android.app.trust; -import static android.Manifest.permission.ACCESS_KEYGUARD_SECURE_STORAGE; - -import android.annotation.NonNull; +import android.Manifest; import android.annotation.RequiresPermission; import android.annotation.SystemService; -import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; -import android.content.ComponentName; import android.content.Context; import android.hardware.biometrics.BiometricSourceType; import android.os.Handler; @@ -37,17 +33,9 @@ import java.util.ArrayList; import java.util.List; /** - * Interface to the system service managing trust. - * - * <p>This class is for internal use only. This class is marked {@code @TestApi} to - * enable testing the trust system including {@link android.service.trust.TrustAgentService}. - * Methods which are currently not used in tests are marked @hide. - * - * @see com.android.server.trust.TrustManagerService - * + * See {@link com.android.server.trust.TrustManagerService} * @hide */ -@TestApi @SystemService(Context.TRUST_SERVICE) public class TrustManager { @@ -63,8 +51,7 @@ public class TrustManager { private final ITrustManager mService; private final ArrayMap<TrustListener, ITrustListener> mTrustListeners; - /** @hide */ - public TrustManager(@NonNull IBinder b) { + public TrustManager(IBinder b) { mService = ITrustManager.Stub.asInterface(b); mTrustListeners = new ArrayMap<TrustListener, ITrustListener>(); } @@ -75,10 +62,8 @@ public class TrustManager { * * @param userId The id for the user to be locked/unlocked. * @param locked The value for that user's locked state. - * - * @hide */ - @RequiresPermission(ACCESS_KEYGUARD_SECURE_STORAGE) + @RequiresPermission(Manifest.permission.ACCESS_KEYGUARD_SECURE_STORAGE) public void setDeviceLockedForUser(int userId, boolean locked) { try { mService.setDeviceLockedForUser(userId, locked); @@ -93,11 +78,8 @@ public class TrustManager { * @param successful if true, the unlock attempt was successful. * * Requires the {@link android.Manifest.permission#ACCESS_KEYGUARD_SECURE_STORAGE} permission. - * - * @hide */ @UnsupportedAppUsage - @RequiresPermission(ACCESS_KEYGUARD_SECURE_STORAGE) public void reportUnlockAttempt(boolean successful, int userId) { try { mService.reportUnlockAttempt(successful, userId); @@ -111,7 +93,6 @@ public class TrustManager { * * Requires the {@link android.Manifest.permission#ACCESS_KEYGUARD_SECURE_STORAGE} permission. */ - @RequiresPermission(ACCESS_KEYGUARD_SECURE_STORAGE) public void reportUserRequestedUnlock(int userId) { try { mService.reportUserRequestedUnlock(userId); @@ -131,10 +112,7 @@ public class TrustManager { * attempt to unlock the device again. * * Requires the {@link android.Manifest.permission#ACCESS_KEYGUARD_SECURE_STORAGE} permission. - * - * @hide */ - @RequiresPermission(ACCESS_KEYGUARD_SECURE_STORAGE) public void reportUnlockLockout(int timeoutMs, int userId) { try { mService.reportUnlockLockout(timeoutMs, userId); @@ -147,10 +125,7 @@ public class TrustManager { * Reports that the list of enabled trust agents changed for user {@param userId}. * * Requires the {@link android.Manifest.permission#ACCESS_KEYGUARD_SECURE_STORAGE} permission. - * - * @hide */ - @RequiresPermission(ACCESS_KEYGUARD_SECURE_STORAGE) public void reportEnabledTrustAgentsChanged(int userId) { try { mService.reportEnabledTrustAgentsChanged(userId); @@ -160,33 +135,10 @@ public class TrustManager { } /** - * Enables a trust agent. - * - * <p>The agent is specified by {@code componentName} and must be a subclass of - * {@link android.service.trust.TrustAgentService} and otherwise meet the requirements - * to be a trust agent. - * - * <p>This method can only be used in tests. - * - * @param componentName the trust agent to enable - */ - @RequiresPermission(ACCESS_KEYGUARD_SECURE_STORAGE) - public void enableTrustAgentForUserForTest(@NonNull ComponentName componentName, int userId) { - try { - mService.enableTrustAgentForUserForTest(componentName, userId); - } catch (RemoteException e) { - throw e.rethrowFromSystemServer(); - } - } - - /** * Reports that the visibility of the keyguard has changed. * * Requires the {@link android.Manifest.permission#ACCESS_KEYGUARD_SECURE_STORAGE} permission. - * - * @hide */ - @RequiresPermission(ACCESS_KEYGUARD_SECURE_STORAGE) public void reportKeyguardShowingChanged() { try { mService.reportKeyguardShowingChanged(); @@ -199,10 +151,7 @@ public class TrustManager { * Registers a listener for trust events. * * Requires the {@link android.Manifest.permission#TRUST_LISTENER} permission. - * - * @hide */ - @RequiresPermission(android.Manifest.permission.TRUST_LISTENER) public void registerTrustListener(final TrustListener trustListener) { try { ITrustListener.Stub iTrustListener = new ITrustListener.Stub() { @@ -243,10 +192,7 @@ public class TrustManager { * Unregisters a listener for trust events. * * Requires the {@link android.Manifest.permission#TRUST_LISTENER} permission. - * - * @hide */ - @RequiresPermission(android.Manifest.permission.TRUST_LISTENER) public void unregisterTrustListener(final TrustListener trustListener) { ITrustListener iTrustListener = mTrustListeners.remove(trustListener); if (iTrustListener != null) { @@ -261,8 +207,6 @@ public class TrustManager { /** * @return whether {@param userId} has enabled and configured trust agents. Ignores short-term * unavailability of trust due to {@link LockPatternUtils.StrongAuthTracker}. - * - * @hide */ @RequiresPermission(android.Manifest.permission.TRUST_LISTENER) public boolean isTrustUsuallyManaged(int userId) { @@ -279,10 +223,8 @@ public class TrustManager { * can be skipped. * * @param userId - * - * @hide */ - @RequiresPermission(ACCESS_KEYGUARD_SECURE_STORAGE) + @RequiresPermission(Manifest.permission.ACCESS_KEYGUARD_SECURE_STORAGE) public void unlockedByBiometricForUser(int userId, BiometricSourceType source) { try { mService.unlockedByBiometricForUser(userId, source); @@ -293,10 +235,8 @@ public class TrustManager { /** * Clears authentication by the specified biometric type for all users. - * - * @hide */ - @RequiresPermission(ACCESS_KEYGUARD_SECURE_STORAGE) + @RequiresPermission(Manifest.permission.ACCESS_KEYGUARD_SECURE_STORAGE) public void clearAllBiometricRecognized(BiometricSourceType source, int unlockedUser) { try { mService.clearAllBiometricRecognized(source, unlockedUser); @@ -324,7 +264,6 @@ public class TrustManager { } }; - /** @hide */ public interface TrustListener { /** diff --git a/core/java/android/app/wallpapereffectsgeneration/CameraAttributes.java b/core/java/android/app/wallpapereffectsgeneration/CameraAttributes.java new file mode 100644 index 000000000000..dfbc7a4c3276 --- /dev/null +++ b/core/java/android/app/wallpapereffectsgeneration/CameraAttributes.java @@ -0,0 +1,301 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.app.wallpapereffectsgeneration; + +import android.annotation.FloatRange; +import android.annotation.NonNull; +import android.annotation.SystemApi; +import android.os.Parcel; +import android.os.Parcelable; + +/** + * Representing the position and other parameters of camera of a single frame. + * + * @hide + */ +@SystemApi +public final class CameraAttributes implements Parcelable { + /** + * The location of the anchor within the 3D scene. + * Expecting 3 floats representing the x, y, z coordinates + * of the anchor point. + */ + @NonNull + private float[] mAnchorPointInWorldSpace; + /** + * Where the anchor point should project to in the output image. + * Expecting 2 floats representing the u,v coordinates of the + * anchor point. + */ + @NonNull + private float[] mAnchorPointInOutputUvSpace; + /** + * Specifies the amount of yaw orbit rotation the camera should perform + * around the anchor point in world space. + */ + private float mCameraOrbitYawDegrees; + /** + * Specifies the amount of pitch orbit rotation the camera should perform + * around the anchor point in world space. + */ + private float mCameraOrbitPitchDegrees; + /** + * Specifies by how much the camera should be placed towards the anchor + * point in world space, which is also called dolly distance. + */ + private float mDollyDistanceInWorldSpace; + /** + * Specifies the vertical fov degrees of the virtual image. + */ + private float mVerticalFovDegrees; + /** + * The frustum of near plane. + */ + private float mFrustumNearInWorldSpace; + /** + * The frustum of far plane. + */ + private float mFrustumFarInWorldSpace; + + private CameraAttributes(Parcel in) { + this.mCameraOrbitYawDegrees = in.readFloat(); + this.mCameraOrbitPitchDegrees = in.readFloat(); + this.mDollyDistanceInWorldSpace = in.readFloat(); + this.mVerticalFovDegrees = in.readFloat(); + this.mFrustumNearInWorldSpace = in.readFloat(); + this.mFrustumFarInWorldSpace = in.readFloat(); + this.mAnchorPointInWorldSpace = in.createFloatArray(); + this.mAnchorPointInOutputUvSpace = in.createFloatArray(); + } + + private CameraAttributes(float[] anchorPointInWorldSpace, float[] anchorPointInOutputUvSpace, + float cameraOrbitYawDegrees, float cameraOrbitPitchDegrees, + float dollyDistanceInWorldSpace, + float verticalFovDegrees, float frustumNearInWorldSpace, float frustumFarInWorldSpace) { + mAnchorPointInWorldSpace = anchorPointInWorldSpace; + mAnchorPointInOutputUvSpace = anchorPointInOutputUvSpace; + mCameraOrbitYawDegrees = cameraOrbitYawDegrees; + mCameraOrbitPitchDegrees = cameraOrbitPitchDegrees; + mDollyDistanceInWorldSpace = dollyDistanceInWorldSpace; + mVerticalFovDegrees = verticalFovDegrees; + mFrustumNearInWorldSpace = frustumNearInWorldSpace; + mFrustumFarInWorldSpace = frustumFarInWorldSpace; + } + + /** + * Get the location of the anchor within the 3D scene. The response float array contains + * 3 floats representing the x, y, z coordinates + */ + @NonNull + public float[] getAnchorPointInWorldSpace() { + return mAnchorPointInWorldSpace; + } + + /** + * Get where the anchor point should project to in the output image. The response float + * array contains 2 floats representing the u,v coordinates of the anchor point. + */ + @NonNull + public float[] getAnchorPointInOutputUvSpace() { + return mAnchorPointInOutputUvSpace; + } + + /** + * Get the camera yaw orbit rotation. + */ + public float getCameraOrbitYawDegrees() { + return mCameraOrbitYawDegrees; + } + + /** + * Get the camera pitch orbit rotation. + */ + public float getCameraOrbitPitchDegrees() { + return mCameraOrbitPitchDegrees; + } + + /** + * Get how many units the camera should be placed towards the anchor point in world space. + */ + public float getDollyDistanceInWorldSpace() { + return mDollyDistanceInWorldSpace; + } + + /** + * Get the camera vertical fov degrees. + */ + public float getVerticalFovDegrees() { + return mVerticalFovDegrees; + } + + /** + * Get the frustum in near plane. + */ + public float getFrustumNearInWorldSpace() { + return mFrustumNearInWorldSpace; + } + + /** + * Get the frustum in far plane. + */ + public float getFrustumFarInWorldSpace() { + return mFrustumFarInWorldSpace; + } + + @NonNull + public static final Creator<CameraAttributes> CREATOR = new Creator<CameraAttributes>() { + @Override + public CameraAttributes createFromParcel(Parcel in) { + return new CameraAttributes(in); + } + + @Override + public CameraAttributes[] newArray(int size) { + return new CameraAttributes[size]; + } + }; + + @Override + public void writeToParcel(@NonNull Parcel out, int flags) { + out.writeFloat(mCameraOrbitYawDegrees); + out.writeFloat(mCameraOrbitPitchDegrees); + out.writeFloat(mDollyDistanceInWorldSpace); + out.writeFloat(mVerticalFovDegrees); + out.writeFloat(mFrustumNearInWorldSpace); + out.writeFloat(mFrustumFarInWorldSpace); + out.writeFloatArray(mAnchorPointInWorldSpace); + out.writeFloatArray(mAnchorPointInOutputUvSpace); + } + + @Override + public int describeContents() { + return 0; + } + + /** + * Builder for {@link CameraAttributes}. + * + * @hide + */ + @SystemApi + public static final class Builder { + @NonNull + private float[] mAnchorPointInWorldSpace; + @NonNull + private float[] mAnchorPointInOutputUvSpace; + private float mCameraOrbitYawDegrees; + private float mCameraOrbitPitchDegrees; + private float mDollyDistanceInWorldSpace; + private float mVerticalFovDegrees; + private float mFrustumNearInWorldSpace; + private float mFrustumFarInWorldSpace; + + /** + * Constructor with anchor point in world space and anchor point in output image + * space. + * + * @param anchorPointInWorldSpace the location of the anchor within the 3D scene. The + * float array contains 3 floats representing the x, y, z coordinates. + * @param anchorPointInOutputUvSpace where the anchor point should project to in the + * output image. The float array contains 2 floats representing the u,v coordinates + * of the anchor point. + * + * @hide + */ + @SystemApi + public Builder(@NonNull float[] anchorPointInWorldSpace, + @NonNull float[] anchorPointInOutputUvSpace) { + mAnchorPointInWorldSpace = anchorPointInWorldSpace; + mAnchorPointInOutputUvSpace = anchorPointInOutputUvSpace; + } + + /** + * Sets the camera orbit yaw rotation. + */ + @NonNull + public Builder setCameraOrbitYawDegrees( + @FloatRange(from = -180.0f, to = 180.0f) float cameraOrbitYawDegrees) { + mCameraOrbitYawDegrees = cameraOrbitYawDegrees; + return this; + } + + /** + * Sets the camera orbit pitch rotation. + */ + @NonNull + public Builder setCameraOrbitPitchDegrees( + @FloatRange(from = -90.0f, to = 90.0f) float cameraOrbitPitchDegrees) { + mCameraOrbitPitchDegrees = cameraOrbitPitchDegrees; + return this; + } + + /** + * Sets the camera dolly distance. + */ + @NonNull + public Builder setDollyDistanceInWorldSpace(float dollyDistanceInWorldSpace) { + mDollyDistanceInWorldSpace = dollyDistanceInWorldSpace; + return this; + } + + /** + * Sets the camera vertical fov degree. + */ + @NonNull + public Builder setVerticalFovDegrees( + @FloatRange(from = 0.0f, to = 180.0f, fromInclusive = false) + float verticalFovDegrees) { + mVerticalFovDegrees = verticalFovDegrees; + return this; + } + + /** + * Sets the frustum in near plane. + */ + @NonNull + public Builder setFrustumNearInWorldSpace( + @FloatRange(from = 0.0f) float frustumNearInWorldSpace) { + mFrustumNearInWorldSpace = frustumNearInWorldSpace; + return this; + } + + /** + * Sets the frustum in far plane. + */ + @NonNull + public Builder setFrustumFarInWorldSpace( + @FloatRange(from = 0.0f) float frustumFarInWorldSpace) { + mFrustumFarInWorldSpace = frustumFarInWorldSpace; + return this; + } + + /** + * Builds a new {@link CameraAttributes} instance. + */ + @NonNull + public CameraAttributes build() { + return new CameraAttributes(mAnchorPointInWorldSpace, + mAnchorPointInOutputUvSpace, + mCameraOrbitYawDegrees, + mCameraOrbitPitchDegrees, + mDollyDistanceInWorldSpace, + mVerticalFovDegrees, + mFrustumNearInWorldSpace, + mFrustumFarInWorldSpace); + } + } +} diff --git a/packages/ConnectivityT/framework-t/src/android/net/NetworkStateSnapshot.aidl b/core/java/android/app/wallpapereffectsgeneration/CinematicEffectRequest.aidl index cb602d7927ce..234774645956 100644 --- a/packages/ConnectivityT/framework-t/src/android/net/NetworkStateSnapshot.aidl +++ b/core/java/android/app/wallpapereffectsgeneration/CinematicEffectRequest.aidl @@ -1,5 +1,5 @@ /** - * Copyright (c) 2021, The Android Open Source Project + * Copyright (c) 2022, The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,6 +14,6 @@ * limitations under the License. */ -package android.net; +package android.app.wallpapereffectsgeneration; -parcelable NetworkStateSnapshot; +parcelable CinematicEffectRequest;
\ No newline at end of file diff --git a/core/java/android/app/wallpapereffectsgeneration/CinematicEffectRequest.java b/core/java/android/app/wallpapereffectsgeneration/CinematicEffectRequest.java new file mode 100644 index 000000000000..f2e33131baa2 --- /dev/null +++ b/core/java/android/app/wallpapereffectsgeneration/CinematicEffectRequest.java @@ -0,0 +1,115 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.app.wallpapereffectsgeneration; + +import android.annotation.NonNull; +import android.annotation.SystemApi; +import android.graphics.Bitmap; +import android.os.Parcel; +import android.os.Parcelable; + +import java.util.Objects; + +/** + * A {@link CinematicEffectRequest} is the data class having all the information + * passed to wallpaper effects generation service. + * + * @hide + */ +@SystemApi +public final class CinematicEffectRequest implements Parcelable { + /** + * Unique id of a cienmatic effect generation task. + */ + @NonNull + private String mTaskId; + + /** + * The bitmap to generate cinematic effect from. + */ + @NonNull + private Bitmap mBitmap; + + private CinematicEffectRequest(Parcel in) { + this.mTaskId = in.readString(); + this.mBitmap = Bitmap.CREATOR.createFromParcel(in); + } + + /** + * Constructor with task id and bitmap. + */ + public CinematicEffectRequest(@NonNull String taskId, @NonNull Bitmap bitmap) { + mTaskId = taskId; + mBitmap = bitmap; + } + + /** + * Returns the task id. + */ + @NonNull + public String getTaskId() { + return mTaskId; + } + + /** + * Returns the bitmap of this request. + */ + @NonNull + public Bitmap getBitmap() { + return mBitmap; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) { + return false; + } + CinematicEffectRequest that = (CinematicEffectRequest) o; + return mTaskId.equals(that.mTaskId); + } + + @Override + public int hashCode() { + return Objects.hash(mTaskId); + } + + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(@NonNull Parcel out, int flags) { + out.writeString(mTaskId); + mBitmap.writeToParcel(out, flags); + } + + @NonNull + public static final Creator<CinematicEffectRequest> CREATOR = + new Creator<CinematicEffectRequest>() { + @Override + public CinematicEffectRequest createFromParcel(Parcel in) { + return new CinematicEffectRequest(in); + } + + @Override + public CinematicEffectRequest[] newArray(int size) { + return new CinematicEffectRequest[size]; + } + }; +} diff --git a/core/java/android/app/wallpapereffectsgeneration/CinematicEffectResponse.aidl b/core/java/android/app/wallpapereffectsgeneration/CinematicEffectResponse.aidl new file mode 100644 index 000000000000..1bd1e1e4bada --- /dev/null +++ b/core/java/android/app/wallpapereffectsgeneration/CinematicEffectResponse.aidl @@ -0,0 +1,19 @@ +/** + * Copyright (c) 2022, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + package android.app.wallpapereffectsgeneration; + + parcelable CinematicEffectResponse;
\ No newline at end of file diff --git a/core/java/android/app/wallpapereffectsgeneration/CinematicEffectResponse.java b/core/java/android/app/wallpapereffectsgeneration/CinematicEffectResponse.java new file mode 100644 index 000000000000..1254794964dd --- /dev/null +++ b/core/java/android/app/wallpapereffectsgeneration/CinematicEffectResponse.java @@ -0,0 +1,299 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.app.wallpapereffectsgeneration; + +import android.annotation.IntDef; +import android.annotation.NonNull; +import android.annotation.Nullable; +import android.annotation.SystemApi; +import android.os.Parcel; +import android.os.Parcelable; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; + +/** + * A {@link CinematicEffectResponse} include textured meshes + * and camera attributes of key frames. + * + * @hide + */ +@SystemApi +public final class CinematicEffectResponse implements Parcelable { + /** @hide */ + @IntDef(prefix = {"CINEMATIC_EFFECT_STATUS_"}, + value = {CINEMATIC_EFFECT_STATUS_UNKNOWN, + CINEMATIC_EFFECT_STATUS_OK, + CINEMATIC_EFFECT_STATUS_ERROR, + CINEMATIC_EFFECT_STATUS_NOT_READY, + CINEMATIC_EFFECT_STATUS_PENDING, + CINEMATIC_EFFECT_STATUS_TOO_MANY_REQUESTS}) + @Retention(RetentionPolicy.SOURCE) + public @interface CinematicEffectStatusCode {} + + /** Cinematic effect generation unknown status. */ + public static final int CINEMATIC_EFFECT_STATUS_UNKNOWN = 0; + /** Cinematic effect generation success. */ + public static final int CINEMATIC_EFFECT_STATUS_OK = 1; + /** Cinematic effect generation failure. */ + public static final int CINEMATIC_EFFECT_STATUS_ERROR = 2; + /** Service not ready for cinematic effect generation. */ + public static final int CINEMATIC_EFFECT_STATUS_NOT_READY = 3; + /** Cienmatic effect generation process is pending. */ + public static final int CINEMATIC_EFFECT_STATUS_PENDING = 4; + /** Too manay requests for server to handle. */ + public static final int CINEMATIC_EFFECT_STATUS_TOO_MANY_REQUESTS = 5; + + /** @hide */ + @IntDef(prefix = {"IMAGE_CONTENT_TYPE_"}, + value = {IMAGE_CONTENT_TYPE_UNKNOWN, + IMAGE_CONTENT_TYPE_PEOPLE_PORTRAIT, + IMAGE_CONTENT_TYPE_LANDSCAPE, + IMAGE_CONTENT_TYPE_OTHER + }) + @Retention(RetentionPolicy.SOURCE) + public @interface ImageContentType {} + + /** Image content unknown. */ + public static final int IMAGE_CONTENT_TYPE_UNKNOWN = 0; + /** Image content is people portrait. */ + public static final int IMAGE_CONTENT_TYPE_PEOPLE_PORTRAIT = 1; + /** Image content is landscape. */ + public static final int IMAGE_CONTENT_TYPE_LANDSCAPE = 2; + /** Image content is doesn't belong to other types. */ + public static final int IMAGE_CONTENT_TYPE_OTHER = 3; + + + @CinematicEffectStatusCode + private int mStatusCode; + + /** The id of the cinematic effect generation task. */ + @NonNull + private String mTaskId; + + @ImageContentType + private int mImageContentType; + + /** The textured mesh required to render cinematic effect. */ + @NonNull + private List<TexturedMesh> mTexturedMeshes; + + /** The start camera position for animation. */ + @Nullable + private CameraAttributes mStartKeyFrame; + + /** The end camera position for animation. */ + @Nullable + private CameraAttributes mEndKeyFrame; + + private CinematicEffectResponse(Parcel in) { + mStatusCode = in.readInt(); + mTaskId = in.readString(); + mImageContentType = in.readInt(); + mTexturedMeshes = new ArrayList<TexturedMesh>(); + in.readTypedList(mTexturedMeshes, TexturedMesh.CREATOR); + mStartKeyFrame = in.readTypedObject(CameraAttributes.CREATOR); + mEndKeyFrame = in.readTypedObject(CameraAttributes.CREATOR); + } + + private CinematicEffectResponse(@CinematicEffectStatusCode int statusCode, + String taskId, + @ImageContentType int imageContentType, + List<TexturedMesh> texturedMeshes, + CameraAttributes startKeyFrame, + CameraAttributes endKeyFrame) { + mStatusCode = statusCode; + mTaskId = taskId; + mImageContentType = imageContentType; + mStartKeyFrame = startKeyFrame; + mEndKeyFrame = endKeyFrame; + mTexturedMeshes = texturedMeshes; + } + + /** Gets the cinematic effect generation status code. */ + @CinematicEffectStatusCode + public int getStatusCode() { + return mStatusCode; + } + + /** Get the task id. */ + @NonNull + public String getTaskId() { + return mTaskId; + } + + /** + * Get the image content type, which briefly classifies what's + * the content of image, like people portrait, landscape etc. + */ + @ImageContentType + public int getImageContentType() { + return mImageContentType; + } + + /** Get the textured meshes. */ + @NonNull + public List<TexturedMesh> getTexturedMeshes() { + return mTexturedMeshes; + } + + /** + * Get the camera attributes (position info and other parameters, see docs of + * {@link CameraAttributes}) of the start key frame on the animation path. + */ + @Nullable + public CameraAttributes getStartKeyFrame() { + return mStartKeyFrame; + } + + /** + * Get the camera attributes (position info and other parameters, see docs of + * {@link CameraAttributes}) of the end key frame on the animation path. + */ + @Nullable + public CameraAttributes getEndKeyFrame() { + return mEndKeyFrame; + } + + @NonNull + public static final Creator<CinematicEffectResponse> CREATOR = + new Creator<CinematicEffectResponse>() { + @Override + public CinematicEffectResponse createFromParcel(Parcel in) { + return new CinematicEffectResponse(in); + } + + @Override + public CinematicEffectResponse[] newArray(int size) { + return new CinematicEffectResponse[size]; + } + }; + + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(@NonNull Parcel out, int flags) { + out.writeInt(mStatusCode); + out.writeString(mTaskId); + out.writeInt(mImageContentType); + out.writeTypedList(mTexturedMeshes, flags); + out.writeTypedObject(mStartKeyFrame, flags); + out.writeTypedObject(mEndKeyFrame, flags); + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) { + return false; + } + CinematicEffectResponse that = (CinematicEffectResponse) o; + return mTaskId.equals(that.mTaskId); + } + + @Override + public int hashCode() { + return Objects.hash(mTaskId); + } + /** + * Builder of {@link CinematicEffectResponse} + * + * @hide + */ + @SystemApi + public static final class Builder { + @CinematicEffectStatusCode + private int mStatusCode; + @NonNull + private String mTaskId; + @ImageContentType + private int mImageContentType; + @NonNull + private List<TexturedMesh> mTexturedMeshes; + @Nullable + private CameraAttributes mStartKeyFrame; + @Nullable + private CameraAttributes mEndKeyFrame; + + /** + * Constructor with task id and status code. + * + * @hide + */ + @SystemApi + public Builder(@CinematicEffectStatusCode int statusCode, @NonNull String taskId) { + mStatusCode = statusCode; + mTaskId = taskId; + } + + /** + * Sets the image content type. + */ + @NonNull + public Builder setImageContentType(@ImageContentType int imageContentType) { + mImageContentType = imageContentType; + return this; + } + + + /** + * Sets the textured meshes. + */ + @NonNull + public Builder setTexturedMeshes(@NonNull List<TexturedMesh> texturedMeshes) { + mTexturedMeshes = texturedMeshes; + return this; + } + + /** + * Sets start key frame. + */ + @NonNull + public Builder setStartKeyFrame(@Nullable CameraAttributes startKeyFrame) { + mStartKeyFrame = startKeyFrame; + return this; + } + + /** + * Sets end key frame. + */ + @NonNull + public Builder setEndKeyFrame(@Nullable CameraAttributes endKeyFrame) { + mEndKeyFrame = endKeyFrame; + return this; + } + + /** + * Builds a {@link CinematicEffectResponse} instance. + */ + @NonNull + public CinematicEffectResponse build() { + if (mTexturedMeshes == null) { + // Place holder because build doesn't allow list to be nullable. + mTexturedMeshes = new ArrayList<>(0); + } + return new CinematicEffectResponse(mStatusCode, mTaskId, mImageContentType, + mTexturedMeshes, mStartKeyFrame, mEndKeyFrame); + } + } +} diff --git a/core/java/android/app/wallpapereffectsgeneration/ICinematicEffectListener.aidl b/core/java/android/app/wallpapereffectsgeneration/ICinematicEffectListener.aidl new file mode 100644 index 000000000000..c1a698d6be0e --- /dev/null +++ b/core/java/android/app/wallpapereffectsgeneration/ICinematicEffectListener.aidl @@ -0,0 +1,30 @@ +/** + * Copyright (c) 2022, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.app.wallpapereffectsgeneration; + +import android.app.wallpapereffectsgeneration.CinematicEffectResponse; + + +/** + * Callback used by system server to notify invoker of {@link WallpaperEffectsGenerationMAnager} + * of the cinematic effect generation result. + * + * @hide + */ +oneway interface ICinematicEffectListener { + void onCinematicEffectGenerated(in CinematicEffectResponse response); +}
\ No newline at end of file diff --git a/core/java/android/app/wallpapereffectsgeneration/IWallpaperEffectsGenerationManager.aidl b/core/java/android/app/wallpapereffectsgeneration/IWallpaperEffectsGenerationManager.aidl new file mode 100644 index 000000000000..706a89c043b9 --- /dev/null +++ b/core/java/android/app/wallpapereffectsgeneration/IWallpaperEffectsGenerationManager.aidl @@ -0,0 +1,34 @@ +/** + * Copyright (c) 2022, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.app.wallpapereffectsgeneration; + +import android.app.wallpapereffectsgeneration.CinematicEffectRequest; +import android.app.wallpapereffectsgeneration.CinematicEffectResponse; +import android.app.wallpapereffectsgeneration.ICinematicEffectListener; + +/** + * Used by {@link android.app.wallpapereffectsgeneration.WallpaperEffectsGenerationManager} + * to to generate effects. + * + * @hide + */ +oneway interface IWallpaperEffectsGenerationManager { + void generateCinematicEffect(in CinematicEffectRequest request, + in ICinematicEffectListener listener); + + void returnCinematicEffectResponse(in CinematicEffectResponse response); +}
\ No newline at end of file diff --git a/core/java/android/app/wallpapereffectsgeneration/TexturedMesh.java b/core/java/android/app/wallpapereffectsgeneration/TexturedMesh.java new file mode 100644 index 000000000000..630de45e3506 --- /dev/null +++ b/core/java/android/app/wallpapereffectsgeneration/TexturedMesh.java @@ -0,0 +1,273 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.app.wallpapereffectsgeneration; + +import android.annotation.IntDef; +import android.annotation.NonNull; +import android.annotation.SystemApi; +import android.graphics.Bitmap; +import android.os.Parcel; +import android.os.Parcelable; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +/** + * The textured mesh representation, including a texture (bitmap) to sample from when rendering, + * and a mesh consisting of primitives such as triangles. The mesh is represented by an indices + * array describing the set of primitives in the mesh, and a vertices array that the indices + * refer to. + * + * @hide + */ +@SystemApi +public final class TexturedMesh implements Parcelable { + /** + * The texture to sample from when rendering mesh. + */ + @NonNull + private Bitmap mBitmap; + + /** + * The set of primitives as pointers into the vertices. + */ + @NonNull + private int[] mIndices; + + /** + * The specific vertices that the indices refer to. + */ + @NonNull + private float[] mVertices; + + /** @hide */ + @IntDef(prefix = {"INDICES_LAYOUT_"}, value = { + INDICES_LAYOUT_UNDEFINED, + INDICES_LAYOUT_TRIANGLES}) + @Retention(RetentionPolicy.SOURCE) + public @interface IndicesLayoutType { + } + + /** Undefined indices layout */ + public static final int INDICES_LAYOUT_UNDEFINED = 0; + /** + * Indices layout is triangle. Vertices are grouped into 3 and each + * group forms a triangle. + */ + public static final int INDICES_LAYOUT_TRIANGLES = 1; + + @IndicesLayoutType + private int mIndicesLayoutType; + + /** @hide */ + @IntDef(prefix = {"VERTICES_LAYOUT_"}, value = { + VERTICES_LAYOUT_UNDEFINED, + VERTICES_LAYOUT_POSITION3_UV2}) + @Retention(RetentionPolicy.SOURCE) + public @interface VerticesLayoutType { + } + + /** + * Undefined vertices layout. + */ + public static final int VERTICES_LAYOUT_UNDEFINED = 0; + /** + * The vertices array uses 5 numbers to represent a point, in the format + * of [x1, y1, z1, u1, v1, x2, y2, z2, u2, v2, ...]. + */ + public static final int VERTICES_LAYOUT_POSITION3_UV2 = 1; + + @VerticesLayoutType + private int mVerticesLayoutType; + + private TexturedMesh(Parcel in) { + this.mIndicesLayoutType = in.readInt(); + this.mVerticesLayoutType = in.readInt(); + this.mBitmap = in.readTypedObject(Bitmap.CREATOR); + Parcel data = Parcel.obtain(); + try { + byte[] bytes = in.readBlob(); + data.unmarshall(bytes, 0, bytes.length); + data.setDataPosition(0); + this.mIndices = data.createIntArray(); + this.mVertices = data.createFloatArray(); + } finally { + data.recycle(); + } + } + + private TexturedMesh(@NonNull Bitmap bitmap, @NonNull int[] indices, + @NonNull float[] vertices, @IndicesLayoutType int indicesLayoutType, + @VerticesLayoutType int verticesLayoutType) { + mBitmap = bitmap; + mIndices = indices; + mVertices = vertices; + mIndicesLayoutType = indicesLayoutType; + mVerticesLayoutType = verticesLayoutType; + } + + /** Get the bitmap, which is the texture to sample from when rendering. */ + @NonNull + public Bitmap getBitmap() { + return mBitmap; + } + + /** + * Get the indices as pointers to the vertices array. Depending on the getIndicesLayoutType(), + * the primitives may have different shapes. For example, with INDICES_LAYOUT_TRIANGLES, + * indices 0, 1, 2 forms a triangle, indices 3, 4, 5 form another triangle. + */ + @NonNull + public int[] getIndices() { + return mIndices; + } + + /** + * Get the vertices that the index array refers to. Depending on the getVerticesLayoutType() + * result, the vertices array can represent different per-vertex coordinates. For example, + * with VERTICES_LAYOUT_POSITION3_UV2 type, vertices are in the format of + * [x1, y1, z1, u1, v1, x2, y2, z2, u2, v2, ...]. + */ + @NonNull + public float[] getVertices() { + return mVertices; + } + + /** Get the indices layout type. */ + @IndicesLayoutType + @NonNull + public int getIndicesLayoutType() { + return mIndicesLayoutType; + } + + /** Get the indices layout type. */ + @VerticesLayoutType + @NonNull + public int getVerticesLayoutType() { + return mVerticesLayoutType; + } + + @NonNull + public static final Creator<TexturedMesh> CREATOR = new Creator<TexturedMesh>() { + @Override + public TexturedMesh createFromParcel(Parcel in) { + return new TexturedMesh(in); + } + + @Override + public TexturedMesh[] newArray(int size) { + return new TexturedMesh[size]; + } + }; + + @Override + public void writeToParcel(@NonNull Parcel out, int flags) { + out.writeInt(mIndicesLayoutType); + out.writeInt(mVerticesLayoutType); + out.writeTypedObject(mBitmap, flags); + + // Indices and vertices can reach 5MB. Write the data as a Blob, + // which will be written to ashmem if too large. + Parcel data = Parcel.obtain(); + try { + data.writeIntArray(mIndices); + data.writeFloatArray(mVertices); + out.writeBlob(data.marshall()); + } finally { + data.recycle(); + } + } + + @Override + public int describeContents() { + return 0; + } + + /** + * A builder for {@link TexturedMesh} + * + * @hide + */ + @SystemApi + public static final class Builder { + private Bitmap mBitmap; + private int[] mIndices; + private float[] mVertices; + @IndicesLayoutType + private int mIndicesLayoutType; + @VerticesLayoutType + private int mVerticesLayouttype; + + /** + * Constructor with bitmap. + * + * @hide + */ + @SystemApi + public Builder(@NonNull Bitmap bitmap) { + mBitmap = bitmap; + } + + /** + * Set the required indices. The indices should represent the primitives. For example, + * with INDICES_LAYOUT_TRIANGLES, indices 0, 1, 2 forms a triangle, indices 3, 4, 5 + * form another triangle. + */ + @NonNull + public Builder setIndices(@NonNull int[] indices) { + mIndices = indices; + return this; + } + + /** + * Set the required vertices. The vertices array should represent per-vertex coordinates. + * For example, with VERTICES_LAYOUT_POSITION3_UV2 type, vertices are in the format of + * [x1, y1, z1, u1, v1, x2, y2, z2, u2, v2, ...]. + * + */ + @NonNull + public Builder setVertices(@NonNull float[] vertices) { + mVertices = vertices; + return this; + } + + /** + * Set the required indices layout type. + */ + @NonNull + public Builder setIndicesLayoutType(@IndicesLayoutType int indicesLayoutType) { + mIndicesLayoutType = indicesLayoutType; + return this; + } + + /** + * Set the required vertices layout type. + */ + @NonNull + public Builder setVerticesLayoutType(@VerticesLayoutType int verticesLayoutype) { + mVerticesLayouttype = verticesLayoutype; + return this; + } + + /** Builds a TexturedMesh based on the given parameters. */ + @NonNull + public TexturedMesh build() { + return new TexturedMesh(mBitmap, mIndices, mVertices, mIndicesLayoutType, + mVerticesLayouttype); + } + } +} diff --git a/core/java/android/app/wallpapereffectsgeneration/WallpaperEffectsGenerationManager.java b/core/java/android/app/wallpapereffectsgeneration/WallpaperEffectsGenerationManager.java new file mode 100644 index 000000000000..5a1d27daa20b --- /dev/null +++ b/core/java/android/app/wallpapereffectsgeneration/WallpaperEffectsGenerationManager.java @@ -0,0 +1,114 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.app.wallpapereffectsgeneration; + +import android.annotation.CallbackExecutor; +import android.annotation.NonNull; +import android.annotation.RequiresPermission; +import android.annotation.SystemApi; +import android.annotation.SystemService; +import android.content.Context; +import android.os.RemoteException; + +import java.util.concurrent.Executor; + +/** + * A {@link WallpaperEffectsGenerationManager} is the class that passes wallpaper effects + * generation requests to wallpaper effect generation service. For example, create a cinematic + * and render a cinematic live wallpaper with the response. + * + * Usage: + * <pre>{@code + * mWallpaperEffectsGenerationManager = + * context.getSystemService(WallpaperEffectsGenerationManager.class); + * mWallpaperEffectsGenerationManager. + * generateCinematicEffect(cinematicEffectRequest, response->{ + * // proceed cinematic effect response. + * }); + * }</pre> + * + * @hide + */ +@SystemApi +@SystemService(Context.WALLPAPER_EFFECTS_GENERATION_SERVICE) +public final class WallpaperEffectsGenerationManager { + /** + * Interface for the cinematic effect listener. + */ + public interface CinematicEffectListener { + /** + * Async call when the cinematic effect response is generated. + * Client needs to check the status code of {@link CinematicEffectResponse} + * to determine if the effect generation is successful. + * + * @param response The generated cinematic effect response. + */ + void onCinematicEffectGenerated(@NonNull CinematicEffectResponse response); + } + + private final IWallpaperEffectsGenerationManager mService; + + /** @hide */ + public WallpaperEffectsGenerationManager( + @NonNull IWallpaperEffectsGenerationManager service) { + mService = service; + } + + /** + * Execute a {@link android.app.wallpapereffectsgeneration.CinematicEffectRequest} from + * the given parameters to the wallpaper effects generation service. After the cinematic + * effect response is ready, the given listener is invoked by the system with the response. + * The listener may never receive a callback if unexpected error happened when proceeding + * request. + * + * @param request request to generate cinematic effect. + * @param executor where the listener is invoked. + * @param listener listener invoked when the cinematic effect response is available. + * @hide + */ + @SystemApi + @RequiresPermission(android.Manifest.permission.MANAGE_WALLPAPER_EFFECTS_GENERATION) + public void generateCinematicEffect(@NonNull CinematicEffectRequest request, + @NonNull @CallbackExecutor Executor executor, + @NonNull CinematicEffectListener listener) { + try { + mService.generateCinematicEffect(request, + new CinematicEffectListenerWrapper(listener, executor)); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + + private static final class CinematicEffectListenerWrapper + extends ICinematicEffectListener.Stub { + @NonNull + private final CinematicEffectListener mListener; + @NonNull + private final Executor mExecutor; + + CinematicEffectListenerWrapper(@NonNull CinematicEffectListener listener, + @NonNull Executor executor) { + mListener = listener; + mExecutor = executor; + } + + @Override + public void onCinematicEffectGenerated(CinematicEffectResponse response) { + mExecutor.execute(() -> mListener.onCinematicEffectGenerated(response)); + } + } +} diff --git a/core/java/android/attention/AttentionManagerInternal.java b/core/java/android/attention/AttentionManagerInternal.java index 941e9e2ecce5..4e00da1b8c10 100644 --- a/core/java/android/attention/AttentionManagerInternal.java +++ b/core/java/android/attention/AttentionManagerInternal.java @@ -46,6 +46,25 @@ public abstract class AttentionManagerInternal { */ public abstract void cancelAttentionCheck(AttentionCallbackInternal callback); + /** + * Requests the continuous updates of proximity signal via the provided callback, + * until the given callback is unregistered. Currently, AttentionManagerService only + * anticipates one client and updates one client at a time. If a new client wants to + * onboard to receiving Proximity updates, please make a feature request to make proximity + * feature multi-client before depending on this feature. + * + * @param callback a callback that receives the proximity updates + * @return {@code true} if the registration should succeed. + */ + public abstract boolean onStartProximityUpdates(ProximityCallbackInternal callback); + + /** + * Requests to stop providing continuous updates until the callback is registered. + * + * @param callback a callback that was used in {@link #onStartProximityUpdates} + */ + public abstract void onStopProximityUpdates(ProximityCallbackInternal callback); + /** Internal interface for attention callback. */ public abstract static class AttentionCallbackInternal { /** @@ -64,4 +83,13 @@ public abstract class AttentionManagerInternal { */ public abstract void onFailure(int error); } + + /** Internal interface for proximity callback. */ + public abstract static class ProximityCallbackInternal { + /** + * @param distance the estimated distance of the user (in meter) + * The distance will be PROXIMITY_UNKNOWN if the proximity sensing was inconclusive. + */ + public abstract void onProximityUpdate(double distance); + } } diff --git a/core/java/android/companion/TEST_MAPPING b/core/java/android/companion/TEST_MAPPING index 63f54fa35158..b561c29c37c4 100644 --- a/core/java/android/companion/TEST_MAPPING +++ b/core/java/android/companion/TEST_MAPPING @@ -1,12 +1,7 @@ { - "presubmit": [ + "imports": [ { - "name": "CtsOsTestCases", - "options": [ - { - "include-filter": "android.os.cts.CompanionDeviceManagerTest" - } - ] + "path": "frameworks/base/services/companion" } ] } diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index a5807d4ecc0a..6ffea3f9217d 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -408,6 +408,7 @@ public abstract class Context { * @hide */ @SystemApi + @Deprecated public static final int BIND_ALLOW_FOREGROUND_SERVICE_STARTS_FROM_BACKGROUND = 0x00040000; /** @@ -421,12 +422,13 @@ public abstract class Context { public static final int BIND_SCHEDULE_LIKE_TOP_APP = 0x00080000; /** - * This flag has never been used. + * Flag for {@link #bindService}: allow background activity starts from the bound service's + * process. + * This flag is only respected if the caller is holding + * {@link android.Manifest.permission#START_ACTIVITIES_FROM_BACKGROUND}. * @hide - * @deprecated This flag has never been used. */ @SystemApi - @Deprecated public static final int BIND_ALLOW_BACKGROUND_ACTIVITY_STARTS = 0x00100000; /** @@ -3888,7 +3890,6 @@ public abstract class Context { //@hide: SPEECH_RECOGNITION_SERVICE, UWB_SERVICE, MEDIA_METRICS_SERVICE, - SUPPLEMENTAL_PROCESS_SERVICE, //@hide: ATTESTATION_VERIFICATION_SERVICE, //@hide: SAFETY_CENTER_SERVICE, }) @@ -5031,6 +5032,20 @@ public abstract class Context { public static final String SOUND_TRIGGER_MIDDLEWARE_SERVICE = "soundtrigger_middleware"; /** + * Used for getting the wallpaper effects generation service. + * + * <p><b>NOTE: </b> this service is optional; callers of + * {@code Context.getSystemServiceName(WALLPAPER_EFFECTS_GENERATION_SERVICE)} should check for + * {@code null}. + * + * @hide + * @see #getSystemService(String) + */ + @SystemApi + public static final String WALLPAPER_EFFECTS_GENERATION_SERVICE = + "wallpaper_effects_generation"; + + /** * Used to access {@link MusicRecognitionManagerService}. * * @hide @@ -5956,13 +5971,6 @@ public abstract class Context { public static final String LOCALE_SERVICE = "locale"; /** - * Use with {@link #getSystemService(String)} to retrieve a Supplemental Process Manager. - * - * @see #getSystemService(String) - */ - public static final String SUPPLEMENTAL_PROCESS_SERVICE = "supplemental_process"; - - /** * Use with {@link #getSystemService(String)} to retrieve a {@link * android.safetycenter.SafetyCenterManager} instance for interacting with the safety center. * @@ -6706,21 +6714,27 @@ public abstract class Context { @NonNull Configuration overrideConfiguration); /** - * Returns a new <code>Context</code> object from the current context but with resources - * adjusted to match the metrics of <code>display</code>. Each call to this method + * Returns a new {@code Context} object from the current context but with resources + * adjusted to match the metrics of {@code display}. Each call to this method * returns a new instance of a context object. Context objects are not shared; however, * common state (such as the {@link ClassLoader} and other resources for the same - * configuration) can be shared, so the <code>Context</code> itself is lightweight. + * configuration) can be shared, so the {@code Context} itself is lightweight. + * + * <p><b>Note:</b> + * This {@code Context} is <b>not</b> expected to be updated with new configuration if the + * underlying display configuration changes and the cached {@code Resources} it returns + * could be stale. It is suggested to use + * {@link android.hardware.display.DisplayManager.DisplayListener} to listen for + * changes and re-create an instance if necessary. </p> * <p> + * This {@code Context} is <b>not</b> a UI context, do not use it to access UI components + * or obtain a {@link WindowManager} instance. + * </p><p> * To obtain an instance of {@link WindowManager} configured to show windows on the given * display, call {@link #createWindowContext(int, Bundle)} on the returned display context, * then call {@link #getSystemService(String)} or {@link #getSystemService(Class)} on the * returned window context. - * <p> - * <b>Note:</b> The context returned by <code>createDisplayContext(Display)</code> is not a UI - * context. Do not access UI components or obtain a {@link WindowManager} from the context - * created by <code>createDisplayContext(Display)</code>. - * + * </p> * @param display The display to which the current context's resources are adjusted. * * @return A context for the display. diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 3e527f8d5215..28bef566b59c 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -5576,6 +5576,7 @@ public class Intent implements Parcelable, Cloneable { /** * A String[] holding attribution tags when used with * {@link #ACTION_VIEW_PERMISSION_USAGE_FOR_PERIOD} + * and ACTION_MANAGE_PERMISSION_USAGE * * E.g. an attribution tag could be location_provider, com.google.android.gms.*, etc. */ @@ -5584,17 +5585,20 @@ public class Intent implements Parcelable, Cloneable { /** * A long representing the start timestamp (epoch time in millis) of the permission usage * when used with {@link #ACTION_VIEW_PERMISSION_USAGE_FOR_PERIOD} + * and ACTION_MANAGE_PERMISSION_USAGE */ public static final String EXTRA_START_TIME = "android.intent.extra.START_TIME"; /** * A long representing the end timestamp (epoch time in millis) of the permission usage when * used with {@link #ACTION_VIEW_PERMISSION_USAGE_FOR_PERIOD} + * and ACTION_MANAGE_PERMISSION_USAGE */ public static final String EXTRA_END_TIME = "android.intent.extra.END_TIME"; /** - * A boolean extra, when used with {@link #ACTION_VIEW_PERMISSION_USAGE_FOR_PERIOD}, + * A boolean extra, when used with {@link #ACTION_VIEW_PERMISSION_USAGE_FOR_PERIOD} + * and {@link #ACTION_MANAGE_PERMISSION_USAGE}, * that specifies whether the permission usage system UI is showing attribution information * for the chosen entry. * diff --git a/core/java/android/content/pm/ApplicationInfo.java b/core/java/android/content/pm/ApplicationInfo.java index 9e9dd1edd577..567f649ea762 100644 --- a/core/java/android/content/pm/ApplicationInfo.java +++ b/core/java/android/content/pm/ApplicationInfo.java @@ -19,6 +19,7 @@ package android.content.pm; import static android.os.Build.VERSION_CODES.DONUT; import android.annotation.IntDef; +import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; import android.annotation.TestApi; @@ -48,6 +49,7 @@ import java.lang.annotation.RetentionPolicy; import java.text.Collator; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.Comparator; import java.util.List; import java.util.Objects; @@ -62,58 +64,58 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { private static ForBoolean sForBoolean = Parcelling.Cache.getOrCreate(ForBoolean.class); /** - * Default task affinity of all activities in this application. See - * {@link ActivityInfo#taskAffinity} for more information. This comes - * from the "taskAffinity" attribute. + * Default task affinity of all activities in this application. See + * {@link ActivityInfo#taskAffinity} for more information. This comes + * from the "taskAffinity" attribute. */ public String taskAffinity; - + /** * Optional name of a permission required to be able to access this * application's components. From the "permission" attribute. */ public String permission; - + /** * The name of the process this application should run in. From the * "process" attribute or, if not set, the same as * <var>packageName</var>. */ public String processName; - + /** * Class implementing the Application object. From the "class" * attribute. */ public String className; - + /** * A style resource identifier (in the package's resources) of the * description of an application. From the "description" attribute * or, if not set, 0. */ - public int descriptionRes; - + public int descriptionRes; + /** * A style resource identifier (in the package's resources) of the * default visual theme of the application. From the "theme" attribute * or, if not set, 0. */ public int theme; - + /** * Class implementing the Application's manage space * functionality. From the "manageSpaceActivity" * attribute. This is an optional attribute and will be null if * applications don't specify it in their manifest */ - public String manageSpaceActivityName; - + public String manageSpaceActivityName; + /** * Class implementing the Application's backup functionality. From * the "backupAgent" attribute. This is an optional attribute and * will be null if the application does not specify it in its manifest. - * + * * <p>If android:allowBackup is set to false, this attribute is ignored. */ public String backupAgentName; @@ -174,7 +176,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { * {@code signatureOrSystem}. */ public static final int FLAG_SYSTEM = 1<<0; - + /** * Value for {@link #flags}: set to true if this application would like to * allow debugging of its @@ -183,7 +185,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { * android:debuggable} of the <application> tag. */ public static final int FLAG_DEBUGGABLE = 1<<1; - + /** * Value for {@link #flags}: set to true if this application has code * associated with it. Comes @@ -191,7 +193,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { * android:hasCode} of the <application> tag. */ public static final int FLAG_HAS_CODE = 1<<2; - + /** * Value for {@link #flags}: set to true if this application is persistent. * Comes from {@link android.R.styleable#AndroidManifestApplication_persistent @@ -212,20 +214,20 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { * android:allowTaskReparenting} of the <application> tag. */ public static final int FLAG_ALLOW_TASK_REPARENTING = 1<<5; - + /** * Value for {@link #flags}: default value for the corresponding ActivityInfo flag. * Comes from {@link android.R.styleable#AndroidManifestApplication_allowClearUserData * android:allowClearUserData} of the <application> tag. */ public static final int FLAG_ALLOW_CLEAR_USER_DATA = 1<<6; - + /** * Value for {@link #flags}: this is set if this application has been * installed as an update to a built-in system application. */ public static final int FLAG_UPDATED_SYSTEM_APP = 1<<7; - + /** * Value for {@link #flags}: this is set if the application has specified * {@link android.R.styleable#AndroidManifestApplication_testOnly @@ -240,15 +242,15 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { * android:smallScreens}. */ public static final int FLAG_SUPPORTS_SMALL_SCREENS = 1<<9; - + /** * Value for {@link #flags}: true when the application's window can be * displayed on normal screens. Corresponds to * {@link android.R.styleable#AndroidManifestSupportsScreens_normalScreens * android:normalScreens}. */ - public static final int FLAG_SUPPORTS_NORMAL_SCREENS = 1<<10; - + public static final int FLAG_SUPPORTS_NORMAL_SCREENS = 1<<10; + /** * Value for {@link #flags}: true when the application's window can be * increased in size for larger screens. Corresponds to @@ -256,7 +258,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { * android:largeScreens}. */ public static final int FLAG_SUPPORTS_LARGE_SCREENS = 1<<11; - + /** * Value for {@link #flags}: true when the application knows how to adjust * its UI for different screen sizes. Corresponds to @@ -264,7 +266,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { * android:resizeable}. */ public static final int FLAG_RESIZEABLE_FOR_SCREENS = 1<<12; - + /** * Value for {@link #flags}: true when the application knows how to * accommodate different screen densities. Corresponds to @@ -276,7 +278,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { */ @Deprecated public static final int FLAG_SUPPORTS_SCREEN_DENSITIES = 1<<13; - + /** * Value for {@link #flags}: set to true if this application would like to * request the VM to operate under the safe mode. Comes from @@ -288,7 +290,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { /** * Value for {@link #flags}: set to <code>false</code> if the application does not wish * to permit any OS-driven backups of its data; <code>true</code> otherwise. - * + * * <p>Comes from the * {@link android.R.styleable#AndroidManifestApplication_allowBackup android:allowBackup} * attribute of the <application> tag. @@ -351,7 +353,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { * android:xlargeScreens}. */ public static final int FLAG_SUPPORTS_XLARGE_SCREENS = 1<<19; - + /** * Value for {@link #flags}: true when the application has requested a * large heap for its processes. Corresponds to @@ -1114,7 +1116,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { * the same uid). */ public int uid; - + /** * The minimum SDK version this application can run on. It will not run * on earlier versions. @@ -1817,7 +1819,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { if (sb == null) { sb = ab.packageName; } - + return sCollator.compare(sa.toString(), sb.toString()); } @@ -1830,7 +1832,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { public ApplicationInfo() { createTimestamp = System.currentTimeMillis(); } - + public ApplicationInfo(ApplicationInfo orig) { super(orig); taskAffinity = orig.taskAffinity; @@ -2125,7 +2127,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { /** * Disable compatibility mode - * + * * @hide */ @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) @@ -2346,7 +2348,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { } return pm.getDefaultActivityIcon(); } - + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private boolean isPackageUnavailable(PackageManager pm) { try { @@ -2655,4 +2657,22 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { public int getLocaleConfigRes() { return localeConfigRes; } + + + /** + * List of all shared libraries this application is linked against. This + * list will only be set if the {@link PackageManager#GET_SHARED_LIBRARY_FILES + * PackageManager.GET_SHARED_LIBRARY_FILES} flag was used when retrieving the structure. + * + * @hide + */ + @NonNull + @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) + public List<SharedLibraryInfo> getSharedLibraryInfos() { + if (sharedLibraryInfos == null) { + return Collections.EMPTY_LIST; + } + return sharedLibraryInfos; + } + } diff --git a/core/java/android/content/pm/IPackageManager.aidl b/core/java/android/content/pm/IPackageManager.aidl index 1c82b38c5007..30aed8bc4de7 100644 --- a/core/java/android/content/pm/IPackageManager.aidl +++ b/core/java/android/content/pm/IPackageManager.aidl @@ -653,6 +653,7 @@ interface IPackageManager { @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) String getPermissionControllerPackageName(); + String getSupplementalProcessPackageName(); ParceledListSlice getInstantApps(int userId); byte[] getInstantAppCookie(String packageName, int userId); diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index e5c31d7c0a8a..07227c5fe0e1 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -1063,6 +1063,7 @@ public abstract class PackageManager { * via this flag. * @hide */ + @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) public static final int MATCH_STATIC_SHARED_AND_SDK_LIBRARIES = 0x04000000; /** @@ -5691,6 +5692,20 @@ public abstract class PackageManager { } /** + * Returns the package name of the component implementing supplemental process service. + * + * @return the package name of the component implementing supplemental process service + * + * @hide + */ + @NonNull + @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) + @TestApi + public String getSupplementalProcessPackageName() { + throw new RuntimeException("Not implemented. Must override in a subclass."); + } + + /** * Add a new dynamic permission to the system. For this to work, your * package must have defined a permission tree through the * {@link android.R.styleable#AndroidManifestPermissionTree diff --git a/core/java/android/hardware/camera2/CameraManager.java b/core/java/android/hardware/camera2/CameraManager.java index c12e8195eeb4..d6d3a97687b5 100644 --- a/core/java/android/hardware/camera2/CameraManager.java +++ b/core/java/android/hardware/camera2/CameraManager.java @@ -25,6 +25,7 @@ import android.annotation.SystemService; import android.annotation.TestApi; import android.content.Context; import android.content.pm.PackageManager; +import android.graphics.Point; import android.hardware.CameraStatus; import android.hardware.ICameraService; import android.hardware.ICameraServiceListener; @@ -458,12 +459,14 @@ public final class CameraManager { (DisplayManager) mContext.getSystemService(Context.DISPLAY_SERVICE); Display display = displayManager.getDisplay(Display.DEFAULT_DISPLAY); if (display != null) { - int width = display.getWidth(); - int height = display.getHeight(); + Point sz = new Point(); + display.getRealSize(sz); + int width = sz.x; + int height = sz.y; if (height > width) { height = width; - width = display.getHeight(); + width = sz.y; } ret = new Size(width, height); @@ -471,7 +474,7 @@ public final class CameraManager { Log.e(TAG, "Invalid default display!"); } } catch (Exception e) { - Log.e(TAG, "getDisplaySize Failed. " + e.toString()); + Log.e(TAG, "getDisplaySize Failed. " + e); } return ret; diff --git a/core/java/android/hardware/display/DisplayManagerGlobal.java b/core/java/android/hardware/display/DisplayManagerGlobal.java index 1a7a63ae8b69..af8ec279ac30 100644 --- a/core/java/android/hardware/display/DisplayManagerGlobal.java +++ b/core/java/android/hardware/display/DisplayManagerGlobal.java @@ -916,6 +916,17 @@ public final class DisplayManagerGlobal { } /** + * Returns the system preferred display mode. + */ + public Display.Mode getSystemPreferredDisplayMode(int displayId) { + try { + return mDm.getSystemPreferredDisplayMode(displayId); + } catch (RemoteException ex) { + throw ex.rethrowFromSystemServer(); + } + } + + /** * When enabled the app requested display resolution and refresh rate is always selected * in DisplayModeDirector regardless of user settings and policies for low brightness, low * battery etc. diff --git a/core/java/android/hardware/display/IDisplayManager.aidl b/core/java/android/hardware/display/IDisplayManager.aidl index 35663af189f4..b3af52b19063 100644 --- a/core/java/android/hardware/display/IDisplayManager.aidl +++ b/core/java/android/hardware/display/IDisplayManager.aidl @@ -168,6 +168,7 @@ interface IDisplayManager { // Requires MODIFY_USER_PREFERRED_DISPLAY_MODE permission. void setUserPreferredDisplayMode(int displayId, in Mode mode); Mode getUserPreferredDisplayMode(int displayId); + Mode getSystemPreferredDisplayMode(int displayId); // When enabled the app requested display resolution and refresh rate is always selected // in DisplayModeDirector regardless of user settings and policies for low brightness, low diff --git a/core/java/android/hardware/hdmi/HdmiAudioSystemClient.java b/core/java/android/hardware/hdmi/HdmiAudioSystemClient.java index e7d76f66230d..bb3464691bcb 100644 --- a/core/java/android/hardware/hdmi/HdmiAudioSystemClient.java +++ b/core/java/android/hardware/hdmi/HdmiAudioSystemClient.java @@ -142,7 +142,7 @@ public final class HdmiAudioSystemClient extends HdmiClient { * @hide */ public void setSystemAudioMode(boolean state, @NonNull SetSystemAudioModeCallback callback) { - // TODO(amyjojo): implement this when needed. + // TODO(b/217509829): implement this when needed. } /** diff --git a/core/java/android/hardware/hdmi/HdmiClient.java b/core/java/android/hardware/hdmi/HdmiClient.java index cee6a5b16a3c..b96e4f88eb93 100644 --- a/core/java/android/hardware/hdmi/HdmiClient.java +++ b/core/java/android/hardware/hdmi/HdmiClient.java @@ -21,6 +21,8 @@ import java.util.concurrent.Executor; public abstract class HdmiClient { private static final String TAG = "HdmiClient"; + private static final int UNKNOWN_VENDOR_ID = 0xFFFFFF; + /* package */ final IHdmiControlService mService; private IHdmiVendorCommandListener mIHdmiVendorCommandListener; @@ -156,11 +158,25 @@ public abstract class HdmiClient { } /** - * Sets a listener used to receive incoming vendor-specific command. + * Sets a listener used to receive incoming vendor-specific command. This listener will only + * receive {@code <Vendor Command>} but will not receive any {@code <Vendor Command with ID>} + * messages. * * @param listener listener object */ public void setVendorCommandListener(@NonNull VendorCommandListener listener) { + // Set the vendor ID to INVALID_VENDOR_ID. + setVendorCommandListener(listener, UNKNOWN_VENDOR_ID); + } + + /** + * Sets a listener used to receive incoming vendor-specific command. + * + * @param listener listener object + * @param vendorId The listener is interested in {@code <Vendor Command with ID>} received with + * this vendorId and all {@code <Vendor Command>} messages. + */ + public void setVendorCommandListener(@NonNull VendorCommandListener listener, int vendorId) { if (listener == null) { throw new IllegalArgumentException("listener cannot be null"); } @@ -169,7 +185,7 @@ public abstract class HdmiClient { } try { IHdmiVendorCommandListener wrappedListener = getListenerWrapper(listener); - mService.addVendorCommandListener(wrappedListener, getDeviceType()); + mService.addVendorCommandListener(wrappedListener, vendorId); mIHdmiVendorCommandListener = wrappedListener; } catch (RemoteException e) { Log.e(TAG, "failed to set vendor command listener: ", e); diff --git a/core/java/android/hardware/hdmi/HdmiControlManager.java b/core/java/android/hardware/hdmi/HdmiControlManager.java index 5874385f8191..9235ba15019c 100644 --- a/core/java/android/hardware/hdmi/HdmiControlManager.java +++ b/core/java/android/hardware/hdmi/HdmiControlManager.java @@ -105,6 +105,12 @@ public final class HdmiControlManager { "android.hardware.hdmi.extra.MESSAGE_EXTRA_PARAM1"; /** + * Used as an extra field in the Set Menu Language intent. Contains the requested locale. + * @hide + */ + public static final String EXTRA_LOCALE = "android.hardware.hdmi.extra.LOCALE"; + + /** * Volume value for mute state. */ public static final int AVR_VOLUME_MUTED = 101; @@ -558,6 +564,32 @@ public final class HdmiControlManager { @Retention(RetentionPolicy.SOURCE) public @interface TvSendStandbyOnSleep {} + // -- Whether a playback device should act on an incoming {@code <Set Menu Language>} message. + /** + * Confirmation dialog should be shown upon receiving the CEC message. + * + * @see HdmiControlManager#CEC_SETTING_NAME_SET_MENU_LANGUAGE + * @hide + */ + public static final int SET_MENU_LANGUAGE_ENABLED = 1; + /** + * The message should be ignored. + * + * @see HdmiControlManager#CEC_SETTING_NAME_SET_MENU_LANGUAGE + * @hide + */ + public static final int SET_MENU_LANGUAGE_DISABLED = 0; + /** + * @see HdmiControlManager#CEC_SETTING_NAME_SET_MENU_LANGUAGE + * @hide + */ + @IntDef(prefix = { "SET_MENU_LANGUAGE_" }, value = { + SET_MENU_LANGUAGE_ENABLED, + SET_MENU_LANGUAGE_DISABLED + }) + @Retention(RetentionPolicy.SOURCE) + public @interface SetMenuLanguage {} + // -- The RC profile of a TV panel. /** * RC profile none. @@ -812,6 +844,13 @@ public final class HdmiControlManager { public static final String CEC_SETTING_NAME_TV_SEND_STANDBY_ON_SLEEP = "tv_send_standby_on_sleep"; /** + * Name of a setting deciding whether {@code <Set Menu Language>} message should be + * handled by the framework or ignored. + * + * @hide + */ + public static final String CEC_SETTING_NAME_SET_MENU_LANGUAGE = "set_menu_language"; + /** * Name of a setting representing the RC profile of a TV panel. * * @hide @@ -977,6 +1016,7 @@ public final class HdmiControlManager { CEC_SETTING_NAME_VOLUME_CONTROL_MODE, CEC_SETTING_NAME_TV_WAKE_ON_ONE_TOUCH_PLAY, CEC_SETTING_NAME_TV_SEND_STANDBY_ON_SLEEP, + CEC_SETTING_NAME_SET_MENU_LANGUAGE, CEC_SETTING_NAME_RC_PROFILE_TV, CEC_SETTING_NAME_RC_PROFILE_SOURCE_HANDLES_ROOT_MENU, CEC_SETTING_NAME_RC_PROFILE_SOURCE_HANDLES_SETUP_MENU, diff --git a/core/java/android/hardware/hdmi/HdmiControlServiceWrapper.java b/core/java/android/hardware/hdmi/HdmiControlServiceWrapper.java index 16adee9907ed..818554dd8143 100644 --- a/core/java/android/hardware/hdmi/HdmiControlServiceWrapper.java +++ b/core/java/android/hardware/hdmi/HdmiControlServiceWrapper.java @@ -221,8 +221,8 @@ public final class HdmiControlServiceWrapper { } @Override - public void addVendorCommandListener(IHdmiVendorCommandListener listener, int deviceType) { - HdmiControlServiceWrapper.this.addVendorCommandListener(listener, deviceType); + public void addVendorCommandListener(IHdmiVendorCommandListener listener, int vendorId) { + HdmiControlServiceWrapper.this.addVendorCommandListener(listener, vendorId); } @Override @@ -481,7 +481,7 @@ public final class HdmiControlServiceWrapper { boolean hasVendorId) {} /** @hide */ - public void addVendorCommandListener(IHdmiVendorCommandListener listener, int deviceType) {} + public void addVendorCommandListener(IHdmiVendorCommandListener listener, int vendorId) {} /** @hide */ public void sendStandby(int deviceType, int deviceId) {} diff --git a/core/java/android/hardware/hdmi/IHdmiControlService.aidl b/core/java/android/hardware/hdmi/IHdmiControlService.aidl index 6613397c8c0f..35dd9ed5bbcc 100644 --- a/core/java/android/hardware/hdmi/IHdmiControlService.aidl +++ b/core/java/android/hardware/hdmi/IHdmiControlService.aidl @@ -76,7 +76,7 @@ interface IHdmiControlService { void askRemoteDeviceToBecomeActiveSource(int physicalAddress); void sendVendorCommand(int deviceType, int targetAddress, in byte[] params, boolean hasVendorId); - void addVendorCommandListener(IHdmiVendorCommandListener listener, int deviceType); + void addVendorCommandListener(IHdmiVendorCommandListener listener, int vendorId); void sendStandby(int deviceType, int deviceId); void setHdmiRecordListener(IHdmiRecordListener callback); void startOneTouchRecord(int recorderAddress, in byte[] recordSource); diff --git a/core/java/android/hardware/input/IInputManager.aidl b/core/java/android/hardware/input/IInputManager.aidl index 27403ec4fe59..e1ffd4a6761d 100644 --- a/core/java/android/hardware/input/IInputManager.aidl +++ b/core/java/android/hardware/input/IInputManager.aidl @@ -112,7 +112,7 @@ interface IInputManager { oneway void requestPointerCapture(IBinder inputChannelToken, boolean enabled); /** Create an input monitor for gestures. */ - InputMonitor monitorGestureInput(String name, int displayId); + InputMonitor monitorGestureInput(IBinder token, String name, int displayId); // Add a runtime association between the input port and the display port. This overrides any // static associations. diff --git a/core/java/android/hardware/input/InputManager.java b/core/java/android/hardware/input/InputManager.java index 979e9dd6a1f6..2fd79cf980c7 100644 --- a/core/java/android/hardware/input/InputManager.java +++ b/core/java/android/hardware/input/InputManager.java @@ -35,6 +35,7 @@ import android.hardware.lights.Light; import android.hardware.lights.LightState; import android.hardware.lights.LightsManager; import android.hardware.lights.LightsRequest; +import android.os.Binder; import android.os.BlockUntrustedTouchesMode; import android.os.Build; import android.os.CombinedVibration; @@ -1211,7 +1212,7 @@ public final class InputManager { */ public InputMonitor monitorGestureInput(String name, int displayId) { try { - return mIm.monitorGestureInput(name, displayId); + return mIm.monitorGestureInput(new Binder(), name, displayId); } catch (RemoteException ex) { throw ex.rethrowFromSystemServer(); } diff --git a/core/java/android/inputmethodservice/InputMethodService.java b/core/java/android/inputmethodservice/InputMethodService.java index f55c41594389..fc2fbc39dbeb 100644 --- a/core/java/android/inputmethodservice/InputMethodService.java +++ b/core/java/android/inputmethodservice/InputMethodService.java @@ -346,7 +346,7 @@ public class InputMethodService extends AbstractInputMethodService { */ @AnyThread public static boolean canImeRenderGesturalNavButtons() { - return SystemProperties.getBoolean(PROP_CAN_RENDER_GESTURAL_NAV_BUTTONS, false); + return SystemProperties.getBoolean(PROP_CAN_RENDER_GESTURAL_NAV_BUTTONS, true); } /** @@ -475,7 +475,7 @@ public class InputMethodService extends AbstractInputMethodService { private InputMethodPrivilegedOperations mPrivOps = new InputMethodPrivilegedOperations(); @NonNull - final NavigationBarController mNavigationBarController = + private final NavigationBarController mNavigationBarController = new NavigationBarController(this); @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) @@ -1504,7 +1504,7 @@ public class InputMethodService extends AbstractInputMethodService { Context.LAYOUT_INFLATER_SERVICE); Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "IMS.initSoftInputWindow"); mWindow = new SoftInputWindow(this, mTheme, mDispatcherState); - + mNavigationBarController.onSoftInputWindowCreated(mWindow); { final Window window = mWindow.getWindow(); { diff --git a/core/java/android/inputmethodservice/NavigationBarController.java b/core/java/android/inputmethodservice/NavigationBarController.java index 508172d13aa3..83fc7276eabc 100644 --- a/core/java/android/inputmethodservice/NavigationBarController.java +++ b/core/java/android/inputmethodservice/NavigationBarController.java @@ -29,6 +29,7 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.content.res.Resources; +import android.graphics.Color; import android.graphics.Insets; import android.graphics.Rect; import android.graphics.Region; @@ -65,6 +66,9 @@ final class NavigationBarController { @NonNull ViewTreeObserver.InternalInsetsInfo dest) { } + default void onSoftInputWindowCreated(@NonNull SoftInputWindow softInputWindow) { + } + default void onViewInitialized() { } @@ -78,9 +82,6 @@ final class NavigationBarController { boolean shouldShowImeSwitcherWhenImeIsShown) { } - default void onSystemBarAppearanceChanged(@Appearance int appearance) { - } - default String toDebugString() { return "No-op implementation"; } @@ -101,6 +102,10 @@ final class NavigationBarController { mImpl.updateTouchableInsets(originalInsets, dest); } + void onSoftInputWindowCreated(@NonNull SoftInputWindow softInputWindow) { + mImpl.onSoftInputWindowCreated(softInputWindow); + } + void onViewInitialized() { mImpl.onViewInitialized(); } @@ -117,15 +122,11 @@ final class NavigationBarController { mImpl.setShouldShowImeSwitcherWhenImeIsShown(shouldShowImeSwitcherWhenImeIsShown); } - void onSystemBarAppearanceChanged(@Appearance int appearance) { - mImpl.onSystemBarAppearanceChanged(appearance); - } - String toDebugString() { return mImpl.toDebugString(); } - private static final class Impl implements Callback { + private static final class Impl implements Callback, Window.DecorCallback { private static final int DEFAULT_COLOR_ADAPT_TRANSITION_TIME = 1700; // Copied from com.android.systemui.animation.Interpolators#LEGACY_DECELERATE @@ -158,6 +159,8 @@ final class NavigationBarController { @Nullable private ValueAnimator mTintAnimator; + private boolean mDrawLegacyNavigationBarBackground; + Impl(@NonNull InputMethodService inputMethodService) { mService = inputMethodService; } @@ -226,9 +229,14 @@ final class NavigationBarController { mLastInsets = systemInsets; } - mNavigationBarFrame.setBackground(null); + if (mDrawLegacyNavigationBarBackground) { + mNavigationBarFrame.setBackgroundColor(Color.BLACK); + } else { + mNavigationBarFrame.setBackground(null); + } - setIconTintInternal(calculateTargetDarkIntensity(mAppearance)); + setIconTintInternal(calculateTargetDarkIntensity(mAppearance, + mDrawLegacyNavigationBarBackground)); } private void uninstallNavigationBarFrameIfNecessary() { @@ -362,6 +370,13 @@ final class NavigationBarController { } @Override + public void onSoftInputWindowCreated(@NonNull SoftInputWindow softInputWindow) { + final Window window = softInputWindow.getWindow(); + mAppearance = window.getSystemBarAppearance(); + window.setDecorCallback(this); + } + + @Override public void onViewInitialized() { if (mDestroyed) { return; @@ -471,7 +486,8 @@ final class NavigationBarController { return; } - final float targetDarkIntensity = calculateTargetDarkIntensity(mAppearance); + final float targetDarkIntensity = calculateTargetDarkIntensity(mAppearance, + mDrawLegacyNavigationBarBackground); if (mTintAnimator != null) { mTintAnimator.cancel(); @@ -499,18 +515,42 @@ final class NavigationBarController { } @FloatRange(from = 0.0f, to = 1.0f) - private static float calculateTargetDarkIntensity(@Appearance int appearance) { - final boolean lightNavBar = (appearance & APPEARANCE_LIGHT_NAVIGATION_BARS) != 0; + private static float calculateTargetDarkIntensity(@Appearance int appearance, + boolean drawLegacyNavigationBarBackground) { + final boolean lightNavBar = !drawLegacyNavigationBarBackground + && (appearance & APPEARANCE_LIGHT_NAVIGATION_BARS) != 0; return lightNavBar ? 1.0f : 0.0f; } @Override + public boolean onDrawLegacyNavigationBarBackgroundChanged( + boolean drawLegacyNavigationBarBackground) { + if (mDestroyed) { + return false; + } + + if (drawLegacyNavigationBarBackground != mDrawLegacyNavigationBarBackground) { + mDrawLegacyNavigationBarBackground = drawLegacyNavigationBarBackground; + if (mDrawLegacyNavigationBarBackground) { + mNavigationBarFrame.setBackgroundColor(Color.BLACK); + } else { + mNavigationBarFrame.setBackground(null); + } + scheduleRelayout(); + onSystemBarAppearanceChanged(mAppearance); + } + return drawLegacyNavigationBarBackground; + } + + @Override public String toDebugString() { return "{mRenderGesturalNavButtons=" + mRenderGesturalNavButtons + " mNavigationBarFrame=" + mNavigationBarFrame - + " mShouldShowImeSwitcherWhenImeIsShown" + mShouldShowImeSwitcherWhenImeIsShown + + " mShouldShowImeSwitcherWhenImeIsShown=" + + mShouldShowImeSwitcherWhenImeIsShown + " mAppearance=0x" + Integer.toHexString(mAppearance) + " mDarkIntensity=" + mDarkIntensity + + " mDrawLegacyNavigationBarBackground=" + mDrawLegacyNavigationBarBackground + "}"; } } diff --git a/core/java/android/inputmethodservice/SoftInputWindow.java b/core/java/android/inputmethodservice/SoftInputWindow.java index 0893d2aad740..5704dac7a327 100644 --- a/core/java/android/inputmethodservice/SoftInputWindow.java +++ b/core/java/android/inputmethodservice/SoftInputWindow.java @@ -31,7 +31,6 @@ import android.util.proto.ProtoOutputStream; import android.view.KeyEvent; import android.view.MotionEvent; import android.view.View; -import android.view.WindowInsetsController; import android.view.WindowManager; import java.lang.annotation.Retention; @@ -264,11 +263,6 @@ final class SoftInputWindow extends Dialog { } } - @Override - public void onSystemBarAppearanceChanged(@WindowInsetsController.Appearance int appearance) { - mService.mNavigationBarController.onSystemBarAppearanceChanged(appearance); - } - void dumpDebug(ProtoOutputStream proto, long fieldId) { final long token = proto.start(fieldId); mBounds.dumpDebug(proto, BOUNDS); diff --git a/core/java/android/os/BatteryStatsManager.java b/core/java/android/os/BatteryStatsManager.java index f16bbc66e6cd..071bdea5e3ac 100644 --- a/core/java/android/os/BatteryStatsManager.java +++ b/core/java/android/os/BatteryStatsManager.java @@ -24,8 +24,6 @@ import android.annotation.RequiresPermission; import android.annotation.SystemApi; import android.annotation.SystemService; import android.annotation.TestApi; -import android.bluetooth.annotations.RequiresBluetoothConnectPermission; -import android.bluetooth.annotations.RequiresLegacyBluetoothAdminPermission; import android.content.Context; import android.net.NetworkStack; import android.os.connectivity.CellularBatteryStats; @@ -523,8 +521,6 @@ public final class BatteryStatsManager { * @param reason why Bluetooth has been turned on * @param packageName package responsible for this change */ - @RequiresLegacyBluetoothAdminPermission - @RequiresBluetoothConnectPermission @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public void reportBluetoothOn(int uid, int reason, @NonNull String packageName) { try { @@ -541,8 +537,6 @@ public final class BatteryStatsManager { * @param reason why Bluetooth has been turned on * @param packageName package responsible for this change */ - @RequiresLegacyBluetoothAdminPermission - @RequiresBluetoothConnectPermission @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public void reportBluetoothOff(int uid, int reason, @NonNull String packageName) { try { diff --git a/core/java/android/os/BinderProxy.java b/core/java/android/os/BinderProxy.java index 1b7c00c00f83..63306612fdaf 100644 --- a/core/java/android/os/BinderProxy.java +++ b/core/java/android/os/BinderProxy.java @@ -526,12 +526,15 @@ public final class BinderProxy implements IBinder { public boolean transact(int code, Parcel data, Parcel reply, int flags) throws RemoteException { Binder.checkParcel(this, code, data, "Unreasonably large binder buffer"); - if (mWarnOnBlocking && ((flags & FLAG_ONEWAY) == 0) + boolean warnOnBlocking = mWarnOnBlocking; // Cache it to reduce volatile access. + + if (warnOnBlocking && ((flags & FLAG_ONEWAY) == 0) && Binder.sWarnOnBlockingOnCurrentThread.get()) { // For now, avoid spamming the log by disabling after we've logged // about this interface at least once mWarnOnBlocking = false; + warnOnBlocking = false; if (Build.IS_USERDEBUG) { // Log this as a WTF on userdebug builds. @@ -578,7 +581,13 @@ public final class BinderProxy implements IBinder { } try { - return transactNative(code, data, reply, flags); + final boolean result = transactNative(code, data, reply, flags); + + if (reply != null && !warnOnBlocking) { + reply.addFlags(Parcel.FLAG_IS_REPLY_FROM_BLOCKING_ALLOWED_OBJECT); + } + + return result; } finally { AppOpsManager.resumeNotedAppOpsCollection(prevCollection); diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java index 35b9ccc83e0b..9970641dd324 100755 --- a/core/java/android/os/Build.java +++ b/core/java/android/os/Build.java @@ -31,6 +31,7 @@ import android.sysprop.DeviceProperties; import android.sysprop.SocProperties; import android.sysprop.TelephonyProperties; import android.text.TextUtils; +import android.util.ArraySet; import android.util.Slog; import android.view.View; @@ -39,6 +40,7 @@ import dalvik.system.VMRuntime; import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Set; import java.util.stream.Collectors; /** @@ -396,6 +398,17 @@ public class Build { */ public static final String CODENAME = getString("ro.build.version.codename"); + /** + * All known codenames starting from {@link VERSION_CODES.Q}. + * + * <p>This includes in development codenames as well. + * + * @hide + */ + @SystemApi + @NonNull public static final Set<String> KNOWN_CODENAMES = + new ArraySet<>(new String[]{"Q", "R", "S", "Sv2", "Tiramisu"}); + private static final String[] ALL_CODENAMES = getStringList("ro.build.version.all_codenames", ","); diff --git a/core/java/android/os/GraphicsEnvironment.java b/core/java/android/os/GraphicsEnvironment.java index aa4b83a5c361..0c3514fce76e 100644 --- a/core/java/android/os/GraphicsEnvironment.java +++ b/core/java/android/os/GraphicsEnvironment.java @@ -165,7 +165,7 @@ public class GraphicsEnvironment { private boolean isAngleEnabledByGameMode(Context context, String packageName) { try { final boolean gameModeEnabledAngle = - (mGameManager != null) && mGameManager.getAngleEnabled(packageName); + (mGameManager != null) && mGameManager.isAngleEnabled(packageName); Log.v(TAG, "ANGLE GameManagerService for " + packageName + ": " + gameModeEnabledAngle); return gameModeEnabledAngle; } catch (SecurityException e) { diff --git a/core/java/android/os/Parcel.java b/core/java/android/os/Parcel.java index 3bc3ec83bde5..9998e1206602 100644 --- a/core/java/android/os/Parcel.java +++ b/core/java/android/os/Parcel.java @@ -18,6 +18,7 @@ package android.os; import static java.util.Objects.requireNonNull; +import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SuppressLint; @@ -53,6 +54,8 @@ import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.io.ObjectStreamClass; import java.io.Serializable; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; import java.lang.reflect.Array; import java.lang.reflect.Field; import java.lang.reflect.Modifier; @@ -229,6 +232,25 @@ public final class Parcel { private RuntimeException mStack; + /** @hide */ + @TestApi + public static final int FLAG_IS_REPLY_FROM_BLOCKING_ALLOWED_OBJECT = 1 << 0; + + /** @hide */ + @TestApi + public static final int FLAG_PROPAGATE_ALLOW_BLOCKING = 1 << 1; + + /** @hide */ + @IntDef(flag = true, prefix = { "FLAG_" }, value = { + FLAG_IS_REPLY_FROM_BLOCKING_ALLOWED_OBJECT, + FLAG_PROPAGATE_ALLOW_BLOCKING, + }) + @Retention(RetentionPolicy.SOURCE) + public @interface ParcelFlags {} + + @ParcelFlags + private int mFlags; + /** * Whether or not to parcel the stack trace of an exception. This has a performance * impact, so should only be included in specific processes and only on debug builds. @@ -585,6 +607,40 @@ public final class Parcel { nativeMarkForBinder(mNativePtr, binder); } + /** @hide */ + @ParcelFlags + @TestApi + public int getFlags() { + return mFlags; + } + + /** @hide */ + public void setFlags(@ParcelFlags int flags) { + mFlags = flags; + } + + /** @hide */ + public void addFlags(@ParcelFlags int flags) { + mFlags |= flags; + } + + /** @hide */ + private boolean hasFlags(@ParcelFlags int flags) { + return (mFlags & flags) == flags; + } + + /** + * This method is used by the AIDL compiler for system components. Not intended to be + * used by non-system apps. + */ + // Note: Ideally this method should be @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES), + // but we need to make this method public due to the way the aidl compiler is compiled. + // We don't really need to protect it; even if 3p / non-system apps, nothing would happen. + // This would only work when used on a reply parcel by a binder object that's allowed-blocking. + public void setPropagateAllowBlocking() { + addFlags(FLAG_PROPAGATE_ALLOW_BLOCKING); + } + /** * Returns the total amount of data contained in the parcel. */ @@ -2088,6 +2144,102 @@ public final class Parcel { } /** + * Flatten a homogeneous multi-dimensional array with fixed-size. This delegates to other + * APIs to write a one-dimensional array. Use {@link #readFixedArray(Object)} or + * {@link #createFixedArray(Class, int[])} with the same dimensions to unmarshal. + * + * @param val The array to be written. + * @param parcelableFlags Contextual flags as per + * {@link Parcelable#writeToParcel(Parcel, int) Parcelable.writeToParcel()}. + * Used only if val is an array of Parcelable objects. + * @param dimensions an array of int representing length of each dimension. The array should be + * sized with the exact size of dimensions. + * + * @see #readFixedArray + * @see #createFixedArray + * @see #writeBooleanArray + * @see #writeByteArray + * @see #writeCharArray + * @see #writeIntArray + * @see #writeLongArray + * @see #writeFloatArray + * @see #writeDoubleArray + * @see #writeBinderArray + * @see #writeInterfaceArray + * @see #writeTypedArray + * @throws BadParcelableException If the array's component type is not supported or if its + * size doesn't match with the given dimensions. + */ + public <T> void writeFixedArray(@Nullable T val, int parcelableFlags, + @NonNull int... dimensions) { + if (val == null) { + writeInt(-1); + return; + } + writeFixedArrayInternal(val, parcelableFlags, /*index=*/0, dimensions); + } + + private <T> void writeFixedArrayInternal(T val, int parcelableFlags, int index, + int[] dimensions) { + if (index >= dimensions.length) { + throw new BadParcelableException("Array has more dimensions than expected: " + + dimensions.length); + } + + int length = dimensions[index]; + + // val should be an array of length N + if (val == null) { + throw new BadParcelableException("Non-null array shouldn't have a null array."); + } + if (!val.getClass().isArray()) { + throw new BadParcelableException("Not an array: " + val); + } + if (Array.getLength(val) != length) { + throw new BadParcelableException("bad length: expected " + length + ", but got " + + Array.getLength(val)); + } + + // Delegates to other writers if this is a one-dimensional array. + // Otherwise, write component arrays with recursive calls. + + final Class<?> componentType = val.getClass().getComponentType(); + if (!componentType.isArray() && index + 1 != dimensions.length) { + throw new BadParcelableException("Array has fewer dimensions than expected: " + + dimensions.length); + } + if (componentType == boolean.class) { + writeBooleanArray((boolean[]) val); + } else if (componentType == byte.class) { + writeByteArray((byte[]) val); + } else if (componentType == char.class) { + writeCharArray((char[]) val); + } else if (componentType == int.class) { + writeIntArray((int[]) val); + } else if (componentType == long.class) { + writeLongArray((long[]) val); + } else if (componentType == float.class) { + writeFloatArray((float[]) val); + } else if (componentType == double.class) { + writeDoubleArray((double[]) val); + } else if (componentType == IBinder.class) { + writeBinderArray((IBinder[]) val); + } else if (IInterface.class.isAssignableFrom(componentType)) { + writeInterfaceArray((IInterface[]) val); + } else if (Parcelable.class.isAssignableFrom(componentType)) { + writeTypedArray((Parcelable[]) val, parcelableFlags); + } else if (componentType.isArray()) { + writeInt(length); + for (int i = 0; i < length; i++) { + writeFixedArrayInternal(Array.get(val, i), parcelableFlags, index + 1, + dimensions); + } + } else { + throw new BadParcelableException("unknown type for fixed-size array: " + componentType); + } + } + + /** * Flatten a generic object in to a parcel. The given Object value may * currently be one of the following types: * @@ -2949,7 +3101,15 @@ public final class Parcel { * Read an object from the parcel at the current dataPosition(). */ public final IBinder readStrongBinder() { - return nativeReadStrongBinder(mNativePtr); + final IBinder result = nativeReadStrongBinder(mNativePtr); + + // If it's a reply from a method with @PropagateAllowBlocking, then inherit allow-blocking + // from the object that returned it. + if (result != null && hasFlags( + FLAG_IS_REPLY_FROM_BLOCKING_ALLOWED_OBJECT | FLAG_PROPAGATE_ALLOW_BLOCKING)) { + Binder.allowBlocking(result); + } + return result; } /** @@ -3788,6 +3948,317 @@ public final class Parcel { } /** + * Read a new multi-dimensional array from a parcel. If you want to read Parcelable or + * IInterface values, use {@link #readFixedArray(Object, Parcelable.Creator)} or + * {@link #readFixedArray(Object, Function)}. + * @param val the destination array to hold the read values. + * + * @see #writeTypedArray + * @see #readBooleanArray + * @see #readByteArray + * @see #readCharArray + * @see #readIntArray + * @see #readLongArray + * @see #readFloatArray + * @see #readDoubleArray + * @see #readBinderArray + * @see #readInterfaceArray + * @see #readTypedArray + */ + public <T> void readFixedArray(@NonNull T val) { + Class<?> componentType = val.getClass().getComponentType(); + if (componentType == boolean.class) { + readBooleanArray((boolean[]) val); + } else if (componentType == byte.class) { + readByteArray((byte[]) val); + } else if (componentType == char.class) { + readCharArray((char[]) val); + } else if (componentType == int.class) { + readIntArray((int[]) val); + } else if (componentType == long.class) { + readLongArray((long[]) val); + } else if (componentType == float.class) { + readFloatArray((float[]) val); + } else if (componentType == double.class) { + readDoubleArray((double[]) val); + } else if (componentType == IBinder.class) { + readBinderArray((IBinder[]) val); + } else if (componentType.isArray()) { + int length = readInt(); + if (length != Array.getLength(val)) { + throw new BadParcelableException("Bad length: expected " + Array.getLength(val) + + ", but got " + length); + } + for (int i = 0; i < length; i++) { + readFixedArray(Array.get(val, i)); + } + } else { + throw new BadParcelableException("Unknown type for fixed-size array: " + componentType); + } + } + + /** + * Read a new multi-dimensional array of typed interfaces from a parcel. + * If you want to read Parcelable values, use + * {@link #readFixedArray(Object, Parcelable.Creator)}. For values of other types, use + * {@link #readFixedArray(Object)}. + * @param val the destination array to hold the read values. + */ + public <T, S extends IInterface> void readFixedArray(@NonNull T val, + @NonNull Function<IBinder, S> asInterface) { + Class<?> componentType = val.getClass().getComponentType(); + if (IInterface.class.isAssignableFrom(componentType)) { + readInterfaceArray((S[]) val, asInterface); + } else if (componentType.isArray()) { + int length = readInt(); + if (length != Array.getLength(val)) { + throw new BadParcelableException("Bad length: expected " + Array.getLength(val) + + ", but got " + length); + } + for (int i = 0; i < length; i++) { + readFixedArray(Array.get(val, i), asInterface); + } + } else { + throw new BadParcelableException("Unknown type for fixed-size array: " + componentType); + } + } + + /** + * Read a new multi-dimensional array of typed parcelables from a parcel. + * If you want to read IInterface values, use + * {@link #readFixedArray(Object, Function)}. For values of other types, use + * {@link #readFixedArray(Object)}. + * @param val the destination array to hold the read values. + */ + public <T, S extends Parcelable> void readFixedArray(@NonNull T val, + @NonNull Parcelable.Creator<S> c) { + Class<?> componentType = val.getClass().getComponentType(); + if (Parcelable.class.isAssignableFrom(componentType)) { + readTypedArray((S[]) val, c); + } else if (componentType.isArray()) { + int length = readInt(); + if (length != Array.getLength(val)) { + throw new BadParcelableException("Bad length: expected " + Array.getLength(val) + + ", but got " + length); + } + for (int i = 0; i < length; i++) { + readFixedArray(Array.get(val, i), c); + } + } else { + throw new BadParcelableException("Unknown type for fixed-size array: " + componentType); + } + } + + private void ensureClassHasExpectedDimensions(@NonNull Class<?> cls, int numDimension) { + if (numDimension <= 0) { + throw new BadParcelableException("Fixed-size array should have dimensions."); + } + + for (int i = 0; i < numDimension; i++) { + if (!cls.isArray()) { + throw new BadParcelableException("Array has fewer dimensions than expected: " + + numDimension); + } + cls = cls.getComponentType(); + } + if (cls.isArray()) { + throw new BadParcelableException("Array has more dimensions than expected: " + + numDimension); + } + } + + /** + * Read and return a new multi-dimensional array from a parcel. Returns null if the + * previously written array object is null. If you want to read Parcelable or + * IInterface values, use {@link #createFixedArray(Class, Parcelable.Creator, int[])} or + * {@link #createFixedArray(Class, Function, int[])}. + * @param cls the Class object for the target array type. (e.g. int[][].class) + * @param dimensions an array of int representing length of each dimension. + * + * @see #writeTypedArray + * @see #createBooleanArray + * @see #createByteArray + * @see #createCharArray + * @see #createIntArray + * @see #createLongArray + * @see #createFloatArray + * @see #createDoubleArray + * @see #createBinderArray + * @see #createInterfaceArray + * @see #createTypedArray + */ + @Nullable + public <T> T createFixedArray(@NonNull Class<T> cls, @NonNull int... dimensions) { + // Check if type matches with dimensions + // If type is one-dimensional array, delegate to other creators + // Otherwise, create an multi-dimensional array at once and then fill it with readFixedArray + + ensureClassHasExpectedDimensions(cls, dimensions.length); + + T val = null; + final Class<?> componentType = cls.getComponentType(); + if (componentType == boolean.class) { + val = (T) createBooleanArray(); + } else if (componentType == byte.class) { + val = (T) createByteArray(); + } else if (componentType == char.class) { + val = (T) createCharArray(); + } else if (componentType == int.class) { + val = (T) createIntArray(); + } else if (componentType == long.class) { + val = (T) createLongArray(); + } else if (componentType == float.class) { + val = (T) createFloatArray(); + } else if (componentType == double.class) { + val = (T) createDoubleArray(); + } else if (componentType == IBinder.class) { + val = (T) createBinderArray(); + } else if (componentType.isArray()) { + int length = readInt(); + if (length < 0) { + return null; + } + if (length != dimensions[0]) { + throw new BadParcelableException("Bad length: expected " + dimensions[0] + + ", but got " + length); + } + + // Create a multi-dimensional array with an innermost component type and dimensions + Class<?> innermost = componentType.getComponentType(); + while (innermost.isArray()) { + innermost = innermost.getComponentType(); + } + val = (T) Array.newInstance(innermost, dimensions); + for (int i = 0; i < length; i++) { + readFixedArray(Array.get(val, i)); + } + return val; + } else { + throw new BadParcelableException("Unknown type for fixed-size array: " + componentType); + } + + // Check if val is null (which is OK) or has the expected size. + // This check doesn't have to be multi-dimensional because multi-dimensional arrays + // are created with expected dimensions. + if (val != null && Array.getLength(val) != dimensions[0]) { + throw new BadParcelableException("Bad length: expected " + dimensions[0] + ", but got " + + Array.getLength(val)); + } + return val; + } + + /** + * Read and return a new multi-dimensional array of typed interfaces from a parcel. + * Returns null if the previously written array object is null. If you want to read + * Parcelable values, use {@link #createFixedArray(Class, Parcelable.Creator, int[])}. + * For values of other types use {@link #createFixedArray(Class, int[])}. + * @param cls the Class object for the target array type. (e.g. IFoo[][].class) + * @param dimensions an array of int representing length of each dimension. + */ + @Nullable + public <T, S extends IInterface> T createFixedArray(@NonNull Class<T> cls, + @NonNull Function<IBinder, S> asInterface, @NonNull int... dimensions) { + // Check if type matches with dimensions + // If type is one-dimensional array, delegate to other creators + // Otherwise, create an multi-dimensional array at once and then fill it with readFixedArray + + ensureClassHasExpectedDimensions(cls, dimensions.length); + + T val = null; + final Class<?> componentType = cls.getComponentType(); + if (IInterface.class.isAssignableFrom(componentType)) { + val = (T) createInterfaceArray(n -> (S[]) Array.newInstance(componentType, n), + asInterface); + } else if (componentType.isArray()) { + int length = readInt(); + if (length < 0) { + return null; + } + if (length != dimensions[0]) { + throw new BadParcelableException("Bad length: expected " + dimensions[0] + + ", but got " + length); + } + + // Create a multi-dimensional array with an innermost component type and dimensions + Class<?> innermost = componentType.getComponentType(); + while (innermost.isArray()) { + innermost = innermost.getComponentType(); + } + val = (T) Array.newInstance(innermost, dimensions); + for (int i = 0; i < length; i++) { + readFixedArray(Array.get(val, i), asInterface); + } + return val; + } else { + throw new BadParcelableException("Unknown type for fixed-size array: " + componentType); + } + + // Check if val is null (which is OK) or has the expected size. + // This check doesn't have to be multi-dimensional because multi-dimensional arrays + // are created with expected dimensions. + if (val != null && Array.getLength(val) != dimensions[0]) { + throw new BadParcelableException("Bad length: expected " + dimensions[0] + ", but got " + + Array.getLength(val)); + } + return val; + } + + /** + * Read and return a new multi-dimensional array of typed parcelables from a parcel. + * Returns null if the previously written array object is null. If you want to read + * IInterface values, use {@link #createFixedArray(Class, Function, int[])}. + * For values of other types use {@link #createFixedArray(Class, int[])}. + * @param cls the Class object for the target array type. (e.g. Foo[][].class) + * @param dimensions an array of int representing length of each dimension. + */ + @Nullable + public <T, S extends Parcelable> T createFixedArray(@NonNull Class<T> cls, + @NonNull Parcelable.Creator<S> c, @NonNull int... dimensions) { + // Check if type matches with dimensions + // If type is one-dimensional array, delegate to other creators + // Otherwise, create an multi-dimensional array at once and then fill it with readFixedArray + + ensureClassHasExpectedDimensions(cls, dimensions.length); + + T val = null; + final Class<?> componentType = cls.getComponentType(); + if (Parcelable.class.isAssignableFrom(componentType)) { + val = (T) createTypedArray(c); + } else if (componentType.isArray()) { + int length = readInt(); + if (length < 0) { + return null; + } + if (length != dimensions[0]) { + throw new BadParcelableException("Bad length: expected " + dimensions[0] + + ", but got " + length); + } + + // Create a multi-dimensional array with an innermost component type and dimensions + Class<?> innermost = componentType.getComponentType(); + while (innermost.isArray()) { + innermost = innermost.getComponentType(); + } + val = (T) Array.newInstance(innermost, dimensions); + for (int i = 0; i < length; i++) { + readFixedArray(Array.get(val, i), c); + } + return val; + } else { + throw new BadParcelableException("Unknown type for fixed-size array: " + componentType); + } + + // Check if val is null (which is OK) or has the expected size. + // This check doesn't have to be multi-dimensional because multi-dimensional arrays + // are created with expected dimensions. + if (val != null && Array.getLength(val) != dimensions[0]) { + throw new BadParcelableException("Bad length: expected " + dimensions[0] + ", but got " + + Array.getLength(val)); + } + return val; + } + + /** * Write a heterogeneous array of Parcelable objects into the Parcel. * Each object in the array is written along with its class name, so * that the correct class can later be instantiated. As a result, this @@ -4588,6 +5059,7 @@ public final class Parcel { } private void freeBuffer() { + mFlags = 0; resetSqaushingState(); if (mOwnsNativeParcelObject) { nativeFreeBuffer(mNativePtr); diff --git a/core/java/android/os/VibrationEffect.java b/core/java/android/os/VibrationEffect.java index 9598410d8f33..21c64876c24c 100644 --- a/core/java/android/os/VibrationEffect.java +++ b/core/java/android/os/VibrationEffect.java @@ -410,9 +410,9 @@ public abstract class VibrationEffect implements Parcelable { * * <p>The waveform will start the first transition from the vibrator off state, with the * resonant frequency by default. To provide an initial state, use - * {@link #startWaveform(VibrationParameter)}. + * {@link #startWaveform(VibrationEffect.VibrationParameter)}. * - * @return The {@link VibrationEffect.WaveformBuilder} started with the initial parameters. + * @see VibrationEffect.WaveformBuilder */ @NonNull public static WaveformBuilder startWaveform() { @@ -421,14 +421,16 @@ public abstract class VibrationEffect implements Parcelable { /** * Start building a waveform vibration with an initial state specified by a - * {@link VibrationParameter}. + * {@link VibrationEffect.VibrationParameter}. * * <p>The waveform builder offers more flexibility for creating waveform vibrations, allowing * control over vibration amplitude and frequency via smooth transitions between values. * - * @param initialParameter The initial {@link VibrationParameter} value to be applied at the - * beginning of the vibration. + * @param initialParameter The initial {@link VibrationEffect.VibrationParameter} value to be + * applied at the beginning of the vibration. * @return The {@link VibrationEffect.WaveformBuilder} started with the initial parameters. + * + * @see VibrationEffect.WaveformBuilder */ @NonNull public static WaveformBuilder startWaveform(@NonNull VibrationParameter initialParameter) { @@ -439,17 +441,19 @@ public abstract class VibrationEffect implements Parcelable { /** * Start building a waveform vibration with an initial state specified by two - * {@link VibrationParameter VibrationParameters}. + * {@link VibrationEffect.VibrationParameter VibrationParameters}. * * <p>The waveform builder offers more flexibility for creating waveform vibrations, allowing * control over vibration amplitude and frequency via smooth transitions between values. * - * @param initialParameter1 The initial {@link VibrationParameter} value to be applied at the - * beginning of the vibration. - * @param initialParameter2 The initial {@link VibrationParameter} value to be applied at the - * beginning of the vibration, must be a different type of parameter - * than the one specified by the first argument. + * @param initialParameter1 The initial {@link VibrationEffect.VibrationParameter} value to be + * applied at the beginning of the vibration. + * @param initialParameter2 The initial {@link VibrationEffect.VibrationParameter} value to be + * applied at the beginning of the vibration, must be a different type + * of parameter than the one specified by the first argument. * @return The {@link VibrationEffect.WaveformBuilder} started with the initial parameters. + * + * @see VibrationEffect.WaveformBuilder */ @NonNull public static WaveformBuilder startWaveform(@NonNull VibrationParameter initialParameter1, @@ -805,7 +809,46 @@ public abstract class VibrationEffect implements Parcelable { } /** - * A composition of haptic primitives that, when combined, create a single haptic effect. + * A composition of haptic elements that are combined to be playable as a single + * {@link VibrationEffect}. + * + * <p>The haptic primitives are available as {@code Composition.PRIMITIVE_*} constants and + * can be added to a composition to create a custom vibration effect. Here is an example of an + * effect that grows in intensity and then dies off, with a longer rising portion for emphasis + * and an extra tick 100ms after: + * + * <code> + * VibrationEffect effect = VibrationEffect.startComposition() + * .addPrimitive(VibrationEffect.Composition.PRIMITIVE_SLOW_RISE, 0.5f) + * .addPrimitive(VibrationEffect.Composition.PRIMITIVE_QUICK_FALL, 0.5f) + * .addPrimitive(VibrationEffect.Composition.PRIMITIVE_TICK, 1.0f, 100) + * .compose(); + * </code> + * + * <p>Composition elements can also be {@link VibrationEffect} instances, including other + * compositions, and off durations, which are periods of time when the vibrator will be + * turned off. Here is an example of a composition that "warms up" with a light tap, + * a stronger double tap, then repeats a vibration pattern indefinitely: + * + * <code> + * VibrationEffect repeatingEffect = VibrationEffect.startComposition() + * .addPrimitive(VibrationEffect.Composition.PRIMITIVE_LOW_TICK) + * .addOffDuration(Duration.ofMillis(10)) + * .addEffect(VibrationEffect.createPredefined(VibrationEffect.EFFECT_DOUBLE_CLICK)) + * .addOffDuration(Duration.ofMillis(50)) + * .addEffect(VibrationEffect.createWaveform(pattern, repeatIndex)) + * .compose(); + * </code> + * + * <p>When choosing to play a composed effect, you should check that individual components are + * supported by the device by using the appropriate vibrator method: + * + * <ul> + * <li>Primitive support can be checked using {@link Vibrator#arePrimitivesSupported}. + * <li>Effect support can be checked using {@link Vibrator#areEffectsSupported}. + * <li>Amplitude control for one-shot and waveforms with amplitude values can be checked + * using {@link Vibrator#hasAmplitudeControl}. + * </ul> * * @see VibrationEffect#startComposition() */ @@ -1091,16 +1134,77 @@ public abstract class VibrationEffect implements Parcelable { * A builder for waveform haptic effects. * * <p>Waveform vibrations constitute of one or more timed transitions to new sets of vibration - * parameters. These parameters can be the vibration amplitude or frequency, for example. + * parameters. These parameters can be the vibration amplitude, frequency, or both. + * + * <p>The following example ramps a vibrator turned off to full amplitude at 120Hz, over 100ms + * starting at 60Hz, then holds that state for 200ms and ramps back down again over 100ms: + * + * <code> + * import static android.os.VibrationEffect.VibrationParameter.targetAmplitude; + * import static android.os.VibrationEffect.VibrationParameter.targetFrequency; + * + * VibrationEffect effect = VibrationEffect.startWaveform(targetFrequency(60)) + * .addTransition(Duration.ofMillis(100), targetAmplitude(1), targetFrequency(120)) + * .addSustain(Duration.ofMillis(200)) + * .addTransition(Duration.ofMillis(100), targetAmplitude(0), targetFrequency(60)) + * .build(); + * </code> + * + * <p>The initial state of the waveform can be set via + * {@link VibrationEffect#startWaveform(VibrationParameter)} or + * {@link VibrationEffect#startWaveform(VibrationParameter, VibrationParameter)}. If the initial + * parameters are not set then the {@link WaveformBuilder} will start with the vibrator off, + * represented by zero amplitude, at the vibrator's resonant frequency. + * + * <p>Repeating waveforms can be created by building the repeating block separately and adding + * it to the end of a composition with + * {@link Composition#repeatEffectIndefinitely(VibrationEffect)}: * * <p>Note that physical vibration actuators have different reaction times for changing * amplitude and frequency. Durations specified here represent a timeline for the target * parameters, and quality of effects may be improved if the durations allow time for a * transition to be smoothly applied. * - * <p>Repeating waveforms can be built by constructing the repeating block separately and adding - * it to the end of a composition using - * {@link Composition#repeatEffectIndefinitely(VibrationEffect)}. + * <p>The following example illustrates both an initial state and a repeating section, using + * a {@link VibrationEffect.Composition}. The resulting effect will have a tick followed by a + * repeated beating effect with a rise that stretches out and a sharp finish. + * + * <code> + * VibrationEffect patternToBeRepeated = VibrationEffect.startWaveform(targetAmplitude(0.2f)) + * .addSustain(Duration.ofMillis(10)) + * .addTransition(Duration.ofMillis(20), targetAmplitude(0.4f)) + * .addSustain(Duration.ofMillis(30)) + * .addTransition(Duration.ofMillis(40), targetAmplitude(0.8f)) + * .addSustain(Duration.ofMillis(50)) + * .addTransition(Duration.ofMillis(60), targetAmplitude(0.2f)) + * .build(); + * + * VibrationEffect effect = VibrationEffect.startComposition() + * .addPrimitive(VibrationEffect.Composition.PRIMITIVE_TICK) + * .addOffDuration(Duration.ofMillis(20)) + * .repeatEffectIndefinitely(patternToBeRepeated) + * .compose(); + * </code> + * + * <p>The amplitude step waveforms that can be created via + * {@link VibrationEffect#createWaveform(long[], int[], int)} can also be created with + * {@link WaveformBuilder} by adding zero duration transitions: + * + * <code> + * // These two effects are the same + * VibrationEffect waveform = VibrationEffect.createWaveform( + * new long[] { 10, 20, 30 }, // timings in milliseconds + * new int[] { 51, 102, 204 }, // amplitudes in [0,255] + * -1); // repeat index + * + * VibrationEffect sameWaveform = VibrationEffect.startWaveform(targetAmplitude(0.2f)) + * .addSustain(Duration.ofMillis(10)) + * .addTransition(Duration.ZERO, targetAmplitude(0.4f)) + * .addSustain(Duration.ofMillis(20)) + * .addTransition(Duration.ZERO, targetAmplitude(0.8f)) + * .addSustain(Duration.ofMillis(30)) + * .build(); + * </code> * * @see VibrationEffect#startWaveform */ diff --git a/core/java/android/os/Vibrator.java b/core/java/android/os/Vibrator.java index 8f5086021530..78f1cb12ded6 100644 --- a/core/java/android/os/Vibrator.java +++ b/core/java/android/os/Vibrator.java @@ -546,18 +546,22 @@ public abstract class Vibrator { @VibrationEffectSupport public final int areAllEffectsSupported( @NonNull @VibrationEffect.EffectType int... effectIds) { - int support = VIBRATION_EFFECT_SUPPORT_YES; - for (int supported : areEffectsSupported(effectIds)) { - if (supported == VIBRATION_EFFECT_SUPPORT_NO) { - return VIBRATION_EFFECT_SUPPORT_NO; - } else if (supported == VIBRATION_EFFECT_SUPPORT_UNKNOWN) { - support = VIBRATION_EFFECT_SUPPORT_UNKNOWN; + VibratorInfo info = getInfo(); + int allSupported = VIBRATION_EFFECT_SUPPORT_YES; + for (int effectId : effectIds) { + switch (info.isEffectSupported(effectId)) { + case VIBRATION_EFFECT_SUPPORT_NO: + return VIBRATION_EFFECT_SUPPORT_NO; + case VIBRATION_EFFECT_SUPPORT_YES: + continue; + default: // VIBRATION_EFFECT_SUPPORT_UNKNOWN + allSupported = VIBRATION_EFFECT_SUPPORT_UNKNOWN; + break; } } - return support; + return allSupported; } - /** * Query whether the vibrator supports the given primitives. * @@ -598,8 +602,9 @@ public abstract class Vibrator { */ public final boolean areAllPrimitivesSupported( @NonNull @VibrationEffect.Composition.PrimitiveType int... primitiveIds) { - for (boolean supported : arePrimitivesSupported(primitiveIds)) { - if (!supported) { + VibratorInfo info = getInfo(); + for (int primitiveId : primitiveIds) { + if (!info.isPrimitiveSupported(primitiveId)) { return false; } } diff --git a/core/java/android/os/logcat/ILogcatManagerService.aidl b/core/java/android/os/logcat/ILogcatManagerService.aidl index 68b5679919d6..02db2749bbe8 100644 --- a/core/java/android/os/logcat/ILogcatManagerService.aidl +++ b/core/java/android/os/logcat/ILogcatManagerService.aidl @@ -22,5 +22,7 @@ package android.os.logcat; interface ILogcatManagerService { void startThread(in int uid, in int gid, in int pid, in int fd); void finishThread(in int uid, in int gid, in int pid, in int fd); + void approve(in int uid, in int gid, in int pid, in int fd); + void decline(in int uid, in int gid, in int pid, in int fd); } diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 4e9aec751bdb..ee6f9c033271 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -6094,9 +6094,11 @@ public final class Settings { } /** @hide */ - @UnsupportedAppUsage - public static String getStringForUser(ContentResolver resolver, String name, - int userHandle) { + @SystemApi + @Nullable + @SuppressLint("VisiblySynchronized") + public static String getStringForUser(@NonNull ContentResolver resolver, + @NonNull String name, int userHandle) { if (MOVED_TO_GLOBAL.contains(name)) { Log.w(TAG, "Setting " + name + " has moved from android.provider.Settings.Secure" + " to android.provider.Settings.Global."); @@ -6328,8 +6330,9 @@ public final class Settings { } /** @hide */ - @UnsupportedAppUsage - public static int getIntForUser(ContentResolver cr, String name, int def, int userHandle) { + @SystemApi + public static int getIntForUser(@NonNull ContentResolver cr, @NonNull String name, + int def, int userHandle) { String v = getStringForUser(cr, name, userHandle); return parseIntSettingWithDefault(v, def); } @@ -10665,6 +10668,15 @@ public final class Settings { public static final String FAST_PAIR_SCAN_ENABLED = "fast_pair_scan_enabled"; /** + * Setting to store denylisted system languages by the CEC {@code <Set Menu Language>} + * confirmation dialog. + * + * @hide + */ + public static final String HDMI_CEC_SET_MENU_LANGUAGE_DENYLIST = + "hdmi_cec_set_menu_language_denylist"; + + /** * These entries are considered common between the personal and the managed profile, * since the managed profile doesn't get to change them. */ diff --git a/core/java/android/service/attention/AttentionService.java b/core/java/android/service/attention/AttentionService.java index 49ab5db74b87..f5c59b597c3a 100644 --- a/core/java/android/service/attention/AttentionService.java +++ b/core/java/android/service/attention/AttentionService.java @@ -24,11 +24,14 @@ import android.app.Service; import android.content.Intent; import android.os.IBinder; import android.os.RemoteException; +import android.util.Slog; import com.android.internal.util.Preconditions; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import java.lang.ref.WeakReference; +import java.util.Objects; /** @@ -51,6 +54,7 @@ import java.lang.annotation.RetentionPolicy; */ @SystemApi public abstract class AttentionService extends Service { + private static final String LOG_TAG = "AttentionService"; /** * The {@link Intent} that must be declared as handled by the service. To be supported, the * service must also require the {@link android.Manifest.permission#BIND_ATTENTION_SERVICE} @@ -80,6 +84,9 @@ public abstract class AttentionService extends Service { /** Camera permission is not granted. */ public static final int ATTENTION_FAILURE_CAMERA_PERMISSION_ABSENT = 6; + /** Users’ proximity is unknown (proximity sensing was inconclusive and is unsupported). */ + public static final double PROXIMITY_UNKNOWN = -1; + /** * Result codes for when attention check was successful. * @@ -118,6 +125,20 @@ public abstract class AttentionService extends Service { Preconditions.checkNotNull(callback); AttentionService.this.onCancelAttentionCheck(new AttentionCallback(callback)); } + + /** {@inheritDoc} */ + @Override + public void onStartProximityUpdates(IProximityCallback callback) { + Objects.requireNonNull(callback); + AttentionService.this.onStartProximityUpdates(new ProximityCallback(callback)); + + } + + /** {@inheritDoc} */ + @Override + public void onStopProximityUpdates() { + AttentionService.this.onStopProximityUpdates(); + } }; @Nullable @@ -143,6 +164,23 @@ public abstract class AttentionService extends Service { */ public abstract void onCancelAttentionCheck(@NonNull AttentionCallback callback); + /** + * Requests the continuous updates of proximity signal via the provided callback, + * until the given callback is unregistered. + * + * @param callback the callback to return the result to + */ + public void onStartProximityUpdates(@NonNull ProximityCallback callback) { + Slog.w(LOG_TAG, "Override this method."); + } + + /** + * Requests to stop providing continuous updates until the callback is registered. + */ + public void onStopProximityUpdates() { + Slog.w(LOG_TAG, "Override this method."); + } + /** Callbacks for AttentionService results. */ public static final class AttentionCallback { @NonNull private final IAttentionCallback mCallback; @@ -174,4 +212,26 @@ public abstract class AttentionService extends Service { } } } + + /** Callbacks for ProximityCallback results. */ + public static final class ProximityCallback { + @NonNull private final WeakReference<IProximityCallback> mCallback; + + private ProximityCallback(@NonNull IProximityCallback callback) { + mCallback = new WeakReference<>(callback); + } + + /** + * @param distance the estimated distance of the user (in meter) + * The distance will be PROXIMITY_UNKNOWN if the proximity sensing was inconclusive. + * + */ + public void onProximityUpdate(double distance) { + try { + mCallback.get().onProximityUpdate(distance); + } catch (RemoteException e) { + e.rethrowFromSystemServer(); + } + } + } } diff --git a/core/java/android/service/attention/IAttentionService.aidl b/core/java/android/service/attention/IAttentionService.aidl index 99e79973cfd2..8bb881ba1708 100644 --- a/core/java/android/service/attention/IAttentionService.aidl +++ b/core/java/android/service/attention/IAttentionService.aidl @@ -17,6 +17,7 @@ package android.service.attention; import android.service.attention.IAttentionCallback; +import android.service.attention.IProximityCallback; /** * Interface for a concrete implementation to provide to the AttentionManagerService. @@ -26,4 +27,6 @@ import android.service.attention.IAttentionCallback; oneway interface IAttentionService { void checkAttention(IAttentionCallback callback); void cancelAttentionCheck(IAttentionCallback callback); + void onStartProximityUpdates(IProximityCallback callback); + void onStopProximityUpdates(); }
\ No newline at end of file diff --git a/core/java/android/service/attention/IProximityCallback.aidl b/core/java/android/service/attention/IProximityCallback.aidl new file mode 100644 index 000000000000..9ecf9bc28e84 --- /dev/null +++ b/core/java/android/service/attention/IProximityCallback.aidl @@ -0,0 +1,10 @@ +package android.service.attention; + +/** + * Callback for onStartProximityUpdates request. + * + * @hide + */ +oneway interface IProximityCallback { + void onProximityUpdate(double distance); +} diff --git a/core/java/android/service/games/GameService.java b/core/java/android/service/games/GameService.java index 870a7e3f2646..9df83587f125 100644 --- a/core/java/android/service/games/GameService.java +++ b/core/java/android/service/games/GameService.java @@ -16,9 +16,11 @@ package android.service.games; +import android.Manifest; import android.annotation.IntRange; import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.RequiresPermission; import android.annotation.SdkConstant; import android.annotation.SystemApi; import android.app.IGameManagerService; @@ -173,6 +175,7 @@ public class GameService extends Service { * * @param taskId The taskId of the game. */ + @RequiresPermission(Manifest.permission.MANAGE_GAME_ACTIVITY) public final void createGameSession(@IntRange(from = 0) int taskId) { if (mGameServiceController == null) { throw new IllegalStateException("Can not call before connected()"); diff --git a/core/java/android/service/games/GameSession.java b/core/java/android/service/games/GameSession.java index 9590933cf2da..0987903c9809 100644 --- a/core/java/android/service/games/GameSession.java +++ b/core/java/android/service/games/GameSession.java @@ -84,6 +84,15 @@ public abstract class GameSession { } @Override + public void onTransientSystemBarVisibilityFromRevealGestureChanged( + boolean visibleDueToGesture) { + Handler.getMain().executeOrSendMessage(PooledLambda.obtainMessage( + GameSession::dispatchTransientSystemBarVisibilityFromRevealGestureChanged, + GameSession.this, + visibleDueToGesture)); + } + + @Override public void onTaskFocusChanged(boolean focused) { Handler.getMain().executeOrSendMessage(PooledLambda.obtainMessage( GameSession::moveToState, GameSession.this, @@ -109,6 +118,7 @@ public abstract class GameSession { } private LifecycleState mLifecycleState = LifecycleState.INITIALIZED; + private boolean mAreTransientInsetsVisibleDueToGesture = false; private IGameSessionController mGameSessionController; private int mTaskId; private GameSessionRootView mGameSessionRootView; @@ -138,11 +148,23 @@ public abstract class GameSession { } @Hide - void doDestroy() { + private void doDestroy() { mSurfaceControlViewHost.release(); moveToState(LifecycleState.DESTROYED); } + /** @hide */ + @VisibleForTesting + @MainThread + public void dispatchTransientSystemBarVisibilityFromRevealGestureChanged( + boolean visibleDueToGesture) { + boolean didValueChange = mAreTransientInsetsVisibleDueToGesture != visibleDueToGesture; + mAreTransientInsetsVisibleDueToGesture = visibleDueToGesture; + if (didValueChange) { + onTransientSystemBarVisibilityFromRevealGestureChanged(visibleDueToGesture); + } + } + /** * @hide */ @@ -252,7 +274,23 @@ public abstract class GameSession { * * @param focused True if the game task is focused, false if the game task is unfocused. */ - public void onGameTaskFocusChanged(boolean focused) {} + public void onGameTaskFocusChanged(boolean focused) { + } + + /** + * Called when the visibility of the transient system bars changed due to the user performing + * the reveal gesture. The reveal gesture is defined as a swipe to reveal the transient system + * bars that originates from the system bars. + * + * @param visibleDueToGesture if the transient bars triggered by the reveal gesture are visible. + * This is {@code true} when the transient system bars become visible + * due to user performing the reveal gesture. This is {@code false} + * when the transient system bars are hidden or become permanently + * visible. + */ + public void onTransientSystemBarVisibilityFromRevealGestureChanged( + boolean visibleDueToGesture) { + } /** * Sets the task overlay content to an explicit view. This view is placed directly into the game @@ -261,6 +299,8 @@ public abstract class GameSession { * {@code View} may not be cleared once set, but may be replaced by invoking * {@link #setTaskOverlayView(View, ViewGroup.LayoutParams)} again. * + * <p><b>WARNING</b>: Callers <b>must</b> ensure that only trusted views are provided. + * * @param view The desired content to display. * @param layoutParams Layout parameters for the view. */ @@ -344,12 +384,14 @@ public abstract class GameSession { /** * Called when taking the screenshot failed. + * * @param statusCode Indicates the reason for failure. */ void onFailure(@ScreenshotFailureStatus int statusCode); /** * Called when taking the screenshot succeeded. + * * @param bitmap The screenshot. */ void onSuccess(@NonNull Bitmap bitmap); diff --git a/core/java/android/service/games/IGameSession.aidl b/core/java/android/service/games/IGameSession.aidl index 71da6302b63d..49c36c6a301c 100644 --- a/core/java/android/service/games/IGameSession.aidl +++ b/core/java/android/service/games/IGameSession.aidl @@ -21,5 +21,6 @@ package android.service.games; */ oneway interface IGameSession { void onDestroyed(); + void onTransientSystemBarVisibilityFromRevealGestureChanged(boolean visibleDueToGesture); void onTaskFocusChanged(boolean focused); } diff --git a/core/java/android/service/trust/ITrustAgentServiceCallback.aidl b/core/java/android/service/trust/ITrustAgentServiceCallback.aidl index 220e498df8a8..6b11e7463abc 100644 --- a/core/java/android/service/trust/ITrustAgentServiceCallback.aidl +++ b/core/java/android/service/trust/ITrustAgentServiceCallback.aidl @@ -26,6 +26,7 @@ import android.os.UserHandle; oneway interface ITrustAgentServiceCallback { void grantTrust(CharSequence message, long durationMs, int flags); void revokeTrust(); + void lockUser(); void setManagingTrust(boolean managingTrust); void onConfigureCompleted(boolean result, IBinder token); void addEscrowToken(in byte[] token, int userId); diff --git a/core/java/android/service/trust/TrustAgentService.java b/core/java/android/service/trust/TrustAgentService.java index 5bd423599f5d..8f6e1e00c3f4 100644 --- a/core/java/android/service/trust/TrustAgentService.java +++ b/core/java/android/service/trust/TrustAgentService.java @@ -21,7 +21,6 @@ import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.SdkConstant; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.app.Service; import android.app.admin.DevicePolicyManager; import android.content.ComponentName; @@ -120,16 +119,15 @@ public class TrustAgentService extends Service { * automatically remove trust after some conditions are met (detailed below) with the option for * the agent to renew the trust again later. * - * <p>After this is called, the agent will grant trust until the platform thinks an active user - * is no longer using that trust. For example, if the user dismisses keyguard, the platform will - * remove trust (this does not automatically lock the device). + * <p>After this is called, the agent will grant trust until the platform thinks an active + * user is no longer using that trust. This can happen for any reason as determined by the + * platform. For example, if the user dismisses keyguard, the platform will remove trust; + * since this does not automatically lock the device, this results in the device locking the + * next time the screen turns off. * * <p>When the platform internally removes the agent's trust in this manner, an agent can * re-grant it (via a call to grantTrust) without the user having to unlock the device through * another method (e.g. PIN). This renewable state only persists for a limited time. - * - * TODO(b/213631675): Remove @hide - * @hide */ public static final int FLAG_GRANT_TRUST_TEMPORARY_AND_RENEWABLE = 1 << 2; @@ -140,9 +138,6 @@ public class TrustAgentService extends Service { * Without this flag, the message passed to {@code grantTrust} is only used for debugging * purposes. With the flag, it may be displayed to the user as the reason why the device is * unlocked. - * - * TODO(b/213911325): Remove @hide - * @hide */ public static final int FLAG_GRANT_TRUST_DISPLAY_MESSAGE = 1 << 3; @@ -310,11 +305,7 @@ public class TrustAgentService extends Service { * {@link #grantTrust(CharSequence, long, int)}. * * @see #FLAG_GRANT_TRUST_TEMPORARY_AND_RENEWABLE - * - * TODO(b/213631672): Remove @hide and @TestApi - * @hide */ - @TestApi public void onUserRequestedUnlock() { } @@ -626,11 +617,15 @@ public class TrustAgentService extends Service { * * If the user has no auth method specified, then keyguard will still be shown but can be * dismissed normally. - * - * TODO(b/213631675): Implement & make public - * @hide */ public final void lockUser() { + if (mCallback != null) { + try { + mCallback.lockUser(); + } catch (RemoteException e) { + onError("calling lockUser"); + } + } } /** diff --git a/core/java/android/service/wallpapereffectsgeneration/IWallpaperEffectsGenerationService.aidl b/core/java/android/service/wallpapereffectsgeneration/IWallpaperEffectsGenerationService.aidl new file mode 100644 index 000000000000..ca75d2ed35ed --- /dev/null +++ b/core/java/android/service/wallpapereffectsgeneration/IWallpaperEffectsGenerationService.aidl @@ -0,0 +1,28 @@ + +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.service.wallpapereffectsgeneration; + +import android.app.wallpapereffectsgeneration.CinematicEffectRequest; +/** + * Interface from the system to WallpaperEffectsGeneration service. + * + * @hide + */ +oneway interface IWallpaperEffectsGenerationService { + void onGenerateCinematicEffect(in CinematicEffectRequest request); +}
\ No newline at end of file diff --git a/core/java/android/service/wallpapereffectsgeneration/WallpaperEffectsGenerationService.java b/core/java/android/service/wallpapereffectsgeneration/WallpaperEffectsGenerationService.java new file mode 100644 index 000000000000..18b654ec8f04 --- /dev/null +++ b/core/java/android/service/wallpapereffectsgeneration/WallpaperEffectsGenerationService.java @@ -0,0 +1,142 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.service.wallpapereffectsgeneration; + +import static com.android.internal.util.function.pooled.PooledLambda.obtainMessage; + +import android.annotation.CallSuper; +import android.annotation.NonNull; +import android.annotation.SystemApi; +import android.app.Service; +import android.app.wallpapereffectsgeneration.CinematicEffectRequest; +import android.app.wallpapereffectsgeneration.CinematicEffectResponse; +import android.app.wallpapereffectsgeneration.IWallpaperEffectsGenerationManager; +import android.content.Context; +import android.content.Intent; +import android.os.Handler; +import android.os.IBinder; +import android.os.Looper; +import android.os.RemoteException; +import android.os.ServiceManager; +import android.util.Log; +import android.util.Slog; + +/** + * A service for handling wallpaper effects generation tasks. It must implement + * (onGenerateCinematicEffect} method to generate response and call returnCinematicEffectResponse + * to send the response. + * + * <p>To extend this service, you must declare the service in your manifest file with the + * {@link android.Manifest.permission#BIND_WALLPAPER_EFFECTS_GENERATION} permission and includes + * an intent filter with the {@link #SERVICE_INTERFACE} action. For example: </p> + * <pre> + * <application> + * <service android:name=".CtsWallpaperEffectsGenerationService" + * android:exported="true" + * android:label="CtsWallpaperEffectsGenerationService" + * android:permission="android.permission.BIND_WALLPAPER_EFFECTS_GENERATION_SERVICE"> + * <intent-filter> + * <action android:name="android.service.wallpapereffectsgeneration.WallpaperEffectsGenerationService" + /> + * </intent-filter> + * </service> + * <uses-library android:name="android.test.runner"/> + * </application> + * </pre> + * + * @hide + */ +@SystemApi +public abstract class WallpaperEffectsGenerationService extends Service { + /** + * The {@link Intent} that must be declared as handled by the service. + * + * <p>The service must also require the + * {@link android.permission#MANAGE_WALLPAPER_EFFECTS_GENERATION} + * permission. + * + * @hide + */ + public static final String SERVICE_INTERFACE = + "android.service.wallpapereffectsgeneration.WallpaperEffectsGenerationService"; + private static final boolean DEBUG = false; + private static final String TAG = "WallpaperEffectsGenerationService"; + private Handler mHandler; + private IWallpaperEffectsGenerationManager mService; + + private final IWallpaperEffectsGenerationService mInterface = + new IWallpaperEffectsGenerationService.Stub() { + @Override + public void onGenerateCinematicEffect(CinematicEffectRequest request) { + mHandler.sendMessage( + obtainMessage( + WallpaperEffectsGenerationService::onGenerateCinematicEffect, + WallpaperEffectsGenerationService.this, request)); + } + }; + + /** + * Called when the OS receives a request for generating cinematic effect. On receiving the + * request, it extract cinematic information from the input and call + * {@link #returnCinematicEffectResponse} with the textured mesh + * and metadata wrapped in CinematicEffectResponse. + * + * @param request the cinematic effect request passed from the client. + */ + public abstract void onGenerateCinematicEffect(@NonNull CinematicEffectRequest request); + + /** + * Returns the cinematic effect response. Must be called when cinematic effect + * response is generated and ready to be sent back. Otherwise the response won't be + * returned. + * + * @param response the cinematic effect response returned from service provider. + */ + public final void returnCinematicEffectResponse(@NonNull CinematicEffectResponse response) { + try { + mService.returnCinematicEffectResponse(response); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + + @CallSuper + @Override + public void onCreate() { + super.onCreate(); + if (DEBUG) { + Log.d(TAG, "onCreate WallpaperEffectsGenerationService"); + } + mHandler = new Handler(Looper.getMainLooper(), null, true); + IBinder b = ServiceManager.getService(Context.WALLPAPER_EFFECTS_GENERATION_SERVICE); + mService = IWallpaperEffectsGenerationManager.Stub.asInterface(b); + } + + @NonNull + @Override + public final IBinder onBind(@NonNull Intent intent) { + if (DEBUG) { + Log.d(TAG, "onBind WallpaperEffectsGenerationService"); + } + if (SERVICE_INTERFACE.equals(intent.getAction())) { + return mInterface.asBinder(); + } + Slog.w(TAG, + "Tried to bind to wrong intent (should be " + SERVICE_INTERFACE + ": " + intent); + return null; + } +} diff --git a/core/java/android/view/Display.java b/core/java/android/view/Display.java index fa39380cdcc1..246a8c9d17d3 100644 --- a/core/java/android/view/Display.java +++ b/core/java/android/view/Display.java @@ -1118,6 +1118,19 @@ public final class Display { } /** + * Returns the system's preferred display mode. This mode will be used when the user has not + * specified a display-mode preference. This returns null if the boot display mode feature is + * not supported by system. + * + * @hide + */ + @TestApi + @Nullable + public Display.Mode getSystemPreferredDisplayMode() { + return mGlobal.getSystemPreferredDisplayMode(getDisplayId()); + } + + /** * Returns the display's HDR capabilities. * * @see #isHdr() diff --git a/core/java/android/view/InputMonitor.java b/core/java/android/view/InputMonitor.java index ad1f201ba3c1..8801fe0b47c8 100644 --- a/core/java/android/view/InputMonitor.java +++ b/core/java/android/view/InputMonitor.java @@ -79,13 +79,17 @@ public final class InputMonitor implements Parcelable { - // Code below generated by codegen v1.0.7. + // 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/view/InputMonitor.java + // + // To exclude the generated code from IntelliJ auto-formatting enable (one-time): + // Settings > Editor > Code Style > Formatter Control + //@formatter:off @DataClass.Generated.Member @@ -126,7 +130,7 @@ public final class InputMonitor implements Parcelable { @Override @DataClass.Generated.Member - public void writeToParcel(Parcel dest, int flags) { + public void writeToParcel(@NonNull Parcel dest, int flags) { // You can override field parcelling by defining methods like: // void parcelFieldName(Parcel dest, int flags) { ... } @@ -141,7 +145,7 @@ public final class InputMonitor implements Parcelable { /** @hide */ @SuppressWarnings({"unchecked", "RedundantCast"}) @DataClass.Generated.Member - /* package-private */ InputMonitor(Parcel in) { + /* package-private */ InputMonitor(@NonNull Parcel in) { // You can override field unparcelling by defining methods like: // static FieldType unparcelFieldName(Parcel in) { ... } @@ -167,17 +171,21 @@ public final class InputMonitor implements Parcelable { } @Override - public InputMonitor createFromParcel(Parcel in) { + public InputMonitor createFromParcel(@NonNull Parcel in) { return new InputMonitor(in); } }; @DataClass.Generated( - time = 1571177265149L, - codegenVersion = "1.0.7", + time = 1637697281750L, + codegenVersion = "1.0.23", sourceFile = "frameworks/base/core/java/android/view/InputMonitor.java", inputSignatures = "private static final java.lang.String TAG\nprivate static final boolean DEBUG\nprivate final @android.annotation.NonNull android.view.InputChannel mInputChannel\nprivate final @android.annotation.NonNull android.view.IInputMonitorHost mHost\npublic void pilferPointers()\npublic void dispose()\nclass InputMonitor extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genToString=true)") @Deprecated private void __metadata() {} + + //@formatter:on + // End of generated code + } diff --git a/core/java/android/view/OnBackInvokedDispatcher.java b/core/java/android/view/OnBackInvokedDispatcher.java index 05c312b56cc7..f3ca531f2a42 100644 --- a/core/java/android/view/OnBackInvokedDispatcher.java +++ b/core/java/android/view/OnBackInvokedDispatcher.java @@ -19,6 +19,7 @@ package android.view; import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.SuppressLint; +import android.os.Build; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -32,6 +33,13 @@ import java.lang.annotation.RetentionPolicy; * target (a.k.a. the callback to be invoked next), or its behavior. */ public abstract class OnBackInvokedDispatcher { + + /** @hide */ + public static final String TAG = "OnBackInvokedDispatcher"; + + /** @hide */ + public static final boolean DEBUG = Build.isDebuggable(); + /** @hide */ @IntDef({ PRIORITY_DEFAULT, diff --git a/core/java/android/view/OnBackInvokedDispatcherOwner.java b/core/java/android/view/OnBackInvokedDispatcherOwner.java index 0e14ed4cdb07..e69efe01138c 100644 --- a/core/java/android/view/OnBackInvokedDispatcherOwner.java +++ b/core/java/android/view/OnBackInvokedDispatcherOwner.java @@ -16,7 +16,7 @@ package android.view; -import android.annotation.Nullable; +import android.annotation.NonNull; /** * A class that provides an {@link OnBackInvokedDispatcher} that allows you to register @@ -28,6 +28,6 @@ public interface OnBackInvokedDispatcherOwner { * to its registered {@link OnBackInvokedCallback}s. * Returns null when the root view is not attached to a window or a view tree with a decor. */ - @Nullable + @NonNull OnBackInvokedDispatcher getOnBackInvokedDispatcher(); } diff --git a/core/java/android/view/SurfaceControl.java b/core/java/android/view/SurfaceControl.java index 904d7c82959b..6f5fea258119 100644 --- a/core/java/android/view/SurfaceControl.java +++ b/core/java/android/view/SurfaceControl.java @@ -197,6 +197,9 @@ public final class SurfaceControl implements Parcelable { private static native int[] nativeGetCompositionDataspaces(); private static native boolean nativeSetActiveColorMode(IBinder displayToken, int colorMode); + private static native boolean nativeGetBootDisplayModeSupport(); + private static native void nativeSetBootDisplayMode(IBinder displayToken, int displayMode); + private static native void nativeClearBootDisplayMode(IBinder displayToken); private static native void nativeSetAutoLowLatencyMode(IBinder displayToken, boolean on); private static native void nativeSetGameContentType(IBinder displayToken, boolean on); private static native void nativeSetDisplayPowerMode( @@ -1878,6 +1881,8 @@ public final class SurfaceControl implements Parcelable { public boolean autoLowLatencyModeSupported; public boolean gameContentTypeSupported; + public int preferredBootDisplayMode; + @Override public String toString() { return "DynamicDisplayInfo{" @@ -1887,7 +1892,8 @@ public final class SurfaceControl implements Parcelable { + ", activeColorMode=" + activeColorMode + ", hdrCapabilities=" + hdrCapabilities + ", autoLowLatencyModeSupported=" + autoLowLatencyModeSupported - + ", gameContentTypeSupported" + gameContentTypeSupported + "}"; + + ", gameContentTypeSupported" + gameContentTypeSupported + + ", preferredBootDisplayMode" + preferredBootDisplayMode + "}"; } @Override @@ -1899,7 +1905,8 @@ public final class SurfaceControl implements Parcelable { && activeDisplayModeId == that.activeDisplayModeId && Arrays.equals(supportedColorModes, that.supportedColorModes) && activeColorMode == that.activeColorMode - && Objects.equals(hdrCapabilities, that.hdrCapabilities); + && Objects.equals(hdrCapabilities, that.hdrCapabilities) + && preferredBootDisplayMode == that.preferredBootDisplayMode; } @Override @@ -2266,6 +2273,36 @@ public final class SurfaceControl implements Parcelable { /** * @hide */ + public static boolean getBootDisplayModeSupport() { + return nativeGetBootDisplayModeSupport(); + } + + /** There is no associated getter for this method. When this is set, the display is expected + * to start up in this mode next time the device reboots. + * @hide + */ + public static void setBootDisplayMode(IBinder displayToken, int displayModeId) { + if (displayToken == null) { + throw new IllegalArgumentException("displayToken must not be null"); + } + + nativeSetBootDisplayMode(displayToken, displayModeId); + } + + /** + * @hide + */ + public static void clearBootDisplayMode(IBinder displayToken) { + if (displayToken == null) { + throw new IllegalArgumentException("displayToken must not be null"); + } + + nativeClearBootDisplayMode(displayToken); + } + + /** + * @hide + */ public static void setAutoLowLatencyMode(IBinder displayToken, boolean on) { if (displayToken == null) { throw new IllegalArgumentException("displayToken must not be null"); diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 4ff7e2297ea0..22c66dc7aee6 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -834,7 +834,7 @@ import java.util.function.Predicate; */ @UiThread public class View implements Drawable.Callback, KeyEvent.Callback, - AccessibilityEventSource, OnBackInvokedDispatcherOwner { + AccessibilityEventSource { @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final boolean DBG = false; @@ -12290,7 +12290,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, /** * @return whether this view should have haptic feedback enabled for events - * long presses. + * such as long presses. * * @see #setHapticFeedbackEnabled(boolean) * @see #performHapticFeedback(int) @@ -31447,23 +31447,4 @@ public class View implements Drawable.Callback, KeyEvent.Callback, } return null; } - - /** - * Returns the {@link OnBackInvokedDispatcher} instance of the window this view is attached to. - * - * @return The {@link OnBackInvokedDispatcher} or {@code null} if the view is neither attached - * to a window or a view tree with a decor. - */ - @Nullable - public OnBackInvokedDispatcher getOnBackInvokedDispatcher() { - ViewParent parent = getParent(); - if (parent instanceof View) { - return ((View) parent).getOnBackInvokedDispatcher(); - } else if (parent instanceof ViewRootImpl) { - // Get the fallback dispatcher on {@link ViewRootImpl} if the view tree doesn't have - // a {@link com.android.internal.policy.DecorView}. - return ((ViewRootImpl) parent).getOnBackInvokedDispatcher(); - } - return null; - } } diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index 386b277156e3..3d8653554efd 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -236,7 +236,7 @@ import java.util.function.Consumer; @SuppressWarnings({"EmptyCatchBlock", "PointlessBooleanExpression"}) public final class ViewRootImpl implements ViewParent, View.AttachInfo.Callbacks, ThreadedRenderer.DrawCallbacks, - AttachedSurfaceControl { + AttachedSurfaceControl, OnBackInvokedDispatcherOwner { private static final String TAG = "ViewRootImpl"; private static final boolean DBG = false; private static final boolean LOCAL_LOGV = false; @@ -313,9 +313,9 @@ public final class ViewRootImpl implements ViewParent, private @SurfaceControl.BufferTransform int mPreviousTransformHint = SurfaceControl.BUFFER_TRANSFORM_IDENTITY; /** - * The fallback {@link OnBackInvokedDispatcher} when the window doesn't have a decor view. + * The top level {@link OnBackInvokedDispatcher}. */ - private WindowOnBackInvokedDispatcher mFallbackOnBackInvokedDispatcher = + private final WindowOnBackInvokedDispatcher mOnBackInvokedDispatcher = new WindowOnBackInvokedDispatcher(); /** @@ -893,7 +893,6 @@ public final class ViewRootImpl implements ViewParent, mFastScrollSoundEffectsEnabled = audioManager.areNavigationRepeatSoundEffectsEnabled(); mScrollCaptureRequestTimeout = SCROLL_CAPTURE_REQUEST_TIMEOUT_MILLIS; - mFallbackOnBackInvokedDispatcher.attachToWindow(mWindowSession, mWindow); } public static void addFirstDrawHandler(Runnable callback) { @@ -1144,9 +1143,6 @@ public final class ViewRootImpl implements ViewParent, if (pendingInsetsController != null) { pendingInsetsController.replayAndAttach(mInsetsController); } - ((RootViewSurfaceTaker) mView) - .provideWindowOnBackInvokedDispatcher() - .attachToWindow(mWindowSession, mWindow); } try { @@ -1193,6 +1189,7 @@ public final class ViewRootImpl implements ViewParent, getAttachedWindowFrame(), 1f /* compactScale */, mTmpFrames.displayFrame, mTempRect2, mTmpFrames.frame); setFrame(mTmpFrames.frame); + registerBackCallbackOnWindow(); if (DEBUG_LAYOUT) Log.v(mTag, "Added window " + mWindow); if (res < WindowManagerGlobal.ADD_OKAY) { mAttachInfo.mRootView = null; @@ -8417,6 +8414,7 @@ public final class ViewRootImpl implements ViewParent, mAdded = false; } + mOnBackInvokedDispatcher.detachFromWindow(); WindowManagerGlobal.getInstance().doRemoveView(this); } @@ -10771,12 +10769,17 @@ public final class ViewRootImpl implements ViewParent, * Returns the {@link OnBackInvokedDispatcher} on the decor view if one exists, or the * fallback {@link OnBackInvokedDispatcher} instance. */ - @Nullable - public OnBackInvokedDispatcher getOnBackInvokedDispatcher() { - if (mView instanceof RootViewSurfaceTaker) { - return ((RootViewSurfaceTaker) mView).provideWindowOnBackInvokedDispatcher(); - } - return mFallbackOnBackInvokedDispatcher; + @NonNull + public WindowOnBackInvokedDispatcher getOnBackInvokedDispatcher() { + return mOnBackInvokedDispatcher; + } + + /** + * When this ViewRootImpl is added to the window manager, transfers the first + * {@link OnBackInvokedCallback} to be called to the server. + */ + private void registerBackCallbackOnWindow() { + mOnBackInvokedDispatcher.attachToWindow(mWindowSession, mWindow); } @Override diff --git a/core/java/android/view/Window.java b/core/java/android/view/Window.java index 039b50a637be..8401b7cdb243 100644 --- a/core/java/android/view/Window.java +++ b/core/java/android/view/Window.java @@ -295,6 +295,9 @@ public abstract class Window { private OnWindowDismissedCallback mOnWindowDismissedCallback; private OnWindowSwipeDismissedCallback mOnWindowSwipeDismissedCallback; private WindowControllerCallback mWindowControllerCallback; + @WindowInsetsController.Appearance + private int mSystemBarAppearance; + private DecorCallback mDecorCallback; private OnRestrictedCaptionAreaChangedListener mOnRestrictedCaptionAreaChangedListener; private Rect mRestrictedCaptionAreaRect; @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) @@ -607,17 +610,6 @@ public abstract class Window { * @param hasCapture True if the window has pointer capture. */ default public void onPointerCaptureChanged(boolean hasCapture) { }; - - /** - * Called from - * {@link com.android.internal.policy.DecorView#onSystemBarAppearanceChanged(int)}. - * - * @param appearance The newly applied appearance. - * @hide - */ - default void onSystemBarAppearanceChanged( - @WindowInsetsController.Appearance int appearance) { - } } /** @hide */ @@ -672,6 +664,35 @@ public abstract class Window { void updateNavigationBarColor(int color); } + /** @hide */ + public interface DecorCallback { + /** + * Called from + * {@link com.android.internal.policy.DecorView#onSystemBarAppearanceChanged(int)}. + * + * @param appearance The newly applied appearance. + */ + void onSystemBarAppearanceChanged(@WindowInsetsController.Appearance int appearance); + + /** + * Called from + * {@link com.android.internal.policy.DecorView#updateColorViews(WindowInsets, boolean)} + * when {@link com.android.internal.policy.DecorView#mDrawLegacyNavigationBarBackground} is + * being updated. + * + * @param drawLegacyNavigationBarBackground the new value that is being set to + * {@link com.android.internal.policy.DecorView#mDrawLegacyNavigationBarBackground}. + * @return The value to be set to + * {@link com.android.internal.policy.DecorView#mDrawLegacyNavigationBarBackgroundHandled} + * on behalf of the {@link com.android.internal.policy.DecorView}. + * {@code true} to tell that the Window can render the legacy navigation bar + * background on behalf of the {@link com.android.internal.policy.DecorView}. + * {@code false} to let {@link com.android.internal.policy.DecorView} handle it. + */ + boolean onDrawLegacyNavigationBarBackgroundChanged( + boolean drawLegacyNavigationBarBackground); + } + /** * Callback for clients that want to be aware of where caption draws content. */ @@ -996,6 +1017,36 @@ public abstract class Window { return mWindowControllerCallback; } + /** @hide */ + public final void setDecorCallback(DecorCallback decorCallback) { + mDecorCallback = decorCallback; + } + + /** @hide */ + @WindowInsetsController.Appearance + public final int getSystemBarAppearance() { + return mSystemBarAppearance; + } + + /** @hide */ + public final void dispatchOnSystemBarAppearanceChanged( + @WindowInsetsController.Appearance int appearance) { + mSystemBarAppearance = appearance; + if (mDecorCallback != null) { + mDecorCallback.onSystemBarAppearanceChanged(appearance); + } + } + + /** @hide */ + public final boolean onDrawLegacyNavigationBarBackgroundChanged( + boolean drawLegacyNavigationBarBackground) { + if (mDecorCallback == null) { + return false; + } + return mDecorCallback.onDrawLegacyNavigationBarBackgroundChanged( + drawLegacyNavigationBarBackground); + } + /** * Set a callback for changes of area where caption will draw its content. * diff --git a/core/java/android/view/WindowCallbackWrapper.java b/core/java/android/view/WindowCallbackWrapper.java index 115e9e891408..02c8945d9fce 100644 --- a/core/java/android/view/WindowCallbackWrapper.java +++ b/core/java/android/view/WindowCallbackWrapper.java @@ -163,10 +163,5 @@ public class WindowCallbackWrapper implements Window.Callback { public void onPointerCaptureChanged(boolean hasCapture) { mWrapped.onPointerCaptureChanged(hasCapture); } - - @Override - public void onSystemBarAppearanceChanged(@WindowInsetsController.Appearance int appearance) { - mWrapped.onSystemBarAppearanceChanged(appearance); - } } diff --git a/core/java/android/view/accessibility/AccessibilityNodeInfo.java b/core/java/android/view/accessibility/AccessibilityNodeInfo.java index 0a33d6cd82ea..a31cacfdfd2b 100644 --- a/core/java/android/view/accessibility/AccessibilityNodeInfo.java +++ b/core/java/android/view/accessibility/AccessibilityNodeInfo.java @@ -710,6 +710,8 @@ public class AccessibilityNodeInfo implements Parcelable { private static final int BOOLEAN_PROPERTY_IS_TEXT_ENTRY_KEY = 0x0400000; + private static final int BOOLEAN_PROPERTY_IS_TEXT_SELECTABLE = 0x0800000; + /** * Bits that provide the id of a virtual descendant of a view. */ @@ -2276,6 +2278,38 @@ public class AccessibilityNodeInfo implements Parcelable { } /** + * Gets if the node has selectable text. + * + * <p> + * Services should use {@link #ACTION_SET_SELECTION} for selection. Editable text nodes must + * also be selectable. But not all UIs will populate this field, so services should consider + * 'isTextSelectable | isEditable' to ensure they don't miss nodes with selectable text. + * </p> + * + * @see #isEditable + * @return True if the node has selectable text. + */ + public boolean isTextSelectable() { + return getBooleanProperty(BOOLEAN_PROPERTY_IS_TEXT_SELECTABLE); + } + + /** + * Sets if the node has selectable text. + * <p> + * <strong>Note:</strong> Cannot be called from an + * {@link android.accessibilityservice.AccessibilityService}. + * This class is made immutable before being delivered to an AccessibilityService. + * </p> + * + * @param selectableText True if the node has selectable text, false otherwise. + * + * @throws IllegalStateException If called from an AccessibilityService. + */ + public void setTextSelectable(boolean selectableText) { + setBooleanProperty(BOOLEAN_PROPERTY_IS_TEXT_SELECTABLE, selectableText); + } + + /** * Gets if the node is editable. * * @return True if the node is editable, false otherwise. @@ -4327,8 +4361,12 @@ public class AccessibilityNodeInfo implements Parcelable { return "ACTION_CANCEL_DRAG"; case R.id.accessibilityActionDragDrop: return "ACTION_DROP"; - default: + default: { + if (action == R.id.accessibilityActionShowSuggestions) { + return "ACTION_SHOW_SUGGESTIONS"; + } return "ACTION_UNKNOWN"; + } } } @@ -4462,6 +4500,7 @@ public class AccessibilityNodeInfo implements Parcelable { builder.append("; importantForAccessibility: ").append(isImportantForAccessibility()); builder.append("; visible: ").append(isVisibleToUser()); builder.append("; actions: ").append(mActions); + builder.append("; isTextSelectable: ").append(isTextSelectable()); return builder.toString(); } diff --git a/core/java/android/view/animation/Animation.java b/core/java/android/view/animation/Animation.java index ab749ee284a8..3914a3c963b6 100644 --- a/core/java/android/view/animation/Animation.java +++ b/core/java/android/view/animation/Animation.java @@ -865,6 +865,15 @@ public abstract class Animation implements Cloneable { } /** + * @return if a window animation has outsets applied to it. + * + * @hide + */ + public boolean hasExtension() { + return false; + } + + /** * If showBackground is {@code true} and this animation is applied on a window, then the windows * in the animation will animate with the background associated with this window behind them. * @@ -942,6 +951,21 @@ public abstract class Animation implements Cloneable { } /** + * Gets the transformation to apply a specific point in time. Implementations of this method + * should always be kept in sync with getTransformation. + * + * @param normalizedTime time between 0 and 1 where 0 is the start of the animation and 1 the + * end. + * @param outTransformation A transformation object that is provided by the + * caller and will be filled in by the animation. + * @hide + */ + public void getTransformationAt(float normalizedTime, Transformation outTransformation) { + final float interpolatedTime = mInterpolator.getInterpolation(normalizedTime); + applyTransformation(interpolatedTime, outTransformation); + } + + /** * Gets the transformation to apply at a specified point in time. Implementations of this * method should always replace the specified Transformation or document they are doing * otherwise. @@ -987,8 +1011,7 @@ public abstract class Animation implements Cloneable { normalizedTime = 1.0f - normalizedTime; } - final float interpolatedTime = mInterpolator.getInterpolation(normalizedTime); - applyTransformation(interpolatedTime, outTransformation); + getTransformationAt(normalizedTime, outTransformation); } if (expired) { diff --git a/core/java/android/view/animation/AnimationSet.java b/core/java/android/view/animation/AnimationSet.java index 03c6ca69a592..a2f3544c70ab 100644 --- a/core/java/android/view/animation/AnimationSet.java +++ b/core/java/android/view/animation/AnimationSet.java @@ -363,6 +363,26 @@ public class AnimationSet extends Animation { * The transformation of an animation set is the concatenation of all of its * component animations. * + * @see android.view.animation.Animation#getTransformationAt + * @hide + */ + @Override + public void getTransformationAt(float interpolatedTime, Transformation t) { + final Transformation temp = mTempTransformation; + + for (int i = mAnimations.size() - 1; i >= 0; --i) { + final Animation a = mAnimations.get(i); + + temp.clear(); + a.getTransformationAt(interpolatedTime, t); + t.compose(temp); + } + } + + /** + * The transformation of an animation set is the concatenation of all of its + * component animations. + * * @see android.view.animation.Animation#getTransformation */ @Override @@ -517,4 +537,15 @@ public class AnimationSet extends Animation { public boolean willChangeBounds() { return (mFlags & PROPERTY_CHANGE_BOUNDS_MASK) == PROPERTY_CHANGE_BOUNDS_MASK; } + + /** @hide */ + @Override + public boolean hasExtension() { + for (Animation animation : mAnimations) { + if (animation.hasExtension()) { + return true; + } + } + return false; + } } diff --git a/core/java/android/view/animation/AnimationUtils.java b/core/java/android/view/animation/AnimationUtils.java index 7ce0f4571f76..7d1dc7660871 100644 --- a/core/java/android/view/animation/AnimationUtils.java +++ b/core/java/android/view/animation/AnimationUtils.java @@ -190,6 +190,8 @@ public class AnimationUtils { anim = new TranslateAnimation(c, attrs); } else if (name.equals("cliprect")) { anim = new ClipRectAnimation(c, attrs); + } else if (name.equals("extend")) { + anim = new ExtendAnimation(c, attrs); } else { throw new RuntimeException("Unknown animation name: " + parser.getName()); } diff --git a/core/java/android/view/animation/ExtendAnimation.java b/core/java/android/view/animation/ExtendAnimation.java new file mode 100644 index 000000000000..fd627e50ab0e --- /dev/null +++ b/core/java/android/view/animation/ExtendAnimation.java @@ -0,0 +1,176 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.view.animation; + +import android.content.Context; +import android.content.res.TypedArray; +import android.graphics.Insets; +import android.util.AttributeSet; + +/** + * An animation that controls the outset of an object. + * + * @hide + */ +public class ExtendAnimation extends Animation { + protected Insets mFromInsets = Insets.NONE; + protected Insets mToInsets = Insets.NONE; + + private int mFromLeftType = ABSOLUTE; + private int mFromTopType = ABSOLUTE; + private int mFromRightType = ABSOLUTE; + private int mFromBottomType = ABSOLUTE; + + private int mToLeftType = ABSOLUTE; + private int mToTopType = ABSOLUTE; + private int mToRightType = ABSOLUTE; + private int mToBottomType = ABSOLUTE; + + private float mFromLeftValue; + private float mFromTopValue; + private float mFromRightValue; + private float mFromBottomValue; + + private float mToLeftValue; + private float mToTopValue; + private float mToRightValue; + private float mToBottomValue; + + /** + * Constructor used when an ExtendAnimation is loaded from a resource. + * + * @param context Application context to use + * @param attrs Attribute set from which to read values + */ + public ExtendAnimation(Context context, AttributeSet attrs) { + super(context, attrs); + + TypedArray a = context.obtainStyledAttributes(attrs, + com.android.internal.R.styleable.ExtendAnimation); + + Description d = Description.parseValue(a.peekValue( + com.android.internal.R.styleable.ExtendAnimation_fromExtendLeft)); + mFromLeftType = d.type; + mFromLeftValue = d.value; + + d = Description.parseValue(a.peekValue( + com.android.internal.R.styleable.ExtendAnimation_fromExtendTop)); + mFromTopType = d.type; + mFromTopValue = d.value; + + d = Description.parseValue(a.peekValue( + com.android.internal.R.styleable.ExtendAnimation_fromExtendRight)); + mFromRightType = d.type; + mFromRightValue = d.value; + + d = Description.parseValue(a.peekValue( + com.android.internal.R.styleable.ExtendAnimation_fromExtendBottom)); + mFromBottomType = d.type; + mFromBottomValue = d.value; + + + d = Description.parseValue(a.peekValue( + com.android.internal.R.styleable.ExtendAnimation_toExtendLeft)); + mToLeftType = d.type; + mToLeftValue = d.value; + + d = Description.parseValue(a.peekValue( + com.android.internal.R.styleable.ExtendAnimation_toExtendTop)); + mToTopType = d.type; + mToTopValue = d.value; + + d = Description.parseValue(a.peekValue( + com.android.internal.R.styleable.ExtendAnimation_toExtendRight)); + mToRightType = d.type; + mToRightValue = d.value; + + d = Description.parseValue(a.peekValue( + com.android.internal.R.styleable.ExtendAnimation_toExtendBottom)); + mToBottomType = d.type; + mToBottomValue = d.value; + + a.recycle(); + } + + /** + * Constructor to use when building an ExtendAnimation from code + * + * @param fromInsets the insets to animate from + * @param toInsets the insets to animate to + */ + public ExtendAnimation(Insets fromInsets, Insets toInsets) { + if (fromInsets == null || toInsets == null) { + throw new RuntimeException("Expected non-null animation outsets"); + } + mFromLeftValue = -fromInsets.left; + mFromTopValue = -fromInsets.top; + mFromRightValue = -fromInsets.right; + mFromBottomValue = -fromInsets.bottom; + + mToLeftValue = -toInsets.left; + mToTopValue = -toInsets.top; + mToRightValue = -toInsets.right; + mToBottomValue = -toInsets.bottom; + } + + /** + * Constructor to use when building an ExtendAnimation from code + */ + public ExtendAnimation(int fromL, int fromT, int fromR, int fromB, + int toL, int toT, int toR, int toB) { + this(Insets.of(-fromL, -fromT, -fromR, -fromB), Insets.of(-toL, -toT, -toR, -toB)); + } + + @Override + protected void applyTransformation(float it, Transformation tr) { + int l = mFromInsets.left + (int) ((mToInsets.left - mFromInsets.left) * it); + int t = mFromInsets.top + (int) ((mToInsets.top - mFromInsets.top) * it); + int r = mFromInsets.right + (int) ((mToInsets.right - mFromInsets.right) * it); + int b = mFromInsets.bottom + (int) ((mToInsets.bottom - mFromInsets.bottom) * it); + tr.setInsets(l, t, r, b); + } + + @Override + public boolean willChangeTransformationMatrix() { + return false; + } + + /** @hide */ + @Override + public boolean hasExtension() { + return mFromInsets.left < 0 || mFromInsets.top < 0 || mFromInsets.right < 0 + || mFromInsets.bottom < 0; + } + + @Override + public void initialize(int width, int height, int parentWidth, int parentHeight) { + super.initialize(width, height, parentWidth, parentHeight); + // We remove any negative extension (i.e. positive insets) and set those to 0 + mFromInsets = Insets.min(Insets.of( + -(int) resolveSize(mFromLeftType, mFromLeftValue, width, parentWidth), + -(int) resolveSize(mFromTopType, mFromTopValue, height, parentHeight), + -(int) resolveSize(mFromRightType, mFromRightValue, width, parentWidth), + -(int) resolveSize(mFromBottomType, mFromBottomValue, height, parentHeight) + ), Insets.NONE); + mToInsets = Insets.min(Insets.of( + -(int) resolveSize(mToLeftType, mToLeftValue, width, parentWidth), + -(int) resolveSize(mToTopType, mToTopValue, height, parentHeight), + -(int) resolveSize(mToRightType, mToRightValue, width, parentWidth), + -(int) resolveSize(mToBottomType, mToBottomValue, height, parentHeight) + ), Insets.NONE); + } +} diff --git a/core/java/android/view/animation/Transformation.java b/core/java/android/view/animation/Transformation.java index b35a66e6eb26..bd623088017a 100644 --- a/core/java/android/view/animation/Transformation.java +++ b/core/java/android/view/animation/Transformation.java @@ -18,6 +18,7 @@ package android.view.animation; import android.annotation.FloatRange; import android.compat.annotation.UnsupportedAppUsage; +import android.graphics.Insets; import android.graphics.Matrix; import android.graphics.Rect; @@ -53,6 +54,8 @@ public class Transformation { private boolean mHasClipRect; private Rect mClipRect = new Rect(); + private Insets mInsets = Insets.NONE; + /** * Creates a new transformation with alpha = 1 and the identity matrix. */ @@ -132,8 +135,9 @@ public class Transformation { setClipRect(bounds); } } + setInsets(Insets.add(getInsets(), t.getInsets())); } - + /** * Like {@link #compose(Transformation)} but does this.postConcat(t) of * the transformation matrix. @@ -160,7 +164,7 @@ public class Transformation { public Matrix getMatrix() { return mMatrix; } - + /** * Sets the degree of transparency * @param alpha 1.0 means fully opaqe and 0.0 means fully transparent @@ -170,6 +174,13 @@ public class Transformation { } /** + * @return The degree of transparency + */ + public float getAlpha() { + return mAlpha; + } + + /** * Sets the current Transform's clip rect * @hide */ @@ -203,12 +214,29 @@ public class Transformation { } /** - * @return The degree of transparency + * Sets the current Transform's insets + * @hide */ - public float getAlpha() { - return mAlpha; + public void setInsets(Insets insets) { + mInsets = insets; } - + + /** + * Sets the current Transform's insets + * @hide + */ + public void setInsets(int left, int top, int right, int bottom) { + mInsets = Insets.of(left, top, right, bottom); + } + + /** + * Returns the current Transform's outset rect + * @hide + */ + public Insets getInsets() { + return mInsets; + } + @Override public String toString() { StringBuilder sb = new StringBuilder(64); @@ -216,7 +244,7 @@ public class Transformation { toShortString(sb); return sb.toString(); } - + /** * Return a string representation of the transformation in a compact form. */ @@ -225,7 +253,7 @@ public class Transformation { toShortString(sb); return sb.toString(); } - + /** * @hide */ @@ -234,7 +262,7 @@ public class Transformation { sb.append(" matrix="); sb.append(mMatrix.toShortString()); sb.append('}'); } - + /** * Print short string, to optimize dumping. * @hide diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 7c939aca09cf..0fe2ed51beb6 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -12289,6 +12289,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener EXTRA_DATA_RENDERING_INFO_KEY, EXTRA_DATA_TEXT_CHARACTER_LOCATION_KEY )); + info.setTextSelectable(isTextSelectable()); } else { info.setAvailableExtraData(Arrays.asList( EXTRA_DATA_RENDERING_INFO_KEY diff --git a/core/java/android/window/BackNavigationInfo.java b/core/java/android/window/BackNavigationInfo.java index 571714cc05d5..18c20e2b1fa5 100644 --- a/core/java/android/window/BackNavigationInfo.java +++ b/core/java/android/window/BackNavigationInfo.java @@ -16,8 +16,6 @@ package android.window; -import static java.util.Objects.requireNonNull; - import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; @@ -61,6 +59,12 @@ public final class BackNavigationInfo implements Parcelable { public static final int TYPE_CROSS_TASK = 3; /** + * A {@link android.view.OnBackInvokedCallback} is available and needs to be called. + * <p> + */ + public static final int TYPE_CALLBACK = 4; + + /** * Defines the type of back destinations a back even can lead to. This is used to define the * type of animation that need to be run on SystemUI. */ @@ -84,35 +88,39 @@ public final class BackNavigationInfo implements Parcelable { private final RemoteCallback mRemoteCallback; @Nullable private final WindowConfiguration mTaskWindowConfiguration; + @Nullable + private final IOnBackInvokedCallback mOnBackInvokedCallback; /** * Create a new {@link BackNavigationInfo} instance. * - * @param type The {@link BackTargetType} of the destination (what will be displayed after - * the back action) - * @param topWindowLeash The leash to animate away the current topWindow. The consumer - * of the leash is responsible for removing it. - * @param screenshotSurface The screenshot of the previous activity to be displayed. - * @param screenshotBuffer A buffer containing a screenshot used to display the activity. - * See {@link #getScreenshotHardwareBuffer()} for information - * about nullity. - * @param taskWindowConfiguration The window configuration of the Task being animated - * beneath. - * @param onBackNavigationDone The callback to be called once the client is done with the back - * preview. + * @param type The {@link BackTargetType} of the destination (what will be + * displayed after the back action). + * @param topWindowLeash The leash to animate away the current topWindow. The consumer + * of the leash is responsible for removing it. + * @param screenshotSurface The screenshot of the previous activity to be displayed. + * @param screenshotBuffer A buffer containing a screenshot used to display the activity. + * See {@link #getScreenshotHardwareBuffer()} for information + * about nullity. + * @param taskWindowConfiguration The window configuration of the Task being animated beneath. + * @param onBackNavigationDone The callback to be called once the client is done with the + * back preview. + * @param onBackInvokedCallback The back callback registered by the current top level window. */ public BackNavigationInfo(@BackTargetType int type, @Nullable SurfaceControl topWindowLeash, @Nullable SurfaceControl screenshotSurface, @Nullable HardwareBuffer screenshotBuffer, @Nullable WindowConfiguration taskWindowConfiguration, - @NonNull RemoteCallback onBackNavigationDone) { + @Nullable RemoteCallback onBackNavigationDone, + @Nullable IOnBackInvokedCallback onBackInvokedCallback) { mType = type; mDepartingWindowContainer = topWindowLeash; mScreenshotSurface = screenshotSurface; mScreenshotBuffer = screenshotBuffer; mTaskWindowConfiguration = taskWindowConfiguration; mRemoteCallback = onBackNavigationDone; + mOnBackInvokedCallback = onBackInvokedCallback; } private BackNavigationInfo(@NonNull Parcel in) { @@ -121,7 +129,8 @@ public final class BackNavigationInfo implements Parcelable { mScreenshotSurface = in.readTypedObject(SurfaceControl.CREATOR); mScreenshotBuffer = in.readTypedObject(HardwareBuffer.CREATOR); mTaskWindowConfiguration = in.readTypedObject(WindowConfiguration.CREATOR); - mRemoteCallback = requireNonNull(in.readTypedObject(RemoteCallback.CREATOR)); + mRemoteCallback = in.readTypedObject(RemoteCallback.CREATOR); + mOnBackInvokedCallback = IOnBackInvokedCallback.Stub.asInterface(in.readStrongBinder()); } @Override @@ -132,10 +141,12 @@ public final class BackNavigationInfo implements Parcelable { dest.writeTypedObject(mScreenshotBuffer, flags); dest.writeTypedObject(mTaskWindowConfiguration, flags); dest.writeTypedObject(mRemoteCallback, flags); + dest.writeStrongInterface(mOnBackInvokedCallback); } /** * Returns the type of back navigation that is about to happen. + * * @see BackTargetType */ public @BackTargetType int getType() { @@ -152,8 +163,8 @@ public final class BackNavigationInfo implements Parcelable { } /** - * Returns the {@link SurfaceControl} that should be used to display a screenshot of the - * previous activity. + * Returns the {@link SurfaceControl} that should be used to display a screenshot of the + * previous activity. */ @Nullable public SurfaceControl getScreenshotSurface() { @@ -185,11 +196,27 @@ public final class BackNavigationInfo implements Parcelable { } /** + * Returns the {@link android.view.OnBackInvokedCallback} of the top level window or null if + * the client didn't register a callback. + * <p> + * This is never null when {@link #getType} returns {@link #TYPE_CALLBACK}. + * + * @see android.view.OnBackInvokedCallback + * @see android.view.OnBackInvokedDispatcher + */ + @Nullable + public IOnBackInvokedCallback getOnBackInvokedCallback() { + return mOnBackInvokedCallback; + } + + /** * Callback to be called when the back preview is finished in order to notify the server that * it can clean up the resources created for the animation. */ public void onBackNavigationFinished() { - mRemoteCallback.sendResult(null); + if (mRemoteCallback != null) { + mRemoteCallback.sendResult(null); + } } @Override @@ -218,6 +245,7 @@ public final class BackNavigationInfo implements Parcelable { + ", mTaskWindowConfiguration= " + mTaskWindowConfiguration + ", mScreenshotBuffer=" + mScreenshotBuffer + ", mRemoteCallback=" + mRemoteCallback + + ", mOnBackInvokedCallback=" + mOnBackInvokedCallback + '}'; } @@ -226,7 +254,7 @@ public final class BackNavigationInfo implements Parcelable { */ public static String typeToString(@BackTargetType int type) { switch (type) { - case TYPE_UNDEFINED: + case TYPE_UNDEFINED: return "TYPE_UNDEFINED"; case TYPE_DIALOG_CLOSE: return "TYPE_DIALOG_CLOSE"; diff --git a/core/java/android/window/ProxyOnBackInvokedDispatcher.java b/core/java/android/window/ProxyOnBackInvokedDispatcher.java new file mode 100644 index 000000000000..509bbd4de389 --- /dev/null +++ b/core/java/android/window/ProxyOnBackInvokedDispatcher.java @@ -0,0 +1,162 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.window; + +import android.annotation.NonNull; +import android.annotation.Nullable; +import android.util.Log; +import android.util.Pair; +import android.view.OnBackInvokedCallback; +import android.view.OnBackInvokedDispatcher; +import android.view.OnBackInvokedDispatcherOwner; + +import java.util.ArrayList; +import java.util.List; + +/** + * {@link OnBackInvokedDispatcher} only used to hold callbacks while an actual + * dispatcher becomes available. <b>It does not dispatch the back events</b>. + * <p> + * Once the actual {@link OnBackInvokedDispatcherOwner} becomes available, + * {@link #setActualDispatcherOwner(OnBackInvokedDispatcherOwner)} needs to + * be called and this {@link ProxyOnBackInvokedDispatcher} will pass the callback registrations + * onto it. + * <p> + * This dispatcher will continue to keep track of callback registrations and when a dispatcher is + * removed or set it will unregister the callbacks from the old one and register them on the new + * one unless {@link #reset()} is called before. + * + * @hide + */ +public class ProxyOnBackInvokedDispatcher extends OnBackInvokedDispatcher { + + /** + * List of pair representing an {@link OnBackInvokedCallback} and its associated priority. + * + * @see OnBackInvokedDispatcher#registerOnBackInvokedCallback(OnBackInvokedCallback, int) + */ + private final List<Pair<OnBackInvokedCallback, Integer>> mCallbacks = new ArrayList<>(); + private final Object mLock = new Object(); + private OnBackInvokedDispatcherOwner mActualDispatcherOwner = null; + + @Override + public void registerOnBackInvokedCallback( + @NonNull OnBackInvokedCallback callback, int priority) { + if (DEBUG) { + Log.v(TAG, String.format("Pending register %s. Actual=%s", callback, + mActualDispatcherOwner)); + } + synchronized (mLock) { + mCallbacks.add(Pair.create(callback, priority)); + if (mActualDispatcherOwner != null) { + mActualDispatcherOwner.getOnBackInvokedDispatcher().registerOnBackInvokedCallback( + callback, priority); + } + + } + } + + @Override + public void unregisterOnBackInvokedCallback( + @NonNull OnBackInvokedCallback callback) { + if (DEBUG) { + Log.v(TAG, String.format("Pending unregister %s. Actual=%s", callback, + mActualDispatcherOwner)); + } + synchronized (mLock) { + mCallbacks.removeIf((p) -> p.first.equals(callback)); + } + } + + /** + * Transfers all the pending callbacks to the provided dispatcher. + * <p> + * The callbacks are registered on the dispatcher in the same order as they were added on this + * proxy dispatcher. + */ + private void transferCallbacksToDispatcher() { + if (mActualDispatcherOwner == null) { + return; + } + OnBackInvokedDispatcher dispatcher = + mActualDispatcherOwner.getOnBackInvokedDispatcher(); + if (DEBUG) { + Log.v(TAG, String.format("Pending transferring %d callbacks to %s", mCallbacks.size(), + dispatcher)); + } + for (Pair<OnBackInvokedCallback, Integer> callbackPair : mCallbacks) { + dispatcher.registerOnBackInvokedCallback(callbackPair.first, + callbackPair.second); + } + mCallbacks.clear(); + } + + private void clearCallbacksOnDispatcher() { + if (mActualDispatcherOwner == null) { + return; + } + OnBackInvokedDispatcher onBackInvokedDispatcher = + mActualDispatcherOwner.getOnBackInvokedDispatcher(); + for (Pair<OnBackInvokedCallback, Integer> callback : mCallbacks) { + onBackInvokedDispatcher.unregisterOnBackInvokedCallback(callback.first); + } + } + + /** + * Resets this {@link ProxyOnBackInvokedDispatcher} so it loses track of the currently + * registered callbacks. + * <p> + * Using this method means that when setting a new {@link OnBackInvokedDispatcherOwner}, the + * callbacks registered on the old one won't be removed from it and won't be registered on + * the new one. + */ + public void reset() { + if (DEBUG) { + Log.v(TAG, "Pending reset callbacks"); + } + synchronized (mLock) { + mCallbacks.clear(); + } + } + + /** + * Sets the actual {@link OnBackInvokedDispatcherOwner} that will provides the + * {@link OnBackInvokedDispatcher} onto which the callbacks will be registered. + * <p> + * If any dispatcher owner was already present, all the callbacks that were added via this + * {@link ProxyOnBackInvokedDispatcher} will be unregistered from the old one and registered + * on the new one if it is not null. + * <p> + * If you do not wish for the previously registered callbacks to be reassigned to the new + * dispatcher, {@link #reset} must be called beforehand. + */ + public void setActualDispatcherOwner( + @Nullable OnBackInvokedDispatcherOwner actualDispatcherOwner) { + if (DEBUG) { + Log.v(TAG, String.format("Pending setActual %s. Current %s", + actualDispatcherOwner, mActualDispatcherOwner)); + } + synchronized (mLock) { + if (actualDispatcherOwner == mActualDispatcherOwner) { + return; + } + clearCallbacksOnDispatcher(); + mActualDispatcherOwner = actualDispatcherOwner; + transferCallbacksToDispatcher(); + } + } +} diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java index 347153c7e53e..cdb69e546b8f 100644 --- a/core/java/com/android/internal/app/ResolverActivity.java +++ b/core/java/com/android/internal/app/ResolverActivity.java @@ -1011,7 +1011,9 @@ public class ResolverActivity extends Activity implements protected void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); ViewPager viewPager = findViewById(R.id.profile_pager); - outState.putInt(LAST_SHOWN_TAB_KEY, viewPager.getCurrentItem()); + if (viewPager != null) { + outState.putInt(LAST_SHOWN_TAB_KEY, viewPager.getCurrentItem()); + } } @Override @@ -1019,7 +1021,9 @@ public class ResolverActivity extends Activity implements super.onRestoreInstanceState(savedInstanceState); resetButtonBar(); ViewPager viewPager = findViewById(R.id.profile_pager); - viewPager.setCurrentItem(savedInstanceState.getInt(LAST_SHOWN_TAB_KEY)); + if (viewPager != null) { + viewPager.setCurrentItem(savedInstanceState.getInt(LAST_SHOWN_TAB_KEY)); + } mMultiProfilePagerAdapter.clearInactiveProfileCache(); } @@ -1568,6 +1572,11 @@ public class ResolverActivity extends Activity implements rebuildCompleted = rebuildCompleted && rebuildInactiveCompleted; } + if (shouldUseMiniResolver()) { + configureMiniResolverContent(); + return false; + } + if (useLayoutWithDefault()) { mLayoutId = R.layout.resolver_list_with_default; } else { @@ -1578,6 +1587,72 @@ public class ResolverActivity extends Activity implements return postRebuildList(rebuildCompleted); } + private void configureMiniResolverContent() { + mLayoutId = R.layout.miniresolver; + setContentView(mLayoutId); + + DisplayResolveInfo sameProfileResolveInfo = + mMultiProfilePagerAdapter.getActiveListAdapter().mDisplayList.get(0); + boolean inWorkProfile = getCurrentProfile() == PROFILE_WORK; + + DisplayResolveInfo otherProfileResolveInfo = + mMultiProfilePagerAdapter.getInactiveListAdapter().mDisplayList.get(0); + ImageView icon = findViewById(R.id.icon); + // TODO: Set icon drawable to app icon. + + ((TextView) findViewById(R.id.open_cross_profile)).setText( + getResources().getString( + inWorkProfile ? R.string.miniresolver_open_in_personal + : R.string.miniresolver_open_in_work, + otherProfileResolveInfo.getDisplayLabel())); + ((Button) findViewById(R.id.use_same_profile_browser)).setText( + inWorkProfile ? R.string.miniresolver_use_work_browser + : R.string.miniresolver_use_personal_browser); + + findViewById(R.id.use_same_profile_browser).setOnClickListener( + v -> safelyStartActivity(sameProfileResolveInfo)); + + findViewById(R.id.button_open).setOnClickListener(v -> { + Intent intent = otherProfileResolveInfo.getResolvedIntent(); + if (intent != null) { + prepareIntentForCrossProfileLaunch(intent); + } + safelyStartActivityInternal(otherProfileResolveInfo, + mMultiProfilePagerAdapter.getInactiveListAdapter().mResolverListController + .getUserHandle()); + }); + } + + private boolean shouldUseMiniResolver() { + if (mMultiProfilePagerAdapter.getActiveListAdapter() == null + || mMultiProfilePagerAdapter.getInactiveListAdapter() == null) { + return false; + } + List<DisplayResolveInfo> sameProfileList = + mMultiProfilePagerAdapter.getActiveListAdapter().mDisplayList; + List<DisplayResolveInfo> otherProfileList = + mMultiProfilePagerAdapter.getInactiveListAdapter().mDisplayList; + + if (otherProfileList.size() != 1) { + Log.d(TAG, "Found " + otherProfileList.size() + " resolvers in the other profile"); + return false; + } + + if (otherProfileList.get(0).getResolveInfo().handleAllWebDataURI) { + Log.d(TAG, "Other profile is a web browser"); + return false; + } + + for (DisplayResolveInfo info : sameProfileList) { + if (!info.getResolveInfo().handleAllWebDataURI) { + Log.d(TAG, "Non-browser found in this profile"); + return false; + } + } + + return true; + } + /** * Finishing procedures to be performed after the list has been rebuilt. * </p>Subclasses must call postRebuildListInternal at the end of postRebuildList. diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java index c0fec62bdd94..5ba45c9b8bc3 100644 --- a/core/java/com/android/internal/os/BatteryStatsImpl.java +++ b/core/java/com/android/internal/os/BatteryStatsImpl.java @@ -607,11 +607,15 @@ public class BatteryStatsImpl extends BatteryStats { int UPDATE_BT = 0x08; int UPDATE_RPM = 0x10; int UPDATE_DISPLAY = 0x20; + int RESET = 0x40; + int UPDATE_ALL = UPDATE_CPU | UPDATE_WIFI | UPDATE_RADIO | UPDATE_BT | UPDATE_RPM | UPDATE_DISPLAY; int UPDATE_ON_PROC_STATE_CHANGE = UPDATE_WIFI | UPDATE_RADIO | UPDATE_BT; + int UPDATE_ON_RESET = UPDATE_ALL | RESET; + @IntDef(flag = true, prefix = "UPDATE_", value = { UPDATE_CPU, UPDATE_WIFI, @@ -12909,7 +12913,7 @@ public class BatteryStatsImpl extends BatteryStats { // Flush external data, gathering snapshots, but don't process it since it is pre-reset data mIgnoreNextExternalStats = true; - mExternalSync.scheduleSync("reset", ExternalStatsSync.UPDATE_ALL); + mExternalSync.scheduleSync("reset", ExternalStatsSync.UPDATE_ON_RESET); mHandler.sendEmptyMessage(MSG_REPORT_RESET_STATS); } diff --git a/core/java/com/android/internal/policy/DecorView.java b/core/java/com/android/internal/policy/DecorView.java index a50282ee0aa6..40e40856b000 100644 --- a/core/java/com/android/internal/policy/DecorView.java +++ b/core/java/com/android/internal/policy/DecorView.java @@ -87,7 +87,6 @@ import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuItem; import android.view.MotionEvent; -import android.view.OnBackInvokedDispatcher; import android.view.PendingInsetsController; import android.view.ThreadedRenderer; import android.view.View; @@ -109,7 +108,6 @@ import android.view.animation.AnimationUtils; import android.view.animation.Interpolator; import android.widget.FrameLayout; import android.widget.PopupWindow; -import android.window.WindowOnBackInvokedDispatcher; import com.android.internal.R; import com.android.internal.graphics.drawable.BackgroundBlurDrawable; @@ -285,6 +283,7 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind private Insets mBackgroundInsets = Insets.NONE; private Insets mLastBackgroundInsets = Insets.NONE; private boolean mDrawLegacyNavigationBarBackground; + private boolean mDrawLegacyNavigationBarBackgroundHandled; private PendingInsetsController mPendingInsetsController = new PendingInsetsController(); @@ -296,7 +295,6 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind return true; }; private Consumer<Boolean> mCrossWindowBlurEnabledListener; - private final WindowOnBackInvokedDispatcher mOnBackInvokedDispatcher; DecorView(Context context, int featureId, PhoneWindow window, WindowManager.LayoutParams params) { @@ -325,7 +323,6 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind initResizingPaints(); mLegacyNavigationBarBackgroundPaint.setColor(Color.BLACK); - mOnBackInvokedDispatcher = new WindowOnBackInvokedDispatcher(); } void setBackgroundFallback(@Nullable Drawable fallbackDrawable) { @@ -1035,10 +1032,7 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind public void onSystemBarAppearanceChanged(@WindowInsetsController.Appearance int appearance) { updateColorViews(null /* insets */, true /* animate */); if (mWindow != null) { - final Window.Callback callback = mWindow.getCallback(); - if (callback != null) { - callback.onSystemBarAppearanceChanged(appearance); - } + mWindow.dispatchOnSystemBarAppearanceChanged(appearance); } } @@ -1174,6 +1168,9 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind mDrawLegacyNavigationBarBackground = mNavigationColorViewState.visible && (mWindow.getAttributes().flags & FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS) == 0; if (oldDrawLegacy != mDrawLegacyNavigationBarBackground) { + mDrawLegacyNavigationBarBackgroundHandled = + mWindow.onDrawLegacyNavigationBarBackgroundChanged( + mDrawLegacyNavigationBarBackground); if (viewRoot != null) { viewRoot.requestInvalidateRootRenderNode(); } @@ -1266,7 +1263,7 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind } } - if (forceConsumingNavBar) { + if (forceConsumingNavBar && !mDrawLegacyNavigationBarBackgroundHandled) { mBackgroundInsets = Insets.of(mLastLeftInset, 0, mLastRightInset, mLastBottomInset); } else { mBackgroundInsets = Insets.NONE; @@ -1879,7 +1876,6 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind } mPendingInsetsController.detach(); - mOnBackInvokedDispatcher.detachFromWindow(); } @Override @@ -1924,11 +1920,6 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind return mPendingInsetsController; } - @Override - public WindowOnBackInvokedDispatcher provideWindowOnBackInvokedDispatcher() { - return mOnBackInvokedDispatcher; - } - private ActionMode createActionMode( int type, ActionMode.Callback2 callback, View originatingView) { switch (type) { @@ -2383,7 +2374,6 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind } } } - mOnBackInvokedDispatcher.clear(); } @Override @@ -2491,7 +2481,7 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind } private void drawLegacyNavigationBarBackground(RecordingCanvas canvas) { - if (!mDrawLegacyNavigationBarBackground) { + if (!mDrawLegacyNavigationBarBackground || mDrawLegacyNavigationBarBackgroundHandled) { return; } View v = mNavigationColorViewState.view; @@ -2665,15 +2655,6 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind } } - /** - * Returns the {@link OnBackInvokedDispatcher} on the decor view. - */ - @Override - @Nullable - public OnBackInvokedDispatcher getOnBackInvokedDispatcher() { - return mOnBackInvokedDispatcher; - } - @Override public String toString() { return "DecorView@" + Integer.toHexString(this.hashCode()) + "[" diff --git a/core/java/com/android/internal/policy/PhoneWindow.java b/core/java/com/android/internal/policy/PhoneWindow.java index 7755b694af03..12f38a4d5b9a 100644 --- a/core/java/com/android/internal/policy/PhoneWindow.java +++ b/core/java/com/android/internal/policy/PhoneWindow.java @@ -91,6 +91,8 @@ import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuItem; import android.view.MotionEvent; +import android.view.OnBackInvokedDispatcher; +import android.view.OnBackInvokedDispatcherOwner; import android.view.ScrollCaptureCallback; import android.view.SearchEvent; import android.view.SurfaceHolder.Callback2; @@ -110,6 +112,7 @@ import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.ProgressBar; import android.widget.TextView; +import android.window.ProxyOnBackInvokedDispatcher; import com.android.internal.R; import com.android.internal.view.menu.ContextMenuBuilder; @@ -134,7 +137,8 @@ import java.util.List; * * @hide */ -public class PhoneWindow extends Window implements MenuBuilder.Callback { +public class PhoneWindow extends Window implements MenuBuilder.Callback, + OnBackInvokedDispatcherOwner { private final static String TAG = "PhoneWindow"; @@ -340,6 +344,9 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { boolean mDecorFitsSystemWindows = true; + private ProxyOnBackInvokedDispatcher mProxyOnBackInvokedDispatcher = + new ProxyOnBackInvokedDispatcher(); + static class WindowManagerHolder { static final IWindowManager sWindowManager = IWindowManager.Stub.asInterface( ServiceManager.getService("window")); @@ -2146,6 +2153,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { /** Notify when decor view is attached to window and {@link ViewRootImpl} is available. */ void onViewRootImplSet(ViewRootImpl viewRoot) { viewRoot.setActivityConfigCallback(mActivityConfigCallback); + mProxyOnBackInvokedDispatcher.setActualDispatcherOwner(viewRoot); applyDecorFitsSystemWindows(); } @@ -3993,4 +4001,10 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { public AttachedSurfaceControl getRootSurfaceControl() { return getViewRootImplOrNull(); } + + @NonNull + @Override + public OnBackInvokedDispatcher getOnBackInvokedDispatcher() { + return mProxyOnBackInvokedDispatcher; + } } diff --git a/core/java/com/android/internal/policy/TransitionAnimation.java b/core/java/com/android/internal/policy/TransitionAnimation.java index ece6f2f3571b..37c96e71a0a8 100644 --- a/core/java/com/android/internal/policy/TransitionAnimation.java +++ b/core/java/com/android/internal/policy/TransitionAnimation.java @@ -98,6 +98,10 @@ public class TransitionAnimation { private static final String DEFAULT_PACKAGE = "android"; + // TODO (b/215515255): remove once we full migrate to shell transitions + private static final boolean SHELL_TRANSITIONS_ENABLED = + SystemProperties.getBoolean("persist.debug.shell_transit", false); + private final Context mContext; private final String mTag; @@ -252,6 +256,9 @@ public class TransitionAnimation { resId = ent.array.getResourceId(animAttr, 0); } } + if (!SHELL_TRANSITIONS_ENABLED) { + resId = updateToLegacyIfNeeded(resId); + } resId = updateToTranslucentAnimIfNeeded(resId, transit); if (ResourceId.isValid(resId)) { return loadAnimationSafely(context, resId, mTag); @@ -259,6 +266,24 @@ public class TransitionAnimation { return null; } + /** + * Replace animations that are not compatible with the legacy transition system with ones that + * are compatible with it. + * TODO (b/215515255): remove once we full migrate to shell transitions + */ + private int updateToLegacyIfNeeded(int anim) { + if (anim == R.anim.activity_open_enter) { + return R.anim.activity_open_enter_legacy; + } else if (anim == R.anim.activity_open_exit) { + return R.anim.activity_open_exit_legacy; + } else if (anim == R.anim.activity_close_enter) { + return R.anim.activity_close_enter_legacy; + } else if (anim == R.anim.activity_close_exit) { + return R.anim.activity_close_exit_legacy; + } + return anim; + } + /** Load animation by attribute Id from a specific AnimationStyle resource. */ @Nullable public Animation loadAnimationAttr(String packageName, int animStyleResId, int animAttr, diff --git a/core/java/com/android/internal/power/MeasuredEnergyStats.java b/core/java/com/android/internal/power/MeasuredEnergyStats.java index a52ae107d983..7262e846d9b0 100644 --- a/core/java/com/android/internal/power/MeasuredEnergyStats.java +++ b/core/java/com/android/internal/power/MeasuredEnergyStats.java @@ -438,10 +438,16 @@ public class MeasuredEnergyStats { mState = state; mStateChangeTimestampMs = timestampMs; if (mAccumulatedMultiStateChargeMicroCoulomb == null) { - return; + mAccumulatedMultiStateChargeMicroCoulomb = + new LongMultiStateCounter[mAccumulatedChargeMicroCoulomb.length]; } for (int i = 0; i < mAccumulatedMultiStateChargeMicroCoulomb.length; i++) { LongMultiStateCounter counter = mAccumulatedMultiStateChargeMicroCoulomb[i]; + if (counter == null && mConfig.isSupportedMultiStateBucket(i)) { + counter = new LongMultiStateCounter(mConfig.mStateNames.length); + counter.updateValue(0, timestampMs); + mAccumulatedMultiStateChargeMicroCoulomb[i] = counter; + } if (counter != null) { counter.setState(state, timestampMs); } diff --git a/core/java/com/android/internal/statusbar/IStatusBar.aidl b/core/java/com/android/internal/statusbar/IStatusBar.aidl index 23ebc9f94915..51eb4296d7ae 100644 --- a/core/java/com/android/internal/statusbar/IStatusBar.aidl +++ b/core/java/com/android/internal/statusbar/IStatusBar.aidl @@ -24,12 +24,14 @@ import android.hardware.biometrics.IBiometricContextListener; import android.hardware.biometrics.IBiometricSysuiReceiver; import android.hardware.biometrics.PromptInfo; import android.hardware.fingerprint.IUdfpsHbmListener; +import android.media.MediaRoute2Info; import android.os.Bundle; import android.os.ParcelFileDescriptor; import android.service.notification.StatusBarNotification; import android.view.InsetsVisibilities; import com.android.internal.statusbar.IAddTileResultCallback; +import com.android.internal.statusbar.IUndoMediaTransferCallback; import com.android.internal.statusbar.StatusBarIcon; import com.android.internal.view.AppearanceRegion; @@ -296,4 +298,15 @@ oneway interface IStatusBar void requestAddTile(in ComponentName componentName, in CharSequence appName, in CharSequence label, in Icon icon, in IAddTileResultCallback callback); void cancelRequestAddTile(in String packageName); + + /** Notifies System UI about an update to the media tap-to-transfer sender state. */ + void updateMediaTapToTransferSenderDisplay( + int displayState, + in MediaRoute2Info routeInfo, + in IUndoMediaTransferCallback undoCallback); + + /** Notifies System UI about an update to the media tap-to-transfer receiver state. */ + void updateMediaTapToTransferReceiverDisplay( + int displayState, + in MediaRoute2Info routeInfo); } diff --git a/core/java/com/android/internal/statusbar/IStatusBarService.aidl b/core/java/com/android/internal/statusbar/IStatusBarService.aidl index f28325e3cc51..0c45e5b3eab4 100644 --- a/core/java/com/android/internal/statusbar/IStatusBarService.aidl +++ b/core/java/com/android/internal/statusbar/IStatusBarService.aidl @@ -24,6 +24,7 @@ import android.hardware.biometrics.IBiometricContextListener; import android.hardware.biometrics.IBiometricSysuiReceiver; import android.hardware.biometrics.PromptInfo; import android.hardware.fingerprint.IUdfpsHbmListener; +import android.media.MediaRoute2Info; import android.net.Uri; import android.os.Bundle; import android.os.UserHandle; @@ -33,6 +34,7 @@ import com.android.internal.logging.InstanceId; import com.android.internal.statusbar.IAddTileResultCallback; import com.android.internal.statusbar.ISessionListener; import com.android.internal.statusbar.IStatusBar; +import com.android.internal.statusbar.IUndoMediaTransferCallback; import com.android.internal.statusbar.RegisterStatusBarResult; import com.android.internal.statusbar.StatusBarIcon; import com.android.internal.statusbar.StatusBarIconList; @@ -196,4 +198,15 @@ interface IStatusBarService */ void onSessionStarted(int sessionType, in InstanceId instanceId); void onSessionEnded(int sessionType, in InstanceId instanceId); + + /** Notifies System UI about an update to the media tap-to-transfer sender state. */ + void updateMediaTapToTransferSenderDisplay( + int displayState, + in MediaRoute2Info routeInfo, + in IUndoMediaTransferCallback undoCallback); + + /** Notifies System UI about an update to the media tap-to-transfer receiver state. */ + void updateMediaTapToTransferReceiverDisplay( + int displayState, + in MediaRoute2Info routeInfo); } diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/mediattt/IUndoTransferCallback.aidl b/core/java/com/android/internal/statusbar/IUndoMediaTransferCallback.aidl index b47be8736d23..3dd29807be01 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/mediattt/IUndoTransferCallback.aidl +++ b/core/java/com/android/internal/statusbar/IUndoMediaTransferCallback.aidl @@ -14,17 +14,16 @@ * limitations under the License. */ -package com.android.systemui.shared.mediattt; +package com.android.internal.statusbar; /** - * An interface that will be invoked by System UI if the user choose to undo a transfer. - * - * Other services will implement this interface and System UI will invoke it. + * An interface that will be invoked if the user chooses to undo a transfer. */ -interface IUndoTransferCallback { +interface IUndoMediaTransferCallback { /** - * Invoked by SystemUI when the user requests to undo the media transfer that just occurred. + * Invoked to notify callers that the user has chosen to undo the media transfer that just + * occurred. * * Implementors of this method are repsonsible for actually undoing the transfer. */ diff --git a/core/java/com/android/internal/view/RootViewSurfaceTaker.java b/core/java/com/android/internal/view/RootViewSurfaceTaker.java index 4b89bf5082ba..3ab9a335c8b7 100644 --- a/core/java/com/android/internal/view/RootViewSurfaceTaker.java +++ b/core/java/com/android/internal/view/RootViewSurfaceTaker.java @@ -15,12 +15,10 @@ */ package com.android.internal.view; -import android.annotation.NonNull; import android.annotation.Nullable; import android.view.InputQueue; import android.view.PendingInsetsController; import android.view.SurfaceHolder; -import android.window.WindowOnBackInvokedDispatcher; /** hahahah */ public interface RootViewSurfaceTaker { @@ -31,6 +29,4 @@ public interface RootViewSurfaceTaker { InputQueue.Callback willYouTakeTheInputQueue(); void onRootViewScrollYChanged(int scrollY); @Nullable PendingInsetsController providePendingInsetsController(); - /** @hide */ - @NonNull WindowOnBackInvokedDispatcher provideWindowOnBackInvokedDispatcher(); } diff --git a/core/java/com/android/server/SystemConfig.java b/core/java/com/android/server/SystemConfig.java index 39f17e510a1c..93864fa2e05d 100644 --- a/core/java/com/android/server/SystemConfig.java +++ b/core/java/com/android/server/SystemConfig.java @@ -237,6 +237,10 @@ public class SystemConfig { // be delivered anonymously even to apps which target O+. final ArraySet<String> mAllowImplicitBroadcasts = new ArraySet<>(); + // These are the packages that are exempted from the background restriction applied + // by the system automatically, i.e., due to high background current drain. + final ArraySet<String> mBgRestrictionExemption = new ArraySet<>(); + // These are the package names of apps which should be automatically granted domain verification // for all of their domains. The only way these apps can be overridden by the user is by // explicitly disabling overall link handling support in app info. @@ -389,6 +393,10 @@ public class SystemConfig { return mAllowIgnoreLocationSettings; } + public ArraySet<String> getBgRestrictionExemption() { + return mBgRestrictionExemption; + } + public ArraySet<String> getLinkedApps() { return mLinkedApps; } @@ -1049,6 +1057,20 @@ public class SystemConfig { } XmlUtils.skipCurrentTag(parser); } break; + case "bg-restriction-exemption": { + if (allowOverrideAppRestrictions) { + String pkgname = parser.getAttributeValue(null, "package"); + if (pkgname == null) { + Slog.w(TAG, "<" + name + "> without package in " + + permFile + " at " + parser.getPositionDescription()); + } else { + mBgRestrictionExemption.add(pkgname); + } + } else { + logNotAllowedInPartition(name, permFile, parser); + } + XmlUtils.skipCurrentTag(parser); + } break; case "default-enabled-vr-app": { if (allowAppConfigs) { String pkgname = parser.getAttributeValue(null, "package"); diff --git a/core/jni/android_view_SurfaceControl.cpp b/core/jni/android_view_SurfaceControl.cpp index a8cf2536341b..991591369bcb 100644 --- a/core/jni/android_view_SurfaceControl.cpp +++ b/core/jni/android_view_SurfaceControl.cpp @@ -104,6 +104,7 @@ static struct { jfieldID hdrCapabilities; jfieldID autoLowLatencyModeSupported; jfieldID gameContentTypeSupported; + jfieldID preferredBootDisplayMode; } gDynamicDisplayInfoClassInfo; static struct { @@ -1301,6 +1302,9 @@ static jobject nativeGetDynamicDisplayInfo(JNIEnv* env, jclass clazz, jobject to env->SetBooleanField(object, gDynamicDisplayInfoClassInfo.gameContentTypeSupported, info.gameContentTypeSupported); + + env->SetIntField(object, gDynamicDisplayInfoClassInfo.preferredBootDisplayMode, + info.preferredBootDisplayMode); return object; } @@ -1638,6 +1642,27 @@ static void nativeOverrideHdrTypes(JNIEnv* env, jclass clazz, jobject tokenObjec } } +static jboolean nativeGetBootDisplayModeSupport(JNIEnv* env, jclass clazz) { + bool isBootDisplayModeSupported = false; + SurfaceComposerClient::getBootDisplayModeSupport(&isBootDisplayModeSupported); + return static_cast<jboolean>(isBootDisplayModeSupported); +} + +static void nativeSetBootDisplayMode(JNIEnv* env, jclass clazz, jobject tokenObject, + jint displayModId) { + sp<IBinder> token(ibinderForJavaObject(env, tokenObject)); + if (token == NULL) return; + + SurfaceComposerClient::setBootDisplayMode(token, displayModId); +} + +static void nativeClearBootDisplayMode(JNIEnv* env, jclass clazz, jobject tokenObject) { + sp<IBinder> token(ibinderForJavaObject(env, tokenObject)); + if (token == NULL) return; + + SurfaceComposerClient::clearBootDisplayMode(token); +} + static void nativeSetAutoLowLatencyMode(JNIEnv* env, jclass clazz, jobject tokenObject, jboolean on) { sp<IBinder> token(ibinderForJavaObject(env, tokenObject)); if (token == NULL) return; @@ -2046,6 +2071,12 @@ static const JNINativeMethod sSurfaceControlMethods[] = { (void*)nativeGetDisplayNativePrimaries }, {"nativeSetActiveColorMode", "(Landroid/os/IBinder;I)Z", (void*)nativeSetActiveColorMode}, + {"nativeGetBootDisplayModeSupport", "()Z", + (void*)nativeGetBootDisplayModeSupport }, + {"nativeSetBootDisplayMode", "(Landroid/os/IBinder;I)V", + (void*)nativeSetBootDisplayMode }, + {"nativeClearBootDisplayMode", "(Landroid/os/IBinder;)V", + (void*)nativeClearBootDisplayMode }, {"nativeSetAutoLowLatencyMode", "(Landroid/os/IBinder;Z)V", (void*)nativeSetAutoLowLatencyMode }, {"nativeSetGameContentType", "(Landroid/os/IBinder;Z)V", @@ -2184,6 +2215,8 @@ int register_android_view_SurfaceControl(JNIEnv* env) GetFieldIDOrDie(env, dynamicInfoClazz, "autoLowLatencyModeSupported", "Z"); gDynamicDisplayInfoClassInfo.gameContentTypeSupported = GetFieldIDOrDie(env, dynamicInfoClazz, "gameContentTypeSupported", "Z"); + gDynamicDisplayInfoClassInfo.preferredBootDisplayMode = + GetFieldIDOrDie(env, dynamicInfoClazz, "preferredBootDisplayMode", "I"); jclass modeClazz = FindClassOrDie(env, "android/view/SurfaceControl$DisplayMode"); gDisplayModeClassInfo.clazz = MakeGlobalRefOrDie(env, modeClazz); diff --git a/core/proto/android/server/Android.bp b/core/proto/android/server/Android.bp new file mode 100644 index 000000000000..362daa73ff14 --- /dev/null +++ b/core/proto/android/server/Android.bp @@ -0,0 +1,28 @@ +// +// Copyright (C) 2021 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +package { + default_applicable_licenses: ["Android-Apache-2.0"], +} + +filegroup { + name: "srcs_bluetooth_manager_service_proto", + srcs: [ + "bluetooth_manager_service.proto", + ], + visibility: ["//packages/modules/Bluetooth:__subpackages__"], +} + diff --git a/core/proto/android/server/powermanagerservice.proto b/core/proto/android/server/powermanagerservice.proto index d48ea3b8785c..04f4d7b09d82 100644 --- a/core/proto/android/server/powermanagerservice.proto +++ b/core/proto/android/server/powermanagerservice.proto @@ -452,16 +452,16 @@ message LowPowerStandbyControllerDumpProto { optional bool is_interactive = 5; // Time (in elapsedRealtime) when the device was last interactive - optional bool last_interactive_time = 6; + optional int64 last_interactive_time = 6; - // Time (in milliseconds) after becoming non-interactive that Low Power Standby can activate + // Timeout (in milliseconds) after becoming non-interactive that Low Power Standby can activate optional int32 standby_timeout_config = 7; // True if the device has entered idle mode since becoming non-interactive - optional int32 idle_since_non_interactive = 8; + optional bool idle_since_non_interactive = 8; // True if the device is currently in idle mode - optional int32 is_device_idle = 9; + optional bool is_device_idle = 9; // Set of app ids that are exempt form low power standby repeated int32 allowlist = 10; diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 1c09fc8388eb..c9d7bfdaaa2e 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -2027,6 +2027,11 @@ <permission android:name="android.permission.CONTROL_OEM_PAID_NETWORK_PREFERENCE" android:protectionLevel="signature" /> + <!-- @SystemApi @hide Allows an application to manage ethernet networks. + <p>Not for use by third-party or privileged applications. --> + <permission android:name="android.permission.MANAGE_ETHERNET_NETWORKS" + android:protectionLevel="signature" /> + <!-- ======================================= --> <!-- Permissions for short range, peripheral networks --> <!-- ======================================= --> @@ -4125,6 +4130,16 @@ <permission android:name="android.permission.BIND_CONTENT_SUGGESTIONS_SERVICE" android:protectionLevel="signature" /> + <!-- Must be required by a + android.service.wallpapereffectsgeneration.WallpaperEffectsGenerationService, + to ensure that only the system can bind to it. + @SystemApi @hide This is not a third-party API (intended for OEMs and system apps). + <p>Protection level: signature + --> + <permission android:name="android.permission.BIND_WALLPAPER_EFFECTS_GENERATION_SERVICE" + android:protectionLevel="signature" /> + + <!-- Must be declared by a android.service.musicrecognition.MusicRecognitionService, to ensure that only the system can bind to it. @SystemApi @hide This is not a third-party API (intended for OEMs and system apps). @@ -4627,6 +4642,13 @@ <permission android:name="android.permission.READ_FRAME_BUFFER" android:protectionLevel="signature|recents" /> + <!-- @SystemApi Allows an application to change the touch mode state. + Without this permission, an app can only change the touch mode + if it currently has focus. + @hide --> + <permission android:name="android.permission.MODIFY_TOUCH_MODE_STATE" + android:protectionLevel="signature" /> + <!-- Allows an application to use InputFlinger's low level features. @hide --> <permission android:name="android.permission.ACCESS_INPUT_FLINGER" @@ -5371,7 +5393,7 @@ android:protectionLevel="signature|setup|role" /> <!-- Allows access to keyguard secure storage. Only allowed for system processes. - @hide @TestApi --> + @hide --> <permission android:name="android.permission.ACCESS_KEYGUARD_SECURE_STORAGE" android:protectionLevel="signature|setup" /> @@ -5817,6 +5839,13 @@ <permission android:name="android.permission.MANAGE_SMARTSPACE" android:protectionLevel="signature" /> + <!-- @SystemApi Allows an application to manage the wallpaper effects + generation service. + @hide <p>Not for use by third-party applications.</p> --> + <permission android:name="android.permission.MANAGE_WALLPAPER_EFFECTS_GENERATION" + android:protectionLevel="signature" /> + + <!-- Allows an app to set the theme overlay in /vendor/overlay being used. @hide <p>Not for use by third-party applications.</p> --> @@ -5916,6 +5945,10 @@ <p>Not for use by third-party applications. --> <permission android:name="android.permission.READ_CLIPBOARD_IN_BACKGROUND" android:protectionLevel="signature" /> + <!-- @hide Permission that suppresses the notification when the clipboard is accessed. + <p>Not for use by third-party applications. --> + <permission android:name="android.permission.SUPPRESS_CLIPBOARD_ACCESS_NOTIFICATION" + android:protectionLevel="signature" /> <!-- @SystemApi Allows modifying accessibility state. @hide --> @@ -6512,6 +6545,14 @@ android:exported="false"> </activity> + <activity android:name="com.android.server.logcat.LogAccessConfirmationActivity" + android:theme="@style/Theme.Dialog.Confirmation" + android:excludeFromRecents="true" + android:process=":ui" + android:label="@string/log_access_confirmation_title" + android:exported="false"> + </activity> + <activity android:name="com.android.server.notification.NASLearnMoreActivity" android:theme="@style/Theme.Dialog.Confirmation" android:excludeFromRecents="true" diff --git a/core/res/res/anim/activity_close_enter.xml b/core/res/res/anim/activity_close_enter.xml index 9fa7c5498ea6..0fefb5113dfc 100644 --- a/core/res/res/anim/activity_close_enter.xml +++ b/core/res/res/anim/activity_close_enter.xml @@ -19,16 +19,37 @@ <set xmlns:android="http://schemas.android.com/apk/res/android" android:shareInterpolator="false"> - <scale - android:fromXScale="1.1" - android:toXScale="1" - android:fromYScale="1.1" - android:toYScale="1" - android:pivotX="50%" - android:pivotY="50%" + + <alpha + android:fromAlpha="1.0" + android:toAlpha="1.0" android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true" + android:interpolator="@interpolator/linear" + android:startOffset="0" + android:duration="450" /> + + <translate + android:fromXDelta="-10%" + android:toXDelta="0" + android:fillEnabled="true" + android:fillBefore="true" + android:fillAfter="true" + android:interpolator="@interpolator/fast_out_extra_slow_in" + android:startOffset="0" + android:duration="450" /> + + <extend + android:fromExtendLeft="0" + android:fromExtendTop="0" + android:fromExtendRight="10%" + android:fromExtendBottom="0" + android:toExtendLeft="0" + android:toExtendTop="0" + android:toExtendRight="10%" + android:toExtendBottom="0" android:interpolator="@interpolator/fast_out_extra_slow_in" - android:duration="400"/> + android:startOffset="0" + android:duration="450" /> </set>
\ No newline at end of file diff --git a/core/res/res/anim/activity_close_enter_legacy.xml b/core/res/res/anim/activity_close_enter_legacy.xml new file mode 100644 index 000000000000..9fa7c5498ea6 --- /dev/null +++ b/core/res/res/anim/activity_close_enter_legacy.xml @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** Copyright 2009, The Android Open 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. +*/ +--> + +<set xmlns:android="http://schemas.android.com/apk/res/android" + android:shareInterpolator="false"> + <scale + android:fromXScale="1.1" + android:toXScale="1" + android:fromYScale="1.1" + android:toYScale="1" + android:pivotX="50%" + android:pivotY="50%" + android:fillEnabled="true" + android:fillBefore="true" + android:fillAfter="true" + android:interpolator="@interpolator/fast_out_extra_slow_in" + android:duration="400"/> +</set>
\ No newline at end of file diff --git a/core/res/res/anim/activity_close_exit.xml b/core/res/res/anim/activity_close_exit.xml index 1599ae8cb19f..f807c26dda20 100644 --- a/core/res/res/anim/activity_close_exit.xml +++ b/core/res/res/anim/activity_close_exit.xml @@ -18,27 +18,38 @@ --> <set xmlns:android="http://schemas.android.com/apk/res/android" - android:shareInterpolator="false" - android:zAdjustment="top"> + android:shareInterpolator="false"> + <alpha - android:fromAlpha="1" + android:fromAlpha="1.0" android:toAlpha="0.0" android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true" android:interpolator="@interpolator/linear" - android:startOffset="33" - android:duration="50"/> - <scale - android:fromXScale="1" - android:toXScale="0.9" - android:fromYScale="1" - android:toYScale="0.9" - android:pivotX="50%" - android:pivotY="50%" + android:startOffset="35" + android:duration="83" /> + + <translate + android:fromXDelta="0" + android:toXDelta="10%" android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true" android:interpolator="@interpolator/fast_out_extra_slow_in" - android:duration="400"/> + android:startOffset="0" + android:duration="450" /> + + <extend + android:fromExtendLeft="10%" + android:fromExtendTop="0" + android:fromExtendRight="0" + android:fromExtendBottom="0" + android:toExtendLeft="10%" + android:toExtendTop="0" + android:toExtendRight="0" + android:toExtendBottom="0" + android:interpolator="@interpolator/fast_out_extra_slow_in" + android:startOffset="0" + android:duration="450" /> </set> diff --git a/core/res/res/anim/activity_close_exit_legacy.xml b/core/res/res/anim/activity_close_exit_legacy.xml new file mode 100644 index 000000000000..1599ae8cb19f --- /dev/null +++ b/core/res/res/anim/activity_close_exit_legacy.xml @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** Copyright 2009, The Android Open 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. +*/ +--> + +<set xmlns:android="http://schemas.android.com/apk/res/android" + android:shareInterpolator="false" + android:zAdjustment="top"> + <alpha + android:fromAlpha="1" + android:toAlpha="0.0" + android:fillEnabled="true" + android:fillBefore="true" + android:fillAfter="true" + android:interpolator="@interpolator/linear" + android:startOffset="33" + android:duration="50"/> + <scale + android:fromXScale="1" + android:toXScale="0.9" + android:fromYScale="1" + android:toYScale="0.9" + android:pivotX="50%" + android:pivotY="50%" + android:fillEnabled="true" + android:fillBefore="true" + android:fillAfter="true" + android:interpolator="@interpolator/fast_out_extra_slow_in" + android:duration="400"/> +</set> diff --git a/core/res/res/anim/activity_open_enter.xml b/core/res/res/anim/activity_open_enter.xml index 38d3e8ed06ce..1674dab3040a 100644 --- a/core/res/res/anim/activity_open_enter.xml +++ b/core/res/res/anim/activity_open_enter.xml @@ -18,6 +18,7 @@ <set xmlns:android="http://schemas.android.com/apk/res/android" android:shareInterpolator="false"> + <alpha android:fromAlpha="0" android:toAlpha="1.0" @@ -26,17 +27,27 @@ android:fillAfter="true" android:interpolator="@interpolator/linear" android:startOffset="50" - android:duration="50"/> - <scale - android:fromXScale="0.85" - android:toXScale="1" - android:fromYScale="0.85" - android:toYScale="1" - android:pivotX="50%" - android:pivotY="50%" + android:duration="83" /> + + <translate + android:fromXDelta="10%" + android:toXDelta="0" android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true" android:interpolator="@interpolator/fast_out_extra_slow_in" - android:duration="400"/> + android:duration="450" /> + + <extend + android:fromExtendLeft="10%" + android:fromExtendTop="0" + android:fromExtendRight="0" + android:fromExtendBottom="0" + android:toExtendLeft="10%" + android:toExtendTop="0" + android:toExtendRight="0" + android:toExtendBottom="0" + android:interpolator="@interpolator/fast_out_extra_slow_in" + android:startOffset="0" + android:duration="450" /> </set> diff --git a/core/res/res/anim/activity_open_enter_legacy.xml b/core/res/res/anim/activity_open_enter_legacy.xml new file mode 100644 index 000000000000..38d3e8ed06ce --- /dev/null +++ b/core/res/res/anim/activity_open_enter_legacy.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="utf-8"?><!-- +/* +** Copyright 2009, The Android Open 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. +*/ +--> + +<set xmlns:android="http://schemas.android.com/apk/res/android" + android:shareInterpolator="false"> + <alpha + android:fromAlpha="0" + android:toAlpha="1.0" + android:fillEnabled="true" + android:fillBefore="true" + android:fillAfter="true" + android:interpolator="@interpolator/linear" + android:startOffset="50" + android:duration="50"/> + <scale + android:fromXScale="0.85" + android:toXScale="1" + android:fromYScale="0.85" + android:toYScale="1" + android:pivotX="50%" + android:pivotY="50%" + android:fillEnabled="true" + android:fillBefore="true" + android:fillAfter="true" + android:interpolator="@interpolator/fast_out_extra_slow_in" + android:duration="400"/> +</set> diff --git a/core/res/res/anim/activity_open_exit.xml b/core/res/res/anim/activity_open_exit.xml index 3865d2149f42..372f2c8e09f6 100644 --- a/core/res/res/anim/activity_open_exit.xml +++ b/core/res/res/anim/activity_open_exit.xml @@ -19,27 +19,36 @@ <set xmlns:android="http://schemas.android.com/apk/res/android" android:shareInterpolator="false"> - <!-- Fade out, over a black surface, which simulates a black scrim --> <alpha - android:fromAlpha="1" - android:toAlpha="0.4" + android:fromAlpha="1.0" + android:toAlpha="1.0" android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true" - android:interpolator="@interpolator/linear" - android:startOffset="83" - android:duration="167"/> + android:interpolator="@interpolator/standard_accelerate" + android:startOffset="0" + android:duration="450" /> - <scale - android:fromXScale="1" - android:toXScale="1.05" - android:fromYScale="1" - android:toYScale="1.05" - android:pivotX="50%" - android:pivotY="50%" + <translate + android:fromXDelta="0" + android:toXDelta="-10%" android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true" android:interpolator="@interpolator/fast_out_extra_slow_in" - android:duration="400"/> + android:startOffset="0" + android:duration="450" /> + + <extend + android:fromExtendLeft="0" + android:fromExtendTop="0" + android:fromExtendRight="10%" + android:fromExtendBottom="0" + android:toExtendLeft="0" + android:toExtendTop="0" + android:toExtendRight="10%" + android:toExtendBottom="0" + android:interpolator="@interpolator/fast_out_extra_slow_in" + android:startOffset="0" + android:duration="450" /> </set>
\ No newline at end of file diff --git a/core/res/res/anim/activity_open_exit_legacy.xml b/core/res/res/anim/activity_open_exit_legacy.xml new file mode 100644 index 000000000000..3865d2149f42 --- /dev/null +++ b/core/res/res/anim/activity_open_exit_legacy.xml @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="utf-8"?><!-- +/* +** Copyright 2009, The Android Open 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. +*/ +--> + +<set xmlns:android="http://schemas.android.com/apk/res/android" + android:shareInterpolator="false"> + + <!-- Fade out, over a black surface, which simulates a black scrim --> + <alpha + android:fromAlpha="1" + android:toAlpha="0.4" + android:fillEnabled="true" + android:fillBefore="true" + android:fillAfter="true" + android:interpolator="@interpolator/linear" + android:startOffset="83" + android:duration="167"/> + + <scale + android:fromXScale="1" + android:toXScale="1.05" + android:fromYScale="1" + android:toYScale="1.05" + android:pivotX="50%" + android:pivotY="50%" + android:fillEnabled="true" + android:fillBefore="true" + android:fillAfter="true" + android:interpolator="@interpolator/fast_out_extra_slow_in" + android:duration="400"/> +</set>
\ No newline at end of file diff --git a/core/res/res/layout/miniresolver.xml b/core/res/res/layout/miniresolver.xml new file mode 100644 index 000000000000..44ed6f2a0676 --- /dev/null +++ b/core/res/res/layout/miniresolver.xml @@ -0,0 +1,111 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2022 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> +<com.android.internal.widget.ResolverDrawerLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:maxWidth="@dimen/resolver_max_width" + android:maxCollapsedHeight="@dimen/resolver_max_collapsed_height" + android:maxCollapsedHeightSmall="56dp" + android:id="@id/contentPanel"> + + <RelativeLayout + android:id="@+id/title_container" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_alwaysShow="true" + android:elevation="@dimen/resolver_elevation" + android:paddingTop="@dimen/resolver_small_margin" + android:paddingStart="@dimen/resolver_edge_margin" + android:paddingEnd="@dimen/resolver_edge_margin" + android:paddingBottom="@dimen/resolver_title_padding_bottom" + android:background="@drawable/bottomsheet_background"> + + <ImageView + android:id="@+id/icon" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentTop="true" + android:layout_centerHorizontal="true" + /> + + <TextView + android:id="@+id/open_cross_profile" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@id/icon" + android:layout_centerHorizontal="true" + android:textColor="?android:textColorPrimary" + /> + </RelativeLayout> + + <LinearLayout + android:id="@+id/button_bar_container" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_alwaysShow="true" + android:orientation="vertical" + android:background="?attr/colorBackground" + android:layout_ignoreOffset="true"> + <View + android:id="@+id/resolver_button_bar_divider" + android:layout_width="match_parent" + android:layout_height="1dp" + android:background="?attr/colorBackground" + android:foreground="?attr/dividerVertical" /> + <RelativeLayout + style="?attr/buttonBarStyle" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_ignoreOffset="true" + android:layout_hasNestedScrollIndicator="true" + android:gravity="end|center_vertical" + android:orientation="horizontal" + android:layoutDirection="locale" + android:measureWithLargestChild="true" + android:paddingTop="@dimen/resolver_button_bar_spacing" + android:paddingBottom="@dimen/resolver_button_bar_spacing" + android:paddingStart="@dimen/resolver_edge_margin" + android:paddingEnd="@dimen/resolver_small_margin" + android:elevation="@dimen/resolver_elevation"> + + <Button + android:id="@+id/use_same_profile_browser" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentStart="true" + android:maxLines="2" + style="@android:style/Widget.DeviceDefault.Button.Borderless" + android:fontFamily="@android:string/config_headlineFontFamilyMedium" + android:textAllCaps="false" + android:text="@string/activity_resolver_use_once" + /> + + <Button + android:id="@+id/button_open" + android:layout_width="wrap_content" + android:layout_alignParentEnd="true" + android:maxLines="2" + style="@android:style/Widget.DeviceDefault.Button.Colored" + android:fontFamily="@android:string/config_headlineFontFamilyMedium" + android:textAllCaps="false" + android:layout_height="wrap_content" + android:text="@string/whichViewApplicationLabel" + /> + </RelativeLayout> + </LinearLayout> +</com.android.internal.widget.ResolverDrawerLayout> diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 7916ef43da50..afe0f1bf0001 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -2885,7 +2885,7 @@ <code>public void sayHello(View v)</code> method of your context (typically, your Activity). {@deprecated View actually traverses the Context - hierarchy looking for the relevant method, which is fragile (an intermediate + hierarchy looking for the relevant method, which is fragile (an intermediate ContextWrapper adding a same-named method would change behavior) and restricts bytecode optimizers such as R8. Instead, use View.setOnClickListener.}--> <attr name="onClick" format="string" /> @@ -6975,6 +6975,34 @@ <attr name="toBottom" format="fraction" /> </declare-styleable> + <!-- Defines the ExtendAnimation used to extend windows during animations --> + <declare-styleable name="ExtendAnimation"> + <!-- Defines the amount a window should be extended outward from the left at + the start of the animation. --> + <attr name="fromExtendLeft" format="float|fraction" /> + <!-- Defines the amount a window should be extended outward from the top at + the start of the animation. --> + <attr name="fromExtendTop" format="float|fraction" /> + <!-- Defines the amount a window should be extended outward from the right at + the start of the animation. --> + <attr name="fromExtendRight" format="float|fraction" /> + <!-- Defines the amount a window should be extended outward from the bottom at + the start of the animation. --> + <attr name="fromExtendBottom" format="float|fraction" /> + <!-- Defines the amount a window should be extended outward from the left by + the end of the animation by transitioning from the fromExtendLeft amount. --> + <attr name="toExtendLeft" format="float|fraction" /> + <!-- Defines the amount a window should be extended outward from the top by + the end of the animation by transitioning from the fromExtendTop amount. --> + <attr name="toExtendTop" format="float|fraction" /> + <!-- Defines the amount a window should be extended outward from the right by + the end of the animation by transitioning from the fromExtendRight amount. --> + <attr name="toExtendRight" format="float|fraction" /> + <!-- Defines the amount a window should be extended outward from the bottom by + the end of the animation by transitioning from the fromExtendBottom amount. --> + <attr name="toExtendBottom" format="float|fraction" /> + </declare-styleable> + <declare-styleable name="LayoutAnimation"> <!-- Fraction of the animation duration used to delay the beginning of the animation of each child. --> @@ -7827,7 +7855,7 @@ <!-- Name of a method on the Context used to inflate the menu that will be called when the item is clicked. - {@deprecated Menu actually traverses the Context hierarchy looking for the + {@deprecated Menu actually traverses the Context hierarchy looking for the relevant method, which is fragile (an intermediate ContextWrapper adding a same-named method would change behavior) and restricts bytecode optimizers such as R8. Instead, use MenuItem.setOnMenuItemClickListener.} --> @@ -8847,6 +8875,22 @@ <attr name="gameSessionService" format="string" /> </declare-styleable> + <!-- Use <code>game-mode-config</code> as the root tag of the XML resource that + describes a GameModeConfig. + Described here are the attributes that can be included in that tag. --> + <declare-styleable name="GameModeConfig"> + <!-- Set true to opt in BATTERY mode. --> + <attr name="supportsBatteryGameMode" format="boolean" /> + <!-- Set true to opt in PERFORMANCE mode. --> + <attr name="supportsPerformanceGameMode" format="boolean" /> + <!-- Set true to enable ANGLE. --> + <attr name="allowGameAngleDriver" format="boolean" /> + <!-- Set true to allow resolution downscaling intervention. --> + <attr name="allowGameDownscaling" format="boolean" /> + <!-- Set true to allow FPS override intervention. --> + <attr name="allowGameFpsOverride" format="boolean" /> + </declare-styleable> + <!-- Use <code>voice-enrollment-application</code> as the root tag of the XML resource that escribes the supported keyphrases (hotwords) by the enrollment application. diff --git a/core/res/res/values/attrs_manifest.xml b/core/res/res/values/attrs_manifest.xml index 3a2fb6e70ba8..cb40e86f1535 100644 --- a/core/res/res/values/attrs_manifest.xml +++ b/core/res/res/values/attrs_manifest.xml @@ -2839,6 +2839,14 @@ <attr name="path" /> <attr name="minSdkVersion" /> <attr name="maxSdkVersion" /> + <!-- The order in which the apex system services are initiated. When there are dependencies + among apex system services, setting this attribute for each of them ensures that they are + created in the order required by those dependencies. The apex-system-services that are + started manually within SystemServer ignore the initOrder and are not considered for + automatic starting of the other services. + The value is a simple integer, with higher number being initialized first. If not specified, + the default order is 0. --> + <attr name="initOrder" format="integer" /> </declare-styleable> <!-- The <code>receiver</code> tag declares an diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 7e14dc9b3336..53cf4639f11b 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -2376,6 +2376,12 @@ <!-- ComponentNames of the dreams that we should hide --> <string-array name="config_disabledDreamComponents" translatable="false"> </string-array> + <!-- The list of supported dream complications --> + <integer-array name="config_supportedDreamComplications"> + </integer-array> + <!-- The list of dream complications which should be enabled by default --> + <integer-array name="config_dreamComplicationsEnabledByDefault"> + </integer-array> <!-- Are we allowed to dream while not plugged in? --> <bool name="config_dreamsEnabledOnBattery">false</bool> @@ -2891,6 +2897,11 @@ <string name="config_sensorUseStartedActivity" translatable="false" >com.android.systemui/com.android.systemui.sensorprivacy.SensorUseStartedActivity</string> + <!-- Component name of the activity used to ask a user to confirm system language change after + receiving <Set Menu Language> CEC message. --> + <string name="config_hdmiCecSetMenuLanguageActivity" + >com.android.systemui/com.android.systemui.hdmi.HdmiCecSetMenuLanguageActivity</string> + <!-- Name of the dialog that is used to request the user's consent for a Platform VPN --> <string name="config_platformVpnConfirmDialogComponent" translatable="false" >com.android.vpndialogs/com.android.vpndialogs.PlatformVpnConfirmDialog</string> @@ -4168,6 +4179,15 @@ <string name="config_defaultMusicRecognitionService" translatable="false"></string> + <!-- The package name for the system's wallpaper effects generation service. + This service returns wallpaper effects results. + This service must be trusted, as it can be activated without explicit consent of the user. + If no service with the specified name exists on the device, wallpaper effects + generation service will be disabled. + Example: "com.android.intelligence/.WallpaperEffectsGenerationService" +--> + <string name="config_defaultWallpaperEffectsGenerationService" translatable="false"></string> + <!-- The package name for the default retail demo app. This package must be trusted, as it has the permissions to query the usage stats on the device. @@ -5262,6 +5282,12 @@ <bool name="config_cecTvSendStandbyOnSleepDisabled_allowed">true</bool> <bool name="config_cecTvSendStandbyOnSleepDisabled_default">false</bool> + <bool name="config_cecSetMenuLanguage_userConfigurable">true</bool> + <bool name="config_cecSetMenuLanguageEnabled_allowed">true</bool> + <bool name="config_cecSetMenuLanguageEnabled_default">true</bool> + <bool name="config_cecSetMenuLanguageDisabled_allowed">true</bool> + <bool name="config_cecSetMenuLanguageDisabled_default">false</bool> + <bool name="config_cecRcProfileTv_userConfigurable">true</bool> <bool name="config_cecRcProfileTvNone_allowed">true</bool> <bool name="config_cecRcProfileTvNone_default">true</bool> @@ -5648,4 +5674,13 @@ <!-- The amount of time after becoming non-interactive (in ms) after which Low Power Standby can activate. --> <integer name="config_lowPowerStandbyNonInteractiveTimeout">5000</integer> + + + <!-- Mapping to select an Intent.EXTRA_DOCK_STATE value from extcon state + key-value pairs. Each entry is evaluated in order and is of the form: + "[EXTRA_DOCK_STATE value],key1=value1,key2=value2[,...]" + An entry with no key-value pairs is valid and can be used as a wildcard. + --> + <string-array name="config_dockExtconStateMapping"> + </string-array> </resources> diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 2e96c65ef17f..d57f5ba8179b 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -3255,11 +3255,24 @@ <public name="showClockAndComplications" /> <!-- @hide @SystemApi --> <public name="gameSessionService" /> + <public name="supportsBatteryGameMode" /> + <public name="supportsPerformanceGameMode" /> + <public name="allowGameAngleDriver" /> + <public name="allowGameDownscaling" /> + <public name="allowGameFpsOverride" /> <public name="localeConfig" /> <public name="showBackground" /> <public name="inheritKeyStoreKeys" /> <public name="preferKeepClear" /> <public name="autoHandwritingEnabled" /> + <public name="fromExtendLeft" /> + <public name="fromExtendTop" /> + <public name="fromExtendRight" /> + <public name="fromExtendBottom" /> + <public name="toExtendLeft" /> + <public name="toExtendTop" /> + <public name="toExtendRight" /> + <public name="toExtendBottom" /> </staging-public-group> <staging-public-group type="id" first-id="0x01de0000"> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 610c6a69822c..0dbd4175b716 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -5689,6 +5689,20 @@ <!-- Title for the harmful app warning dialog. [CHAR LIMIT=40] --> <string name="harmful_app_warning_title">Harmful app detected</string> + <!-- Title for the log access confirmation dialog. [CHAR LIMIT=40] --> + <string name="log_access_confirmation_title">System log access request</string> + <!-- Label for the allow button on the log access confirmation dialog. [CHAR LIMIT=20] --> + <string name="log_access_confirmation_allow">Only this time</string> + <!-- Label for the deny button on the log access confirmation dialog. [CHAR LIMIT=20] --> + <string name="log_access_confirmation_deny">Don\u2019t allow</string> + + <!-- Content for the log access confirmation dialog. [CHAR LIMIT=NONE]--> + <string name="log_access_confirmation_body"><xliff:g id="log_access_app_name" example="Example App">%s</xliff:g> requests system logs for functional debugging. + These logs might contain information that apps and services on your device have written.</string> + + <!-- Privacy notice do not show [CHAR LIMIT=20] --> + <string name="log_access_do_not_show_again">Don\u2019t show again</string> + <!-- Text describing a permission request for one app to show another app's slices [CHAR LIMIT=NONE] --> <string name="slices_permission_request"><xliff:g id="app" example="Example App">%1$s</xliff:g> wants to show <xliff:g id="app_2" example="Other Example App">%2$s</xliff:g> slices</string> @@ -5857,6 +5871,8 @@ <string name="accessibility_system_action_lock_screen_label">Lock Screen</string> <!-- Label for taking screenshot action [CHAR LIMIT=NONE] --> <string name="accessibility_system_action_screenshot_label">Screenshot</string> + <!-- Label for headset hook action [CHAR LIMIT=NONE] --> + <string name="accessibility_system_action_headset_hook_label">Headset Hook</string> <!-- Label for triggering on-screen accessibility shortcut action [CHAR LIMIT=NONE] --> <string name="accessibility_system_action_on_screen_a11y_shortcut_label">On-screen Accessibility Shortcut</string> <!-- Label for showing on-screen accessibility shortcut chooser action [CHAR LIMIT=NONE] --> @@ -5865,6 +5881,16 @@ <string name="accessibility_system_action_hardware_a11y_shortcut_label">Accessibility Shortcut</string> <!-- Label for dismissing the notification shade [CHAR LIMIT=NONE] --> <string name="accessibility_system_action_dismiss_notification_shade">Dismiss Notification Shade</string> + <!-- Label for Dpad up action [CHAR LIMIT=NONE] --> + <string name="accessibility_system_action_dpad_up_label">Dpad Up</string> + <!-- Label for Dpad down action [CHAR LIMIT=NONE] --> + <string name="accessibility_system_action_dpad_down_label">Dpad Down</string> + <!-- Label for Dpad left action [CHAR LIMIT=NONE] --> + <string name="accessibility_system_action_dpad_left_label">Dpad Left</string> + <!-- Label for Dpad right action [CHAR LIMIT=NONE] --> + <string name="accessibility_system_action_dpad_right_label">Dpad Right</string> + <!-- Label for Dpad center action [CHAR LIMIT=NONE] --> + <string name="accessibility_system_action_dpad_center_label">Dpad Center</string> <!-- Accessibility description of caption view --> <string name="accessibility_freeform_caption">Caption bar of <xliff:g id="app_name">%1$s</xliff:g>.</string> @@ -5924,9 +5950,9 @@ <string name="resolver_no_personal_apps_available">No personal apps</string> <!-- Dialog title. User must choose between opening content in a cross-profile app or same-profile browser. [CHAR LIMIT=NONE] --> - <string name="miniresolver_open_in_personal">Open in <xliff:g id="app" example="YouTube">%s</xliff:g> in personal profile?</string> + <string name="miniresolver_open_in_personal">Open <xliff:g id="app" example="YouTube">%s</xliff:g> in your personal profile?</string> <!-- Dialog title. User must choose between opening content in a cross-profile app or same-profile browser. [CHAR LIMIT=NONE] --> - <string name="miniresolver_open_in_work">Open in <xliff:g id="app" example="YouTube">%s</xliff:g> in work profile?</string> + <string name="miniresolver_open_in_work">Open <xliff:g id="app" example="YouTube">%s</xliff:g> in your work profile?</string> <!-- Button option. Open the link in the personal browser. [CHAR LIMIT=NONE] --> <string name="miniresolver_use_personal_browser">Use personal browser</string> <!-- Button option. Open the link in the work browser. [CHAR LIMIT=NONE] --> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index f86add6e4e3b..764b2738bce8 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -375,6 +375,7 @@ <java-symbol type="string" name="config_usbConfirmActivity" /> <java-symbol type="string" name="config_usbResolverActivity" /> <java-symbol type="string" name="config_sensorUseStartedActivity" /> + <java-symbol type="string" name="config_hdmiCecSetMenuLanguageActivity" /> <java-symbol type="integer" name="config_minNumVisibleRecentTasks_lowRam" /> <java-symbol type="integer" name="config_maxNumVisibleRecentTasks_lowRam" /> <java-symbol type="integer" name="config_minNumVisibleRecentTasks_grid" /> @@ -1598,6 +1599,13 @@ <java-symbol type="layout" name="resolver_list_per_profile" /> <java-symbol type="layout" name="chooser_list_per_profile" /> <java-symbol type="layout" name="resolver_empty_states" /> + <java-symbol type="id" name="open_cross_profile" /> + <java-symbol type="string" name="miniresolver_open_in_personal" /> + <java-symbol type="string" name="miniresolver_open_in_work" /> + <java-symbol type="string" name="miniresolver_use_personal_browser" /> + <java-symbol type="string" name="miniresolver_use_work_browser" /> + <java-symbol type="id" name="button_open" /> + <java-symbol type="id" name="use_same_profile_browser" /> <java-symbol type="anim" name="slide_in_child_bottom" /> <java-symbol type="anim" name="slide_in_right" /> @@ -1696,7 +1704,13 @@ <java-symbol type="anim" name="activity_translucent_open_enter" /> <java-symbol type="anim" name="activity_translucent_close_exit" /> <java-symbol type="anim" name="activity_open_enter" /> + <java-symbol type="anim" name="activity_open_exit" /> + <java-symbol type="anim" name="activity_close_enter" /> <java-symbol type="anim" name="activity_close_exit" /> + <java-symbol type="anim" name="activity_open_enter_legacy" /> + <java-symbol type="anim" name="activity_open_exit_legacy" /> + <java-symbol type="anim" name="activity_close_enter_legacy" /> + <java-symbol type="anim" name="activity_close_exit_legacy" /> <java-symbol type="anim" name="task_fragment_close_enter" /> <java-symbol type="anim" name="task_fragment_close_exit" /> <java-symbol type="anim" name="task_fragment_open_enter" /> @@ -2214,6 +2228,8 @@ <java-symbol type="integer" name="config_dreamsBatteryLevelMinimumWhenNotPowered" /> <java-symbol type="integer" name="config_dreamsBatteryLevelDrainCutoff" /> <java-symbol type="string" name="config_dreamsDefaultComponent" /> + <java-symbol type="array" name="config_supportedDreamComplications" /> + <java-symbol type="array" name="config_dreamComplicationsEnabledByDefault" /> <java-symbol type="drawable" name="default_dream_preview" /> <java-symbol type="array" name="config_disabledDreamComponents" /> <java-symbol type="string" name="config_dozeComponent" /> @@ -2706,6 +2722,7 @@ <java-symbol type="bool" name="config_allow_ussd_over_ims" /> <java-symbol type="attr" name="touchscreenBlocksFocus" /> <java-symbol type="layout" name="resolver_list_with_default" /> + <java-symbol type="layout" name="miniresolver" /> <java-symbol type="string" name="activity_resolver_use_always" /> <java-symbol type="string" name="whichApplicationNamed" /> <java-symbol type="string" name="whichApplicationLabel" /> @@ -3672,6 +3689,7 @@ <java-symbol type="string" name="config_defaultContentSuggestionsService" /> <java-symbol type="string" name="config_defaultSearchUiService" /> <java-symbol type="string" name="config_defaultSmartspaceService" /> + <java-symbol type="string" name="config_defaultWallpaperEffectsGenerationService" /> <java-symbol type="string" name="config_defaultMusicRecognitionService" /> <java-symbol type="string" name="config_defaultAttentionService" /> <java-symbol type="string" name="config_defaultRotationResolverService" /> @@ -3847,6 +3865,11 @@ <java-symbol type="string" name="harmful_app_warning_title" /> <java-symbol type="layout" name="harmful_app_warning_dialog" /> + <java-symbol type="string" name="log_access_confirmation_allow" /> + <java-symbol type="string" name="log_access_confirmation_deny" /> + <java-symbol type="string" name="log_access_confirmation_title" /> + <java-symbol type="string" name="log_access_confirmation_body" /> + <java-symbol type="string" name="config_defaultAssistantAccessComponent" /> <java-symbol type="string" name="slices_permission_request" /> @@ -4128,10 +4151,16 @@ <java-symbol type="string" name="accessibility_system_action_quick_settings_label" /> <java-symbol type="string" name="accessibility_system_action_recents_label" /> <java-symbol type="string" name="accessibility_system_action_screenshot_label" /> + <java-symbol type="string" name="accessibility_system_action_headset_hook_label" /> <java-symbol type="string" name="accessibility_system_action_on_screen_a11y_shortcut_label" /> <java-symbol type="string" name="accessibility_system_action_on_screen_a11y_shortcut_chooser_label" /> <java-symbol type="string" name="accessibility_system_action_hardware_a11y_shortcut_label" /> <java-symbol type="string" name="accessibility_system_action_dismiss_notification_shade" /> + <java-symbol type="string" name="accessibility_system_action_dpad_up_label" /> + <java-symbol type="string" name="accessibility_system_action_dpad_down_label" /> + <java-symbol type="string" name="accessibility_system_action_dpad_left_label" /> + <java-symbol type="string" name="accessibility_system_action_dpad_right_label" /> + <java-symbol type="string" name="accessibility_system_action_dpad_center_label" /> <java-symbol type="string" name="accessibility_freeform_caption" /> @@ -4452,6 +4481,12 @@ <java-symbol type="bool" name="config_cecTvSendStandbyOnSleepDisabled_allowed" /> <java-symbol type="bool" name="config_cecTvSendStandbyOnSleepDisabled_default" /> + <java-symbol type="bool" name="config_cecSetMenuLanguage_userConfigurable" /> + <java-symbol type="bool" name="config_cecSetMenuLanguageEnabled_allowed" /> + <java-symbol type="bool" name="config_cecSetMenuLanguageEnabled_default" /> + <java-symbol type="bool" name="config_cecSetMenuLanguageDisabled_allowed" /> + <java-symbol type="bool" name="config_cecSetMenuLanguageDisabled_default" /> + <java-symbol type="bool" name="config_cecRcProfileTv_userConfigurable" /> <java-symbol type="bool" name="config_cecRcProfileTvNone_allowed" /> <java-symbol type="bool" name="config_cecRcProfileTvNone_default" /> @@ -4679,6 +4714,8 @@ <java-symbol type="string" name="config_deviceSpecificDeviceStatePolicyProvider" /> + <java-symbol type="array" name="config_dockExtconStateMapping" /> + <java-symbol type="string" name="notification_channel_abusive_bg_apps"/> <java-symbol type="string" name="notification_title_abusive_bg_apps"/> <java-symbol type="string" name="notification_content_abusive_bg_apps"/> diff --git a/core/tests/batterystatstests/BatteryStatsViewer/AndroidManifest.xml b/core/tests/batterystatstests/BatteryStatsViewer/AndroidManifest.xml index bd987a03b51f..6639c0241ae2 100644 --- a/core/tests/batterystatstests/BatteryStatsViewer/AndroidManifest.xml +++ b/core/tests/batterystatstests/BatteryStatsViewer/AndroidManifest.xml @@ -20,6 +20,7 @@ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> <uses-permission android:name="android.permission.BATTERY_STATS"/> + <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS"/> <application android:theme="@style/Theme" diff --git a/core/tests/coretests/src/android/app/PropertyInvalidatedCacheTests.java b/core/tests/coretests/src/android/app/PropertyInvalidatedCacheTests.java index d3e8bb0ec317..5338d046596a 100644 --- a/core/tests/coretests/src/android/app/PropertyInvalidatedCacheTests.java +++ b/core/tests/coretests/src/android/app/PropertyInvalidatedCacheTests.java @@ -37,9 +37,9 @@ import org.junit.Test; @SmallTest public class PropertyInvalidatedCacheTests { - // This property is never set. The test process does not have permission to set any - // properties. - static final String CACHE_PROPERTY = "cache_key.cache_test_a"; + // Configuration for creating caches + private static final int MODULE = PropertyInvalidatedCache.MODULE_TEST; + private static final String API = "testApi"; // This class is a proxy for binder calls. It contains a counter that increments // every time the class is queried. @@ -64,6 +64,25 @@ public class PropertyInvalidatedCacheTests { } } + // The functions for querying the server. + private static class ServerQuery + extends PropertyInvalidatedCache.QueryHandler<Integer, Boolean> { + private final ServerProxy mServer; + + ServerQuery(ServerProxy server) { + mServer = server; + } + + @Override + public Boolean apply(Integer x) { + return mServer.query(x); + } + @Override + public boolean shouldBypassCache(Integer x) { + return x % 13 == 0; + } + } + // Clear the test mode after every test, in case this process is used for other // tests. This also resets the test property map. @After @@ -82,19 +101,11 @@ public class PropertyInvalidatedCacheTests { // Create a cache that uses simple arithmetic to computer its values. PropertyInvalidatedCache<Integer, Boolean> testCache = - new PropertyInvalidatedCache<>(4, CACHE_PROPERTY) { - @Override - public Boolean recompute(Integer x) { - return tester.query(x); - } - @Override - public boolean bypass(Integer x) { - return x % 13 == 0; - } - }; + new PropertyInvalidatedCache<>(4, MODULE, API, "cache1", + new ServerQuery(tester)); PropertyInvalidatedCache.setTestMode(true); - PropertyInvalidatedCache.testPropertyName(CACHE_PROPERTY); + testCache.testPropertyName(); tester.verify(0); assertEquals(tester.value(3), testCache.query(3)); @@ -136,26 +147,14 @@ public class PropertyInvalidatedCacheTests { // Three caches, all using the same system property but one uses a different name. PropertyInvalidatedCache<Integer, Boolean> cache1 = - new PropertyInvalidatedCache<>(4, CACHE_PROPERTY) { - @Override - public Boolean recompute(Integer x) { - return tester.query(x); - } - }; + new PropertyInvalidatedCache<>(4, MODULE, API, "cache1", + new ServerQuery(tester)); PropertyInvalidatedCache<Integer, Boolean> cache2 = - new PropertyInvalidatedCache<>(4, CACHE_PROPERTY) { - @Override - public Boolean recompute(Integer x) { - return tester.query(x); - } - }; + new PropertyInvalidatedCache<>(4, MODULE, API, "cache1", + new ServerQuery(tester)); PropertyInvalidatedCache<Integer, Boolean> cache3 = - new PropertyInvalidatedCache<>(4, CACHE_PROPERTY, "cache3") { - @Override - public Boolean recompute(Integer x) { - return tester.query(x); - } - }; + new PropertyInvalidatedCache<>(4, MODULE, API, "cache3", + new ServerQuery(tester)); // Caches are enabled upon creation. assertEquals(false, cache1.getDisabledState()); @@ -176,61 +175,70 @@ public class PropertyInvalidatedCacheTests { assertEquals(false, cache3.getDisabledState()); // Create a new cache1. Verify that the new instance is disabled. - cache1 = new PropertyInvalidatedCache<>(4, CACHE_PROPERTY) { - @Override - public Boolean recompute(Integer x) { - return tester.query(x); - } - }; + cache1 = new PropertyInvalidatedCache<>(4, MODULE, API, "cache1", + new ServerQuery(tester)); assertEquals(true, cache1.getDisabledState()); // Remove the record of caches being locally disabled. This is a clean-up step. - cache1.clearDisableLocal(); + cache1.forgetDisableLocal(); assertEquals(true, cache1.getDisabledState()); assertEquals(true, cache2.getDisabledState()); assertEquals(false, cache3.getDisabledState()); // Create a new cache1. Verify that the new instance is not disabled. - cache1 = new PropertyInvalidatedCache<>(4, CACHE_PROPERTY) { - @Override - public Boolean recompute(Integer x) { - return tester.query(x); - } - }; + cache1 = new PropertyInvalidatedCache<>(4, MODULE, API, "cache1", + new ServerQuery(tester)); assertEquals(false, cache1.getDisabledState()); } - private static final String UNSET_KEY = "Aiw7woh6ie4toh7W"; + private static class TestQuery + extends PropertyInvalidatedCache.QueryHandler<Integer, String> { + + private int mRecomputeCount = 0; + + @Override + public String apply(Integer qv) { + mRecomputeCount += 1; + return "foo" + qv.toString(); + } + + int getRecomputeCount() { + return mRecomputeCount; + } + } private static class TestCache extends PropertyInvalidatedCache<Integer, String> { + private final TestQuery mQuery; + TestCache() { - this(CACHE_PROPERTY); + this(MODULE, API); } - TestCache(String key) { - super(4, key); + TestCache(int module, String api) { + this(module, api, new TestQuery()); setTestMode(true); - testPropertyName(key); + testPropertyName(); } - @Override - public String recompute(Integer qv) { - mRecomputeCount += 1; - return "foo" + qv.toString(); + TestCache(int module, String api, TestQuery query) { + super(4, module, api, api, query); + mQuery = query; + setTestMode(true); + testPropertyName(); } - int getRecomputeCount() { - return mRecomputeCount; + public int getRecomputeCount() { + return mQuery.getRecomputeCount(); } - private int mRecomputeCount = 0; + } @Test public void testCacheRecompute() { TestCache cache = new TestCache(); cache.invalidateCache(); - assertEquals(cache.isDisabledLocal(), false); + assertEquals(cache.isDisabled(), false); assertEquals("foo5", cache.query(5)); assertEquals(1, cache.getRecomputeCount()); assertEquals("foo5", cache.query(5)); @@ -241,6 +249,11 @@ public class PropertyInvalidatedCacheTests { assertEquals("foo5", cache.query(5)); assertEquals("foo5", cache.query(5)); assertEquals(3, cache.getRecomputeCount()); + // Invalidate the cache with a direct call to the property. + PropertyInvalidatedCache.invalidateCache(MODULE, API); + assertEquals("foo5", cache.query(5)); + assertEquals("foo5", cache.query(5)); + assertEquals(4, cache.getRecomputeCount()); } @Test @@ -257,7 +270,8 @@ public class PropertyInvalidatedCacheTests { @Test public void testCachePropertyUnset() { - TestCache cache = new TestCache(UNSET_KEY); + final String UNSET_API = "otherApi"; + TestCache cache = new TestCache(MODULE, UNSET_API); assertEquals("foo5", cache.query(5)); assertEquals("foo5", cache.query(5)); assertEquals(2, cache.getRecomputeCount()); @@ -327,17 +341,40 @@ public class PropertyInvalidatedCacheTests { @Test public void testLocalProcessDisable() { TestCache cache = new TestCache(); - assertEquals(cache.isDisabledLocal(), false); + assertEquals(cache.isDisabled(), false); cache.invalidateCache(); assertEquals("foo5", cache.query(5)); assertEquals(1, cache.getRecomputeCount()); assertEquals("foo5", cache.query(5)); assertEquals(1, cache.getRecomputeCount()); - assertEquals(cache.isDisabledLocal(), false); + assertEquals(cache.isDisabled(), false); cache.disableLocal(); - assertEquals(cache.isDisabledLocal(), true); + assertEquals(cache.isDisabled(), true); assertEquals("foo5", cache.query(5)); assertEquals("foo5", cache.query(5)); assertEquals(3, cache.getRecomputeCount()); } + + @Test + public void testPropertyNames() { + String n1; + n1 = PropertyInvalidatedCache.createPropertyName( + PropertyInvalidatedCache.MODULE_SYSTEM, "getPackageInfo"); + assertEquals(n1, "cache_key.system_server.get_package_info"); + n1 = PropertyInvalidatedCache.createPropertyName( + PropertyInvalidatedCache.MODULE_SYSTEM, "get_package_info"); + assertEquals(n1, "cache_key.system_server.get_package_info"); + try { + n1 = PropertyInvalidatedCache.createPropertyName( + PropertyInvalidatedCache.MODULE_SYSTEM - 1, "get package_info"); + // n1 is an invalid api name. + assertEquals(false, true); + } catch (IllegalArgumentException e) { + // An exception is expected here. + } + + n1 = PropertyInvalidatedCache.createPropertyName( + PropertyInvalidatedCache.MODULE_BLUETOOTH, "getState"); + assertEquals(n1, "cache_key.bluetooth.get_state"); + } } diff --git a/core/tests/coretests/src/android/os/VibrationEffectTest.java b/core/tests/coretests/src/android/os/VibrationEffectTest.java index 104f077e5ad2..f7ca822c36e2 100644 --- a/core/tests/coretests/src/android/os/VibrationEffectTest.java +++ b/core/tests/coretests/src/android/os/VibrationEffectTest.java @@ -146,6 +146,7 @@ public class VibrationEffectTest { @Test public void testValidateWaveformBuilder() { + // Cover builder methods VibrationEffect.startWaveform(targetAmplitude(1)) .addTransition(Duration.ofSeconds(1), targetAmplitude(0.5f), targetFrequency(100)) .addTransition(Duration.ZERO, targetAmplitude(0f), targetFrequency(200)) @@ -158,6 +159,39 @@ public class VibrationEffectTest { .build() .validate(); + // Make sure class summary javadoc examples compile and are valid. + // NOTE: IF THIS IS UPDATED, PLEASE ALSO UPDATE WaveformBuilder javadocs. + VibrationEffect.startWaveform(targetFrequency(60)) + .addTransition(Duration.ofMillis(100), targetAmplitude(1), targetFrequency(120)) + .addSustain(Duration.ofMillis(200)) + .addTransition(Duration.ofMillis(100), targetAmplitude(0), targetFrequency(60)) + .build() + .validate(); + VibrationEffect.startComposition() + .addPrimitive(VibrationEffect.Composition.PRIMITIVE_TICK) + .addOffDuration(Duration.ofMillis(20)) + .repeatEffectIndefinitely( + VibrationEffect.startWaveform(targetAmplitude(0.2f)) + .addSustain(Duration.ofMillis(10)) + .addTransition(Duration.ofMillis(20), targetAmplitude(0.4f)) + .addSustain(Duration.ofMillis(30)) + .addTransition(Duration.ofMillis(40), targetAmplitude(0.8f)) + .addSustain(Duration.ofMillis(50)) + .addTransition(Duration.ofMillis(60), targetAmplitude(0.2f)) + .build()) + .compose() + .validate(); + VibrationEffect.createWaveform(new long[]{10, 20, 30}, new int[]{51, 102, 204}, -1) + .validate(); + VibrationEffect.startWaveform(targetAmplitude(0.2f)) + .addSustain(Duration.ofMillis(10)) + .addTransition(Duration.ZERO, targetAmplitude(0.4f)) + .addSustain(Duration.ofMillis(20)) + .addTransition(Duration.ZERO, targetAmplitude(0.8f)) + .addSustain(Duration.ofMillis(30)) + .build() + .validate(); + assertThrows(IllegalStateException.class, () -> VibrationEffect.startWaveform().build().validate()); assertThrows(IllegalArgumentException.class, () -> targetAmplitude(-2)); @@ -171,6 +205,7 @@ public class VibrationEffectTest { @Test public void testValidateComposed() { + // Cover builder methods VibrationEffect.startComposition() .addPrimitive(VibrationEffect.Composition.PRIMITIVE_CLICK) .addEffect(TEST_ONE_SHOT) @@ -178,14 +213,31 @@ public class VibrationEffectTest { .addOffDuration(Duration.ofMillis(100)) .addPrimitive(VibrationEffect.Composition.PRIMITIVE_CLICK, 0.5f, 10) .addEffect(VibrationEffect.get(VibrationEffect.EFFECT_CLICK)) + .addEffect(VibrationEffect.createWaveform(new long[]{10, 20}, /* repeat= */ 0)) .compose() .validate(); - VibrationEffect.startComposition() .repeatEffectIndefinitely(TEST_ONE_SHOT) .compose() .validate(); + // Make sure class summary javadoc examples compile and are valid. + // NOTE: IF THIS IS UPDATED, PLEASE ALSO UPDATE Composition javadocs. + VibrationEffect.startComposition() + .addPrimitive(VibrationEffect.Composition.PRIMITIVE_SLOW_RISE, 0.5f) + .addPrimitive(VibrationEffect.Composition.PRIMITIVE_QUICK_FALL, 0.5f) + .addPrimitive(VibrationEffect.Composition.PRIMITIVE_TICK, 1.0f, 100) + .compose() + .validate(); + VibrationEffect.startComposition() + .addPrimitive(VibrationEffect.Composition.PRIMITIVE_LOW_TICK) + .addOffDuration(Duration.ofMillis(10)) + .addEffect(VibrationEffect.createPredefined(VibrationEffect.EFFECT_DOUBLE_CLICK)) + .addOffDuration(Duration.ofMillis(50)) + .addEffect(VibrationEffect.createWaveform(new long[]{10, 20}, /* repeat= */ 0)) + .compose() + .validate(); + assertThrows(IllegalStateException.class, () -> VibrationEffect.startComposition().compose().validate()); assertThrows(IllegalStateException.class, diff --git a/core/tests/coretests/src/android/view/accessibility/AccessibilityNodeInfoTest.java b/core/tests/coretests/src/android/view/accessibility/AccessibilityNodeInfoTest.java index 201883689546..99670d98bb84 100644 --- a/core/tests/coretests/src/android/view/accessibility/AccessibilityNodeInfoTest.java +++ b/core/tests/coretests/src/android/view/accessibility/AccessibilityNodeInfoTest.java @@ -58,7 +58,7 @@ public class AccessibilityNodeInfoTest { // The number of flags held in boolean properties. Their values should also be double-checked // in the methods above. - private static final int NUM_BOOLEAN_PROPERTIES = 23; + private static final int NUM_BOOLEAN_PROPERTIES = 24; @Test public void testStandardActions_serializationFlagIsValid() { diff --git a/core/tests/coretests/src/android/view/accessibility/AccessibilityServiceConnectionImpl.java b/core/tests/coretests/src/android/view/accessibility/AccessibilityServiceConnectionImpl.java index 02e5942a3544..fc385a013d00 100644 --- a/core/tests/coretests/src/android/view/accessibility/AccessibilityServiceConnectionImpl.java +++ b/core/tests/coretests/src/android/view/accessibility/AccessibilityServiceConnectionImpl.java @@ -204,4 +204,6 @@ public class AccessibilityServiceConnectionImpl extends IAccessibilityServiceCon public void logTrace(long timestamp, String where, long loggingTypes, String callingParams, int processId, long threadId, int callingUid, Bundle serializedCallingStackInBundle) {} + + public void setAnimationScale(float scale) {} } diff --git a/core/tests/coretests/src/android/window/BackNavigationTest.java b/core/tests/coretests/src/android/window/BackNavigationTest.java new file mode 100644 index 000000000000..91d853143764 --- /dev/null +++ b/core/tests/coretests/src/android/window/BackNavigationTest.java @@ -0,0 +1,134 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.window; + +import static junit.framework.Assert.fail; + +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +import android.annotation.NonNull; +import android.app.ActivityTaskManager; +import android.app.EmptyActivity; +import android.app.Instrumentation; +import android.os.RemoteException; +import android.support.test.uiautomator.UiDevice; +import android.view.OnBackInvokedCallback; + +import androidx.lifecycle.Lifecycle; +import androidx.test.core.app.ActivityScenario; +import androidx.test.ext.junit.rules.ActivityScenarioRule; +import androidx.test.platform.app.InstrumentationRegistry; + +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; + +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; + +/** + * Integration test for back navigation + */ +public class BackNavigationTest { + + @Rule + public final ActivityScenarioRule<EmptyActivity> mScenarioRule = + new ActivityScenarioRule<>(EmptyActivity.class); + private ActivityScenario<EmptyActivity> mScenario; + private Instrumentation mInstrumentation; + + @Before + public void setup() { + mScenario = mScenarioRule.getScenario(); + mInstrumentation = InstrumentationRegistry.getInstrumentation(); + try { + UiDevice.getInstance(mInstrumentation).wakeUp(); + } catch (RemoteException ignored) { + } + mInstrumentation.getUiAutomation().adoptShellPermissionIdentity(); + } + + @Test + public void registerCallback_initialized() { + CountDownLatch latch = registerBackCallback(); + mScenario.moveToState(Lifecycle.State.RESUMED); + assertCallbackIsCalled(latch); + } + + @Test + public void registerCallback_created() { + mScenario.moveToState(Lifecycle.State.CREATED); + CountDownLatch latch = registerBackCallback(); + mScenario.moveToState(Lifecycle.State.STARTED); + mScenario.moveToState(Lifecycle.State.RESUMED); + assertCallbackIsCalled(latch); + } + + @Test + public void registerCallback_resumed() { + mScenario.moveToState(Lifecycle.State.CREATED); + mScenario.moveToState(Lifecycle.State.STARTED); + mScenario.moveToState(Lifecycle.State.RESUMED); + CountDownLatch latch = registerBackCallback(); + assertCallbackIsCalled(latch); + } + + private void assertCallbackIsCalled(CountDownLatch latch) { + try { + mInstrumentation.getUiAutomation().waitForIdle(500, 1000); + BackNavigationInfo info = ActivityTaskManager.getService().startBackNavigation(); + assertNotNull("BackNavigationInfo is null", info); + assertNotNull("OnBackInvokedCallback is null", info.getOnBackInvokedCallback()); + info.getOnBackInvokedCallback().onBackInvoked(); + assertTrue(latch.await(500, TimeUnit.MILLISECONDS)); + } catch (RemoteException ex) { + ex.rethrowFromSystemServer(); + } catch (InterruptedException ex) { + fail("Application died before invoking the callback.\n" + ex.getMessage()); + } catch (TimeoutException ex) { + fail(ex.getMessage()); + } + } + + @NonNull + private CountDownLatch registerBackCallback() { + CountDownLatch backInvokedLatch = new CountDownLatch(1); + CountDownLatch backRegisteredLatch = new CountDownLatch(1); + mScenario.onActivity(activity -> { + activity.getOnBackInvokedDispatcher().registerOnBackInvokedCallback( + new OnBackInvokedCallback() { + @Override + public void onBackInvoked() { + backInvokedLatch.countDown(); + } + }, 0 + ); + backRegisteredLatch.countDown(); + }); + try { + if (!backRegisteredLatch.await(100, TimeUnit.MILLISECONDS)) { + fail("Back callback was not registered on the Activity thread. This might be " + + "an error with the test itself."); + } + } catch (InterruptedException e) { + fail(e.getMessage()); + } + return backInvokedLatch; + } +} diff --git a/core/tests/coretests/src/com/android/internal/app/ResolverActivityTest.java b/core/tests/coretests/src/com/android/internal/app/ResolverActivityTest.java index 75d20252ae27..2817728fd9ea 100644 --- a/core/tests/coretests/src/com/android/internal/app/ResolverActivityTest.java +++ b/core/tests/coretests/src/com/android/internal/app/ResolverActivityTest.java @@ -731,6 +731,25 @@ public class ResolverActivityTest { } @Test + public void testMiniResolver() { + ResolverActivity.ENABLE_TABBED_VIEW = true; + markWorkProfileUserAvailable(); + List<ResolvedComponentInfo> personalResolvedComponentInfos = + createResolvedComponentsForTest(1); + List<ResolvedComponentInfo> workResolvedComponentInfos = + createResolvedComponentsForTest(1); + // Personal profile only has a browser + personalResolvedComponentInfos.get(0).getResolveInfoAt(0).handleAllWebDataURI = true; + setupResolverControllers(personalResolvedComponentInfos, workResolvedComponentInfos); + Intent sendIntent = createSendImageIntent(); + sendIntent.setType("TestType"); + + mActivityRule.launchActivity(sendIntent); + waitForIdle(); + onView(withId(R.id.open_cross_profile)).check(matches(isDisplayed())); + } + + @Test public void testWorkTab_noAppsAvailable_workOff_noAppsAvailableEmptyStateShown() { // enable the work tab feature flag ResolverActivity.ENABLE_TABBED_VIEW = true; diff --git a/core/tests/coretests/src/com/android/internal/power/MeasuredEnergyStatsTest.java b/core/tests/coretests/src/com/android/internal/power/MeasuredEnergyStatsTest.java index dbb2cf15dd8e..88349b38040c 100644 --- a/core/tests/coretests/src/com/android/internal/power/MeasuredEnergyStatsTest.java +++ b/core/tests/coretests/src/com/android/internal/power/MeasuredEnergyStatsTest.java @@ -383,10 +383,10 @@ public class MeasuredEnergyStatsTest { assertEquals(13, stats.getAccumulatedStandardBucketCharge(POWER_BUCKET_SCREEN_ON, 0)); // 6 * (6000-4000)/(6000-2000) assertEquals(3, stats.getAccumulatedStandardBucketCharge(POWER_BUCKET_SCREEN_ON, 1)); - - // POWER_BUCKET_SCREEN_OTHER was only present along with state=1 - assertEquals(0, stats.getAccumulatedStandardBucketCharge(POWER_BUCKET_SCREEN_OTHER, 0)); - assertEquals(40, stats.getAccumulatedStandardBucketCharge(POWER_BUCKET_SCREEN_OTHER, 1)); + // 40 * (4000-1000)/(5000-1000) + assertEquals(30, stats.getAccumulatedStandardBucketCharge(POWER_BUCKET_SCREEN_OTHER, 0)); + // 40 * (5000-4000)/(5000-1000) + assertEquals(10, stats.getAccumulatedStandardBucketCharge(POWER_BUCKET_SCREEN_OTHER, 1)); } @Test diff --git a/core/tests/hdmitests/src/android/hardware/hdmi/HdmiAudioSystemClientTest.java b/core/tests/hdmitests/src/android/hardware/hdmi/HdmiAudioSystemClientTest.java index f04a9f735881..e16a2f8e8560 100644 --- a/core/tests/hdmitests/src/android/hardware/hdmi/HdmiAudioSystemClientTest.java +++ b/core/tests/hdmitests/src/android/hardware/hdmi/HdmiAudioSystemClientTest.java @@ -288,9 +288,8 @@ public class HdmiAudioSystemClientTest { } @Override - public void addVendorCommandListener(final IHdmiVendorCommandListener listener, - final int deviceType) { - } + public void addVendorCommandListener( + final IHdmiVendorCommandListener listener, final int vendorId) {} @Override public void sendVendorCommand(final int deviceType, final int targetAddress, diff --git a/data/etc/com.android.settings.xml b/data/etc/com.android.settings.xml index ddcab6eb76c8..5dcc5998850b 100644 --- a/data/etc/com.android.settings.xml +++ b/data/etc/com.android.settings.xml @@ -61,5 +61,6 @@ <permission name="android.permission.READ_DREAM_SUPPRESSION"/> <permission name="android.permission.RESTART_WIFI_SUBSYSTEM"/> <permission name="android.permission.READ_SAFETY_CENTER_STATUS" /> + <permission name="android.permission.SEND_SAFETY_CENTER_UPDATE" /> </privapp-permissions> </permissions> diff --git a/data/etc/com.android.systemui.xml b/data/etc/com.android.systemui.xml index d95644a02e69..ae350ec547c3 100644 --- a/data/etc/com.android.systemui.xml +++ b/data/etc/com.android.systemui.xml @@ -74,5 +74,6 @@ <permission name="android.permission.BROADCAST_CLOSE_SYSTEM_DIALOGS" /> <permission name="android.permission.FORCE_STOP_PACKAGES" /> <permission name="android.permission.ACCESS_FPS_COUNTER" /> + <permission name="android.permission.CHANGE_CONFIGURATION" /> </privapp-permissions> </permissions> diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml index b3dcc34d6e93..a331b6eb6750 100644 --- a/data/etc/privapp-permissions-platform.xml +++ b/data/etc/privapp-permissions-platform.xml @@ -474,6 +474,7 @@ applications that come with the platform <!-- Permission needed for CTS test - WifiManagerTest --> <permission name="android.permission.WIFI_ACCESS_COEX_UNSAFE_CHANNELS" /> <permission name="android.permission.WIFI_UPDATE_COEX_UNSAFE_CHANNELS" /> + <permission name="android.permission.NEARBY_WIFI_DEVICES" /> <permission name="android.permission.OVERRIDE_WIFI_CONFIG" /> <!-- Permission required for CTS test CarrierMessagingServiceWrapperTest --> <permission name="android.permission.BIND_CARRIER_SERVICES"/> @@ -581,6 +582,7 @@ applications that come with the platform <permission name="android.permission.INSTALL_DYNAMIC_SYSTEM"/> <permission name="android.permission.BIND_CELL_BROADCAST_SERVICE"/> <permission name="android.permission.READ_SAFETY_CENTER_STATUS" /> + <permission name="android.permission.SEND_SAFETY_CENTER_UPDATE" /> </privapp-permissions> <privapp-permissions package="com.android.bips"> diff --git a/data/etc/services.core.protolog.json b/data/etc/services.core.protolog.json index 15672332a522..f2a875c76f1c 100644 --- a/data/etc/services.core.protolog.json +++ b/data/etc/services.core.protolog.json @@ -727,12 +727,6 @@ "group": "WM_DEBUG_BOOT", "at": "com\/android\/server\/wm\/WindowManagerService.java" }, - "-1343787701": { - "message": "startBackNavigation task=%s, topRunningActivity=%s", - "level": "DEBUG", - "group": "WM_DEBUG_BACK_PREVIEW", - "at": "com\/android\/server\/wm\/BackNavigationController.java" - }, "-1340540100": { "message": "Creating SnapshotStartingData", "level": "VERBOSE", @@ -1765,6 +1759,12 @@ "group": "WM_DEBUG_SYNC_ENGINE", "at": "com\/android\/server\/wm\/BLASTSyncEngine.java" }, + "-228813488": { + "message": "%s: Setting back callback %s", + "level": "DEBUG", + "group": "WM_DEBUG_BACK_PREVIEW", + "at": "com\/android\/server\/wm\/WindowState.java" + }, "-208825711": { "message": "shouldWaitAnimatingExit: isWallpaperTarget: %s", "level": "DEBUG", @@ -3691,6 +3691,12 @@ "group": "WM_DEBUG_REMOTE_ANIMATIONS", "at": "com\/android\/server\/wm\/RemoteAnimationController.java" }, + "1898905572": { + "message": "startBackNavigation task=%s, topRunningActivity=%s, topWindow=%s backCallback=%s", + "level": "DEBUG", + "group": "WM_DEBUG_BACK_PREVIEW", + "at": "com\/android\/server\/wm\/BackNavigationController.java" + }, "1903353011": { "message": "notifyAppStopped: %s", "level": "VERBOSE", diff --git a/identity/java/android/security/identity/IdentityCredential.java b/identity/java/android/security/identity/IdentityCredential.java index cdf746fc9900..f440b693a5b3 100644 --- a/identity/java/android/security/identity/IdentityCredential.java +++ b/identity/java/android/security/identity/IdentityCredential.java @@ -454,7 +454,8 @@ public abstract class IdentityCredential { * @param challenge is a non-empty byte array whose contents should be unique, fresh and * provided by the issuing authority. The value provided is embedded in the * generated CBOR and enables the issuing authority to verify that the - * returned proof is fresh. + * returned proof is fresh. Implementations are required to support + * challenges at least 32 bytes of length. * @return the COSE_Sign1 data structure above */ public @NonNull byte[] proveOwnership(@NonNull byte[] challenge) { @@ -485,7 +486,8 @@ public abstract class IdentityCredential { * @param challenge is a non-empty byte array whose contents should be unique, fresh and * provided by the issuing authority. The value provided is embedded in the * generated CBOR and enables the issuing authority to verify that the - * returned proof is fresh. + * returned proof is fresh. Implementations are required to support + * challenges at least 32 bytes of length. * @return the COSE_Sign1 data structure above */ public @NonNull byte[] delete(@NonNull byte[] challenge) { diff --git a/identity/java/android/security/identity/WritableIdentityCredential.java b/identity/java/android/security/identity/WritableIdentityCredential.java index 305d0ead0652..6d569648f2c6 100644 --- a/identity/java/android/security/identity/WritableIdentityCredential.java +++ b/identity/java/android/security/identity/WritableIdentityCredential.java @@ -59,7 +59,8 @@ public abstract class WritableIdentityCredential { * @param challenge is a non-empty byte array whose contents should be unique, fresh and * provided by the issuing authority. The value provided is embedded in the * attestation extension and enables the issuing authority to verify that the - * attestation certificate is fresh. + * attestation certificate is fresh. Implementations are required to support + * challenges at least 32 bytes of length. * @return the X.509 certificate for this credential's CredentialKey. */ public abstract @NonNull Collection<X509Certificate> getCredentialKeyCertificateChain( diff --git a/libs/WindowManager/Shell/res/layout/letterbox_education_toast_layout.xml b/libs/WindowManager/Shell/res/layout/letterbox_education_toast_layout.xml deleted file mode 100644 index a309d4829f0d..000000000000 --- a/libs/WindowManager/Shell/res/layout/letterbox_education_toast_layout.xml +++ /dev/null @@ -1,61 +0,0 @@ -<!-- - ~ Copyright (C) 2022 The Android Open Source Project - ~ - ~ Licensed under the Apache License, Version 2.0 (the "License"); - ~ you may not use this file except in compliance with the License. - ~ You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License. - --> -<com.android.wm.shell.compatui.LetterboxEduToastLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:background="@color/compat_controls_background" - android:gravity="center" - android:paddingVertical="14dp" - android:paddingHorizontal="16dp"> - - <!-- Adding an extra layer to animate the alpha of the background and content separately. --> - <LinearLayout - android:id="@+id/letterbox_education_content" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:gravity="center_vertical" - android:orientation="horizontal"> - - <ImageView - android:id="@+id/letterbox_education_icon" - android:layout_width="@dimen/letterbox_education_toast_icon_size" - android:layout_height="@dimen/letterbox_education_toast_icon_size"/> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:maxWidth="@dimen/letterbox_education_toast_text_max_width" - android:paddingHorizontal="16dp" - android:lineSpacingExtra="5sp" - android:text="@string/letterbox_education_toast_title" - android:textAlignment="viewStart" - android:textColor="@color/compat_controls_text" - android:textSize="16sp" - android:maxLines="1" - android:ellipsize="end"/> - - <ImageButton - android:id="@+id/letterbox_education_toast_expand" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/letterbox_education_ic_expand_more_ripple" - android:background="@android:color/transparent" - android:contentDescription="@string/letterbox_education_expand_button_description"/> - - </LinearLayout> - -</com.android.wm.shell.compatui.LetterboxEduToastLayout> diff --git a/libs/WindowManager/Shell/res/values/dimen.xml b/libs/WindowManager/Shell/res/values/dimen.xml index ab2c9b1466b8..40c7647ecedf 100644 --- a/libs/WindowManager/Shell/res/values/dimen.xml +++ b/libs/WindowManager/Shell/res/values/dimen.xml @@ -219,18 +219,9 @@ <!-- The width of the camera compat hint. --> <dimen name="camera_compat_hint_width">143dp</dimen> - <!-- The corner radius of the letterbox education toast. --> - <dimen name="letterbox_education_toast_corner_radius">100dp</dimen> - <!-- The corner radius of the letterbox education dialog. --> <dimen name="letterbox_education_dialog_corner_radius">28dp</dimen> - <!-- The margin between the letterbox education toast/dialog and the bottom of the task. --> - <dimen name="letterbox_education_margin_bottom">16dp</dimen> - - <!-- The size of the icon in the letterbox education toast. --> - <dimen name="letterbox_education_toast_icon_size">24dp</dimen> - <!-- The size of an icon in the letterbox education dialog. --> <dimen name="letterbox_education_dialog_icon_size">48dp</dimen> @@ -243,9 +234,6 @@ <!-- The maximum width of the title and subtitle in the letterbox education dialog. --> <dimen name="letterbox_education_dialog_title_max_width">444dp</dimen> - <!-- The maximum width of the text in the letterbox education toast. --> - <dimen name="letterbox_education_toast_text_max_width">398dp</dimen> - <!-- The distance that the letterbox education dialog will move up during appear/dismiss animation. --> <dimen name="letterbox_education_dialog_animation_elevation">20dp</dimen> diff --git a/libs/WindowManager/Shell/res/values/strings.xml b/libs/WindowManager/Shell/res/values/strings.xml index a8a9ed74cd35..16a4b524803a 100644 --- a/libs/WindowManager/Shell/res/values/strings.xml +++ b/libs/WindowManager/Shell/res/values/strings.xml @@ -174,9 +174,6 @@ <!-- The title of the letterbox education dialog. [CHAR LIMIT=NONE] --> <string name="letterbox_education_dialog_title">Get the most out of <xliff:g id="app_name" example="YouTube">%s</xliff:g></string> - <!-- The title of the letterbox education toast. [CHAR LIMIT=60] --> - <string name="letterbox_education_toast_title">Rotate your device for a full-screen view</string> - <!-- Description of the rotate screen into portrait action. [CHAR LIMIT=NONE] --> <string name="letterbox_education_screen_rotation_portrait_text">Rotate your screen to portrait</string> @@ -192,7 +189,4 @@ <!-- Button text for dismissing the letterbox education dialog. [CHAR LIMIT=20] --> <string name="letterbox_education_got_it">Got it</string> - <!-- Accessibility description of the letterbox education toast expand to dialog button. [CHAR LIMIT=NONE] --> - <string name="letterbox_education_expand_button_description">Expand for more information.</string> - </resources> 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 a477bd7f8295..7ab683513570 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 @@ -1790,6 +1790,7 @@ public class BubbleStackView extends FrameLayout /** * Changes the expanded state of the stack. + * Don't call this directly, call mBubbleData#setExpanded. * * @param shouldExpand whether the bubble stack should appear expanded */ @@ -1836,7 +1837,7 @@ public class BubbleStackView extends FrameLayout } else if (mManageEduView != null && mManageEduView.getVisibility() == VISIBLE) { mManageEduView.hide(); } else { - setExpanded(false); + mBubbleData.setExpanded(false); } } } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/letterboxedu/LetterboxEduToastLayout.java b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/letterboxedu/LetterboxEduToastLayout.java deleted file mode 100644 index e7f592dcb14d..000000000000 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/letterboxedu/LetterboxEduToastLayout.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright (C) 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.wm.shell.compatui.letterboxedu; - -import android.content.Context; -import android.graphics.drawable.Drawable; -import android.util.AttributeSet; -import android.widget.FrameLayout; -import android.widget.ImageView; - -import com.android.wm.shell.R; - -/** - * Container for the Letterbox Education Toast. - */ -// TODO(b/215316431): Add tests -public class LetterboxEduToastLayout extends FrameLayout { - - public LetterboxEduToastLayout(Context context) { - this(context, null); - } - - public LetterboxEduToastLayout(Context context, AttributeSet attrs) { - this(context, attrs, 0); - } - - public LetterboxEduToastLayout(Context context, AttributeSet attrs, int defStyleAttr) { - this(context, attrs, defStyleAttr, 0); - } - - public LetterboxEduToastLayout(Context context, AttributeSet attrs, int defStyleAttr, - int defStyleRes) { - super(context, attrs, defStyleAttr, defStyleRes); - } - - /** - * Register a callback for the dismiss button. - * @param callback The callback to register - */ - void setExpandOnClickListener(Runnable callback) { - findViewById(R.id.letterbox_education_toast_expand).setOnClickListener( - view -> callback.run()); - } - - /** - * Updates the layout with the given app info. - * @param appName The name of the app - * @param appIcon The icon of the app - */ - void updateAppInfo(String appName, Drawable appIcon) { - ImageView icon = findViewById(R.id.letterbox_education_icon); - icon.setContentDescription(appName); - icon.setImageDrawable(appIcon); - } -} diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java index 17005ea7d500..6b0d7f5fa461 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java @@ -867,6 +867,10 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, } private void fadeExistingPip(boolean show) { + if (mLeash == null || !mLeash.isValid()) { + Log.w(TAG, "Invalid leash on fadeExistingPip: " + mLeash); + return; + } final float alphaStart = show ? 0 : 1; final float alphaEnd = show ? 1 : 0; mPipAnimationController diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/ISplitScreen.aidl b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/ISplitScreen.aidl index 3cfa541c1c86..d022ec15f232 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/ISplitScreen.aidl +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/ISplitScreen.aidl @@ -89,9 +89,17 @@ interface ISplitScreen { /** * Version of startTasks using legacy transition system. */ - oneway void startTasksWithLegacyTransition(int mainTaskId, in Bundle mainOptions, - int sideTaskId, in Bundle sideOptions, int sidePosition, - float splitRatio, in RemoteAnimationAdapter adapter) = 11; + oneway void startTasksWithLegacyTransition(int mainTaskId, in Bundle mainOptions, + int sideTaskId, in Bundle sideOptions, int sidePosition, + float splitRatio, in RemoteAnimationAdapter adapter) = 11; + + /** + * Start a pair of intent and task using legacy transition system. + */ + oneway void startIntentAndTaskWithLegacyTransition(in PendingIntent pendingIntent, + in Intent fillInIntent, int taskId, boolean intentFirst, in Bundle mainOptions, + in Bundle sideOptions, int sidePosition, float splitRatio, + in RemoteAnimationAdapter adapter) = 12; /** * Blocking call that notifies and gets additional split-screen targets when entering @@ -100,5 +108,7 @@ interface ISplitScreen { * @param appTargets apps that will be re-parented to display area */ RemoteAnimationTarget[] onGoingToRecentsLegacy(boolean cancel, - in RemoteAnimationTarget[] appTargets) = 12; + in RemoteAnimationTarget[] appTargets) = 13; + + } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java index 3e6dc8241f4f..990b53a601f3 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java @@ -641,6 +641,18 @@ public class SplitScreenController implements DragAndDropPolicy.Starter, } @Override + public void startIntentAndTaskWithLegacyTransition(PendingIntent pendingIntent, + Intent fillInIntent, int taskId, boolean intentFirst, Bundle mainOptions, + Bundle sideOptions, int sidePosition, float splitRatio, + RemoteAnimationAdapter adapter) { + executeRemoteCallWithTaskPermission(mController, + "startIntentAndTaskWithLegacyTransition", (controller) -> + controller.mStageCoordinator.startIntentAndTaskWithLegacyTransition( + pendingIntent, fillInIntent, taskId, intentFirst, mainOptions, + sideOptions, sidePosition, splitRatio, adapter)); + } + + @Override public void startTasks(int mainTaskId, @Nullable Bundle mainOptions, int sideTaskId, @Nullable Bundle sideOptions, @SplitPosition int sidePosition, float splitRatio, 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 a2c2f591cde0..219530b46da4 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 @@ -57,8 +57,10 @@ import android.annotation.Nullable; import android.app.ActivityManager; import android.app.ActivityOptions; import android.app.ActivityTaskManager; +import android.app.PendingIntent; import android.app.WindowConfiguration; import android.content.Context; +import android.content.Intent; import android.content.res.Configuration; import android.graphics.Rect; import android.hardware.devicestate.DeviceStateManager; @@ -467,6 +469,116 @@ class StageCoordinator implements SplitLayout.SplitLayoutHandler, mTaskOrganizer.applyTransaction(wct); } + /** Start an intent and a task ordered by {@code intentFirst}. */ + void startIntentAndTaskWithLegacyTransition(PendingIntent pendingIntent, Intent fillInIntent, + int taskId, boolean intentFirst, @Nullable Bundle mainOptions, + @Nullable Bundle sideOptions, @SplitPosition int sidePosition, float splitRatio, + RemoteAnimationAdapter adapter) { + // TODO: try pulling the first chunk of this method into a method so that it can be shared + // with startTasksWithLegacyTransition. So far attempts to do so result in failure in split. + + // Init divider first to make divider leash for remote animation target. + mSplitLayout.init(); + // Set false to avoid record new bounds with old task still on top; + mShouldUpdateRecents = false; + final WindowContainerTransaction wct = new WindowContainerTransaction(); + final WindowContainerTransaction evictWct = new WindowContainerTransaction(); + prepareEvictChildTasks(SPLIT_POSITION_TOP_OR_LEFT, evictWct); + prepareEvictChildTasks(SPLIT_POSITION_BOTTOM_OR_RIGHT, evictWct); + // Need to add another wrapper here in shell so that we can inject the divider bar + // and also manage the process elevation via setRunningRemote + IRemoteAnimationRunner wrapper = new IRemoteAnimationRunner.Stub() { + @Override + public void onAnimationStart(@WindowManager.TransitionOldType int transit, + RemoteAnimationTarget[] apps, + RemoteAnimationTarget[] wallpapers, + RemoteAnimationTarget[] nonApps, + final IRemoteAnimationFinishedCallback finishedCallback) { + RemoteAnimationTarget[] augmentedNonApps = + new RemoteAnimationTarget[nonApps.length + 1]; + for (int i = 0; i < nonApps.length; ++i) { + augmentedNonApps[i] = nonApps[i]; + } + augmentedNonApps[augmentedNonApps.length - 1] = getDividerBarLegacyTarget(); + + IRemoteAnimationFinishedCallback wrapCallback = + new IRemoteAnimationFinishedCallback.Stub() { + @Override + public void onAnimationFinished() throws RemoteException { + mShouldUpdateRecents = true; + mSyncQueue.queue(evictWct); + mSyncQueue.runInSync(t -> setDividerVisibility(true, t)); + finishedCallback.onAnimationFinished(); + } + }; + try { + try { + ActivityTaskManager.getService().setRunningRemoteTransitionDelegate( + adapter.getCallingApplication()); + } catch (SecurityException e) { + Slog.e(TAG, "Unable to boost animation thread. This should only happen" + + " during unit tests"); + } + adapter.getRunner().onAnimationStart(transit, apps, wallpapers, + augmentedNonApps, wrapCallback); + } catch (RemoteException e) { + Slog.e(TAG, "Error starting remote animation", e); + } + } + + @Override + public void onAnimationCancelled() { + mShouldUpdateRecents = true; + mSyncQueue.queue(evictWct); + mSyncQueue.runInSync(t -> setDividerVisibility(true, t)); + try { + adapter.getRunner().onAnimationCancelled(); + } catch (RemoteException e) { + Slog.e(TAG, "Error starting remote animation", e); + } + } + }; + RemoteAnimationAdapter wrappedAdapter = new RemoteAnimationAdapter( + wrapper, adapter.getDuration(), adapter.getStatusBarTransitionDelay()); + + if (mainOptions == null) { + mainOptions = ActivityOptions.makeRemoteAnimation(wrappedAdapter).toBundle(); + } else { + ActivityOptions mainActivityOptions = ActivityOptions.fromBundle(mainOptions); + mainActivityOptions.update(ActivityOptions.makeRemoteAnimation(wrappedAdapter)); + mainOptions = mainActivityOptions.toBundle(); + } + + sideOptions = sideOptions != null ? sideOptions : new Bundle(); + setSideStagePosition(sidePosition, wct); + + mSplitLayout.setDivideRatio(splitRatio); + if (mMainStage.isActive()) { + mMainStage.moveToTop(getMainStageBounds(), wct); + } else { + // Build a request WCT that will launch both apps such that task 0 is on the main stage + // while task 1 is on the side stage. + mMainStage.activate(getMainStageBounds(), wct, false /* reparent */); + } + mSideStage.moveToTop(getSideStageBounds(), wct); + + // Make sure the launch options will put tasks in the corresponding split roots + addActivityOptions(mainOptions, mMainStage); + addActivityOptions(sideOptions, mSideStage); + + // Add task launch requests + if (intentFirst) { + wct.sendPendingIntent(pendingIntent, fillInIntent, mainOptions); + wct.startTask(taskId, sideOptions); + } else { + wct.startTask(taskId, mainOptions); + wct.sendPendingIntent(pendingIntent, fillInIntent, sideOptions); + } + + // Using legacy transitions, so we can't use blast sync since it conflicts. + mTaskOrganizer.applyTransaction(wct); + } + /** * Collects all the current child tasks of a specific split and prepares transaction to evict * them to display. diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultTransitionHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultTransitionHandler.java index 27b6dc5b304f..ddf01a8c5ee9 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultTransitionHandler.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultTransitionHandler.java @@ -67,7 +67,11 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; +import android.graphics.Canvas; import android.graphics.Color; +import android.graphics.Insets; +import android.graphics.Paint; +import android.graphics.PixelFormat; import android.graphics.Point; import android.graphics.Rect; import android.graphics.drawable.Drawable; @@ -78,6 +82,7 @@ import android.os.SystemProperties; import android.os.UserHandle; import android.util.ArrayMap; import android.view.Choreographer; +import android.view.Surface; import android.view.SurfaceControl; import android.view.SurfaceSession; import android.view.WindowManager; @@ -103,6 +108,8 @@ import com.android.wm.shell.common.TransactionPool; import com.android.wm.shell.protolog.ShellProtoLogGroup; import java.util.ArrayList; +import java.util.List; +import java.util.function.Consumer; /** The default handler that handles anything not already handled. */ public class DefaultTransitionHandler implements Transitions.TransitionHandler { @@ -331,6 +338,9 @@ public class DefaultTransitionHandler implements Transitions.TransitionHandler { finishCallback.onTransitionFinished(null /* wct */, null /* wctCB */); }; + final List<Consumer<SurfaceControl.Transaction>> postStartTransactionCallbacks = + new ArrayList<>(); + @ColorInt int backgroundColorForTransition = 0; final int wallpaperTransit = getWallpaperTransitType(info); for (int i = info.getChanges().size() - 1; i >= 0; --i) { @@ -402,13 +412,15 @@ public class DefaultTransitionHandler implements Transitions.TransitionHandler { } } - float cornerRadius = 0; + final float cornerRadius; if (a.hasRoundedCorners() && isTask) { // hasRoundedCorners is currently only enabled for tasks final Context displayContext = mDisplayController.getDisplayContext(change.getTaskInfo().displayId); cornerRadius = ScreenDecorationsUtils.getWindowCornerRadius(displayContext); + } else { + cornerRadius = 0; } if (a.getShowBackground()) { @@ -424,12 +436,37 @@ public class DefaultTransitionHandler implements Transitions.TransitionHandler { } } + boolean delayedEdgeExtension = false; + if (!isTask && a.hasExtension()) { + if (!Transitions.isOpeningType(change.getMode())) { + // Can screenshot now (before startTransaction is applied) + edgeExtendWindow(change, a, startTransaction, finishTransaction); + } else { + // Need to screenshot after startTransaction is applied otherwise activity + // may not be visible or ready yet. + postStartTransactionCallbacks + .add(t -> edgeExtendWindow(change, a, t, finishTransaction)); + delayedEdgeExtension = true; + } + } + final Rect clipRect = Transitions.isClosingType(change.getMode()) ? mRotator.getEndBoundsInStartRotation(change) : change.getEndAbsBounds(); - startSurfaceAnimation(animations, a, change.getLeash(), onAnimFinish, - mTransactionPool, mMainExecutor, mAnimExecutor, null /* position */, - cornerRadius, clipRect); + + if (delayedEdgeExtension) { + // If the edge extension needs to happen after the startTransition has been + // applied, then we want to only start the animation after the edge extension + // postStartTransaction callback has been run + postStartTransactionCallbacks.add(t -> + startSurfaceAnimation(animations, a, change.getLeash(), onAnimFinish, + mTransactionPool, mMainExecutor, mAnimExecutor, + null /* position */, cornerRadius, clipRect)); + } else { + startSurfaceAnimation(animations, a, change.getLeash(), onAnimFinish, + mTransactionPool, mMainExecutor, mAnimExecutor, null /* position */, + cornerRadius, clipRect); + } if (info.getAnimationOptions() != null) { attachThumbnail(animations, onAnimFinish, change, info.getAnimationOptions(), @@ -443,7 +480,20 @@ public class DefaultTransitionHandler implements Transitions.TransitionHandler { startTransaction, finishTransaction); } - startTransaction.apply(); + // postStartTransactionCallbacks require that the start transaction is already + // applied to run otherwise they may result in flickers and UI inconsistencies. + boolean waitForStartTransactionApply = postStartTransactionCallbacks.size() > 0; + startTransaction.apply(waitForStartTransactionApply); + + // Run tasks that require startTransaction to already be applied + for (Consumer<SurfaceControl.Transaction> postStartTransactionCallback : + postStartTransactionCallbacks) { + final SurfaceControl.Transaction t = mTransactionPool.acquire(); + postStartTransactionCallback.accept(t); + t.apply(); + mTransactionPool.release(t); + } + mRotator.cleanUp(finishTransaction); TransitionMetrics.getInstance().reportAnimationStart(transition); // run finish now in-case there are no animations @@ -451,6 +501,117 @@ public class DefaultTransitionHandler implements Transitions.TransitionHandler { return true; } + private void edgeExtendWindow(TransitionInfo.Change change, + Animation a, SurfaceControl.Transaction startTransaction, + SurfaceControl.Transaction finishTransaction) { + final Transformation transformationAtStart = new Transformation(); + a.getTransformationAt(0, transformationAtStart); + final Transformation transformationAtEnd = new Transformation(); + a.getTransformationAt(1, transformationAtEnd); + + // We want to create an extension surface that is the maximal size and the animation will + // take care of cropping any part that overflows. + final Insets maxExtensionInsets = Insets.min( + transformationAtStart.getInsets(), transformationAtEnd.getInsets()); + + final int targetSurfaceHeight = Math.max(change.getStartAbsBounds().height(), + change.getEndAbsBounds().height()); + final int targetSurfaceWidth = Math.max(change.getStartAbsBounds().width(), + change.getEndAbsBounds().width()); + if (maxExtensionInsets.left < 0) { + final Rect edgeBounds = new Rect(0, 0, 1, targetSurfaceHeight); + final Rect extensionRect = new Rect(0, 0, + -maxExtensionInsets.left, targetSurfaceHeight); + final int xPos = maxExtensionInsets.left; + final int yPos = 0; + createExtensionSurface(change.getLeash(), edgeBounds, extensionRect, xPos, yPos, + "Left Edge Extension", startTransaction, finishTransaction); + } + + if (maxExtensionInsets.top < 0) { + final Rect edgeBounds = new Rect(0, 0, targetSurfaceWidth, 1); + final Rect extensionRect = new Rect(0, 0, + targetSurfaceWidth, -maxExtensionInsets.top); + final int xPos = 0; + final int yPos = maxExtensionInsets.top; + createExtensionSurface(change.getLeash(), edgeBounds, extensionRect, xPos, yPos, + "Top Edge Extension", startTransaction, finishTransaction); + } + + if (maxExtensionInsets.right < 0) { + final Rect edgeBounds = new Rect(targetSurfaceWidth - 1, 0, + targetSurfaceWidth, targetSurfaceHeight); + final Rect extensionRect = new Rect(0, 0, + -maxExtensionInsets.right, targetSurfaceHeight); + final int xPos = targetSurfaceWidth; + final int yPos = 0; + createExtensionSurface(change.getLeash(), edgeBounds, extensionRect, xPos, yPos, + "Right Edge Extension", startTransaction, finishTransaction); + } + + if (maxExtensionInsets.bottom < 0) { + final Rect edgeBounds = new Rect(0, targetSurfaceHeight - 1, + targetSurfaceWidth, targetSurfaceHeight); + final Rect extensionRect = new Rect(0, 0, + targetSurfaceWidth, -maxExtensionInsets.bottom); + final int xPos = maxExtensionInsets.left; + final int yPos = targetSurfaceHeight; + createExtensionSurface(change.getLeash(), edgeBounds, extensionRect, xPos, yPos, + "Bottom Edge Extension", startTransaction, finishTransaction); + } + } + + private SurfaceControl createExtensionSurface(SurfaceControl surfaceToExtend, Rect edgeBounds, + Rect extensionRect, int xPos, int yPos, String layerName, + SurfaceControl.Transaction startTransaction, + SurfaceControl.Transaction finishTransaction) { + final SurfaceControl edgeExtensionLayer = new SurfaceControl.Builder() + .setName(layerName) + .setParent(surfaceToExtend) + .setHidden(true) + .setCallsite("DefaultTransitionHandler#startAnimation") + .setOpaque(true) + .setBufferSize(extensionRect.width(), extensionRect.height()) + .build(); + + SurfaceControl.LayerCaptureArgs captureArgs = + new SurfaceControl.LayerCaptureArgs.Builder(surfaceToExtend) + .setSourceCrop(edgeBounds) + .setFrameScale(1) + .setPixelFormat(PixelFormat.RGBA_8888) + .setChildrenOnly(true) + .setAllowProtected(true) + .build(); + final SurfaceControl.ScreenshotHardwareBuffer edgeBuffer = + SurfaceControl.captureLayers(captureArgs); + + if (edgeBuffer == null) { + ProtoLog.e(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, + "Failed to capture edge of window."); + return null; + } + + android.graphics.BitmapShader shader = + new android.graphics.BitmapShader(edgeBuffer.asBitmap(), + android.graphics.Shader.TileMode.CLAMP, + android.graphics.Shader.TileMode.CLAMP); + final Paint paint = new Paint(); + paint.setShader(shader); + + final Surface surface = new Surface(edgeExtensionLayer); + Canvas c = surface.lockHardwareCanvas(); + c.drawRect(extensionRect, paint); + surface.unlockCanvasAndPost(c); + surface.release(); + + startTransaction.setLayer(edgeExtensionLayer, Integer.MIN_VALUE); + startTransaction.setPosition(edgeExtensionLayer, xPos, yPos); + startTransaction.setVisibility(edgeExtensionLayer, true); + finishTransaction.remove(edgeExtensionLayer); + + return edgeExtensionLayer; + } + private void addBackgroundToTransition( @NonNull SurfaceControl rootLeash, @ColorInt int color, @@ -778,9 +939,17 @@ public class DefaultTransitionHandler implements Transitions.TransitionHandler { } t.setMatrix(leash, transformation.getMatrix(), matrix); t.setAlpha(leash, transformation.getAlpha()); + + Insets extensionInsets = Insets.min(transformation.getInsets(), Insets.NONE); + if (!extensionInsets.equals(Insets.NONE) && clipRect != null && !clipRect.isEmpty()) { + // Clip out any overflowing edge extension + clipRect.inset(extensionInsets); + t.setCrop(leash, clipRect); + } + if (anim.hasRoundedCorners() && cornerRadius > 0 && clipRect != null) { // We can only apply rounded corner if a crop is set - t.setWindowCrop(leash, clipRect); + t.setCrop(leash, clipRect); t.setCornerRadius(leash, cornerRadius); } diff --git a/libs/WindowManager/Shell/tests/flicker/AndroidTest.xml b/libs/WindowManager/Shell/tests/flicker/AndroidTest.xml index 574a9f4da627..556742e2ac5f 100644 --- a/libs/WindowManager/Shell/tests/flicker/AndroidTest.xml +++ b/libs/WindowManager/Shell/tests/flicker/AndroidTest.xml @@ -26,8 +26,16 @@ <option name="shell-timeout" value="6600s" /> <option name="test-timeout" value="6000s" /> <option name="hidden-api-checks" value="false" /> + <option name="device-listeners" + value="com.android.server.wm.flicker.TraceFileReadyListener" /> </test> <metrics_collector class="com.android.tradefed.device.metric.FilePullerLogCollector"> + <option name="pull-pattern-keys" value="(\w)+\.winscope" /> + <option name="pull-pattern-keys" value="(\w)+\.mp4" /> + <option name="collect-on-run-ended-only" value="false" /> + <option name="clean-up" value="true" /> + </metrics_collector> + <metrics_collector class="com.android.tradefed.device.metric.FilePullerLogCollector"> <option name="directory-keys" value="/sdcard/flicker" /> <option name="collect-on-run-ended-only" value="true" /> <option name="clean-up" value="true" /> diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/BackAnimationControllerTest.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/BackAnimationControllerTest.java index 960c7ac4099a..b738c47ef6ff 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/BackAnimationControllerTest.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/BackAnimationControllerTest.java @@ -75,7 +75,8 @@ public class BackAnimationControllerTest { screenshotSurface, hardwareBuffer, new WindowConfiguration(), - new RemoteCallback((bundle) -> {})); + new RemoteCallback((bundle) -> {}), + null); try { doReturn(navigationInfo).when(mActivityTaskManager).startBackNavigation(); } catch (RemoteException ex) { diff --git a/media/java/android/media/AudioManager.java b/media/java/android/media/AudioManager.java index 15a398de9021..b8333fb57848 100644 --- a/media/java/android/media/AudioManager.java +++ b/media/java/android/media/AudioManager.java @@ -5919,13 +5919,14 @@ public class AudioManager { * @param newDevice Bluetooth device connected or null if there is no new devices * @param previousDevice Bluetooth device disconnected or null if there is no disconnected * devices - * @param info contain all info related to the device. {@link BtProfileConnectionInfo} + * @param info contain all info related to the device. {@link BluetoothProfileConnectionInfo} * {@hide} */ @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) @RequiresPermission(android.Manifest.permission.BLUETOOTH_STACK) public void handleBluetoothActiveDeviceChanged(@Nullable BluetoothDevice newDevice, - @Nullable BluetoothDevice previousDevice, @NonNull BtProfileConnectionInfo info) { + @Nullable BluetoothDevice previousDevice, + @NonNull BluetoothProfileConnectionInfo info) { final IAudioService service = getService(); try { service.handleBluetoothActiveDeviceChanged(newDevice, previousDevice, info); diff --git a/media/java/android/media/BtProfileConnectionInfo.aidl b/media/java/android/media/BluetoothProfileConnectionInfo.aidl index 047f06be0964..0617084fd826 100644 --- a/media/java/android/media/BtProfileConnectionInfo.aidl +++ b/media/java/android/media/BluetoothProfileConnectionInfo.aidl @@ -16,5 +16,5 @@ package android.media; -parcelable BtProfileConnectionInfo; +parcelable BluetoothProfileConnectionInfo; diff --git a/media/java/android/media/BtProfileConnectionInfo.java b/media/java/android/media/BluetoothProfileConnectionInfo.java index d1bb41e70b54..c14884657ddd 100644 --- a/media/java/android/media/BtProfileConnectionInfo.java +++ b/media/java/android/media/BluetoothProfileConnectionInfo.java @@ -15,40 +15,25 @@ */ package android.media; -import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.SystemApi; import android.bluetooth.BluetoothProfile; import android.os.Parcel; import android.os.Parcelable; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - /** * Contains information about Bluetooth profile connection state changed * {@hide} */ @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) -public final class BtProfileConnectionInfo implements Parcelable { - /** @hide */ - @IntDef({ - BluetoothProfile.A2DP, - BluetoothProfile.A2DP_SINK, - BluetoothProfile.HEADSET, // Can only be set by BtHelper - BluetoothProfile.HEARING_AID, - BluetoothProfile.LE_AUDIO, - }) - @Retention(RetentionPolicy.SOURCE) - public @interface BtProfile {} - - private final @BtProfile int mProfile; +public final class BluetoothProfileConnectionInfo implements Parcelable { + private final int mProfile; private final boolean mSupprNoisy; private final int mVolume; private final boolean mIsLeOutput; - private BtProfileConnectionInfo(@BtProfile int profile, boolean suppressNoisyIntent, int volume, - boolean isLeOutput) { + private BluetoothProfileConnectionInfo(int profile, boolean suppressNoisyIntent, + int volume, boolean isLeOutput) { mProfile = profile; mSupprNoisy = suppressNoisyIntent; mVolume = volume; @@ -59,21 +44,21 @@ public final class BtProfileConnectionInfo implements Parcelable { * Constructor used by BtHelper when a profile is connected * {@hide} */ - public BtProfileConnectionInfo(@BtProfile int profile) { + public BluetoothProfileConnectionInfo(int profile) { this(profile, false, -1, false); } - public static final @NonNull Parcelable.Creator<BtProfileConnectionInfo> CREATOR = - new Parcelable.Creator<BtProfileConnectionInfo>() { + public static final @NonNull Parcelable.Creator<BluetoothProfileConnectionInfo> CREATOR = + new Parcelable.Creator<BluetoothProfileConnectionInfo>() { @Override - public BtProfileConnectionInfo createFromParcel(Parcel source) { - return new BtProfileConnectionInfo(source.readInt(), source.readBoolean(), - source.readInt(), source.readBoolean()); + public BluetoothProfileConnectionInfo createFromParcel(Parcel source) { + return new BluetoothProfileConnectionInfo(source.readInt(), + source.readBoolean(), source.readInt(), source.readBoolean()); } @Override - public BtProfileConnectionInfo[] newArray(int size) { - return new BtProfileConnectionInfo[size]; + public BluetoothProfileConnectionInfo[] newArray(int size) { + return new BluetoothProfileConnectionInfo[size]; } }; @@ -98,10 +83,10 @@ public final class BtProfileConnectionInfo implements Parcelable { * * @param volume of device -1 to ignore value */ - public static @NonNull BtProfileConnectionInfo a2dpInfo(boolean suppressNoisyIntent, - int volume) { - return new BtProfileConnectionInfo(BluetoothProfile.A2DP, suppressNoisyIntent, volume, - false); + public static @NonNull BluetoothProfileConnectionInfo createA2dpInfo( + boolean suppressNoisyIntent, int volume) { + return new BluetoothProfileConnectionInfo(BluetoothProfile.A2DP, suppressNoisyIntent, + volume, false); } /** @@ -110,8 +95,8 @@ public final class BtProfileConnectionInfo implements Parcelable { * * @param volume of device -1 to ignore value */ - public static @NonNull BtProfileConnectionInfo a2dpSinkInfo(int volume) { - return new BtProfileConnectionInfo(BluetoothProfile.A2DP_SINK, true, volume, false); + public static @NonNull BluetoothProfileConnectionInfo createA2dpSinkInfo(int volume) { + return new BluetoothProfileConnectionInfo(BluetoothProfile.A2DP_SINK, true, volume, false); } /** @@ -120,9 +105,10 @@ public final class BtProfileConnectionInfo implements Parcelable { * @param suppressNoisyIntent if true the {@link AudioManager.ACTION_AUDIO_BECOMING_NOISY} * intent will not be sent. */ - public static @NonNull BtProfileConnectionInfo hearingAidInfo(boolean suppressNoisyIntent) { - return new BtProfileConnectionInfo(BluetoothProfile.HEARING_AID, suppressNoisyIntent, -1, - false); + public static @NonNull BluetoothProfileConnectionInfo createHearingAidInfo( + boolean suppressNoisyIntent) { + return new BluetoothProfileConnectionInfo(BluetoothProfile.HEARING_AID, suppressNoisyIntent, + -1, false); } /** @@ -133,16 +119,16 @@ public final class BtProfileConnectionInfo implements Parcelable { * * @param isLeOutput if true mean the device is an output device, if false it's an input device */ - public static @NonNull BtProfileConnectionInfo leAudio(boolean suppressNoisyIntent, - boolean isLeOutput) { - return new BtProfileConnectionInfo(BluetoothProfile.LE_AUDIO, suppressNoisyIntent, -1, - isLeOutput); + public static @NonNull BluetoothProfileConnectionInfo createLeAudioInfo( + boolean suppressNoisyIntent, boolean isLeOutput) { + return new BluetoothProfileConnectionInfo(BluetoothProfile.LE_AUDIO, suppressNoisyIntent, + -1, isLeOutput); } /** * @return The profile connection */ - public @BtProfile int getProfile() { + public int getProfile() { return mProfile; } @@ -150,7 +136,7 @@ public final class BtProfileConnectionInfo implements Parcelable { * @return {@code true} if {@link AudioManager.ACTION_AUDIO_BECOMING_NOISY} intent will not be * sent */ - public boolean getSuppressNoisyIntent() { + public boolean isSuppressNoisyIntent() { return mSupprNoisy; } @@ -167,7 +153,7 @@ public final class BtProfileConnectionInfo implements Parcelable { * @return {@code true} is the LE device is an output device, {@code false} if it's an input * device */ - public boolean getIsLeOutput() { + public boolean isLeOutput() { return mIsLeOutput; } } diff --git a/media/java/android/media/IAudioService.aidl b/media/java/android/media/IAudioService.aidl index 96199a988704..4451c64b6548 100755 --- a/media/java/android/media/IAudioService.aidl +++ b/media/java/android/media/IAudioService.aidl @@ -25,7 +25,7 @@ import android.media.AudioFocusInfo; import android.media.AudioPlaybackConfiguration; import android.media.AudioRecordingConfiguration; import android.media.AudioRoutesInfo; -import android.media.BtProfileConnectionInfo; +import android.media.BluetoothProfileConnectionInfo; import android.media.IAudioFocusDispatcher; import android.media.IAudioModeDispatcher; import android.media.IAudioRoutesObserver; @@ -276,7 +276,7 @@ interface IAudioService { oneway void playerHasOpPlayAudio(in int piid, in boolean hasOpPlayAudio); void handleBluetoothActiveDeviceChanged(in BluetoothDevice newDevice, - in BluetoothDevice previousDevice, in BtProfileConnectionInfo info); + in BluetoothDevice previousDevice, in BluetoothProfileConnectionInfo info); oneway void setFocusRequestResultFromExtPolicy(in AudioFocusInfo afi, int requestResult, in IAudioPolicyCallback pcb); diff --git a/media/java/android/media/ImageReader.java b/media/java/android/media/ImageReader.java index e2e48d35a672..5f02a430f384 100644 --- a/media/java/android/media/ImageReader.java +++ b/media/java/android/media/ImageReader.java @@ -43,6 +43,7 @@ import java.util.Objects; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.Executor; import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.locks.StampedLock; /** * <p>The ImageReader class allows direct application access to image data @@ -675,7 +676,8 @@ public class ImageReader implements AutoCloseable { * If no handler specified and the calling thread has no looper. */ public void setOnImageAvailableListener(OnImageAvailableListener listener, Handler handler) { - synchronized (mListenerLock) { + long writeStamp = mListenerLock.writeLock(); + try { if (listener != null) { Looper looper = handler != null ? handler.getLooper() : Looper.myLooper(); if (looper == null) { @@ -691,6 +693,8 @@ public class ImageReader implements AutoCloseable { mListenerExecutor = null; } mListener = listener; + } finally { + mListenerLock.unlockWrite(writeStamp); } } @@ -713,9 +717,12 @@ public class ImageReader implements AutoCloseable { throw new IllegalArgumentException("executor must not be null"); } - synchronized (mListenerLock) { + long writeStamp = mListenerLock.writeLock(); + try { mListenerExecutor = executor; mListener = listener; + } finally { + mListenerLock.unlockWrite(writeStamp); } } @@ -731,6 +738,8 @@ public class ImageReader implements AutoCloseable { /** * Callback that is called when a new image is available from ImageReader. * + * This callback must not modify or close the passed {@code reader}. + * * @param reader the ImageReader the callback is associated with. * @see ImageReader * @see Image @@ -889,28 +898,41 @@ public class ImageReader implements AutoCloseable { return; } + synchronized (ir.mCloseLock) { + if (!ir.mIsReaderValid) { + // It's dangerous to fire onImageAvailable() callback when the ImageReader + // is being closed, as application could acquire next image in the + // onImageAvailable() callback. + return; + } + } + final Executor executor; - final OnImageAvailableListener listener; - synchronized (ir.mListenerLock) { + final long readStamp = ir.mListenerLock.readLock(); + try { executor = ir.mListenerExecutor; - listener = ir.mListener; - } - final boolean isReaderValid; - synchronized (ir.mCloseLock) { - isReaderValid = ir.mIsReaderValid; + if (executor == null) { + return; + } + } finally { + ir.mListenerLock.unlockRead(readStamp); } - // It's dangerous to fire onImageAvailable() callback when the ImageReader - // is being closed, as application could acquire next image in the - // onImageAvailable() callback. - if (executor != null && listener != null && isReaderValid) { - executor.execute(new Runnable() { - @Override - public void run() { - listener.onImageAvailable(ir); + executor.execute(() -> { + // Acquire readlock to ensure that the ImageReader does not change its + // state while a listener is actively processing. + final long rStamp = ir.mListenerLock.readLock(); + try { + // Fire onImageAvailable of the latest non-null listener + // This ensures that if the listener changes while messages are in queue, the + // in-flight messages will call onImageAvailable of the new listener instead + if (ir.mListener != null) { + ir.mListener.onImageAvailable(ir); } - }); - } + } finally { + ir.mListenerLock.unlockRead(rStamp); + } + }); } /** @@ -1070,7 +1092,7 @@ public class ImageReader implements AutoCloseable { private Surface mSurface; private int mEstimatedNativeAllocBytes; - private final Object mListenerLock = new Object(); + private final StampedLock mListenerLock = new StampedLock(); private final Object mCloseLock = new Object(); private boolean mIsReaderValid = false; private OnImageAvailableListener mListener; diff --git a/media/java/android/media/RouteDiscoveryPreference.java b/media/java/android/media/RouteDiscoveryPreference.java index 06dc498afe5e..004501812ff6 100644 --- a/media/java/android/media/RouteDiscoveryPreference.java +++ b/media/java/android/media/RouteDiscoveryPreference.java @@ -64,8 +64,11 @@ public final class RouteDiscoveryPreference implements Parcelable { @NonNull private final List<String> mPreferredFeatures; + @NonNull private final List<String> mRequiredFeatures; + @NonNull private final List<String> mPackagesOrder; + @NonNull private final List<String> mAllowedPackages; private final boolean mShouldPerformActiveScan; @@ -118,7 +121,6 @@ public final class RouteDiscoveryPreference implements Parcelable { * Gets the required features of routes that media router would like to discover. * <p> * Routes that have all the required features will be discovered. - * This precedes {@link #getPreferredFeatures()}. * They may include predefined features such as * {@link MediaRoute2Info#FEATURE_LIVE_AUDIO}, {@link MediaRoute2Info#FEATURE_LIVE_VIDEO}, * or {@link MediaRoute2Info#FEATURE_REMOTE_PLAYBACK} or custom features defined by a provider. @@ -133,12 +135,16 @@ public final class RouteDiscoveryPreference implements Parcelable { /** * Gets the ordered list of package names used to remove duplicate routes. * <p> - * When the app enables duplicate removal, all the routes that have the same deduplication ID - * except one from the provider whose package name appears first in the list will be removed. + * Duplicate route removal is enabled if the returned list is non-empty. Routes are deduplicated + * based on their {@link MediaRoute2Info#getDeduplicationIds() deduplication IDs}. If two routes + * have a deduplication ID in common, only the route from the provider whose package name is + * first in the provided list will remain. + * + * @see #shouldRemoveDuplicates() */ @NonNull public List<String> getDeduplicationPackageOrder() { - return mPackagesOrder == null ? List.of() : mPackagesOrder; + return mPackagesOrder; } /** @@ -164,10 +170,9 @@ public final class RouteDiscoveryPreference implements Parcelable { } /** - * Gets whether duplicate routes should be removed. - * <p> - * If it is {@code true}, only one of routes that have - * the same deduplication ID will be obtained. + * Gets whether duplicate routes removal is enabled. + * + * @see #getDeduplicationPackageOrder() */ public boolean shouldRemoveDuplicates() { return !mPackagesOrder.isEmpty(); @@ -338,23 +343,20 @@ public final class RouteDiscoveryPreference implements Parcelable { } /** - * Sets the order of packages when removing duplicate routes. - * <p> - * Routes are removed based on its - * {@link MediaRoute2Info#getDeduplicationIds() deduplication ID}. - * If two routes have the same ID, even if they are from different providers, - * one of them is removed from the list. + * Sets the order of packages to use when removing duplicate routes. * <p> - * Routes from the provider whose package name appears first in the given package order - * will remain. - * If unspecified, any route can be selected. + * Routes are deduplicated based on their + * {@link MediaRoute2Info#getDeduplicationIds() deduplication IDs}. + * If two routes have a deduplication ID in common, only the route from the provider whose + * package name is first in the provided list will remain. * - * @param packageOrder list of package names for choosing routes to be removed or - * {@code null} not to remove duplicate routes. + * @param packageOrder ordered list of package names used to remove duplicate routes, or an + * empty list if deduplication should not be enabled. */ @NonNull - public Builder setDeduplicationPackageOrder(@Nullable List<String> packageOrder) { - mPackageOrder = (packageOrder == null) ? null : List.copyOf(packageOrder); + public Builder setDeduplicationPackageOrder(@NonNull List<String> packageOrder) { + Objects.requireNonNull(packageOrder, "packageOrder must not be null"); + mPackageOrder = List.copyOf(packageOrder); return this; } diff --git a/media/java/android/media/tv/tuner/DemuxCapabilities.java b/media/java/android/media/tv/tuner/DemuxCapabilities.java index 0f5bf082d44f..14a9144c9cdc 100644 --- a/media/java/android/media/tv/tuner/DemuxCapabilities.java +++ b/media/java/android/media/tv/tuner/DemuxCapabilities.java @@ -36,13 +36,8 @@ import java.lang.annotation.RetentionPolicy; public class DemuxCapabilities { /** @hide */ - @IntDef(flag = true, value = { - Filter.TYPE_TS, - Filter.TYPE_MMTP, - Filter.TYPE_IP, - Filter.TYPE_TLV, - Filter.TYPE_ALP - }) + @IntDef(value = {Filter.TYPE_TS, Filter.TYPE_MMTP, Filter.TYPE_IP, Filter.TYPE_TLV, + Filter.TYPE_ALP}) @Retention(RetentionPolicy.SOURCE) public @interface FilterCapabilities {} diff --git a/media/java/android/media/tv/tuner/filter/Filter.java b/media/java/android/media/tv/tuner/filter/Filter.java index 9f4423644877..14accaafe189 100644 --- a/media/java/android/media/tv/tuner/filter/Filter.java +++ b/media/java/android/media/tv/tuner/filter/Filter.java @@ -153,8 +153,8 @@ public class Filter implements AutoCloseable { /** @hide */ - @IntDef(flag = true, prefix = "STATUS_", value = {STATUS_DATA_READY, STATUS_LOW_WATER, - STATUS_HIGH_WATER, STATUS_OVERFLOW}) + @IntDef(prefix = "STATUS_", + value = {STATUS_DATA_READY, STATUS_LOW_WATER, STATUS_HIGH_WATER, STATUS_OVERFLOW}) @Retention(RetentionPolicy.SOURCE) public @interface Status {} @@ -185,8 +185,7 @@ public class Filter implements AutoCloseable { public static final int STATUS_OVERFLOW = DemuxFilterStatus.OVERFLOW; /** @hide */ - @IntDef(flag = true, - prefix = "SCRAMBLING_STATUS_", + @IntDef(prefix = "SCRAMBLING_STATUS_", value = {SCRAMBLING_STATUS_UNKNOWN, SCRAMBLING_STATUS_NOT_SCRAMBLED, SCRAMBLING_STATUS_SCRAMBLED}) @Retention(RetentionPolicy.SOURCE) @@ -209,8 +208,7 @@ public class Filter implements AutoCloseable { android.hardware.tv.tuner.ScramblingStatus.SCRAMBLED; /** @hide */ - @IntDef(flag = true, - prefix = "MONITOR_EVENT_", + @IntDef(prefix = "MONITOR_EVENT_", value = {MONITOR_EVENT_SCRAMBLING_STATUS, MONITOR_EVENT_IP_CID_CHANGE}) @Retention(RetentionPolicy.SOURCE) public @interface MonitorEventMask {} diff --git a/media/java/android/media/tv/tuner/filter/RecordSettings.java b/media/java/android/media/tv/tuner/filter/RecordSettings.java index d34581da29cb..b16d9fb247b7 100644 --- a/media/java/android/media/tv/tuner/filter/RecordSettings.java +++ b/media/java/android/media/tv/tuner/filter/RecordSettings.java @@ -40,8 +40,7 @@ public class RecordSettings extends Settings { * * @hide */ - @IntDef(flag = true, - value = {TS_INDEX_INVALID, TS_INDEX_FIRST_PACKET, TS_INDEX_PAYLOAD_UNIT_START_INDICATOR, + @IntDef(value = {TS_INDEX_INVALID, TS_INDEX_FIRST_PACKET, TS_INDEX_PAYLOAD_UNIT_START_INDICATOR, TS_INDEX_CHANGE_TO_NOT_SCRAMBLED, TS_INDEX_CHANGE_TO_EVEN_SCRAMBLED, TS_INDEX_CHANGE_TO_ODD_SCRAMBLED, TS_INDEX_DISCONTINUITY_INDICATOR, TS_INDEX_RANDOM_ACCESS_INDICATOR, TS_INDEX_PRIORITY_INDICATOR, @@ -165,7 +164,6 @@ public class RecordSettings extends Settings { * @hide */ @IntDef(prefix = "SC_INDEX_", - flag = true, value = {SC_INDEX_I_FRAME, SC_INDEX_P_FRAME, SC_INDEX_B_FRAME, SC_INDEX_SEQUENCE, SC_INDEX_I_SLICE, SC_INDEX_P_SLICE, SC_INDEX_B_SLICE, SC_INDEX_SI_SLICE, SC_INDEX_SP_SLICE}) @@ -214,8 +212,7 @@ public class RecordSettings extends Settings { * * @hide */ - @IntDef(flag = true, - value = {SC_HEVC_INDEX_SPS, SC_HEVC_INDEX_AUD, SC_HEVC_INDEX_SLICE_CE_BLA_W_LP, + @IntDef(value = {SC_HEVC_INDEX_SPS, SC_HEVC_INDEX_AUD, SC_HEVC_INDEX_SLICE_CE_BLA_W_LP, SC_HEVC_INDEX_SLICE_BLA_W_RADL, SC_HEVC_INDEX_SLICE_BLA_N_LP, SC_HEVC_INDEX_SLICE_IDR_W_RADL, SC_HEVC_INDEX_SLICE_IDR_N_LP, SC_HEVC_INDEX_SLICE_TRAIL_CRA}) @@ -258,8 +255,7 @@ public class RecordSettings extends Settings { /** * @hide */ - @IntDef(flag = true, - prefix = "SC_", + @IntDef(prefix = "SC_", value = { SC_INDEX_I_FRAME, SC_INDEX_P_FRAME, diff --git a/media/java/android/media/tv/tuner/filter/SharedFilter.java b/media/java/android/media/tv/tuner/filter/SharedFilter.java index 740ab9c45c83..21964ee5a32a 100644 --- a/media/java/android/media/tv/tuner/filter/SharedFilter.java +++ b/media/java/android/media/tv/tuner/filter/SharedFilter.java @@ -38,7 +38,7 @@ import java.util.concurrent.Executor; @SystemApi public final class SharedFilter implements AutoCloseable { /** @hide */ - @IntDef(flag = true, prefix = "STATUS_", value = {STATUS_INACCESSIBLE}) + @IntDef(prefix = "STATUS_", value = {STATUS_INACCESSIBLE}) @Retention(RetentionPolicy.SOURCE) public @interface Status {} diff --git a/media/java/android/media/tv/tuner/frontend/AnalogFrontendSettings.java b/media/java/android/media/tv/tuner/frontend/AnalogFrontendSettings.java index e0405ef57f2e..6c1134ae8fac 100644 --- a/media/java/android/media/tv/tuner/frontend/AnalogFrontendSettings.java +++ b/media/java/android/media/tv/tuner/frontend/AnalogFrontendSettings.java @@ -36,8 +36,7 @@ import java.lang.annotation.RetentionPolicy; @SystemApi public class AnalogFrontendSettings extends FrontendSettings { /** @hide */ - @IntDef(flag = true, - prefix = "SIGNAL_TYPE_", + @IntDef(prefix = "SIGNAL_TYPE_", value = {SIGNAL_TYPE_UNDEFINED, SIGNAL_TYPE_AUTO, SIGNAL_TYPE_PAL, SIGNAL_TYPE_PAL_M, SIGNAL_TYPE_PAL_N, SIGNAL_TYPE_PAL_60, SIGNAL_TYPE_NTSC, SIGNAL_TYPE_NTSC_443, SIGNAL_TYPE_SECAM}) @@ -82,8 +81,7 @@ public class AnalogFrontendSettings extends FrontendSettings { public static final int SIGNAL_TYPE_SECAM = FrontendAnalogType.SECAM; /** @hide */ - @IntDef(flag = true, - prefix = "SIF_", + @IntDef(prefix = "SIF_", value = {SIF_UNDEFINED, SIF_AUTO, SIF_BG, SIF_BG_A2, SIF_BG_NICAM, SIF_I, SIF_DK, SIF_DK1_A2, SIF_DK2_A2, SIF_DK3_A2, SIF_DK_NICAM, SIF_L, SIF_M, SIF_M_BTSC, SIF_M_A2, SIF_M_EIAJ, SIF_I_NICAM, SIF_L_NICAM, SIF_L_PRIME}) diff --git a/media/java/android/media/tv/tuner/frontend/Atsc3FrontendSettings.java b/media/java/android/media/tv/tuner/frontend/Atsc3FrontendSettings.java index a7157e20c5e6..c99f911c4236 100644 --- a/media/java/android/media/tv/tuner/frontend/Atsc3FrontendSettings.java +++ b/media/java/android/media/tv/tuner/frontend/Atsc3FrontendSettings.java @@ -39,8 +39,7 @@ import java.lang.annotation.RetentionPolicy; public class Atsc3FrontendSettings extends FrontendSettings { /** @hide */ - @IntDef(flag = true, - prefix = "BANDWIDTH_", + @IntDef(prefix = "BANDWIDTH_", value = {BANDWIDTH_UNDEFINED, BANDWIDTH_AUTO, BANDWIDTH_BANDWIDTH_6MHZ, BANDWIDTH_BANDWIDTH_7MHZ, BANDWIDTH_BANDWIDTH_8MHZ}) @Retention(RetentionPolicy.SOURCE) @@ -69,8 +68,7 @@ public class Atsc3FrontendSettings extends FrontendSettings { /** @hide */ - @IntDef(flag = true, - prefix = "MODULATION_", + @IntDef(prefix = "MODULATION_", value = {MODULATION_UNDEFINED, MODULATION_AUTO, MODULATION_MOD_QPSK, MODULATION_MOD_16QAM, MODULATION_MOD_64QAM, MODULATION_MOD_256QAM, @@ -113,8 +111,7 @@ public class Atsc3FrontendSettings extends FrontendSettings { /** @hide */ - @IntDef(flag = true, - prefix = "TIME_INTERLEAVE_MODE_", + @IntDef(prefix = "TIME_INTERLEAVE_MODE_", value = {TIME_INTERLEAVE_MODE_UNDEFINED, TIME_INTERLEAVE_MODE_AUTO, TIME_INTERLEAVE_MODE_CTI, TIME_INTERLEAVE_MODE_HTI}) @Retention(RetentionPolicy.SOURCE) @@ -140,8 +137,7 @@ public class Atsc3FrontendSettings extends FrontendSettings { /** @hide */ - @IntDef(flag = true, - prefix = "CODERATE_", + @IntDef(prefix = "CODERATE_", value = {CODERATE_UNDEFINED, CODERATE_AUTO, CODERATE_2_15, CODERATE_3_15, CODERATE_4_15, CODERATE_5_15, CODERATE_6_15, CODERATE_7_15, CODERATE_8_15, CODERATE_9_15, CODERATE_10_15, CODERATE_11_15, CODERATE_12_15, CODERATE_13_15}) @@ -207,8 +203,7 @@ public class Atsc3FrontendSettings extends FrontendSettings { /** @hide */ - @IntDef(flag = true, - prefix = "FEC_", + @IntDef(prefix = "FEC_", value = {FEC_UNDEFINED, FEC_AUTO, FEC_BCH_LDPC_16K, FEC_BCH_LDPC_64K, FEC_CRC_LDPC_16K, FEC_CRC_LDPC_64K, FEC_LDPC_16K, FEC_LDPC_64K}) @Retention(RetentionPolicy.SOURCE) @@ -249,8 +244,7 @@ public class Atsc3FrontendSettings extends FrontendSettings { /** @hide */ - @IntDef(flag = true, - prefix = "DEMOD_OUTPUT_FORMAT_", + @IntDef(prefix = "DEMOD_OUTPUT_FORMAT_", value = {DEMOD_OUTPUT_FORMAT_UNDEFINED, DEMOD_OUTPUT_FORMAT_ATSC3_LINKLAYER_PACKET, DEMOD_OUTPUT_FORMAT_BASEBAND_PACKET}) @Retention(RetentionPolicy.SOURCE) diff --git a/media/java/android/media/tv/tuner/frontend/AtscFrontendSettings.java b/media/java/android/media/tv/tuner/frontend/AtscFrontendSettings.java index 3071ce861e0d..64c6ce629740 100644 --- a/media/java/android/media/tv/tuner/frontend/AtscFrontendSettings.java +++ b/media/java/android/media/tv/tuner/frontend/AtscFrontendSettings.java @@ -34,8 +34,7 @@ import java.lang.annotation.RetentionPolicy; public class AtscFrontendSettings extends FrontendSettings { /** @hide */ - @IntDef(flag = true, - prefix = "MODULATION_", + @IntDef(prefix = "MODULATION_", value = {MODULATION_UNDEFINED, MODULATION_AUTO, MODULATION_MOD_8VSB, MODULATION_MOD_16VSB}) @Retention(RetentionPolicy.SOURCE) diff --git a/media/java/android/media/tv/tuner/frontend/DtmbFrontendSettings.java b/media/java/android/media/tv/tuner/frontend/DtmbFrontendSettings.java index 6b5d6ca9eb84..07c1fbffd91e 100644 --- a/media/java/android/media/tv/tuner/frontend/DtmbFrontendSettings.java +++ b/media/java/android/media/tv/tuner/frontend/DtmbFrontendSettings.java @@ -43,8 +43,7 @@ import java.lang.annotation.RetentionPolicy; public final class DtmbFrontendSettings extends FrontendSettings { /** @hide */ - @IntDef(flag = true, - prefix = "BANDWIDTH_", + @IntDef(prefix = "BANDWIDTH_", value = {BANDWIDTH_UNDEFINED, BANDWIDTH_AUTO, BANDWIDTH_6MHZ, BANDWIDTH_8MHZ}) @Retention(RetentionPolicy.SOURCE) public @interface Bandwidth {} @@ -68,8 +67,7 @@ public final class DtmbFrontendSettings extends FrontendSettings { /** @hide */ - @IntDef(flag = true, - prefix = "TIME_INTERLEAVE_MODE_", + @IntDef(prefix = "TIME_INTERLEAVE_MODE_", value = {TIME_INTERLEAVE_MODE_UNDEFINED, TIME_INTERLEAVE_MODE_AUTO, TIME_INTERLEAVE_MODE_TIMER_INT_240, TIME_INTERLEAVE_MODE_TIMER_INT_720}) @Retention(RetentionPolicy.SOURCE) @@ -97,8 +95,7 @@ public final class DtmbFrontendSettings extends FrontendSettings { /** @hide */ - @IntDef(flag = true, - prefix = "GUARD_INTERVAL_", + @IntDef(prefix = "GUARD_INTERVAL_", value = {GUARD_INTERVAL_UNDEFINED, GUARD_INTERVAL_AUTO, GUARD_INTERVAL_PN_420_VARIOUS, GUARD_INTERVAL_PN_595_CONST, GUARD_INTERVAL_PN_945_VARIOUS, GUARD_INTERVAL_PN_420_CONST, @@ -143,8 +140,7 @@ public final class DtmbFrontendSettings extends FrontendSettings { /** @hide */ - @IntDef(flag = true, - prefix = "MODULATION_", + @IntDef(prefix = "MODULATION_", value = {MODULATION_CONSTELLATION_UNDEFINED, MODULATION_CONSTELLATION_AUTO, MODULATION_CONSTELLATION_4QAM, MODULATION_CONSTELLATION_4QAM_NR, MODULATION_CONSTELLATION_16QAM, MODULATION_CONSTELLATION_32QAM, @@ -187,8 +183,7 @@ public final class DtmbFrontendSettings extends FrontendSettings { FrontendDtmbModulation.CONSTELLATION_64QAM; /** @hide */ - @IntDef(flag = true, - prefix = "CODERATE_", + @IntDef(prefix = "CODERATE_", value = {CODERATE_UNDEFINED, CODERATE_AUTO, CODERATE_2_5, CODERATE_3_5, CODERATE_4_5}) @Retention(RetentionPolicy.SOURCE) public @interface CodeRate {} @@ -215,8 +210,7 @@ public final class DtmbFrontendSettings extends FrontendSettings { public static final int CODERATE_4_5 = FrontendDtmbCodeRate.CODERATE_4_5; /** @hide */ - @IntDef(flag = true, - prefix = "TRANSMISSION_MODE_", + @IntDef(prefix = "TRANSMISSION_MODE_", value = {TRANSMISSION_MODE_UNDEFINED, TRANSMISSION_MODE_AUTO, TRANSMISSION_MODE_C1, TRANSMISSION_MODE_C3780}) @Retention(RetentionPolicy.SOURCE) diff --git a/media/java/android/media/tv/tuner/frontend/DvbcFrontendSettings.java b/media/java/android/media/tv/tuner/frontend/DvbcFrontendSettings.java index afe953de5389..45bfc09b8ae7 100644 --- a/media/java/android/media/tv/tuner/frontend/DvbcFrontendSettings.java +++ b/media/java/android/media/tv/tuner/frontend/DvbcFrontendSettings.java @@ -40,8 +40,7 @@ import java.lang.annotation.RetentionPolicy; public class DvbcFrontendSettings extends FrontendSettings { /** @hide */ - @IntDef(flag = true, - prefix = "MODULATION_", + @IntDef(prefix = "MODULATION_", value = {MODULATION_UNDEFINED, MODULATION_AUTO, MODULATION_MOD_16QAM, MODULATION_MOD_32QAM, MODULATION_MOD_64QAM, MODULATION_MOD_128QAM, MODULATION_MOD_256QAM}) @@ -98,8 +97,7 @@ public class DvbcFrontendSettings extends FrontendSettings { /** @hide */ - @IntDef(flag = true, - prefix = "ANNEX_", + @IntDef(prefix = "ANNEX_", value = {ANNEX_UNDEFINED, ANNEX_A, ANNEX_B, ANNEX_C}) @Retention(RetentionPolicy.SOURCE) public @interface Annex {} @@ -159,8 +157,7 @@ public class DvbcFrontendSettings extends FrontendSettings { android.hardware.tv.tuner.FrontendSpectralInversion.INVERTED; /** @hide */ - @IntDef(flag = true, - prefix = "TIME_INTERLEAVE_MODE_", + @IntDef(prefix = "TIME_INTERLEAVE_MODE_", value = {TIME_INTERLEAVE_MODE_UNDEFINED, TIME_INTERLEAVE_MODE_AUTO, TIME_INTERLEAVE_MODE_128_1_0, TIME_INTERLEAVE_MODE_128_1_1, TIME_INTERLEAVE_MODE_64_2, TIME_INTERLEAVE_MODE_32_4, @@ -226,8 +223,7 @@ public class DvbcFrontendSettings extends FrontendSettings { FrontendCableTimeInterleaveMode.INTERLEAVING_128_4; /** @hide */ - @IntDef(flag = true, - prefix = "BANDWIDTH_", + @IntDef(prefix = "BANDWIDTH_", value = {BANDWIDTH_UNDEFINED, BANDWIDTH_5MHZ, BANDWIDTH_6MHZ, BANDWIDTH_7MHZ, BANDWIDTH_8MHZ}) @Retention(RetentionPolicy.SOURCE) diff --git a/media/java/android/media/tv/tuner/frontend/DvbsFrontendSettings.java b/media/java/android/media/tv/tuner/frontend/DvbsFrontendSettings.java index e16f19285100..56dbb480880b 100644 --- a/media/java/android/media/tv/tuner/frontend/DvbsFrontendSettings.java +++ b/media/java/android/media/tv/tuner/frontend/DvbsFrontendSettings.java @@ -42,8 +42,7 @@ import java.lang.annotation.RetentionPolicy; @SystemApi public class DvbsFrontendSettings extends FrontendSettings { /** @hide */ - @IntDef(flag = true, - prefix = "SCAN_TYPE_", + @IntDef(prefix = "SCAN_TYPE_", value = {SCAN_TYPE_UNDEFINED, SCAN_TYPE_DIRECT, SCAN_TYPE_DISEQC, SCAN_TYPE_UNICABLE, SCAN_TYPE_JESS}) @Retention(RetentionPolicy.SOURCE) @@ -75,8 +74,7 @@ public class DvbsFrontendSettings extends FrontendSettings { public static final int SCAN_TYPE_JESS = FrontendDvbsScanType.JESS; /** @hide */ - @IntDef(flag = true, - prefix = "MODULATION_", + @IntDef(prefix = "MODULATION_", value = {MODULATION_UNDEFINED, MODULATION_AUTO, MODULATION_MOD_QPSK, MODULATION_MOD_8PSK, MODULATION_MOD_16QAM, MODULATION_MOD_16PSK, MODULATION_MOD_32PSK, MODULATION_MOD_ACM, MODULATION_MOD_8APSK, @@ -207,8 +205,7 @@ public class DvbsFrontendSettings extends FrontendSettings { /** @hide */ - @IntDef(flag = true, - prefix = "STANDARD_", + @IntDef(prefix = "STANDARD_", value = {STANDARD_AUTO, STANDARD_S, STANDARD_S2, STANDARD_S2X}) @Retention(RetentionPolicy.SOURCE) public @interface Standard {} diff --git a/media/java/android/media/tv/tuner/frontend/DvbtFrontendSettings.java b/media/java/android/media/tv/tuner/frontend/DvbtFrontendSettings.java index d86e9a8af5f6..06547e1fc0e7 100644 --- a/media/java/android/media/tv/tuner/frontend/DvbtFrontendSettings.java +++ b/media/java/android/media/tv/tuner/frontend/DvbtFrontendSettings.java @@ -42,8 +42,7 @@ import java.lang.annotation.RetentionPolicy; public class DvbtFrontendSettings extends FrontendSettings { /** @hide */ - @IntDef(flag = true, - prefix = "TRANSMISSION_MODE_", + @IntDef(prefix = "TRANSMISSION_MODE_", value = {TRANSMISSION_MODE_UNDEFINED, TRANSMISSION_MODE_AUTO, TRANSMISSION_MODE_2K, TRANSMISSION_MODE_8K, TRANSMISSION_MODE_4K, TRANSMISSION_MODE_1K, TRANSMISSION_MODE_16K, TRANSMISSION_MODE_32K}) @@ -98,8 +97,7 @@ public class DvbtFrontendSettings extends FrontendSettings { FrontendDvbtTransmissionMode.MODE_32K_E; /** @hide */ - @IntDef(flag = true, - prefix = "BANDWIDTH_", + @IntDef(prefix = "BANDWIDTH_", value = {BANDWIDTH_UNDEFINED, BANDWIDTH_AUTO, BANDWIDTH_8MHZ, BANDWIDTH_7MHZ, BANDWIDTH_6MHZ, BANDWIDTH_5MHZ, BANDWIDTH_1_7MHZ, BANDWIDTH_10MHZ}) @Retention(RetentionPolicy.SOURCE) @@ -140,8 +138,7 @@ public class DvbtFrontendSettings extends FrontendSettings { /** @hide */ - @IntDef(flag = true, - prefix = "CONSTELLATION_", + @IntDef(prefix = "CONSTELLATION_", value = {CONSTELLATION_UNDEFINED, CONSTELLATION_AUTO, CONSTELLATION_QPSK, CONSTELLATION_16QAM, CONSTELLATION_64QAM, CONSTELLATION_256QAM, CONSTELLATION_QPSK_R, CONSTELLATION_16QAM_R, CONSTELLATION_64QAM_R, @@ -192,8 +189,7 @@ public class DvbtFrontendSettings extends FrontendSettings { FrontendDvbtConstellation.CONSTELLATION_256QAM_R; /** @hide */ - @IntDef(flag = true, - prefix = "HIERARCHY_", + @IntDef(prefix = "HIERARCHY_", value = {HIERARCHY_UNDEFINED, HIERARCHY_AUTO, HIERARCHY_NON_NATIVE, HIERARCHY_1_NATIVE, HIERARCHY_2_NATIVE, HIERARCHY_4_NATIVE, HIERARCHY_NON_INDEPTH, HIERARCHY_1_INDEPTH, HIERARCHY_2_INDEPTH, HIERARCHY_4_INDEPTH}) @@ -243,8 +239,7 @@ public class DvbtFrontendSettings extends FrontendSettings { /** @hide */ - @IntDef(flag = true, - prefix = "CODERATE_", + @IntDef(prefix = "CODERATE_", value = {CODERATE_UNDEFINED, CODERATE_AUTO, CODERATE_1_2, CODERATE_2_3, CODERATE_3_4, CODERATE_5_6, CODERATE_7_8, CODERATE_3_5, CODERATE_4_5, CODERATE_6_7, CODERATE_8_9}) @Retention(RetentionPolicy.SOURCE) @@ -296,8 +291,7 @@ public class DvbtFrontendSettings extends FrontendSettings { public static final int CODERATE_8_9 = FrontendDvbtCoderate.CODERATE_8_9; /** @hide */ - @IntDef(flag = true, - prefix = "GUARD_INTERVAL_", + @IntDef(prefix = "GUARD_INTERVAL_", value = {GUARD_INTERVAL_UNDEFINED, GUARD_INTERVAL_AUTO, GUARD_INTERVAL_1_32, GUARD_INTERVAL_1_16, GUARD_INTERVAL_1_8, GUARD_INTERVAL_1_4, @@ -346,8 +340,7 @@ public class DvbtFrontendSettings extends FrontendSettings { public static final int GUARD_INTERVAL_19_256 = FrontendDvbtGuardInterval.INTERVAL_19_256; /** @hide */ - @IntDef(flag = true, - prefix = "STANDARD", + @IntDef(prefix = "STANDARD_", value = {STANDARD_AUTO, STANDARD_T, STANDARD_T2} ) @Retention(RetentionPolicy.SOURCE) diff --git a/media/java/android/media/tv/tuner/frontend/FrontendSettings.java b/media/java/android/media/tv/tuner/frontend/FrontendSettings.java index 38bffec3f77f..2f45a7072017 100644 --- a/media/java/android/media/tv/tuner/frontend/FrontendSettings.java +++ b/media/java/android/media/tv/tuner/frontend/FrontendSettings.java @@ -89,8 +89,7 @@ public abstract class FrontendSettings { /** @hide */ - @LongDef(flag = true, - prefix = "FEC_", + @LongDef(prefix = "FEC_", value = {FEC_UNDEFINED, FEC_AUTO, FEC_1_2, FEC_1_3, FEC_1_4, FEC_1_5, FEC_2_3, FEC_2_5, FEC_2_9, FEC_3_4, FEC_3_5, FEC_4_5, FEC_4_15, FEC_5_6, FEC_5_9, FEC_6_7, FEC_7_8, FEC_7_9, FEC_7_15, FEC_8_9, FEC_8_15, FEC_9_10, FEC_9_20, FEC_11_15, FEC_11_20, diff --git a/media/java/android/media/tv/tuner/frontend/FrontendStatus.java b/media/java/android/media/tv/tuner/frontend/FrontendStatus.java index c1e9b38a13b0..9fbea724f491 100644 --- a/media/java/android/media/tv/tuner/frontend/FrontendStatus.java +++ b/media/java/android/media/tv/tuner/frontend/FrontendStatus.java @@ -25,6 +25,9 @@ import android.media.tv.tuner.Lnb; import android.media.tv.tuner.TunerVersionChecker; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; /** * A Frontend Status class that contains the metrics of the active frontend. @@ -1086,22 +1089,26 @@ public class FrontendStatus { } /** - * Gets an array of all PLPs information of ATSC3 frontend, which includes both tuned and not + * Gets a list of all PLPs information of ATSC3 frontend, which includes both tuned and not * tuned PLPs for currently watching service. * - * <p>This query is only supported by Tuner HAL 2.0 or higher. Unsupported version or if HAL - * doesn't return all PLPs information will throw IllegalStateException. Use - * {@link TunerVersionChecker#getTunerVersion()} to check the version. + * <p>This query is only supported by Tuner HAL 2.0 or higher. Unsupported version will throw + * UnsupportedOperationException. Use {@link TunerVersionChecker#getTunerVersion()} to check + * the version. + * + * @return a list of all PLPs information. It is empty if HAL doesn't return all PLPs + * information status. */ - @SuppressLint("ArrayReturn") @NonNull - public Atsc3PlpInfo[] getAllAtsc3PlpInfo() { - TunerVersionChecker.checkHigherOrEqualVersionTo( - TunerVersionChecker.TUNER_VERSION_2_0, "Atsc3PlpInfo all status"); + public List<Atsc3PlpInfo> getAllAtsc3PlpInfo() { + if (!TunerVersionChecker.checkHigherOrEqualVersionTo( + TunerVersionChecker.TUNER_VERSION_2_0, "Atsc3PlpInfo all status")) { + throw new UnsupportedOperationException("Atsc3PlpInfo all status is empty"); + } if (mAllPlpInfo == null) { - throw new IllegalStateException("Atsc3PlpInfo all status is empty"); + return Collections.EMPTY_LIST; } - return mAllPlpInfo; + return Arrays.asList(mAllPlpInfo); } /** diff --git a/media/java/android/media/tv/tuner/frontend/Isdbs3FrontendSettings.java b/media/java/android/media/tv/tuner/frontend/Isdbs3FrontendSettings.java index 726fe15b8edb..7e83d1545032 100644 --- a/media/java/android/media/tv/tuner/frontend/Isdbs3FrontendSettings.java +++ b/media/java/android/media/tv/tuner/frontend/Isdbs3FrontendSettings.java @@ -36,8 +36,7 @@ import java.lang.annotation.RetentionPolicy; @SystemApi public class Isdbs3FrontendSettings extends FrontendSettings { /** @hide */ - @IntDef(flag = true, - prefix = "MODULATION_", + @IntDef(prefix = "MODULATION_", value = {MODULATION_UNDEFINED, MODULATION_AUTO, MODULATION_MOD_BPSK, MODULATION_MOD_QPSK, MODULATION_MOD_8PSK, MODULATION_MOD_16APSK, MODULATION_MOD_32APSK}) @@ -75,8 +74,7 @@ public class Isdbs3FrontendSettings extends FrontendSettings { /** @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef(flag = true, - prefix = "CODERATE_", + @IntDef(prefix = "CODERATE_", value = {CODERATE_UNDEFINED, CODERATE_AUTO, CODERATE_1_3, CODERATE_2_5, CODERATE_1_2, CODERATE_3_5, CODERATE_2_3, CODERATE_3_4, CODERATE_7_9, CODERATE_4_5, CODERATE_5_6, CODERATE_7_8, CODERATE_9_10}) diff --git a/media/java/android/media/tv/tuner/frontend/IsdbsFrontendSettings.java b/media/java/android/media/tv/tuner/frontend/IsdbsFrontendSettings.java index 51ec5aeeb2eb..50294539e8f8 100644 --- a/media/java/android/media/tv/tuner/frontend/IsdbsFrontendSettings.java +++ b/media/java/android/media/tv/tuner/frontend/IsdbsFrontendSettings.java @@ -54,8 +54,7 @@ public class IsdbsFrontendSettings extends FrontendSettings { /** @hide */ - @IntDef(flag = true, - prefix = "MODULATION_", + @IntDef(prefix = "MODULATION_", value = {MODULATION_UNDEFINED, MODULATION_AUTO, MODULATION_MOD_BPSK, MODULATION_MOD_QPSK, MODULATION_MOD_TC8PSK}) @Retention(RetentionPolicy.SOURCE) @@ -84,8 +83,7 @@ public class IsdbsFrontendSettings extends FrontendSettings { /** @hide */ - @IntDef(flag = true, - prefix = "CODERATE_", + @IntDef(prefix = "CODERATE_", value = {CODERATE_UNDEFINED, CODERATE_AUTO, CODERATE_1_2, CODERATE_2_3, CODERATE_3_4, CODERATE_5_6, CODERATE_7_8}) @Retention(RetentionPolicy.SOURCE) diff --git a/media/java/android/media/tv/tuner/frontend/IsdbtFrontendSettings.java b/media/java/android/media/tv/tuner/frontend/IsdbtFrontendSettings.java index 89512a05674b..f08a51497f75 100644 --- a/media/java/android/media/tv/tuner/frontend/IsdbtFrontendSettings.java +++ b/media/java/android/media/tv/tuner/frontend/IsdbtFrontendSettings.java @@ -40,8 +40,7 @@ import java.lang.annotation.RetentionPolicy; @SystemApi public class IsdbtFrontendSettings extends FrontendSettings { /** @hide */ - @IntDef(flag = true, - prefix = "MODULATION_", + @IntDef(prefix = "MODULATION_", value = {MODULATION_UNDEFINED, MODULATION_AUTO, MODULATION_MOD_DQPSK, MODULATION_MOD_QPSK, MODULATION_MOD_16QAM, MODULATION_MOD_64QAM}) @Retention(RetentionPolicy.SOURCE) @@ -74,8 +73,7 @@ public class IsdbtFrontendSettings extends FrontendSettings { /** @hide */ - @IntDef(flag = true, - prefix = "MODE_", + @IntDef(prefix = "MODE_", value = {MODE_UNDEFINED, MODE_AUTO, MODE_1, MODE_2, MODE_3}) @Retention(RetentionPolicy.SOURCE) public @interface Mode {} @@ -103,8 +101,7 @@ public class IsdbtFrontendSettings extends FrontendSettings { /** @hide */ - @IntDef(flag = true, - prefix = "BANDWIDTH_", + @IntDef(prefix = "BANDWIDTH_", value = {BANDWIDTH_UNDEFINED, BANDWIDTH_AUTO, BANDWIDTH_8MHZ, BANDWIDTH_7MHZ, BANDWIDTH_6MHZ}) @Retention(RetentionPolicy.SOURCE) @@ -132,7 +129,7 @@ public class IsdbtFrontendSettings extends FrontendSettings { public static final int BANDWIDTH_6MHZ = FrontendIsdbtBandwidth.BANDWIDTH_6MHZ; /** @hide */ - @IntDef(flag = true, prefix = "PARTIAL_RECEPTION_FLAG_", + @IntDef(prefix = "PARTIAL_RECEPTION_FLAG_", value = {PARTIAL_RECEPTION_FLAG_UNDEFINED, PARTIAL_RECEPTION_FLAG_FALSE, PARTIAL_RECEPTION_FLAG_TRUE}) @Retention(RetentionPolicy.SOURCE) @@ -153,7 +150,7 @@ public class IsdbtFrontendSettings extends FrontendSettings { public static final int PARTIAL_RECEPTION_FLAG_TRUE = FrontendIsdbtPartialReceptionFlag.TRUE; /** @hide */ - @IntDef(flag = true, prefix = "TIME_INTERLEAVE_MODE_", + @IntDef(prefix = "TIME_INTERLEAVE_MODE_", value = {TIME_INTERLEAVE_MODE_UNDEFINED, TIME_INTERLEAVE_MODE_AUTO, TIME_INTERLEAVE_MODE_1_0, TIME_INTERLEAVE_MODE_1_4, TIME_INTERLEAVE_MODE_1_8, TIME_INTERLEAVE_MODE_1_16, TIME_INTERLEAVE_MODE_2_0, TIME_INTERLEAVE_MODE_2_2, diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/BtProfileConnectionInfoTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/BluetoothProfileConnectionInfoTest.java index fd66d3b9904e..f23794b50543 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/BtProfileConnectionInfoTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/BluetoothProfileConnectionInfoTest.java @@ -19,7 +19,7 @@ package com.android.mediaframeworktest.unit; import static org.junit.Assert.assertEquals; import android.bluetooth.BluetoothProfile; -import android.media.BtProfileConnectionInfo; +import android.media.BluetoothProfileConnectionInfo; import androidx.test.runner.AndroidJUnit4; @@ -27,22 +27,24 @@ import org.junit.Test; import org.junit.runner.RunWith; @RunWith(AndroidJUnit4.class) -public class BtProfileConnectionInfoTest { +public class BluetoothProfileConnectionInfoTest { @Test public void testCoverageA2dp() { final boolean supprNoisy = false; final int volume = 42; - final BtProfileConnectionInfo info = BtProfileConnectionInfo.a2dpInfo(supprNoisy, volume); + final BluetoothProfileConnectionInfo info = BluetoothProfileConnectionInfo + .createA2dpInfo(supprNoisy, volume); assertEquals(info.getProfile(), BluetoothProfile.A2DP); - assertEquals(info.getSuppressNoisyIntent(), supprNoisy); + assertEquals(info.isSuppressNoisyIntent(), supprNoisy); assertEquals(info.getVolume(), volume); } @Test public void testCoverageA2dpSink() { final int volume = 42; - final BtProfileConnectionInfo info = BtProfileConnectionInfo.a2dpSinkInfo(volume); + final BluetoothProfileConnectionInfo info = BluetoothProfileConnectionInfo + .createA2dpSinkInfo(volume); assertEquals(info.getProfile(), BluetoothProfile.A2DP_SINK); assertEquals(info.getVolume(), volume); } @@ -50,20 +52,21 @@ public class BtProfileConnectionInfoTest { @Test public void testCoveragehearingAid() { final boolean supprNoisy = true; - final BtProfileConnectionInfo info = BtProfileConnectionInfo.hearingAidInfo(supprNoisy); + final BluetoothProfileConnectionInfo info = BluetoothProfileConnectionInfo + .createHearingAidInfo(supprNoisy); assertEquals(info.getProfile(), BluetoothProfile.HEARING_AID); - assertEquals(info.getSuppressNoisyIntent(), supprNoisy); + assertEquals(info.isSuppressNoisyIntent(), supprNoisy); } @Test public void testCoverageLeAudio() { final boolean supprNoisy = false; final boolean isLeOutput = true; - final BtProfileConnectionInfo info = BtProfileConnectionInfo.leAudio(supprNoisy, - isLeOutput); + final BluetoothProfileConnectionInfo info = BluetoothProfileConnectionInfo + .createLeAudioInfo(supprNoisy, isLeOutput); assertEquals(info.getProfile(), BluetoothProfile.LE_AUDIO); - assertEquals(info.getSuppressNoisyIntent(), supprNoisy); - assertEquals(info.getIsLeOutput(), isLeOutput); + assertEquals(info.isSuppressNoisyIntent(), supprNoisy); + assertEquals(info.isLeOutput(), isLeOutput); } } diff --git a/native/android/libandroid.map.txt b/native/android/libandroid.map.txt index f9a17746892e..b7beb6e1a6a8 100644 --- a/native/android/libandroid.map.txt +++ b/native/android/libandroid.map.txt @@ -309,6 +309,9 @@ LIBANDROID { android_res_nquery; # introduced=29 android_res_nresult; # introduced=29 android_res_nsend; # introduced=29 + android_tag_socket_with_uid; # introduced=Tiramisu + android_tag_socket; # introduced=Tiramisu + android_untag_socket; # introduced=Tiramisu AThermal_acquireManager; # introduced=30 AThermal_releaseManager; # introduced=30 AThermal_getCurrentThermalStatus; # introduced=30 diff --git a/packages/ConnectivityT/framework-t/Android.bp b/packages/ConnectivityT/framework-t/Android.bp index 327b1fb2f5d8..6329565ca567 100644 --- a/packages/ConnectivityT/framework-t/Android.bp +++ b/packages/ConnectivityT/framework-t/Android.bp @@ -125,14 +125,14 @@ filegroup { name: "framework-connectivity-ethernet-sources", srcs: [ "src/android/net/EthernetManager.java", + "src/android/net/EthernetNetworkManagementException.java", + "src/android/net/EthernetNetworkManagementException.aidl", "src/android/net/EthernetNetworkSpecifier.java", + "src/android/net/EthernetNetworkUpdateRequest.java", + "src/android/net/EthernetNetworkUpdateRequest.aidl", "src/android/net/IEthernetManager.aidl", + "src/android/net/IEthernetNetworkManagementListener.aidl", "src/android/net/IEthernetServiceListener.aidl", - "src/android/net/IInternalNetworkManagementListener.aidl", - "src/android/net/InternalNetworkUpdateRequest.java", - "src/android/net/InternalNetworkUpdateRequest.aidl", - "src/android/net/InternalNetworkManagementException.java", - "src/android/net/InternalNetworkManagementException.aidl", "src/android/net/ITetheredInterfaceCallback.aidl", ], path: "src", @@ -158,7 +158,6 @@ filegroup { name: "framework-connectivity-tiramisu-sources", srcs: [ ":framework-connectivity-ethernet-sources", - ":framework-connectivity-ipsec-sources", ":framework-connectivity-netstats-sources", ], visibility: ["//frameworks/base"], @@ -167,6 +166,7 @@ filegroup { filegroup { name: "framework-connectivity-tiramisu-updatable-sources", srcs: [ + ":framework-connectivity-ipsec-sources", ":framework-connectivity-nsd-sources", ":framework-connectivity-tiramisu-internal-sources", ], diff --git a/packages/ConnectivityT/framework-t/src/android/net/ConnectivityFrameworkInitializerTiramisu.java b/packages/ConnectivityT/framework-t/src/android/net/ConnectivityFrameworkInitializerTiramisu.java index 630f902ecfd7..577ac5466692 100644 --- a/packages/ConnectivityT/framework-t/src/android/net/ConnectivityFrameworkInitializerTiramisu.java +++ b/packages/ConnectivityT/framework-t/src/android/net/ConnectivityFrameworkInitializerTiramisu.java @@ -48,5 +48,14 @@ public final class ConnectivityFrameworkInitializerTiramisu { return new NsdManager(context, service); } ); + + SystemServiceRegistry.registerContextAwareService( + Context.IPSEC_SERVICE, + IpSecManager.class, + (context, serviceBinder) -> { + IIpSecService service = IIpSecService.Stub.asInterface(serviceBinder); + return new IpSecManager(context, service); + } + ); } } diff --git a/packages/ConnectivityT/framework-t/src/android/net/EthernetManager.java b/packages/ConnectivityT/framework-t/src/android/net/EthernetManager.java index ece54df96665..e0ce081c0276 100644 --- a/packages/ConnectivityT/framework-t/src/android/net/EthernetManager.java +++ b/packages/ConnectivityT/framework-t/src/android/net/EthernetManager.java @@ -320,15 +320,15 @@ public class EthernetManager { } private static final class InternalNetworkManagementListener - extends IInternalNetworkManagementListener.Stub { + extends IEthernetNetworkManagementListener.Stub { @NonNull private final Executor mExecutor; @NonNull - private final BiConsumer<Network, InternalNetworkManagementException> mListener; + private final BiConsumer<Network, EthernetNetworkManagementException> mListener; InternalNetworkManagementListener( @NonNull final Executor executor, - @NonNull final BiConsumer<Network, InternalNetworkManagementException> listener) { + @NonNull final BiConsumer<Network, EthernetNetworkManagementException> listener) { Objects.requireNonNull(executor, "Pass a non-null executor"); Objects.requireNonNull(listener, "Pass a non-null listener"); mExecutor = executor; @@ -338,14 +338,14 @@ public class EthernetManager { @Override public void onComplete( @Nullable final Network network, - @Nullable final InternalNetworkManagementException e) { + @Nullable final EthernetNetworkManagementException e) { mExecutor.execute(() -> mListener.accept(network, e)); } } private InternalNetworkManagementListener getInternalNetworkManagementListener( @Nullable final Executor executor, - @Nullable final BiConsumer<Network, InternalNetworkManagementException> listener) { + @Nullable final BiConsumer<Network, EthernetNetworkManagementException> listener) { if (null != listener) { Objects.requireNonNull(executor, "Pass a non-null executor, or a null listener"); } @@ -358,11 +358,12 @@ public class EthernetManager { return proxy; } + @RequiresPermission(android.Manifest.permission.MANAGE_ETHERNET_NETWORKS) private void updateConfiguration( @NonNull String iface, - @NonNull InternalNetworkUpdateRequest request, + @NonNull EthernetNetworkUpdateRequest request, @Nullable @CallbackExecutor Executor executor, - @Nullable BiConsumer<Network, InternalNetworkManagementException> listener) { + @Nullable BiConsumer<Network, EthernetNetworkManagementException> listener) { final InternalNetworkManagementListener proxy = getInternalNetworkManagementListener( executor, listener); try { @@ -372,10 +373,11 @@ public class EthernetManager { } } + @RequiresPermission(android.Manifest.permission.MANAGE_ETHERNET_NETWORKS) private void connectNetwork( @NonNull String iface, @Nullable @CallbackExecutor Executor executor, - @Nullable BiConsumer<Network, InternalNetworkManagementException> listener) { + @Nullable BiConsumer<Network, EthernetNetworkManagementException> listener) { final InternalNetworkManagementListener proxy = getInternalNetworkManagementListener( executor, listener); try { @@ -385,10 +387,11 @@ public class EthernetManager { } } + @RequiresPermission(android.Manifest.permission.MANAGE_ETHERNET_NETWORKS) private void disconnectNetwork( @NonNull String iface, @Nullable @CallbackExecutor Executor executor, - @Nullable BiConsumer<Network, InternalNetworkManagementException> listener) { + @Nullable BiConsumer<Network, EthernetNetworkManagementException> listener) { final InternalNetworkManagementListener proxy = getInternalNetworkManagementListener( executor, listener); try { diff --git a/packages/ConnectivityT/framework-t/src/android/net/InternalNetworkManagementException.aidl b/packages/ConnectivityT/framework-t/src/android/net/EthernetNetworkManagementException.aidl index dcce706989f6..adf9e5a4db9d 100644 --- a/packages/ConnectivityT/framework-t/src/android/net/InternalNetworkManagementException.aidl +++ b/packages/ConnectivityT/framework-t/src/android/net/EthernetNetworkManagementException.aidl @@ -16,4 +16,4 @@ package android.net; - parcelable InternalNetworkManagementException;
\ No newline at end of file + parcelable EthernetNetworkManagementException;
\ No newline at end of file diff --git a/packages/ConnectivityT/framework-t/src/android/net/InternalNetworkManagementException.java b/packages/ConnectivityT/framework-t/src/android/net/EthernetNetworkManagementException.java index 7f4e403f2259..a35f28e172fd 100644 --- a/packages/ConnectivityT/framework-t/src/android/net/InternalNetworkManagementException.java +++ b/packages/ConnectivityT/framework-t/src/android/net/EthernetNetworkManagementException.java @@ -20,22 +20,34 @@ import android.annotation.NonNull; import android.os.Parcel; import android.os.Parcelable; +import java.util.Objects; + /** @hide */ -public final class InternalNetworkManagementException +public final class EthernetNetworkManagementException extends RuntimeException implements Parcelable { /* @hide */ - public InternalNetworkManagementException(@NonNull final Throwable t) { - super(t); + public EthernetNetworkManagementException(@NonNull final String errorMessage) { + super(errorMessage); + } + + @Override + public int hashCode() { + return Objects.hash(getMessage()); } - private InternalNetworkManagementException(@NonNull final Parcel source) { - super(source.readString()); + @Override + public boolean equals(Object obj) { + if (this == obj) return true; + if (obj == null || getClass() != obj.getClass()) return false; + final EthernetNetworkManagementException that = (EthernetNetworkManagementException) obj; + + return Objects.equals(getMessage(), that.getMessage()); } @Override public void writeToParcel(@NonNull Parcel dest, int flags) { - dest.writeString(getCause().getMessage()); + dest.writeString(getMessage()); } @Override @@ -44,16 +56,16 @@ public final class InternalNetworkManagementException } @NonNull - public static final Parcelable.Creator<InternalNetworkManagementException> CREATOR = - new Parcelable.Creator<InternalNetworkManagementException>() { + public static final Parcelable.Creator<EthernetNetworkManagementException> CREATOR = + new Parcelable.Creator<EthernetNetworkManagementException>() { @Override - public InternalNetworkManagementException[] newArray(int size) { - return new InternalNetworkManagementException[size]; + public EthernetNetworkManagementException[] newArray(int size) { + return new EthernetNetworkManagementException[size]; } @Override - public InternalNetworkManagementException createFromParcel(@NonNull Parcel source) { - return new InternalNetworkManagementException(source); + public EthernetNetworkManagementException createFromParcel(@NonNull Parcel source) { + return new EthernetNetworkManagementException(source.readString()); } }; } diff --git a/packages/ConnectivityT/framework-t/src/android/net/InternalNetworkUpdateRequest.aidl b/packages/ConnectivityT/framework-t/src/android/net/EthernetNetworkUpdateRequest.aidl index da00cb97afb4..debc348ea363 100644 --- a/packages/ConnectivityT/framework-t/src/android/net/InternalNetworkUpdateRequest.aidl +++ b/packages/ConnectivityT/framework-t/src/android/net/EthernetNetworkUpdateRequest.aidl @@ -16,4 +16,4 @@ package android.net; - parcelable InternalNetworkUpdateRequest;
\ No newline at end of file + parcelable EthernetNetworkUpdateRequest;
\ No newline at end of file diff --git a/packages/ConnectivityT/framework-t/src/android/net/InternalNetworkUpdateRequest.java b/packages/ConnectivityT/framework-t/src/android/net/EthernetNetworkUpdateRequest.java index f42c4b7c420d..4d229d23b163 100644 --- a/packages/ConnectivityT/framework-t/src/android/net/InternalNetworkUpdateRequest.java +++ b/packages/ConnectivityT/framework-t/src/android/net/EthernetNetworkUpdateRequest.java @@ -23,7 +23,7 @@ import android.os.Parcelable; import java.util.Objects; /** @hide */ -public final class InternalNetworkUpdateRequest implements Parcelable { +public final class EthernetNetworkUpdateRequest implements Parcelable { @NonNull private final StaticIpConfiguration mIpConfig; @NonNull @@ -40,7 +40,7 @@ public final class InternalNetworkUpdateRequest implements Parcelable { } /** @hide */ - public InternalNetworkUpdateRequest(@NonNull final StaticIpConfiguration ipConfig, + public EthernetNetworkUpdateRequest(@NonNull final StaticIpConfiguration ipConfig, @NonNull final NetworkCapabilities networkCapabilities) { Objects.requireNonNull(ipConfig); Objects.requireNonNull(networkCapabilities); @@ -48,7 +48,7 @@ public final class InternalNetworkUpdateRequest implements Parcelable { mNetworkCapabilities = new NetworkCapabilities(networkCapabilities); } - private InternalNetworkUpdateRequest(@NonNull final Parcel source) { + private EthernetNetworkUpdateRequest(@NonNull final Parcel source) { Objects.requireNonNull(source); mIpConfig = StaticIpConfiguration.CREATOR.createFromParcel(source); mNetworkCapabilities = NetworkCapabilities.CREATOR.createFromParcel(source); @@ -56,7 +56,7 @@ public final class InternalNetworkUpdateRequest implements Parcelable { @Override public String toString() { - return "InternalNetworkUpdateRequest{" + return "EthernetNetworkUpdateRequest{" + "mIpConfig=" + mIpConfig + ", mNetworkCapabilities=" + mNetworkCapabilities + '}'; } @@ -65,7 +65,7 @@ public final class InternalNetworkUpdateRequest implements Parcelable { public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; - InternalNetworkUpdateRequest that = (InternalNetworkUpdateRequest) o; + EthernetNetworkUpdateRequest that = (EthernetNetworkUpdateRequest) o; return Objects.equals(that.getIpConfig(), mIpConfig) && Objects.equals(that.getNetworkCapabilities(), mNetworkCapabilities); @@ -88,16 +88,16 @@ public final class InternalNetworkUpdateRequest implements Parcelable { } @NonNull - public static final Parcelable.Creator<InternalNetworkUpdateRequest> CREATOR = - new Parcelable.Creator<InternalNetworkUpdateRequest>() { + public static final Parcelable.Creator<EthernetNetworkUpdateRequest> CREATOR = + new Parcelable.Creator<EthernetNetworkUpdateRequest>() { @Override - public InternalNetworkUpdateRequest[] newArray(int size) { - return new InternalNetworkUpdateRequest[size]; + public EthernetNetworkUpdateRequest[] newArray(int size) { + return new EthernetNetworkUpdateRequest[size]; } @Override - public InternalNetworkUpdateRequest createFromParcel(@NonNull Parcel source) { - return new InternalNetworkUpdateRequest(source); + public EthernetNetworkUpdateRequest createFromParcel(@NonNull Parcel source) { + return new EthernetNetworkUpdateRequest(source); } }; } diff --git a/packages/ConnectivityT/framework-t/src/android/net/IEthernetManager.aidl b/packages/ConnectivityT/framework-t/src/android/net/IEthernetManager.aidl index e688bea1cfac..544d02ba76ff 100644 --- a/packages/ConnectivityT/framework-t/src/android/net/IEthernetManager.aidl +++ b/packages/ConnectivityT/framework-t/src/android/net/IEthernetManager.aidl @@ -18,8 +18,8 @@ package android.net; import android.net.IpConfiguration; import android.net.IEthernetServiceListener; -import android.net.IInternalNetworkManagementListener; -import android.net.InternalNetworkUpdateRequest; +import android.net.IEthernetNetworkManagementListener; +import android.net.EthernetNetworkUpdateRequest; import android.net.ITetheredInterfaceCallback; /** @@ -38,8 +38,8 @@ interface IEthernetManager void setIncludeTestInterfaces(boolean include); void requestTetheredInterface(in ITetheredInterfaceCallback callback); void releaseTetheredInterface(in ITetheredInterfaceCallback callback); - void updateConfiguration(String iface, in InternalNetworkUpdateRequest request, - in IInternalNetworkManagementListener listener); - void connectNetwork(String iface, in IInternalNetworkManagementListener listener); - void disconnectNetwork(String iface, in IInternalNetworkManagementListener listener); + void updateConfiguration(String iface, in EthernetNetworkUpdateRequest request, + in IEthernetNetworkManagementListener listener); + void connectNetwork(String iface, in IEthernetNetworkManagementListener listener); + void disconnectNetwork(String iface, in IEthernetNetworkManagementListener listener); } diff --git a/packages/ConnectivityT/framework-t/src/android/net/IInternalNetworkManagementListener.aidl b/packages/ConnectivityT/framework-t/src/android/net/IEthernetNetworkManagementListener.aidl index 69cde3bd14e8..93edccfdafd9 100644 --- a/packages/ConnectivityT/framework-t/src/android/net/IInternalNetworkManagementListener.aidl +++ b/packages/ConnectivityT/framework-t/src/android/net/IEthernetNetworkManagementListener.aidl @@ -16,10 +16,10 @@ package android.net; -import android.net.InternalNetworkManagementException; +import android.net.EthernetNetworkManagementException; import android.net.Network; /** @hide */ -oneway interface IInternalNetworkManagementListener { - void onComplete(in Network network, in InternalNetworkManagementException exception); +oneway interface IEthernetNetworkManagementListener { + void onComplete(in Network network, in EthernetNetworkManagementException exception); }
\ No newline at end of file diff --git a/packages/ConnectivityT/framework-t/src/com/android/server/NetworkManagementSocketTagger.java b/packages/ConnectivityT/framework-t/src/com/android/server/NetworkManagementSocketTagger.java deleted file mode 100644 index 8aca1d67942f..000000000000 --- a/packages/ConnectivityT/framework-t/src/com/android/server/NetworkManagementSocketTagger.java +++ /dev/null @@ -1,116 +0,0 @@ -/* - * Copyright (C) 2011 The Android Open 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; - -import android.os.StrictMode; -import android.util.Log; - -import dalvik.system.SocketTagger; - -import java.io.FileDescriptor; -import java.net.SocketException; - -/** - * Assigns tags to sockets for traffic stats. - * @hide - */ -public final class NetworkManagementSocketTagger extends SocketTagger { - private static final String TAG = "NetworkManagementSocketTagger"; - private static final boolean LOGD = false; - - private static ThreadLocal<SocketTags> threadSocketTags = new ThreadLocal<SocketTags>() { - @Override - protected SocketTags initialValue() { - return new SocketTags(); - } - }; - - public static void install() { - SocketTagger.set(new NetworkManagementSocketTagger()); - } - - public static int setThreadSocketStatsTag(int tag) { - final int old = threadSocketTags.get().statsTag; - threadSocketTags.get().statsTag = tag; - return old; - } - - public static int getThreadSocketStatsTag() { - return threadSocketTags.get().statsTag; - } - - public static int setThreadSocketStatsUid(int uid) { - final int old = threadSocketTags.get().statsUid; - threadSocketTags.get().statsUid = uid; - return old; - } - - public static int getThreadSocketStatsUid() { - return threadSocketTags.get().statsUid; - } - - @Override - public void tag(FileDescriptor fd) throws SocketException { - final SocketTags options = threadSocketTags.get(); - if (LOGD) { - Log.d(TAG, "tagSocket(" + fd.getInt$() + ") with statsTag=0x" - + Integer.toHexString(options.statsTag) + ", statsUid=" + options.statsUid); - } - if (options.statsTag == -1) { - StrictMode.noteUntaggedSocket(); - } - // TODO: skip tagging when options would be no-op - tagSocketFd(fd, options.statsTag, options.statsUid); - } - - private void tagSocketFd(FileDescriptor fd, int tag, int uid) { - if (tag == -1 && uid == -1) return; - - final int errno = native_tagSocketFd(fd, tag, uid); - if (errno < 0) { - Log.i(TAG, "tagSocketFd(" + fd.getInt$() + ", " - + tag + ", " - + uid + ") failed with errno" + errno); - } - } - - @Override - public void untag(FileDescriptor fd) throws SocketException { - if (LOGD) { - Log.i(TAG, "untagSocket(" + fd.getInt$() + ")"); - } - unTagSocketFd(fd); - } - - private void unTagSocketFd(FileDescriptor fd) { - final SocketTags options = threadSocketTags.get(); - if (options.statsTag == -1 && options.statsUid == -1) return; - - final int errno = native_untagSocketFd(fd); - if (errno < 0) { - Log.w(TAG, "untagSocket(" + fd.getInt$() + ") failed with errno " + errno); - } - } - - public static class SocketTags { - public int statsTag = -1; - public int statsUid = -1; - } - - private static native int native_tagSocketFd(FileDescriptor fd, int tag, int uid); - private static native int native_untagSocketFd(FileDescriptor fd); -} diff --git a/packages/ConnectivityT/service/Android.bp b/packages/ConnectivityT/service/Android.bp index 24bc91d91ef7..d2d6ef0cbbb1 100644 --- a/packages/ConnectivityT/service/Android.bp +++ b/packages/ConnectivityT/service/Android.bp @@ -83,7 +83,6 @@ filegroup { name: "services.connectivity-tiramisu-sources", srcs: [ ":services.connectivity-ethernet-sources", - ":services.connectivity-ipsec-sources", ":services.connectivity-netstats-sources", ], path: "src", @@ -93,6 +92,7 @@ filegroup { filegroup { name: "services.connectivity-tiramisu-updatable-sources", srcs: [ + ":services.connectivity-ipsec-sources", ":services.connectivity-nsd-sources", ], path: "src", diff --git a/packages/ConnectivityT/service/src/com/android/server/IpSecService.java b/packages/ConnectivityT/service/src/com/android/server/IpSecService.java index 179d9459fd84..4bc40eae4404 100644 --- a/packages/ConnectivityT/service/src/com/android/server/IpSecService.java +++ b/packages/ConnectivityT/service/src/com/android/server/IpSecService.java @@ -1008,16 +1008,10 @@ public class IpSecService extends IIpSecService.Stub { * * @param context Binder context for this service */ - private IpSecService(Context context) { + public IpSecService(Context context) { this(context, new Dependencies()); } - static IpSecService create(Context context) - throws InterruptedException { - final IpSecService service = new IpSecService(context); - return service; - } - @NonNull private AppOpsManager getAppOpsManager() { AppOpsManager appOps = (AppOpsManager) mContext.getSystemService(Context.APP_OPS_SERVICE); @@ -1054,26 +1048,6 @@ public class IpSecService extends IIpSecService.Stub { } } - /** Called by system server when system is ready. */ - public void systemReady() { - if (isNetdAlive()) { - Log.d(TAG, "IpSecService is ready"); - } else { - Log.wtf(TAG, "IpSecService not ready: failed to connect to NetD Native Service!"); - } - } - - synchronized boolean isNetdAlive() { - try { - if (mNetd == null) { - return false; - } - return mNetd.isAlive(); - } catch (RemoteException re) { - return false; - } - } - /** * Checks that the provided InetAddress is valid for use in an IPsec SA. The address must not be * a wildcard address and must be in a numeric form such as 1.2.3.4 or 2001::1. @@ -1896,7 +1870,6 @@ public class IpSecService extends IIpSecService.Stub { mContext.enforceCallingOrSelfPermission(DUMP, TAG); pw.println("IpSecService dump:"); - pw.println("NetdNativeService Connection: " + (isNetdAlive() ? "alive" : "dead")); pw.println(); pw.println("mUserResourceTracker:"); diff --git a/packages/SettingsLib/res/values/arrays.xml b/packages/SettingsLib/res/values/arrays.xml index 93e3deef7aa5..29a1831d28cb 100644 --- a/packages/SettingsLib/res/values/arrays.xml +++ b/packages/SettingsLib/res/values/arrays.xml @@ -647,6 +647,11 @@ <item>disabled</item> </array> + <!-- Images offered as options in the avatar picker. If populated, the avatar_image_descriptions + array must also be populated with a content description for each image. --> <array name="avatar_images"/> + <!-- Content descriptions for each of the images in the avatar_images array. --> + <string-array name="avatar_image_descriptions"/> + </resources> diff --git a/packages/SettingsLib/res/values/config.xml b/packages/SettingsLib/res/values/config.xml index b150e0169a96..45253bb7944a 100644 --- a/packages/SettingsLib/res/values/config.xml +++ b/packages/SettingsLib/res/values/config.xml @@ -28,9 +28,4 @@ <!-- Control whether status bar should distinguish HSPA data icon form UMTS data icon on devices --> <bool name="config_hspa_data_distinguishable">false</bool> - - <integer-array name="config_supportedDreamComplications"> - </integer-array> - <integer-array name="config_dreamComplicationsEnabledByDefault"> - </integer-array> </resources>
\ No newline at end of file diff --git a/packages/SettingsLib/res/values/strings.xml b/packages/SettingsLib/res/values/strings.xml index af6a658f362a..0fe869fc44ef 100644 --- a/packages/SettingsLib/res/values/strings.xml +++ b/packages/SettingsLib/res/values/strings.xml @@ -1562,4 +1562,8 @@ <!-- Title for a screen allowing the user to choose a profile picture. [CHAR LIMIT=NONE] --> <string name="avatar_picker_title">Choose a profile picture</string> + + <!-- Content description for a default user icon. [CHAR LIMIT=NONE] --> + <string name="default_user_icon_description">Default user icon</string> + </resources> diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/A2dpProfile.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/A2dpProfile.java index 99e3160fcbe3..df19c67f00e5 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/A2dpProfile.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/A2dpProfile.java @@ -173,8 +173,10 @@ public class A2dpProfile implements LocalBluetoothProfile { } public BluetoothDevice getActiveDevice() { - if (mService == null) return null; - return mService.getActiveDevice(); + if (mBluetoothAdapter == null) return null; + final List<BluetoothDevice> activeDevices = mBluetoothAdapter + .getActiveDevices(BluetoothProfile.A2DP); + return (activeDevices.size() > 0) ? activeDevices.get(0) : null; } @Override @@ -221,7 +223,7 @@ public class A2dpProfile implements LocalBluetoothProfile { } public boolean supportsHighQualityAudio(BluetoothDevice device) { - BluetoothDevice bluetoothDevice = (device != null) ? device : mService.getActiveDevice(); + BluetoothDevice bluetoothDevice = (device != null) ? device : getActiveDevice(); if (bluetoothDevice == null) { return false; } @@ -234,7 +236,7 @@ public class A2dpProfile implements LocalBluetoothProfile { */ @RequiresApi(Build.VERSION_CODES.TIRAMISU) public boolean isHighQualityAudioEnabled(BluetoothDevice device) { - BluetoothDevice bluetoothDevice = (device != null) ? device : mService.getActiveDevice(); + BluetoothDevice bluetoothDevice = (device != null) ? device : getActiveDevice(); if (bluetoothDevice == null) { return false; } @@ -260,7 +262,7 @@ public class A2dpProfile implements LocalBluetoothProfile { } public void setHighQualityAudioEnabled(BluetoothDevice device, boolean enabled) { - BluetoothDevice bluetoothDevice = (device != null) ? device : mService.getActiveDevice(); + BluetoothDevice bluetoothDevice = (device != null) ? device : getActiveDevice(); if (bluetoothDevice == null) { return; } @@ -286,7 +288,7 @@ public class A2dpProfile implements LocalBluetoothProfile { */ @RequiresApi(Build.VERSION_CODES.TIRAMISU) public String getHighQualityAudioOptionLabel(BluetoothDevice device) { - BluetoothDevice bluetoothDevice = (device != null) ? device : mService.getActiveDevice(); + BluetoothDevice bluetoothDevice = (device != null) ? device : getActiveDevice(); int unknownCodecId = R.string.bluetooth_profile_a2dp_high_quality_unknown_codec; if (bluetoothDevice == null || !supportsHighQualityAudio(device) || getConnectionStatus(device) != BluetoothProfile.STATE_CONNECTED) { diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/HeadsetProfile.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/HeadsetProfile.java index b11bbdec191f..7e5c1240cc63 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/HeadsetProfile.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/HeadsetProfile.java @@ -132,10 +132,12 @@ public class HeadsetProfile implements LocalBluetoothProfile { } public BluetoothDevice getActiveDevice() { - if (mService == null) { + if (mBluetoothAdapter == null) { return null; } - return mService.getActiveDevice(); + final List<BluetoothDevice> activeDevices = mBluetoothAdapter + .getActiveDevices(BluetoothProfile.HEADSET); + return (activeDevices.size() > 0) ? activeDevices.get(0) : null; } public int getAudioState(BluetoothDevice device) { diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/HearingAidProfile.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/HearingAidProfile.java index dc109cac37b2..6f2d4decf033 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/HearingAidProfile.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/HearingAidProfile.java @@ -173,8 +173,10 @@ public class HearingAidProfile implements LocalBluetoothProfile { } public List<BluetoothDevice> getActiveDevices() { - if (mService == null) return new ArrayList<>(); - return mService.getActiveDevices(); + if (mBluetoothAdapter == null) { + return new ArrayList<>(); + } + return mBluetoothAdapter.getActiveDevices(BluetoothProfile.HEARING_AID); } @Override diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/LeAudioProfile.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/LeAudioProfile.java index 209507ac7088..db6d41ef692d 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/LeAudioProfile.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/LeAudioProfile.java @@ -21,12 +21,12 @@ import static android.bluetooth.BluetoothAdapter.ACTIVE_DEVICE_ALL; import static android.bluetooth.BluetoothProfile.CONNECTION_POLICY_ALLOWED; import static android.bluetooth.BluetoothProfile.CONNECTION_POLICY_FORBIDDEN; -import android.bluetooth.BluetoothLeAudio; import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothClass; import android.bluetooth.BluetoothCodecConfig; import android.bluetooth.BluetoothCodecStatus; import android.bluetooth.BluetoothDevice; +import android.bluetooth.BluetoothLeAudio; import android.bluetooth.BluetoothProfile; import android.bluetooth.BluetoothUuid; import android.content.Context; @@ -177,10 +177,10 @@ public class LeAudioProfile implements LocalBluetoothProfile { } public List<BluetoothDevice> getActiveDevices() { - if (mService == null) { + if (mBluetoothAdapter == null) { return new ArrayList<>(); } - return mService.getActiveDevices(); + return mBluetoothAdapter.getActiveDevices(BluetoothProfile.LE_AUDIO); } @Override diff --git a/packages/SettingsLib/src/com/android/settingslib/dream/DreamBackend.java b/packages/SettingsLib/src/com/android/settingslib/dream/DreamBackend.java index 6bf43e528009..d179b828d4ab 100644 --- a/packages/SettingsLib/src/com/android/settingslib/dream/DreamBackend.java +++ b/packages/SettingsLib/src/com/android/settingslib/dream/DreamBackend.java @@ -151,13 +151,13 @@ public class DreamBackend { .map(ComponentName::unflattenFromString) .collect(Collectors.toSet()); - mSupportedComplications = - Arrays.stream(resources.getIntArray(R.array.config_supportedDreamComplications)) - .boxed() - .collect(Collectors.toSet()); + mSupportedComplications = Arrays.stream(resources.getIntArray( + com.android.internal.R.array.config_supportedDreamComplications)) + .boxed() + .collect(Collectors.toSet()); - mDefaultEnabledComplications = Arrays.stream( - resources.getIntArray(R.array.config_dreamComplicationsEnabledByDefault)) + mDefaultEnabledComplications = Arrays.stream(resources.getIntArray( + com.android.internal.R.array.config_dreamComplicationsEnabledByDefault)) .boxed() // A complication can only be enabled by default if it is also supported. .filter(mSupportedComplications::contains) @@ -528,7 +528,18 @@ public class DreamBackend { if (flattenedString.indexOf('/') < 0) { flattenedString = serviceInfo.packageName + "/" + flattenedString; } - return ComponentName.unflattenFromString(flattenedString); + + ComponentName cn = ComponentName.unflattenFromString(flattenedString); + + if (cn == null) return null; + if (!cn.getPackageName().equals(serviceInfo.packageName)) { + Log.w(TAG, + "Inconsistent package name in component: " + cn.getPackageName() + + ", should be: " + serviceInfo.packageName); + return null; + } + + return cn; } private static DreamMetadata getDreamMetadata(PackageManager pm, ResolveInfo resolveInfo) { diff --git a/packages/SettingsLib/src/com/android/settingslib/users/AvatarPickerActivity.java b/packages/SettingsLib/src/com/android/settingslib/users/AvatarPickerActivity.java index 50015e653399..93be66ad4882 100644 --- a/packages/SettingsLib/src/com/android/settingslib/users/AvatarPickerActivity.java +++ b/packages/SettingsLib/src/com/android/settingslib/users/AvatarPickerActivity.java @@ -45,6 +45,7 @@ import com.google.android.setupdesign.GlifLayout; import com.google.android.setupdesign.util.ThemeHelper; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; /** @@ -180,6 +181,7 @@ public class AvatarPickerActivity extends Activity { private final int mPreselectedImageStartPosition; private final List<Drawable> mImageDrawables; + private final List<String> mImageDescriptions; private final TypedArray mPreselectedImages; private final int[] mUserIconColors; private int mSelectedPosition = NONE; @@ -196,6 +198,7 @@ public class AvatarPickerActivity extends Activity { mPreselectedImages = getResources().obtainTypedArray(R.array.avatar_images); mUserIconColors = UserIcons.getUserIconColors(getResources()); mImageDrawables = buildDrawableList(); + mImageDescriptions = buildDescriptionsList(); } @NonNull @@ -210,15 +213,24 @@ public class AvatarPickerActivity extends Activity { public void onBindViewHolder(@NonNull AvatarViewHolder viewHolder, int position) { if (position == mTakePhotoPosition) { viewHolder.setDrawable(getDrawable(R.drawable.avatar_take_photo_circled)); + viewHolder.setContentDescription(getString(R.string.user_image_take_photo)); viewHolder.setClickListener(view -> mAvatarPhotoController.takePhoto()); } else if (position == mChoosePhotoPosition) { viewHolder.setDrawable(getDrawable(R.drawable.avatar_choose_photo_circled)); + viewHolder.setContentDescription(getString(R.string.user_image_choose_photo)); viewHolder.setClickListener(view -> mAvatarPhotoController.choosePhoto()); } else if (position >= mPreselectedImageStartPosition) { + int index = indexFromPosition(position); viewHolder.setSelected(position == mSelectedPosition); - viewHolder.setDrawable(mImageDrawables.get(indexFromPosition(position))); + viewHolder.setDrawable(mImageDrawables.get(index)); + if (mImageDescriptions != null) { + viewHolder.setContentDescription(mImageDescriptions.get(index)); + } else { + viewHolder.setContentDescription( + getString(R.string.default_user_icon_description)); + } viewHolder.setClickListener(view -> { if (mSelectedPosition == position) { deselect(position); @@ -256,6 +268,15 @@ public class AvatarPickerActivity extends Activity { return result; } + private List<String> buildDescriptionsList() { + if (mPreselectedImages.length() > 0) { + return Arrays.asList( + getResources().getStringArray(R.array.avatar_image_descriptions)); + } + + return null; + } + private Drawable circularDrawableFrom(BitmapDrawable drawable) { Bitmap bitmap = drawable.getBitmap(); @@ -323,6 +344,10 @@ public class AvatarPickerActivity extends Activity { mImageView.setImageDrawable(drawable); } + public void setContentDescription(String desc) { + mImageView.setContentDescription(desc); + } + public void setClickListener(View.OnClickListener listener) { mImageView.setOnClickListener(listener); } diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/A2dpProfileTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/A2dpProfileTest.java index f167721f94bf..d7b366e60a1d 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/A2dpProfileTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/A2dpProfileTest.java @@ -60,6 +60,8 @@ public class A2dpProfileTest { private BluetoothDevice mDevice; @Mock private BluetoothA2dp mBluetoothA2dp; + @Mock + private BluetoothAdapter mBluetoothAdapter; private BluetoothProfile.ServiceListener mServiceListener; private A2dpProfile mProfile; @@ -72,7 +74,8 @@ public class A2dpProfileTest { mProfile = new A2dpProfile(mContext, mDeviceManager, mProfileManager); mServiceListener = mShadowBluetoothAdapter.getServiceListener(); mServiceListener.onServiceConnected(BluetoothProfile.A2DP, mBluetoothA2dp); - when(mBluetoothA2dp.getActiveDevice()).thenReturn(mDevice); + when(mBluetoothAdapter.getActiveDevices(eq(BluetoothProfile.A2DP))) + .thenReturn(Arrays.asList(mDevice)); } @Test diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/dream/DreamBackendTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/dream/DreamBackendTest.java index 53d465305a69..86f7850cf1f2 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/dream/DreamBackendTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/dream/DreamBackendTest.java @@ -24,8 +24,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.res.Resources; -import com.android.settingslib.R; - import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -53,10 +51,15 @@ public final class DreamBackendTest { final Resources res = mock(Resources.class); when(mContext.getResources()).thenReturn(res); - when(res.getIntArray(R.array.config_supportedDreamComplications)).thenReturn( + when(res.getIntArray( + com.android.internal.R.array.config_supportedDreamComplications)).thenReturn( SUPPORTED_DREAM_COMPLICATIONS); - when(res.getIntArray(R.array.config_dreamComplicationsEnabledByDefault)).thenReturn( + when(res.getIntArray( + com.android.internal.R.array.config_dreamComplicationsEnabledByDefault)).thenReturn( DEFAULT_DREAM_COMPLICATIONS); + when(res.getStringArray( + com.android.internal.R.array.config_disabledDreamComponents)).thenReturn( + new String[]{}); mBackend = new DreamBackend(mContext); } diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml index 27fc6ba47ec9..6f4cd4a0f6ee 100644 --- a/packages/Shell/AndroidManifest.xml +++ b/packages/Shell/AndroidManifest.xml @@ -192,6 +192,9 @@ <uses-permission android:name="android.permission.REVOKE_RUNTIME_PERMISSIONS" /> <uses-permission android:name="android.permission.INSTALL_GRANT_RUNTIME_PERMISSIONS" /> <uses-permission android:name="android.permission.WHITELIST_RESTRICTED_PERMISSIONS" /> + <!-- Permission required for processes that don't own the focused window to switch + touch mode state --> + <uses-permission android:name="android.permission.MODIFY_TOUCH_MODE_STATE" /> <!-- Permission required to test onPermissionsChangedListener --> <uses-permission android:name="android.permission.OBSERVE_GRANT_REVOKE_PERMISSIONS" /> <uses-permission android:name="android.permission.SET_KEYBOARD_LAYOUT" /> @@ -530,6 +533,7 @@ <!-- Permission needed for CTS test - WifiManagerTest --> <uses-permission android:name="android.permission.WIFI_ACCESS_COEX_UNSAFE_CHANNELS" /> <uses-permission android:name="android.permission.WIFI_UPDATE_COEX_UNSAFE_CHANNELS" /> + <uses-permission android:name="android.permission.NEARBY_WIFI_DEVICES" /> <uses-permission android:name="android.permission.OVERRIDE_WIFI_CONFIG" /> <!-- Permission required for CTS tests to enable/disable rate limiting toasts. --> diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml index 2e6a58f7f5da..776a5117cb2e 100644 --- a/packages/SystemUI/AndroidManifest.xml +++ b/packages/SystemUI/AndroidManifest.xml @@ -213,6 +213,9 @@ <!-- DevicePolicyManager get user restrictions --> <uses-permission android:name="android.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS" /> + <!-- DevicePolicyManager get admin policy --> + <uses-permission android:name="android.permission.QUERY_ADMIN_POLICY" /> + <!-- TV picture-in-picture --> <uses-permission android:name="android.permission.RECEIVE_MEDIA_RESOURCE_USAGE" /> @@ -303,6 +306,10 @@ <uses-permission android:name="android.permission.READ_CLIPBOARD_IN_BACKGROUND" /> <uses-permission android:name="android.permission.SET_CLIP_SOURCE" /> + <!-- To change system language (HDMI CEC) --> + <uses-permission android:name="android.permission.CHANGE_CONFIGURATION" /> + <uses-permission android:name="android.permission.SUPPRESS_CLIPBOARD_ACCESS_NOTIFICATION" /> + <protected-broadcast android:name="com.android.settingslib.action.REGISTER_SLICE_RECEIVER" /> <protected-broadcast android:name="com.android.settingslib.action.UNREGISTER_SLICE_RECEIVER" /> <protected-broadcast android:name="com.android.settings.flashlight.action.FLASHLIGHT_CHANGED" /> @@ -486,6 +493,16 @@ android:excludeFromRecents="true"> </activity> + <!-- started from HdmiCecLocalDevicePlayback --> + <activity android:name=".hdmi.HdmiCecSetMenuLanguageActivity" + android:exported="true" + android:launchMode="singleTop" + android:permission="android.permission.CHANGE_CONFIGURATION" + android:theme="@style/BottomSheet" + android:finishOnCloseSystemDialogs="true" + android:excludeFromRecents="true"> + </activity> + <!-- started from SensoryPrivacyService --> <activity android:name=".sensorprivacy.SensorUseStartedActivity" android:exported="true" @@ -856,11 +873,11 @@ android:singleUser="true" android:permission="android.permission.BIND_DREAM_SERVICE" /> - <!-- Service for external clients to do media transfer --> - <!-- TODO(b/203800643): Export and guard with a permission. --> + <!-- Service for external clients to notify us of nearby media devices --> + <!-- TODO(b/216313420): Export and guard with a permission. --> <service - android:name=".media.taptotransfer.sender.MediaTttSenderService" - /> + android:name=".media.nearby.NearbyMediaDevicesService" + /> <receiver android:name=".tuner.TunerService$ClearReceiver" diff --git a/packages/SystemUI/TEST_MAPPING b/packages/SystemUI/TEST_MAPPING index dee4ff5a0bf5..9722b1fe2d2e 100644 --- a/packages/SystemUI/TEST_MAPPING +++ b/packages/SystemUI/TEST_MAPPING @@ -1,7 +1,7 @@ { // Looking for unit test presubmit configuration? // This currently lives in ATP config apct/system_ui/unit_test - "presubmit": [ + "presubmit-large": [ { "name": "PlatformScenarioTests", "options": [ @@ -24,7 +24,9 @@ "exclude-annotation": "android.platform.test.scenario.annotation.FoldableOnly" } ] - }, + } + ], + "presubmit": [ { "name": "SystemUIGoogleTests", "options": [ diff --git a/packages/SystemUI/animation/src/com/android/systemui/animation/ActivityLaunchAnimator.kt b/packages/SystemUI/animation/src/com/android/systemui/animation/ActivityLaunchAnimator.kt index 08d217d15a5a..4540b77d0a40 100644 --- a/packages/SystemUI/animation/src/com/android/systemui/animation/ActivityLaunchAnimator.kt +++ b/packages/SystemUI/animation/src/com/android/systemui/animation/ActivityLaunchAnimator.kt @@ -301,6 +301,7 @@ class ActivityLaunchAnimator( * The intent was started. If [willAnimate] is false, nothing else will happen and the * animation will not be started. */ + @JvmDefault fun onIntentStarted(willAnimate: Boolean) {} /** @@ -308,6 +309,7 @@ class ActivityLaunchAnimator( * this if the animation was already started, i.e. if [onLaunchAnimationStart] was called * before the cancellation. */ + @JvmDefault fun onLaunchAnimationCancelled() {} } diff --git a/packages/SystemUI/animation/src/com/android/systemui/animation/DialogLaunchAnimator.kt b/packages/SystemUI/animation/src/com/android/systemui/animation/DialogLaunchAnimator.kt index f7a7603944f6..3051d8056a89 100644 --- a/packages/SystemUI/animation/src/com/android/systemui/animation/DialogLaunchAnimator.kt +++ b/packages/SystemUI/animation/src/com/android/systemui/animation/DialogLaunchAnimator.kt @@ -19,6 +19,7 @@ package com.android.systemui.animation import android.animation.Animator import android.animation.AnimatorListenerAdapter import android.animation.ValueAnimator +import android.app.ActivityManager import android.app.Dialog import android.graphics.Color import android.graphics.Rect @@ -45,7 +46,8 @@ private const val TAG = "DialogLaunchAnimator" class DialogLaunchAnimator @JvmOverloads constructor( private val dreamManager: IDreamManager, private val launchAnimator: LaunchAnimator = LaunchAnimator(TIMINGS, INTERPOLATORS), - private var isForTesting: Boolean = false + // TODO(b/217621394): Remove special handling for low-RAM devices after animation sync is fixed + private var forceDisableSynchronization: Boolean = ActivityManager.isLowRamDeviceStatic() ) { private companion object { private val TIMINGS = ActivityLaunchAnimator.TIMINGS @@ -111,7 +113,7 @@ class DialogLaunchAnimator @JvmOverloads constructor( dialog = dialog, animateBackgroundBoundsChange, animatedParent, - isForTesting + forceDisableSynchronization ) openedDialogs.add(animatedDialog) @@ -187,10 +189,9 @@ private class AnimatedDialog( private val parentAnimatedDialog: AnimatedDialog? = null, /** - * Whether we are currently running in a test, in which case we need to disable - * synchronization. + * Whether synchronization should be disabled, which can be useful if we are running in a test. */ - private val isForTesting: Boolean + private val forceDisableSynchronization: Boolean ) { /** * The DecorView of this dialog window. @@ -420,8 +421,9 @@ private class AnimatedDialog( * (or inversely, removed from the UI when the touch surface is made visible). */ private fun synchronizeNextDraw(then: () -> Unit) { - if (isForTesting || !touchSurface.isAttachedToWindow || touchSurface.viewRootImpl == null || - !decorView.isAttachedToWindow || decorView.viewRootImpl == null) { + if (forceDisableSynchronization || + !touchSurface.isAttachedToWindow || touchSurface.viewRootImpl == null || + !decorView.isAttachedToWindow || decorView.viewRootImpl == null) { // No need to synchronize if either the touch surface or dialog view is not attached // to a window. then() diff --git a/packages/SystemUI/animation/src/com/android/systemui/animation/LaunchAnimator.kt b/packages/SystemUI/animation/src/com/android/systemui/animation/LaunchAnimator.kt index ebe96ebf2988..77386cf2ff10 100644 --- a/packages/SystemUI/animation/src/com/android/systemui/animation/LaunchAnimator.kt +++ b/packages/SystemUI/animation/src/com/android/systemui/animation/LaunchAnimator.kt @@ -100,9 +100,11 @@ class LaunchAnimator( * needed for the animation. [isExpandingFullyAbove] will be true if the window is expanding * fully above the [launchContainer]. */ + @JvmDefault fun onLaunchAnimationStart(isExpandingFullyAbove: Boolean) {} /** The animation made progress and the expandable view [state] should be updated. */ + @JvmDefault fun onLaunchAnimationProgress(state: State, progress: Float, linearProgress: Float) {} /** @@ -110,6 +112,7 @@ class LaunchAnimator( * called previously. This is typically used to clean up the resources initialized when the * animation was started. */ + @JvmDefault fun onLaunchAnimationEnd(isExpandingFullyAbove: Boolean) {} } diff --git a/packages/SystemUI/monet/src/com/android/systemui/monet/ColorScheme.kt b/packages/SystemUI/monet/src/com/android/systemui/monet/ColorScheme.kt index 29221aa04699..208825ccc8cf 100644 --- a/packages/SystemUI/monet/src/com/android/systemui/monet/ColorScheme.kt +++ b/packages/SystemUI/monet/src/com/android/systemui/monet/ColorScheme.kt @@ -103,6 +103,20 @@ enum class Style(internal val coreSpec: CoreSpec) { n1 = TonalSpec(chroma = Chroma(ChromaStrategy.EQ, 16.0)), n2 = TonalSpec(chroma = Chroma(ChromaStrategy.EQ, 32.0)) )), + RAINBOW(CoreSpec( + a1 = TonalSpec(chroma = Chroma(ChromaStrategy.GTE, 48.0)), + a2 = TonalSpec(chroma = Chroma(ChromaStrategy.EQ, 16.0)), + a3 = TonalSpec(Hue(HueStrategy.ADD, 60.0), Chroma(ChromaStrategy.EQ, 24.0)), + n1 = TonalSpec(chroma = Chroma(ChromaStrategy.EQ, 0.0)), + n2 = TonalSpec(chroma = Chroma(ChromaStrategy.EQ, 0.0)) + )), + FRUIT_SALAD(CoreSpec( + a1 = TonalSpec(Hue(HueStrategy.SUBTRACT, 50.0), Chroma(ChromaStrategy.GTE, 48.0)), + a2 = TonalSpec(Hue(HueStrategy.SUBTRACT, 50.0), Chroma(ChromaStrategy.EQ, 36.0)), + a3 = TonalSpec(chroma = Chroma(ChromaStrategy.EQ, 36.0)), + n1 = TonalSpec(chroma = Chroma(ChromaStrategy.EQ, 10.0)), + n2 = TonalSpec(chroma = Chroma(ChromaStrategy.EQ, 16.0)) + )), } class ColorScheme( diff --git a/packages/SystemUI/res-keyguard/layout/footer_actions.xml b/packages/SystemUI/res-keyguard/layout/footer_actions.xml index ecb3cb3961a4..339cab42048b 100644 --- a/packages/SystemUI/res-keyguard/layout/footer_actions.xml +++ b/packages/SystemUI/res-keyguard/layout/footer_actions.xml @@ -19,8 +19,10 @@ <com.android.systemui.qs.FooterActionsView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="48dp" - android:gravity="center_vertical"> + android:layout_height="@dimen/qs_footer_height" + android:gravity="center_vertical" + android:layout_gravity="bottom" +> <com.android.systemui.statusbar.phone.MultiUserSwitch android:id="@+id/multi_user_switch" diff --git a/packages/SystemUI/res-keyguard/layout/new_footer_actions.xml b/packages/SystemUI/res-keyguard/layout/new_footer_actions.xml new file mode 100644 index 000000000000..95bdd8948c7c --- /dev/null +++ b/packages/SystemUI/res-keyguard/layout/new_footer_actions.xml @@ -0,0 +1,102 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +** Copyright 2022, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +--> + +<!-- Action buttons for footer in QS/QQS, containing settings button, power off button etc --> +<com.android.systemui.qs.FooterActionsView + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:androidprv="http://schemas.android.com/apk/prv/res/android" + android:layout_width="match_parent" + android:layout_height="@dimen/qs_footer_height" + android:gravity="center_vertical" + android:layout_gravity="bottom" +> + + <View + android:layout_height="1dp" + android:layout_width="0dp" + android:layout_weight="1" + /> + + <LinearLayout + android:layout_height="match_parent" + android:layout_width="wrap_content" + > + + <com.android.systemui.statusbar.phone.MultiUserSwitch + android:id="@+id/multi_user_switch" + android:layout_width="@dimen/qs_footer_action_button_size" + android:layout_height="@dimen/qs_footer_action_button_size" + android:layout_marginEnd="@dimen/qs_tile_margin_horizontal" + android:background="@drawable/qs_footer_action_circle" + android:focusable="true"> + + <ImageView + android:id="@+id/multi_user_avatar" + android:layout_width="@dimen/multi_user_avatar_expanded_size" + android:layout_height="@dimen/multi_user_avatar_expanded_size" + android:layout_gravity="center" + android:scaleType="centerInside" /> + </com.android.systemui.statusbar.phone.MultiUserSwitch> + + <com.android.systemui.statusbar.AlphaOptimizedFrameLayout + android:id="@+id/settings_button_container" + android:layout_width="@dimen/qs_footer_action_button_size" + android:layout_height="@dimen/qs_footer_action_button_size" + android:layout_marginEnd="@dimen/qs_tile_margin_horizontal" + android:background="@drawable/qs_footer_action_circle" + android:clipChildren="false" + android:clipToPadding="false"> + + <com.android.systemui.statusbar.phone.SettingsButton + android:id="@+id/settings_button" + android:layout_width="match_parent" + android:layout_height="@dimen/qs_footer_action_button_size" + android:layout_gravity="center" + android:background="@android:color/transparent" + android:contentDescription="@string/accessibility_quick_settings_settings" + android:padding="@dimen/qs_footer_icon_padding" + android:scaleType="centerInside" + android:src="@drawable/ic_settings" + android:tint="?android:attr/textColorPrimary" /> + + <com.android.systemui.statusbar.AlphaOptimizedImageView + android:id="@+id/tuner_icon" + android:layout_width="8dp" + android:layout_height="8dp" + android:layout_gravity="center_horizontal|bottom" + android:layout_marginBottom="@dimen/qs_footer_icon_padding" + android:src="@drawable/tuner" + android:tint="?android:attr/textColorTertiary" + android:visibility="invisible" /> + + </com.android.systemui.statusbar.AlphaOptimizedFrameLayout> + + <com.android.systemui.statusbar.AlphaOptimizedImageView + android:id="@+id/pm_lite" + android:layout_width="@dimen/qs_footer_action_button_size" + android:layout_height="@dimen/qs_footer_action_button_size" + android:background="@drawable/qs_footer_action_circle_color" + android:clickable="true" + android:clipToPadding="false" + android:focusable="true" + android:padding="@dimen/qs_footer_icon_padding" + android:src="@*android:drawable/ic_lock_power_off" + android:contentDescription="@string/accessibility_quick_settings_power_menu" + android:tint="?androidprv:attr/textColorOnAccent" /> + + </LinearLayout> +</com.android.systemui.qs.FooterActionsView>
\ No newline at end of file diff --git a/packages/SystemUI/res/drawable/action_chip_background.xml b/packages/SystemUI/res/drawable/action_chip_background.xml index eeff39b7a8fd..745470f4c61a 100644 --- a/packages/SystemUI/res/drawable/action_chip_background.xml +++ b/packages/SystemUI/res/drawable/action_chip_background.xml @@ -17,11 +17,11 @@ <ripple xmlns:android="http://schemas.android.com/apk/res/android" xmlns:androidprv="http://schemas.android.com/apk/prv/res/android" - android:color="@color/screenshot_button_ripple"> + android:color="@color/overlay_button_ripple"> <item android:id="@android:id/background"> <shape android:shape="rectangle"> <solid android:color="?androidprv:attr/colorAccentSecondary"/> - <corners android:radius="@dimen/screenshot_button_corner_radius"/> + <corners android:radius="@dimen/overlay_button_corner_radius"/> </shape> </item> </ripple> diff --git a/packages/SystemUI/res/drawable/action_chip_container_background.xml b/packages/SystemUI/res/drawable/action_chip_container_background.xml index 72767a12bcf5..36083f1f0408 100644 --- a/packages/SystemUI/res/drawable/action_chip_container_background.xml +++ b/packages/SystemUI/res/drawable/action_chip_container_background.xml @@ -19,5 +19,5 @@ xmlns:androidprv="http://schemas.android.com/apk/prv/res/android" android:shape="rectangle"> <solid android:color="?androidprv:attr/colorSurface"/> - <corners android:radius="@dimen/screenshot_action_container_corner_radius"/> + <corners android:radius="@dimen/overlay_action_container_corner_radius"/> </shape> diff --git a/packages/SystemUI/res/drawable/auth_dialog_enterprise.xml b/packages/SystemUI/res/drawable/auth_dialog_enterprise.xml index c547c52a4077..ec9465b20d61 100644 --- a/packages/SystemUI/res/drawable/auth_dialog_enterprise.xml +++ b/packages/SystemUI/res/drawable/auth_dialog_enterprise.xml @@ -20,6 +20,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> <path - android:pathData="M20,6h-4L16,4c0,-1.11 -0.89,-2 -2,-2h-4c-1.11,0 -2,0.89 -2,2v2L4,6c-1.11,0 -1.99,0.89 -1.99,2L2,19c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2L22,8c0,-1.11 -0.89,-2 -2,-2zM12,15c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM14,6h-4L10,4h4v2z" + android:pathData="@*android:string/config_work_badge_path_24" android:fillColor="?android:attr/colorAccent"/> </vector>
\ No newline at end of file diff --git a/libs/WindowManager/Shell/res/drawable/letterbox_education_ic_expand_more.xml b/packages/SystemUI/res/drawable/ic_media_next.xml index ff5740609b84..016653ba4edb 100644 --- a/libs/WindowManager/Shell/res/drawable/letterbox_education_ic_expand_more.xml +++ b/packages/SystemUI/res/drawable/ic_media_next.xml @@ -12,14 +12,15 @@ ~ distributed under the License is distributed on an "AS IS" BASIS, ~ WITHOUT 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 --> <vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="24dp" - android:height="24dp" - android:viewportWidth="24" - android:viewportHeight="24"> + android:width="12dp" + android:height="12dp" + android:viewportWidth="12" + android:viewportHeight="12"> <path - android:fillColor="@android:color/system_neutral2_400" - android:pathData="M16.59,8.59L12.0,13.17 7.41,8.59 6.0,10.0l6.0,6.0 6.0,-6.0z"/> -</vector>
\ No newline at end of file + android:pathData="M0,12L8.5,6L0,0V12ZM2,3.86L5.03,6L2,8.14V3.86ZM12,0H10V12H12V0Z" + android:fillColor="#ffffff" + android:fillType="evenOdd"/> +</vector> diff --git a/packages/SystemUI/res/values-w500dp/dimens.xml b/packages/SystemUI/res/drawable/ic_media_pause.xml index 5ce5ceee6dc9..1f4b2cf6455e 100644 --- a/packages/SystemUI/res/values-w500dp/dimens.xml +++ b/packages/SystemUI/res/drawable/ic_media_pause.xml @@ -1,5 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> - <!-- ~ Copyright (C) 2022 The Android Open Source Project ~ @@ -13,9 +12,15 @@ ~ distributed under the License is distributed on an "AS IS" BASIS, ~ WITHOUT 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 --> - -<resources> - <dimen name="controls_padding_horizontal">75dp</dimen> -</resources> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="14dp" + android:height="16dp" + android:viewportWidth="14" + android:viewportHeight="16"> + <path + android:pathData="M9.1818,15.6363H13.5455V0.3635H9.1818V15.6363ZM0.4546,15.6363H4.8182V0.3635H0.4546V15.6363Z" + android:fillColor="#FFFFFF" + android:fillType="evenOdd"/> +</vector>
\ No newline at end of file diff --git a/libs/WindowManager/Shell/res/drawable/letterbox_education_ic_expand_more_ripple.xml b/packages/SystemUI/res/drawable/ic_media_play.xml index 16dea484b644..0eac1ad12c1d 100644 --- a/libs/WindowManager/Shell/res/drawable/letterbox_education_ic_expand_more_ripple.xml +++ b/packages/SystemUI/res/drawable/ic_media_play.xml @@ -12,9 +12,15 @@ ~ distributed under the License is distributed on an "AS IS" BASIS, ~ WITHOUT 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 --> -<ripple xmlns:android="http://schemas.android.com/apk/res/android" - android:color="@android:color/system_neutral2_200"> - <item android:drawable="@drawable/letterbox_education_ic_expand_more"/> -</ripple>
\ No newline at end of file +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + <path + android:pathData="M20,12L6,21V3L20,12ZM15.26,12L8.55,7.68V16.32L15.26,12Z" + android:fillColor="#FFFFFF" + android:fillType="evenOdd"/> +</vector>
\ No newline at end of file diff --git a/packages/SystemUI/res/values-w850dp/dimens.xml b/packages/SystemUI/res/drawable/ic_media_prev.xml index bb6ba8fb07b6..b4aeed4b3df3 100644 --- a/packages/SystemUI/res/values-w850dp/dimens.xml +++ b/packages/SystemUI/res/drawable/ic_media_prev.xml @@ -1,5 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> - <!-- ~ Copyright (C) 2022 The Android Open Source Project ~ @@ -13,9 +12,15 @@ ~ distributed under the License is distributed on an "AS IS" BASIS, ~ WITHOUT 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 --> - -<resources> - <dimen name="controls_padding_horizontal">205dp</dimen> -</resources> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="12dp" + android:height="12dp" + android:viewportWidth="12" + android:viewportHeight="12"> + <path + android:pathData="M0,0H2V12H0V0ZM3.5,6L12,12V0L3.5,6ZM6.97,6L10,8.14V3.86L6.97,6Z" + android:fillColor="#ffffff" + android:fillType="evenOdd"/> +</vector> diff --git a/packages/SystemUI/res/drawable/screenshot_actions_background_protection.xml b/packages/SystemUI/res/drawable/overlay_actions_background_protection.xml index dd818a068d61..d8f56324566d 100644 --- a/packages/SystemUI/res/drawable/screenshot_actions_background_protection.xml +++ b/packages/SystemUI/res/drawable/overlay_actions_background_protection.xml @@ -17,6 +17,6 @@ <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> <gradient android:angle="90" - android:startColor="@color/screenshot_background_protection_start" + android:startColor="@color/overlay_background_protection_start" android:endColor="#00000000"/> </shape>
\ No newline at end of file diff --git a/packages/SystemUI/res/drawable/screenshot_button_background.xml b/packages/SystemUI/res/drawable/overlay_button_background.xml index 3c39fe2ecb06..3c39fe2ecb06 100644 --- a/packages/SystemUI/res/drawable/screenshot_button_background.xml +++ b/packages/SystemUI/res/drawable/overlay_button_background.xml diff --git a/packages/SystemUI/res/drawable/qs_footer_action_circle.xml b/packages/SystemUI/res/drawable/qs_footer_action_circle.xml new file mode 100644 index 000000000000..f54c30f2e794 --- /dev/null +++ b/packages/SystemUI/res/drawable/qs_footer_action_circle.xml @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2022 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> +<inset xmlns:android="http://schemas.android.com/apk/res/android" + android:insetTop="@dimen/qs_footer_action_inset" + android:insetBottom="@dimen/qs_footer_action_inset" + android:insetLeft="@dimen/qs_footer_action_inset" + android:insetRight="@dimen/qs_footer_action_inset"> + <ripple + android:color="?android:attr/colorControlHighlight"> + <item android:id="@android:id/mask"> + <shape android:shape="oval"> + <solid android:color="@android:color/white"/> + </shape> + </item> + <item> + <shape android:shape="oval"> + <solid android:color="?attr/offStateColor"/> + </shape> + </item> + + </ripple> +</inset>
\ No newline at end of file diff --git a/packages/SystemUI/res/drawable/qs_footer_action_circle_color.xml b/packages/SystemUI/res/drawable/qs_footer_action_circle_color.xml new file mode 100644 index 000000000000..1a323bccfa65 --- /dev/null +++ b/packages/SystemUI/res/drawable/qs_footer_action_circle_color.xml @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2022 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> +<inset xmlns:android="http://schemas.android.com/apk/res/android" + android:insetTop="@dimen/qs_footer_action_inset" + android:insetBottom="@dimen/qs_footer_action_inset" + android:insetLeft="@dimen/qs_footer_action_inset" + android:insetRight="@dimen/qs_footer_action_inset"> + <ripple + android:color="?android:attr/colorControlHighlight"> + <item android:id="@android:id/mask"> + <shape android:shape="oval"> + <solid android:color="@android:color/white"/> + </shape> + </item> + <item> + <shape android:shape="oval"> + <solid android:color="?android:attr/colorAccent"/> + </shape> + </item> + + </ripple> +</inset>
\ No newline at end of file diff --git a/packages/SystemUI/res/drawable/qs_media_scrim.xml b/packages/SystemUI/res/drawable/qs_media_scrim.xml new file mode 100644 index 000000000000..2ec319c6e253 --- /dev/null +++ b/packages/SystemUI/res/drawable/qs_media_scrim.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2022 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License + --> +<shape xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="rectangle"> + <corners android:radius="@dimen/notification_corner_radius"/> + <!-- gradient from 25% in the center to 100% at edges --> + <gradient + android:type="radial" + android:gradientRadius="100%p" + android:startColor="#40000000" + android:endColor="#FF000000" /> +</shape> diff --git a/packages/SystemUI/res/layout/auth_credential_password_view.xml b/packages/SystemUI/res/layout/auth_credential_password_view.xml index 1e0ce0026d8e..0ff1db2ef694 100644 --- a/packages/SystemUI/res/layout/auth_credential_password_view.xml +++ b/packages/SystemUI/res/layout/auth_credential_password_view.xml @@ -18,64 +18,72 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:orientation="vertical" - android:gravity="center_horizontal" - android:elevation="@dimen/biometric_dialog_elevation"> + android:elevation="@dimen/biometric_dialog_elevation" + android:orientation="vertical"> - <Space - android:layout_width="0dp" - android:layout_height="0dp" - android:layout_weight="1"/> + <RelativeLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> - <ImageView - android:id="@+id/icon" - android:layout_width="wrap_content" - android:layout_height="wrap_content"/> + <LinearLayout + android:id="@+id/auth_credential_header" + style="@style/AuthCredentialHeaderStyle" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_alignParentTop="true"> - <TextView - android:id="@+id/title" - android:layout_width="match_parent" - android:layout_height="wrap_content" - style="@style/TextAppearance.AuthCredential.Title"/> + <ImageView + android:id="@+id/icon" + android:layout_width="48dp" + android:layout_height="48dp" + android:contentDescription="@null" /> - <TextView - android:id="@+id/subtitle" - android:layout_width="match_parent" - android:layout_height="wrap_content" - style="@style/TextAppearance.AuthCredential.Subtitle"/> + <TextView + android:id="@+id/title" + style="@style/TextAppearance.AuthNonBioCredential.Title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> - <TextView - android:id="@+id/description" - android:layout_width="match_parent" - android:layout_height="wrap_content" - style="@style/TextAppearance.AuthCredential.Description"/> + <TextView + android:id="@+id/subtitle" + style="@style/TextAppearance.AuthNonBioCredential.Subtitle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> - <Space - android:layout_width="0dp" - android:layout_height="0dp" - android:layout_weight="1"/> + <TextView + android:id="@+id/description" + style="@style/TextAppearance.AuthNonBioCredential.Description" + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> - <ImeAwareEditText - android:id="@+id/lockPassword" - android:layout_width="208dp" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" - android:minHeight="48dp" - android:gravity="center" - android:inputType="textPassword" - android:maxLength="500" - android:imeOptions="actionNext|flagNoFullscreen|flagForceAscii" - style="@style/TextAppearance.AuthCredential.PasswordEntry"/> + </LinearLayout> - <TextView - android:id="@+id/error" - android:layout_width="match_parent" - android:layout_height="wrap_content" - style="@style/TextAppearance.AuthCredential.Error"/> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:gravity="center" + android:orientation="vertical" + android:layout_alignParentBottom="true"> + + <ImeAwareEditText + android:id="@+id/lockPassword" + style="@style/TextAppearance.AuthCredential.PasswordEntry" + android:layout_width="208dp" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:imeOptions="actionNext|flagNoFullscreen|flagForceAscii" + android:inputType="textPassword" + android:minHeight="48dp" /> + + <TextView + android:id="@+id/error" + style="@style/TextAppearance.AuthNonBioCredential.Error" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + + </LinearLayout> - <Space - android:layout_width="0dp" - android:layout_height="0dp" - android:layout_weight="5"/> + </RelativeLayout> </com.android.systemui.biometrics.AuthCredentialPasswordView>
\ No newline at end of file diff --git a/packages/SystemUI/res/layout/auth_credential_pattern_view.xml b/packages/SystemUI/res/layout/auth_credential_pattern_view.xml index 4939ea2c99ee..dada9813c320 100644 --- a/packages/SystemUI/res/layout/auth_credential_pattern_view.xml +++ b/packages/SystemUI/res/layout/auth_credential_pattern_view.xml @@ -22,76 +22,81 @@ android:gravity="center_horizontal" android:elevation="@dimen/biometric_dialog_elevation"> - <Space - android:layout_width="0dp" - android:layout_height="0dp" - android:layout_weight="1"/> - - <ImageView - android:id="@+id/icon" - android:layout_width="wrap_content" - android:layout_height="wrap_content"/> - - <TextView - android:id="@+id/title" + <RelativeLayout android:layout_width="match_parent" - android:layout_height="wrap_content" - style="@style/TextAppearance.AuthCredential.Title"/> + android:layout_height="match_parent" + android:orientation="vertical"> - <TextView - android:id="@+id/subtitle" - android:layout_width="match_parent" - android:layout_height="wrap_content" - style="@style/TextAppearance.AuthCredential.Subtitle"/> + <LinearLayout + android:id="@+id/auth_credential_header" + style="@style/AuthCredentialHeaderStyle" + android:layout_width="match_parent" + android:layout_height="wrap_content"> - <TextView - android:id="@+id/description" - android:layout_width="match_parent" - android:layout_height="wrap_content" - style="@style/TextAppearance.AuthCredential.Description"/> + <ImageView + android:id="@+id/icon" + android:layout_width="48dp" + android:layout_height="48dp" + android:contentDescription="@null" /> - <Space - android:layout_width="0dp" - android:layout_height="0dp" - android:layout_weight="1"/> + <TextView + android:id="@+id/title" + style="@style/TextAppearance.AuthNonBioCredential.Title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:gravity="center" - android:paddingLeft="0dp" - android:paddingRight="0dp" - android:paddingTop="0dp" - android:paddingBottom="16dp" - android:clipToPadding="false"> - - <FrameLayout - android:layout_width="wrap_content" - android:layout_height="0dp" - android:layout_weight="1" - style="@style/LockPatternContainerStyle"> - - <com.android.internal.widget.LockPatternView - android:id="@+id/lockPattern" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_gravity="center" - style="@style/LockPatternStyleBiometricPrompt"/> + <TextView + android:id="@+id/subtitle" + style="@style/TextAppearance.AuthNonBioCredential.Subtitle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> + + <TextView + android:id="@+id/description" + style="@style/TextAppearance.AuthNonBioCredential.Description" + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> + </LinearLayout> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_below="@id/auth_credential_header" + android:gravity="center" + android:orientation="vertical" + android:paddingBottom="16dp" + android:paddingTop="60dp"> + + <FrameLayout + style="@style/LockPatternContainerStyle" + android:layout_width="wrap_content" + android:layout_height="0dp" + android:layout_weight="1"> + + <com.android.internal.widget.LockPatternView + android:id="@+id/lockPattern" + style="@style/LockPatternStyle" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_gravity="center" /> - </FrameLayout> + </FrameLayout> - <TextView - android:id="@+id/error" + </LinearLayout> + + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - style="@style/TextAppearance.AuthCredential.Error"/> + android:layout_alignParentBottom="true"> + + <TextView + android:id="@+id/error" + style="@style/TextAppearance.AuthNonBioCredential.Error" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> - </LinearLayout> + </LinearLayout> - <Space - android:layout_width="0dp" - android:layout_height="0dp" - android:layout_weight="1"/> + </RelativeLayout> </com.android.systemui.biometrics.AuthCredentialPatternView>
\ No newline at end of file diff --git a/packages/SystemUI/res/layout/clipboard_overlay.xml b/packages/SystemUI/res/layout/clipboard_overlay.xml index 7e31909613ee..c58c00114262 100644 --- a/packages/SystemUI/res/layout/clipboard_overlay.xml +++ b/packages/SystemUI/res/layout/clipboard_overlay.xml @@ -14,126 +14,137 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> -<com.android.systemui.clipboardoverlay.DraggableConstraintLayout +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" - android:theme="@style/Screenshot" android:alpha="0" android:layout_width="match_parent" android:layout_height="match_parent"> <ImageView - android:id="@+id/actions_container_background" - android:visibility="gone" - android:layout_height="0dp" - android:layout_width="0dp" - android:elevation="1dp" - android:background="@drawable/action_chip_container_background" - android:layout_marginStart="@dimen/screenshot_action_container_margin_horizontal" - app:layout_constraintBottom_toBottomOf="@+id/actions_container" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="@+id/actions_container" - app:layout_constraintEnd_toEndOf="@+id/actions_container"/> - <HorizontalScrollView - android:id="@+id/actions_container" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginEnd="@dimen/screenshot_action_container_margin_horizontal" - android:paddingEnd="@dimen/screenshot_action_container_padding_right" - android:paddingVertical="@dimen/screenshot_action_container_padding_vertical" - android:elevation="1dp" - android:scrollbars="none" - app:layout_constraintHorizontal_bias="0" - app:layout_constraintWidth_percent="1.0" - app:layout_constraintWidth_max="wrap" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toEndOf="@+id/preview_border" - app:layout_constraintEnd_toEndOf="parent"> - <LinearLayout - android:id="@+id/actions" + android:id="@+id/background_protection" + android:layout_height="@dimen/overlay_bg_protection_height" + android:layout_width="match_parent" + android:layout_gravity="bottom" + android:src="@drawable/overlay_actions_background_protection"/> + <com.android.systemui.clipboardoverlay.DraggableConstraintLayout + android:id="@+id/clipboard_ui" + android:theme="@style/FloatingOverlay" + android:layout_width="match_parent" + android:layout_height="match_parent"> + <ImageView + android:id="@+id/actions_container_background" + android:visibility="gone" + android:layout_height="0dp" + android:layout_width="0dp" + android:elevation="1dp" + android:background="@drawable/action_chip_container_background" + android:layout_marginStart="@dimen/overlay_action_container_margin_horizontal" + app:layout_constraintBottom_toBottomOf="@+id/actions_container" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="@+id/actions_container" + app:layout_constraintEnd_toEndOf="@+id/actions_container"/> + <HorizontalScrollView + android:id="@+id/actions_container" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginEnd="@dimen/overlay_action_container_margin_horizontal" + android:paddingEnd="@dimen/overlay_action_container_padding_right" + android:paddingVertical="@dimen/overlay_action_container_padding_vertical" + android:elevation="1dp" + android:scrollbars="none" + app:layout_constraintHorizontal_bias="0" + app:layout_constraintWidth_percent="1.0" + app:layout_constraintWidth_max="wrap" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toEndOf="@+id/preview_border" + app:layout_constraintEnd_toEndOf="parent"> + <LinearLayout + android:id="@+id/actions" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:animateLayoutChanges="true"> + <include layout="@layout/overlay_action_chip" + android:id="@+id/remote_copy_chip"/> + <include layout="@layout/overlay_action_chip" + android:id="@+id/edit_chip"/> + </LinearLayout> + </HorizontalScrollView> + <View + android:id="@+id/preview_border" + android:layout_width="0dp" + android:layout_height="0dp" + android:layout_marginStart="@dimen/overlay_offset_x" + android:layout_marginBottom="@dimen/overlay_offset_y" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintBottom_toBottomOf="@id/actions_container_background" + android:elevation="@dimen/overlay_preview_elevation" + app:layout_constraintEnd_toEndOf="@id/clipboard_preview_end" + app:layout_constraintTop_toTopOf="@id/clipboard_preview_top" + android:background="@drawable/overlay_border"/> + <androidx.constraintlayout.widget.Barrier + android:id="@+id/clipboard_preview_end" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:animateLayoutChanges="true"> - <include layout="@layout/screenshot_action_chip" - android:id="@+id/remote_copy_chip"/> - <include layout="@layout/screenshot_action_chip" - android:id="@+id/edit_chip"/> - </LinearLayout> - </HorizontalScrollView> - <View - android:id="@+id/preview_border" - android:layout_width="0dp" - android:layout_height="0dp" - android:layout_marginStart="@dimen/overlay_offset_x" - android:layout_marginBottom="@dimen/overlay_offset_y" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintBottom_toBottomOf="@id/actions_container_background" - android:elevation="@dimen/overlay_preview_elevation" - app:layout_constraintEnd_toEndOf="@id/clipboard_preview_end" - app:layout_constraintTop_toTopOf="@id/clipboard_preview_top" - android:background="@drawable/overlay_border"/> - <androidx.constraintlayout.widget.Barrier - android:id="@+id/clipboard_preview_end" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - app:barrierMargin="@dimen/overlay_border_width" - app:barrierDirection="end" - app:constraint_referenced_ids="clipboard_preview"/> - <androidx.constraintlayout.widget.Barrier - android:id="@+id/clipboard_preview_top" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - app:barrierDirection="top" - app:barrierMargin="@dimen/overlay_border_width_neg" - app:constraint_referenced_ids="clipboard_preview"/> - <FrameLayout - android:id="@+id/clipboard_preview" - android:elevation="@dimen/overlay_preview_elevation" - android:background="@drawable/overlay_preview_background" - android:clipChildren="true" - android:clipToOutline="true" - android:clipToPadding="true" - android:layout_width="@dimen/clipboard_preview_size" - android:layout_margin="@dimen/overlay_border_width" - android:layout_height="wrap_content" - android:layout_gravity="center" - app:layout_constraintBottom_toBottomOf="@id/preview_border" - app:layout_constraintStart_toStartOf="@id/preview_border" - app:layout_constraintEnd_toEndOf="@id/preview_border" - app:layout_constraintTop_toTopOf="@id/preview_border"> - <TextView android:id="@+id/text_preview" - android:textFontWeight="500" - android:padding="8dp" - android:gravity="center|start" - android:ellipsize="end" - android:autoSizeTextType="uniform" - android:autoSizeMinTextSize="10sp" - android:autoSizeMaxTextSize="200sp" - android:textColor="?android:attr/textColorPrimary" - android:layout_width="@dimen/clipboard_preview_size" - android:layout_height="@dimen/clipboard_preview_size"/> - <ImageView - android:id="@+id/image_preview" - android:scaleType="fitCenter" - android:adjustViewBounds="true" - android:layout_width="match_parent" - android:layout_height="wrap_content"/> - </FrameLayout> - <FrameLayout - android:id="@+id/dismiss_button" - android:layout_width="@dimen/overlay_dismiss_button_tappable_size" - android:layout_height="@dimen/overlay_dismiss_button_tappable_size" - android:elevation="@dimen/overlay_dismiss_button_elevation" - android:visibility="gone" - app:layout_constraintStart_toEndOf="@id/clipboard_preview" - app:layout_constraintEnd_toEndOf="@id/clipboard_preview" - app:layout_constraintTop_toTopOf="@id/clipboard_preview" - app:layout_constraintBottom_toTopOf="@id/clipboard_preview" - android:contentDescription="@string/clipboard_dismiss_description"> - <ImageView - android:id="@+id/dismiss_image" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_margin="@dimen/overlay_dismiss_button_margin" - android:src="@drawable/overlay_cancel"/> - </FrameLayout> -</com.android.systemui.clipboardoverlay.DraggableConstraintLayout> + app:barrierMargin="@dimen/overlay_border_width" + app:barrierDirection="end" + app:constraint_referenced_ids="clipboard_preview"/> + <androidx.constraintlayout.widget.Barrier + android:id="@+id/clipboard_preview_top" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + app:barrierDirection="top" + app:barrierMargin="@dimen/overlay_border_width_neg" + app:constraint_referenced_ids="clipboard_preview"/> + <FrameLayout + android:id="@+id/clipboard_preview" + android:elevation="@dimen/overlay_preview_elevation" + android:background="@drawable/overlay_preview_background" + android:clipChildren="true" + android:clipToOutline="true" + android:clipToPadding="true" + android:layout_width="@dimen/clipboard_preview_size" + android:layout_margin="@dimen/overlay_border_width" + android:layout_height="wrap_content" + android:layout_gravity="center" + app:layout_constraintBottom_toBottomOf="@id/preview_border" + app:layout_constraintStart_toStartOf="@id/preview_border" + app:layout_constraintEnd_toEndOf="@id/preview_border" + app:layout_constraintTop_toTopOf="@id/preview_border"> + <TextView android:id="@+id/text_preview" + android:textFontWeight="500" + android:padding="8dp" + android:gravity="center|start" + android:ellipsize="end" + android:autoSizeTextType="uniform" + android:autoSizeMinTextSize="10sp" + android:autoSizeMaxTextSize="200sp" + android:textColor="?android:attr/textColorPrimary" + android:layout_width="@dimen/clipboard_preview_size" + android:layout_height="@dimen/clipboard_preview_size"/> + <ImageView + android:id="@+id/image_preview" + android:scaleType="fitCenter" + android:adjustViewBounds="true" + android:layout_width="match_parent" + android:layout_height="wrap_content"/> + </FrameLayout> + <FrameLayout + android:id="@+id/dismiss_button" + android:layout_width="@dimen/overlay_dismiss_button_tappable_size" + android:layout_height="@dimen/overlay_dismiss_button_tappable_size" + android:elevation="@dimen/overlay_dismiss_button_elevation" + android:visibility="gone" + app:layout_constraintStart_toEndOf="@id/clipboard_preview" + app:layout_constraintEnd_toEndOf="@id/clipboard_preview" + app:layout_constraintTop_toTopOf="@id/clipboard_preview" + app:layout_constraintBottom_toTopOf="@id/clipboard_preview" + android:contentDescription="@string/clipboard_dismiss_description"> + <ImageView + android:id="@+id/dismiss_image" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_margin="@dimen/overlay_dismiss_button_margin" + android:src="@drawable/overlay_cancel"/> + </FrameLayout> + </com.android.systemui.clipboardoverlay.DraggableConstraintLayout> +</FrameLayout>
\ No newline at end of file diff --git a/packages/SystemUI/res/layout/dream_overlay_complication_clock_date.xml b/packages/SystemUI/res/layout/dream_overlay_complication_clock_date.xml new file mode 100644 index 000000000000..b6f516fd2042 --- /dev/null +++ b/packages/SystemUI/res/layout/dream_overlay_complication_clock_date.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2022 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. +--> +<TextClock + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/date_view" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingLeft="@dimen/dream_overlay_complication_clock_date_padding_left" + android:paddingBottom="@dimen/dream_overlay_complication_clock_date_padding_bottom" + android:gravity="center_horizontal" + android:textColor="@android:color/white" + android:shadowColor="@color/keyguard_shadow_color" + android:shadowRadius="?attr/shadowRadius" + android:format12Hour="EEE, MMM d" + android:format24Hour="EEE, MMM d" + android:textSize="@dimen/dream_overlay_complication_clock_date_text_size"/> diff --git a/packages/SystemUI/res/layout/dream_overlay_complication_clock_time.xml b/packages/SystemUI/res/layout/dream_overlay_complication_clock_time.xml new file mode 100644 index 000000000000..82c8d5f04327 --- /dev/null +++ b/packages/SystemUI/res/layout/dream_overlay_complication_clock_time.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2022 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. +--> +<TextClock + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/time_view" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingLeft="@dimen/dream_overlay_complication_clock_time_padding_left" + android:fontFamily="@font/clock" + android:textColor="@android:color/white" + android:format12Hour="h:mm" + android:format24Hour="kk:mm" + android:shadowColor="@color/keyguard_shadow_color" + android:shadowRadius="?attr/shadowRadius" + android:textSize="@dimen/dream_overlay_complication_clock_time_text_size"/> diff --git a/packages/SystemUI/res/layout/dream_overlay_complication_weather.xml b/packages/SystemUI/res/layout/dream_overlay_complication_weather.xml new file mode 100644 index 000000000000..08f0d6781b04 --- /dev/null +++ b/packages/SystemUI/res/layout/dream_overlay_complication_weather.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2022 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. +--> +<TextView + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/weather_view" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingLeft="@dimen/dream_overlay_complication_weather_padding_left" + android:paddingBottom="@dimen/dream_overlay_complication_weather_padding_bottom" + android:textColor="@android:color/white" + android:shadowColor="@color/keyguard_shadow_color" + android:shadowRadius="?attr/shadowRadius" + android:textSize="@dimen/dream_overlay_complication_weather_text_size"/> diff --git a/packages/SystemUI/res/layout/dream_overlay_complications_layer.xml b/packages/SystemUI/res/layout/dream_overlay_complications_layer.xml index 2d565a1a04fc..f4eb32f7cf22 100644 --- a/packages/SystemUI/res/layout/dream_overlay_complications_layer.xml +++ b/packages/SystemUI/res/layout/dream_overlay_complications_layer.xml @@ -20,34 +20,6 @@ android:id="@+id/dream_overlay_complications_layer" android:layout_width="match_parent" android:layout_height="match_parent"> - <TextClock - android:id="@+id/time_view" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:fontFamily="sans-serif-thin" - android:format12Hour="h:mm" - android:format24Hour="kk:mm" - android:shadowColor="#B2000000" - android:shadowRadius="2.0" - android:singleLine="true" - android:textSize="72sp" - android:textColor="@android:color/white" - app:layout_constraintBottom_toTopOf="@+id/date_view" - app:layout_constraintStart_toStartOf="parent" /> - <TextClock - android:id="@+id/date_view" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:shadowColor="#B2000000" - android:shadowRadius="2.0" - android:format12Hour="EEE, MMM d" - android:format24Hour="EEE, MMM d" - android:singleLine="true" - android:textSize="18sp" - android:textColor="@android:color/white" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="@+id/time_view" - app:layout_constraintStart_toStartOf="@+id/time_view" /> <androidx.constraintlayout.widget.Guideline android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/packages/SystemUI/res/layout/dream_overlay_container.xml b/packages/SystemUI/res/layout/dream_overlay_container.xml index 4929f502fef0..3c2183d0ca61 100644 --- a/packages/SystemUI/res/layout/dream_overlay_container.xml +++ b/packages/SystemUI/res/layout/dream_overlay_container.xml @@ -25,7 +25,7 @@ android:id="@+id/dream_overlay_content" android:layout_width="match_parent" android:layout_height="0dp" - app:layout_constraintTop_toTopOf="parent" + app:layout_constraintTop_toBottomOf="@id/dream_overlay_status_bar" app:layout_constraintBottom_toBottomOf="parent" /> <com.android.systemui.dreams.DreamOverlayStatusBarView diff --git a/packages/SystemUI/res/layout/long_screenshot.xml b/packages/SystemUI/res/layout/long_screenshot.xml index 856697c5673d..cdf61036e2b7 100644 --- a/packages/SystemUI/res/layout/long_screenshot.xml +++ b/packages/SystemUI/res/layout/long_screenshot.xml @@ -18,7 +18,6 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" - xmlns:androidprv="http://schemas.android.com/apk/prv/res/android" android:background="?android:colorBackgroundFloating" android:id="@+id/root" android:layout_width="match_parent" @@ -32,7 +31,7 @@ android:text="@string/save" android:layout_marginStart="8dp" android:layout_marginTop="@dimen/long_screenshot_action_bar_top_margin" - android:background="@drawable/screenshot_button_background" + android:background="@drawable/overlay_button_background" android:textColor="?android:textColorSecondary" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" @@ -46,7 +45,7 @@ android:text="@android:string/cancel" android:layout_marginStart="6dp" android:layout_marginTop="@dimen/long_screenshot_action_bar_top_margin" - android:background="@drawable/screenshot_button_background" + android:background="@drawable/overlay_button_background" android:textColor="?android:textColorSecondary" app:layout_constraintStart_toEndOf="@id/save" app:layout_constraintTop_toTopOf="parent" diff --git a/packages/SystemUI/res/layout/media_session_view.xml b/packages/SystemUI/res/layout/media_session_view.xml index cc02fea84a33..51d160892a01 100644 --- a/packages/SystemUI/res/layout/media_session_view.xml +++ b/packages/SystemUI/res/layout/media_session_view.xml @@ -28,6 +28,22 @@ android:background="@drawable/qs_media_background" android:theme="@style/MediaPlayer"> + <ImageView + android:layout_width="match_parent" + android:layout_height="184dp" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toBottomOf="parent" + android:translationZ="0dp" + android:id="@+id/album_art" + android:scaleType="centerCrop" + android:adjustViewBounds="true" + android:clipToOutline="true" + android:foreground="@drawable/qs_media_scrim" + android:background="@drawable/qs_media_scrim" + /> + <androidx.constraintlayout.widget.Guideline android:id="@+id/center_vertical_guideline" android:layout_width="wrap_content" @@ -281,6 +297,7 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toBottomOf="@id/remove_text"> <TextView + android:id="@+id/cancel_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center|bottom" @@ -304,6 +321,7 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toBottomOf="@id/remove_text"> <TextView + android:id="@+id/dismiss_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center|bottom" diff --git a/packages/SystemUI/res/layout/media_view.xml b/packages/SystemUI/res/layout/media_view.xml index b546a9cbe90e..9471b9f9786c 100644 --- a/packages/SystemUI/res/layout/media_view.xml +++ b/packages/SystemUI/res/layout/media_view.xml @@ -264,6 +264,7 @@ app:layout_constraintTop_toBottomOf="@id/remove_text"> <TextView + android:id="@+id/cancel_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center|bottom" @@ -288,6 +289,7 @@ app:layout_constraintTop_toBottomOf="@id/remove_text"> <TextView + android:id="@+id/dismiss_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center|bottom" diff --git a/packages/SystemUI/res/layout/screenshot_action_chip.xml b/packages/SystemUI/res/layout/overlay_action_chip.xml index b80469febf3c..e0c20ff4269c 100644 --- a/packages/SystemUI/res/layout/screenshot_action_chip.xml +++ b/packages/SystemUI/res/layout/overlay_action_chip.xml @@ -14,33 +14,34 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> -<com.android.systemui.screenshot.ScreenshotActionChip +<com.android.systemui.screenshot.OverlayActionChip xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/screenshot_action_chip" + android:id="@+id/overlay_action_chip" + android:theme="@style/FloatingOverlay" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="@dimen/screenshot_action_chip_margin_start" - android:paddingVertical="@dimen/screenshot_action_chip_margin_vertical" + android:layout_marginStart="@dimen/overlay_action_chip_margin_start" + android:paddingVertical="@dimen/overlay_action_chip_margin_vertical" android:layout_gravity="center" android:gravity="center" android:alpha="0.0"> <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" - android:paddingVertical="@dimen/screenshot_action_chip_padding_vertical" + android:paddingVertical="@dimen/overlay_action_chip_padding_vertical" android:background="@drawable/action_chip_background" android:gravity="center"> <ImageView - android:id="@+id/screenshot_action_chip_icon" - android:tint="?android:attr/textColorPrimary" - android:layout_width="@dimen/screenshot_action_chip_icon_size" - android:layout_height="@dimen/screenshot_action_chip_icon_size"/> + android:id="@+id/overlay_action_chip_icon" + android:tint="?attr/overlayButtonTextColor" + android:layout_width="@dimen/overlay_action_chip_icon_size" + android:layout_height="@dimen/overlay_action_chip_icon_size"/> <TextView - android:id="@+id/screenshot_action_chip_text" + android:id="@+id/overlay_action_chip_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:fontFamily="@*android:string/config_headlineFontFamilyMedium" - android:textSize="@dimen/screenshot_action_chip_text_size" - android:textColor="?android:attr/textColorPrimary"/> + android:textSize="@dimen/overlay_action_chip_text_size" + android:textColor="?attr/overlayButtonTextColor"/> </LinearLayout> -</com.android.systemui.screenshot.ScreenshotActionChip> +</com.android.systemui.screenshot.OverlayActionChip> diff --git a/packages/SystemUI/res/layout/qs_footer_impl.xml b/packages/SystemUI/res/layout/qs_footer_impl.xml index 5cd9e9485fda..b6e34998a7cd 100644 --- a/packages/SystemUI/res/layout/qs_footer_impl.xml +++ b/packages/SystemUI/res/layout/qs_footer_impl.xml @@ -19,7 +19,7 @@ <com.android.systemui.qs.QSFooterView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/qs_footer" android:layout_width="match_parent" - android:layout_height="@dimen/qs_footer_height" + android:layout_height="wrap_content" android:layout_marginStart="@dimen/qs_footer_margin" android:layout_marginEnd="@dimen/qs_footer_margin" android:layout_marginBottom="@dimen/qs_footers_margin_bottom" @@ -36,7 +36,7 @@ <LinearLayout android:layout_width="match_parent" - android:layout_height="48dp" + android:layout_height="@dimen/qs_footer_height" android:layout_gravity="center_vertical"> <TextView @@ -80,8 +80,13 @@ </LinearLayout> - <include layout="@layout/footer_actions" - android:id="@+id/qs_footer_actions"/> + <ViewStub + android:id="@+id/footer_stub" + android:inflatedId="@+id/qs_footer_actions" + android:layout="@layout/footer_actions" + android:layout_height="@dimen/qs_footer_height" + android:layout_width="match_parent" + /> </LinearLayout> diff --git a/packages/SystemUI/res/layout/qs_panel.xml b/packages/SystemUI/res/layout/qs_panel.xml index f5c6036a5a86..22abd0c2f034 100644 --- a/packages/SystemUI/res/layout/qs_panel.xml +++ b/packages/SystemUI/res/layout/qs_panel.xml @@ -51,6 +51,15 @@ android:id="@+id/qs_detail" layout="@layout/qs_detail" /> + <ViewStub + android:id="@+id/container_stub" + android:inflatedId="@+id/qs_footer_actions" + android:layout="@layout/new_footer_actions" + android:layout_height="@dimen/qs_footer_height" + android:layout_width="match_parent" + android:layout_gravity="bottom" + /> + <include android:id="@+id/qs_customize" layout="@layout/qs_customize_panel" diff --git a/packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml b/packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml index 10a2f4c625c6..2c29f071dcbc 100644 --- a/packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml +++ b/packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml @@ -57,16 +57,6 @@ android:focusable="true" android:paddingBottom="24dp" android:importantForAccessibility="yes"> - - <include - layout="@layout/footer_actions" - android:id="@+id/qqs_footer_actions" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="@dimen/qqs_layout_margin_top" - android:layout_marginStart="@dimen/qs_footer_margin" - android:layout_marginEnd="@dimen/qs_footer_margin" - /> </com.android.systemui.qs.QuickQSPanel> </RelativeLayout> diff --git a/packages/SystemUI/res/layout/screenshot.xml b/packages/SystemUI/res/layout/screenshot.xml index 227212bd4634..890dbe592fc7 100644 --- a/packages/SystemUI/res/layout/screenshot.xml +++ b/packages/SystemUI/res/layout/screenshot.xml @@ -17,7 +17,7 @@ <com.android.systemui.screenshot.ScreenshotView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/screenshot_frame" - android:theme="@style/Screenshot" + android:theme="@style/FloatingOverlay" android:layout_width="match_parent" android:layout_height="match_parent" android:importantForAccessibility="no"> @@ -30,11 +30,11 @@ android:importantForAccessibility="no"/> <ImageView android:id="@+id/screenshot_actions_background" - android:layout_height="@dimen/screenshot_bg_protection_height" + android:layout_height="@dimen/overlay_bg_protection_height" android:layout_width="match_parent" android:layout_gravity="bottom" android:alpha="0.0" - android:src="@drawable/screenshot_actions_background_protection"/> + android:src="@drawable/overlay_actions_background_protection"/> <ImageView android:id="@+id/screenshot_flash" android:layout_width="match_parent" diff --git a/packages/SystemUI/res/layout/screenshot_static.xml b/packages/SystemUI/res/layout/screenshot_static.xml index 8f791c34419d..813bb6018801 100644 --- a/packages/SystemUI/res/layout/screenshot_static.xml +++ b/packages/SystemUI/res/layout/screenshot_static.xml @@ -26,7 +26,7 @@ android:layout_width="0dp" android:elevation="1dp" android:background="@drawable/action_chip_container_background" - android:layout_marginStart="@dimen/screenshot_action_container_margin_horizontal" + android:layout_marginStart="@dimen/overlay_action_container_margin_horizontal" app:layout_constraintBottom_toBottomOf="@+id/screenshot_actions_container" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@+id/screenshot_actions_container" @@ -35,9 +35,9 @@ android:id="@+id/screenshot_actions_container" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginEnd="@dimen/screenshot_action_container_margin_horizontal" - android:paddingEnd="@dimen/screenshot_action_container_padding_right" - android:paddingVertical="@dimen/screenshot_action_container_padding_vertical" + android:layout_marginEnd="@dimen/overlay_action_container_margin_horizontal" + android:paddingEnd="@dimen/overlay_action_container_padding_right" + android:paddingVertical="@dimen/overlay_action_container_padding_vertical" android:elevation="1dp" android:scrollbars="none" app:layout_constraintHorizontal_bias="0" @@ -50,11 +50,11 @@ android:id="@+id/screenshot_actions" android:layout_width="wrap_content" android:layout_height="wrap_content"> - <include layout="@layout/screenshot_action_chip" + <include layout="@layout/overlay_action_chip" android:id="@+id/screenshot_share_chip"/> - <include layout="@layout/screenshot_action_chip" + <include layout="@layout/overlay_action_chip" android:id="@+id/screenshot_edit_chip"/> - <include layout="@layout/screenshot_action_chip" + <include layout="@layout/overlay_action_chip" android:id="@+id/screenshot_scroll_chip" android:visibility="gone" /> </LinearLayout> @@ -89,7 +89,7 @@ <ImageView android:id="@+id/screenshot_preview" android:visibility="invisible" - android:layout_width="@dimen/screenshot_x_scale" + android:layout_width="@dimen/overlay_x_scale" android:layout_margin="@dimen/overlay_border_width" android:layout_height="wrap_content" android:layout_gravity="center" diff --git a/packages/SystemUI/res/layout/status_bar_expanded.xml b/packages/SystemUI/res/layout/status_bar_expanded.xml index 2290964eccd0..39d7f4f5db4e 100644 --- a/packages/SystemUI/res/layout/status_bar_expanded.xml +++ b/packages/SystemUI/res/layout/status_bar_expanded.xml @@ -122,7 +122,7 @@ android:layout_marginTop="@dimen/notification_panel_margin_top" android:layout_width="@dimen/notification_panel_width" android:layout_height="match_parent" - android:layout_marginBottom="@dimen/close_handle_underlap" + android:layout_marginBottom="@dimen/notification_panel_margin_bottom" android:importantForAccessibility="no" systemui:layout_constraintStart_toStartOf="parent" systemui:layout_constraintEnd_toEndOf="parent" diff --git a/packages/SystemUI/res/values-night/colors.xml b/packages/SystemUI/res/values-night/colors.xml index 3412722776c2..b318bbc157ca 100644 --- a/packages/SystemUI/res/values-night/colors.xml +++ b/packages/SystemUI/res/values-night/colors.xml @@ -58,9 +58,9 @@ <!-- The color of the text in the Global Actions menu --> <color name="global_actions_alert_text">@color/GM2_red_300</color> - <!-- Global screenshot actions --> - <color name="screenshot_button_ripple">#42FFFFFF</color> - <color name="screenshot_background_protection_start">#80000000</color> <!-- 50% black --> + <!-- Floating overlay actions --> + <color name="overlay_button_ripple">#42FFFFFF</color> + <color name="overlay_background_protection_start">#80000000</color> <!-- 50% black --> <!-- Media --> <color name="media_divider">#85ffffff</color> diff --git a/packages/SystemUI/res/values-night/styles.xml b/packages/SystemUI/res/values-night/styles.xml index 1f815b79ec30..f7261e70a610 100644 --- a/packages/SystemUI/res/values-night/styles.xml +++ b/packages/SystemUI/res/values-night/styles.xml @@ -47,8 +47,8 @@ <item name="android:textColorSecondary">?android:attr/textColorPrimaryInverse</item> </style> - <style name="Screenshot" parent="@android:style/Theme.DeviceDefault.DayNight"> - <item name="android:textColorPrimary">?android:attr/textColorPrimaryInverse</item> + <style name="FloatingOverlay" parent="@android:style/Theme.DeviceDefault.DayNight"> + <item name="overlayButtonTextColor">?android:attr/textColorPrimaryInverse</item> </style> <style name="Theme.PeopleTileConfigActivity" parent="@style/Theme.SystemUI"> diff --git a/packages/SystemUI/res/values-sw600dp-land/dimens.xml b/packages/SystemUI/res/values-sw600dp-land/dimens.xml index 89d046b83d97..c2cec5231243 100644 --- a/packages/SystemUI/res/values-sw600dp-land/dimens.xml +++ b/packages/SystemUI/res/values-sw600dp-land/dimens.xml @@ -26,6 +26,10 @@ keyguard_split_shade_top_margin - status_bar_header_height_keyguard = 8dp --> <dimen name="keyguard_clock_top_margin">8dp</dimen> + <dimen name="split_shade_notifications_scrim_margin_bottom">16dp</dimen> + + <dimen name="notification_panel_margin_bottom">48dp</dimen> + <!-- Limit the TaskView to this percentage of the overall screen width (0.0 - 1.0) --> <item name="controls_task_view_width_percentage" translatable="false" format="float" type="dimen">0.45</item> <dimen name="controls_task_view_right_margin">8dp</dimen> diff --git a/packages/SystemUI/res/values-sw720dp-land/dimens.xml b/packages/SystemUI/res/values-sw720dp-land/dimens.xml new file mode 100644 index 000000000000..ae557c4e72fc --- /dev/null +++ b/packages/SystemUI/res/values-sw720dp-land/dimens.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> + +<!-- + * Copyright (c) 2022, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. +*/ +--> +<resources> + <dimen name="controls_padding_horizontal">205dp</dimen> + <dimen name="split_shade_notifications_scrim_margin_bottom">16dp</dimen> + <dimen name="notification_panel_margin_bottom">56dp</dimen> +</resources> diff --git a/packages/SystemUI/res/values-sw720dp/dimens.xml b/packages/SystemUI/res/values-sw720dp/dimens.xml index 1564ee8c5604..95df59442978 100644 --- a/packages/SystemUI/res/values-sw720dp/dimens.xml +++ b/packages/SystemUI/res/values-sw720dp/dimens.xml @@ -16,8 +16,9 @@ */ --> <resources> - <!-- gap on either side of status bar notification icons --> <dimen name="status_bar_icon_padding">1dp</dimen> + + <dimen name="controls_padding_horizontal">75dp</dimen> </resources> diff --git a/packages/SystemUI/res/values/attrs.xml b/packages/SystemUI/res/values/attrs.xml index db699242a061..e6ab0ff9bd73 100644 --- a/packages/SystemUI/res/values/attrs.xml +++ b/packages/SystemUI/res/values/attrs.xml @@ -85,7 +85,7 @@ Contract: Pixel with fillColor blended over backgroundColor blended over translucent should equal to singleToneColor blended over translucent. --> <declare-styleable name="TonedIcon"> - <attr name="backgroundColor" format="integer" /> + <attr name="iconBackgroundColor" format="integer" /> <attr name="fillColor" format="integer" /> <attr name="singleToneColor" format="integer" /> <attr name="homeHandleColor" format="integer" /> @@ -204,5 +204,7 @@ <attr name="singleLineVerticalPadding" format="dimension" /> <attr name="textViewId" format="reference" /> </declare-styleable> + + <attr name="overlayButtonTextColor" format="color" /> </resources> diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml index 81e3e04b279e..3ab569a19c0c 100644 --- a/packages/SystemUI/res/values/colors.xml +++ b/packages/SystemUI/res/values/colors.xml @@ -138,9 +138,9 @@ <color name="udfps_enroll_progress">#7DA7F1</color> <color name="udfps_enroll_progress_help">#ffEE675C</color> - <!-- Global screenshot actions --> - <color name="screenshot_button_ripple">#1f000000</color> - <color name="screenshot_background_protection_start">#40000000</color> <!-- 25% black --> + <!-- Floating overlay actions --> + <color name="overlay_button_ripple">#1f000000</color> + <color name="overlay_background_protection_start">#40000000</color> <!-- 25% black --> <!-- GM2 colors --> <color name="GM2_grey_100">#F1F3F4</color> diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index 800dd0a6d7a3..dba7290dba09 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -258,36 +258,36 @@ <!-- Dimensions related to screenshots --> - <!-- The padding on the global screenshot background image --> - <dimen name="screenshot_x_scale">80dp</dimen> - <dimen name="screenshot_bg_protection_height">242dp</dimen> - <dimen name="screenshot_action_container_corner_radius">18dp</dimen> - <dimen name="screenshot_action_container_padding_vertical">4dp</dimen> - <dimen name="screenshot_action_container_margin_horizontal">8dp</dimen> - <dimen name="screenshot_action_container_padding_right">8dp</dimen> - <!-- Radius of the chip background on global screenshot actions --> - <dimen name="screenshot_button_corner_radius">8dp</dimen> + + <dimen name="screenshot_crop_handle_thickness">3dp</dimen> + <dimen name="long_screenshot_action_bar_top_margin">8dp</dimen> + + <!-- Dimensions shared between "overlays" (clipboard and screenshot preview UIs) --> + <!-- Constrained size of the floating overlay preview --> + <dimen name="overlay_x_scale">80dp</dimen> + <!-- Radius of the chip background on floating overlay actions --> + <dimen name="overlay_button_corner_radius">8dp</dimen> <!-- Margin between successive chips --> - <dimen name="screenshot_action_chip_margin_start">8dp</dimen> + <dimen name="overlay_action_chip_margin_start">8dp</dimen> <!-- Padding to make tappable chip height 48dp (18+11+11+4+4) --> - <dimen name="screenshot_action_chip_margin_vertical">4dp</dimen> - <dimen name="screenshot_action_chip_padding_vertical">11dp</dimen> - <dimen name="screenshot_action_chip_icon_size">18sp</dimen> + <dimen name="overlay_action_chip_margin_vertical">4dp</dimen> + <dimen name="overlay_action_chip_padding_vertical">11dp</dimen> + <dimen name="overlay_action_chip_icon_size">18sp</dimen> <!-- Padding on each side of the icon for icon-only chips --> - <dimen name="screenshot_action_chip_icon_only_padding_horizontal">14dp</dimen> + <dimen name="overlay_action_chip_icon_only_padding_horizontal">14dp</dimen> <!-- Padding at the edges of the chip for icon-and-text chips --> - <dimen name="screenshot_action_chip_padding_horizontal">12dp</dimen> + <dimen name="overlay_action_chip_padding_horizontal">12dp</dimen> <!-- Spacing between chip icon and chip text --> - <dimen name="screenshot_action_chip_spacing">8dp</dimen> - <dimen name="screenshot_action_chip_text_size">14sp</dimen> - <dimen name="screenshot_dismissal_height_delta">80dp</dimen> - <dimen name="screenshot_crop_handle_thickness">3dp</dimen> - <dimen name="long_screenshot_action_bar_top_margin">8dp</dimen> - - <!-- Dimensions shared between "overlays" (clipboard and screenshot preview UIs) --> + <dimen name="overlay_action_chip_spacing">8dp</dimen> + <dimen name="overlay_action_chip_text_size">14sp</dimen> <dimen name="overlay_offset_y">8dp</dimen> <dimen name="overlay_offset_x">16dp</dimen> <dimen name="overlay_preview_elevation">4dp</dimen> + <dimen name="overlay_action_container_margin_horizontal">8dp</dimen> + <dimen name="overlay_bg_protection_height">242dp</dimen> + <dimen name="overlay_action_container_corner_radius">18dp</dimen> + <dimen name="overlay_action_container_padding_vertical">4dp</dimen> + <dimen name="overlay_action_container_padding_right">8dp</dimen> <dimen name="overlay_dismiss_button_elevation">7dp</dimen> <dimen name="overlay_dismiss_button_tappable_size">48dp</dimen> <dimen name="overlay_dismiss_button_margin">8dp</dimen> @@ -295,7 +295,7 @@ <!-- need a negative margin for some of the constraints. should be overlay_border_width * -1 --> <dimen name="overlay_border_width_neg">-4dp</dimen> - <dimen name="clipboard_preview_size">@dimen/screenshot_x_scale</dimen> + <dimen name="clipboard_preview_size">@dimen/overlay_x_scale</dimen> <!-- The width of the view containing navigation buttons --> @@ -311,9 +311,6 @@ <!-- Move the back button drawable for 3 button layout upwards in ime mode and in portrait --> <dimen name="navbar_back_button_ime_offset">2dp</dimen> - <!-- Amount of close_handle that will NOT overlap the notification list --> - <dimen name="close_handle_underlap">32dp</dimen> - <!-- Height of the status bar header bar in the car setting. --> <dimen name="car_status_bar_header_height">128dp</dimen> @@ -330,7 +327,7 @@ <!-- The height of the quick settings footer that holds the user switcher, settings icon, etc. --> - <dimen name="qs_footer_height">96dp</dimen> + <dimen name="qs_footer_height">48dp</dimen> <!-- The size of each of the icon buttons in the QS footer --> <dimen name="qs_footer_action_button_size">48dp</dimen> @@ -376,8 +373,12 @@ --> <dimen name="nssl_split_shade_min_content_height">256dp</dimen> - <!-- The bottom margin of the panel that holds the list of notifications. --> - <dimen name="notification_panel_margin_bottom">0dp</dimen> + <dimen name="notification_panel_margin_bottom">32dp</dimen> + + <!-- The bottom padding of the panel that holds the list of notifications. --> + <dimen name="notification_panel_padding_bottom">0dp</dimen> + + <dimen name="split_shade_notifications_scrim_margin_bottom">0dp</dimen> <dimen name="notification_panel_width">@dimen/match_parent</dimen> @@ -490,7 +491,7 @@ <dimen name="qs_tile_text_size">14sp</dimen> <dimen name="qs_panel_padding">16dp</dimen> <dimen name="qs_dual_tile_padding_horizontal">6dp</dimen> - <dimen name="qs_panel_padding_bottom">0dp</dimen> + <dimen name="qs_panel_padding_bottom">@dimen/qs_footer_height</dimen> <dimen name="qs_panel_padding_top">48dp</dimen> <dimen name="qs_detail_header_padding">0dp</dimen> <dimen name="qs_detail_image_width">56dp</dimen> @@ -1345,6 +1346,16 @@ shade. --> <dimen name="dream_overlay_notifications_drag_area_height">100dp</dimen> + <!-- Dream overlay complications related dimensions --> + <dimen name="dream_overlay_complication_clock_time_padding_left">50dp</dimen> + <dimen name="dream_overlay_complication_clock_time_text_size">72sp</dimen> + <dimen name="dream_overlay_complication_clock_date_padding_left">60dp</dimen> + <dimen name="dream_overlay_complication_clock_date_padding_bottom">50dp</dimen> + <dimen name="dream_overlay_complication_clock_date_text_size">18sp</dimen> + <dimen name="dream_overlay_complication_weather_padding_left">20dp</dimen> + <dimen name="dream_overlay_complication_weather_padding_bottom">50dp</dimen> + <dimen name="dream_overlay_complication_weather_text_size">18sp</dimen> + <!-- The position of the end guide, which dream overlay complications can align their start with if their end is aligned with the parent end. Represented as the percentage over from the start of the parent container. --> diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 75ae52c6e6f4..e5cabb0ecac0 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -123,6 +123,18 @@ <!-- Message of notification shown when trying to enable USB debugging but a secondary user is the current foreground user. --> <string name="usb_debugging_secondary_user_message">The user currently signed in to this device can\'t turn on USB debugging. To use this feature, switch to the primary user.</string> + <!-- Title of confirmation dialog for wireless debugging [CHAR LIMIT=80] --> + <string name="hdmi_cec_set_menu_language_title">Do you want to change the system language to <xliff:g id="language" example="German">%1$s</xliff:g>?</string> + + <!-- Description for the <Set Menu Language> confirmation dialog [CHAR LIMIT=NONE] --> + <string name="hdmi_cec_set_menu_language_description">System language change requested by another device</string> + + <!-- Button label for accepting language change [CHAR LIMIT=25] --> + <string name="hdmi_cec_set_menu_language_accept">Change language</string> + + <!-- Button label for declining language change [CHAR LIMIT=25] --> + <string name="hdmi_cec_set_menu_language_decline">Keep current language</string> + <!-- Title of confirmation dialog for wireless debugging [CHAR LIMIT=NONE] --> <string name="wifi_debugging_title">Allow wireless debugging on this network?</string> @@ -2367,11 +2379,15 @@ <string name="fgs_manager_dialog_title">Active apps</string> <!-- Label of the button to stop an app from running [CHAR LIMIT=12]--> <string name="fgs_manager_app_item_stop_button_label">Stop</string> + <!-- Label of the button to stop an app from running but the app is already stopped and the button is disabled [CHAR LIMIT=12]--> + <string name="fgs_manager_app_item_stop_button_stopped_label">Stopped</string> <!-- Label for button to copy edited text back to the clipboard [CHAR LIMIT=20] --> <string name="clipboard_edit_text_copy">Copy</string> <!-- Text informing user that content has been copied to the system clipboard [CHAR LIMIT=NONE] --> <string name="clipboard_overlay_text_copied">Copied</string> + <!-- Text informing user where text being edited was copied from [CHAR LIMIT=NONE] --> + <string name="clipboard_edit_source">From <xliff:g id="appName" example="Gmail">%1$s</xliff:g></string> <!-- Label for button to dismiss clipboard overlay [CHAR LIMIT=NONE] --> <string name="clipboard_dismiss_description">Dismiss copy UI</string> </resources> diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml index ac9873938a29..590cc9b4eb0a 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml @@ -236,6 +236,41 @@ <item name="android:textColor">?android:attr/colorError</item> </style> + <style name="TextAppearance.AuthNonBioCredential" + parent="@android:style/TextAppearance.DeviceDefault"> + <item name="android:accessibilityLiveRegion">polite</item> + <item name="android:textAlignment">gravity</item> + <item name="android:layout_gravity">top</item> + <item name="android:textColor">?android:attr/textColorPrimary</item> + </style> + + <style name="TextAppearance.AuthNonBioCredential.Title"> + <item name="android:fontFamily">google-sans</item> + <item name="android:layout_marginTop">20dp</item> + <item name="android:textSize">36sp</item> + </style> + + <style name="TextAppearance.AuthNonBioCredential.Subtitle"> + <item name="android:fontFamily">google-sans</item> + <item name="android:layout_marginTop">20dp</item> + <item name="android:textSize">18sp</item> + </style> + + <style name="TextAppearance.AuthNonBioCredential.Description"> + <item name="android:fontFamily">google-sans</item> + <item name="android:layout_marginTop">20dp</item> + <item name="android:textSize">16sp</item> + </style> + + <style name="TextAppearance.AuthNonBioCredential.Error"> + <item name="android:paddingTop">6dp</item> + <item name="android:paddingBottom">18dp</item> + <item name="android:paddingHorizontal">24dp</item> + <item name="android:textSize">14sp</item> + <item name="android:textColor">?android:attr/colorError</item> + <item name="android:gravity">center</item> + </style> + <style name="TextAppearance.AuthCredential.PasswordEntry" parent="@android:style/TextAppearance.DeviceDefault"> <item name="android:gravity">center</item> <item name="android:singleLine">true</item> @@ -243,6 +278,15 @@ <item name="android:textSize">24sp</item> </style> + <style name="AuthCredentialHeaderStyle"> + <item name="android:paddingStart">48dp</item> + <item name="android:paddingEnd">24dp</item> + <item name="android:paddingTop">28dp</item> + <item name="android:paddingBottom">20dp</item> + <item name="android:orientation">vertical</item> + <item name="android:layout_gravity">top</item> + </style> + <style name="DeviceManagementDialogTitle"> <item name="android:gravity">center</item> <item name="android:textAppearance">@style/TextAppearance.DeviceManagementDialog.Title</item> @@ -307,9 +351,8 @@ <item name="android:maxWidth">420dp</item> <item name="android:minHeight">0dp</item> <item name="android:minWidth">0dp</item> - <item name="android:paddingBottom">0dp</item> - <item name="android:paddingHorizontal">44dp</item> - <item name="android:paddingTop">0dp</item> + <item name="android:paddingHorizontal">60dp</item> + <item name="android:paddingBottom">40dp</item> </style> <style name="LockPatternStyle"> @@ -404,19 +447,19 @@ </style> <style name="DualToneLightTheme"> - <item name="backgroundColor">@color/light_mode_icon_color_dual_tone_background</item> + <item name="iconBackgroundColor">@color/light_mode_icon_color_dual_tone_background</item> <item name="fillColor">@color/light_mode_icon_color_dual_tone_fill</item> <item name="singleToneColor">@color/light_mode_icon_color_single_tone</item> <item name="homeHandleColor">@color/navigation_bar_home_handle_light_color</item> </style> <style name="DualToneDarkTheme"> - <item name="backgroundColor">@color/dark_mode_icon_color_dual_tone_background</item> + <item name="iconBackgroundColor">@color/dark_mode_icon_color_dual_tone_background</item> <item name="fillColor">@color/dark_mode_icon_color_dual_tone_fill</item> <item name="singleToneColor">@color/dark_mode_icon_color_single_tone</item> <item name="homeHandleColor">@color/navigation_bar_home_handle_dark_color</item> </style> <style name="QSHeaderDarkTheme"> - <item name="backgroundColor">@color/dark_mode_qs_icon_color_dual_tone_background</item> + <item name="iconBackgroundColor">@color/dark_mode_qs_icon_color_dual_tone_background</item> <item name="fillColor">@color/dark_mode_qs_icon_color_dual_tone_fill</item> <item name="singleToneColor">@color/dark_mode_qs_icon_color_single_tone</item> </style> @@ -664,7 +707,9 @@ <item name="android:windowActivityTransitions">true</item> </style> - <style name="Screenshot" parent="@android:style/Theme.DeviceDefault.DayNight"/> + <style name="FloatingOverlay" parent="@android:style/Theme.DeviceDefault.DayNight"> + <item name="overlayButtonTextColor">?android:attr/textColorPrimary</item> + </style> <!-- Clipboard overlay's edit text activity. --> <style name="EditTextActivity" parent="@android:style/Theme.DeviceDefault.DayNight"> diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/animation/UnfoldConstantTranslateAnimator.kt b/packages/SystemUI/shared/src/com/android/systemui/shared/animation/UnfoldConstantTranslateAnimator.kt new file mode 100644 index 000000000000..ffab3cd79d7f --- /dev/null +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/animation/UnfoldConstantTranslateAnimator.kt @@ -0,0 +1,96 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.systemui.shared.animation + +import android.view.View +import android.view.ViewGroup +import com.android.systemui.shared.animation.UnfoldConstantTranslateAnimator.ViewIdToTranslate +import com.android.systemui.unfold.UnfoldTransitionProgressProvider +import com.android.systemui.unfold.UnfoldTransitionProgressProvider.TransitionProgressListener +import java.lang.ref.WeakReference + +/** + * Translates items away/towards the hinge when the device is opened/closed, according to the + * direction specified in [ViewIdToTranslate.direction], for a maximum of [translationMax] when + * progresses are 0. + */ +class UnfoldConstantTranslateAnimator( + private val viewsIdToTranslate: Set<ViewIdToTranslate>, + private val progressProvider: UnfoldTransitionProgressProvider +) : TransitionProgressListener { + + private var viewsToTranslate = listOf<ViewToTranslate>() + private lateinit var rootView: ViewGroup + private var translationMax = 0f + + fun init(rootView: ViewGroup, translationMax: Float) { + this.rootView = rootView + this.translationMax = translationMax + progressProvider.addCallback(this) + } + + override fun onTransitionStarted() { + registerViewsForAnimation(rootView, viewsIdToTranslate) + } + + override fun onTransitionProgress(progress: Float) { + translateViews(progress) + } + + override fun onTransitionFinished() { + translateViews(progress = 1f) + } + + private fun translateViews(progress: Float) { + // progress == 0 -> -translationMax + // progress == 1 -> 0 + val xTrans = (progress - 1f) * translationMax + viewsToTranslate.forEach { (view, direction, shouldBeAnimated) -> + if (shouldBeAnimated()) { + view.get()?.translationX = xTrans * direction.multiplier + } + } + } + + /** Finds in [parent] all views specified by [ids] and register them for the animation. */ + private fun registerViewsForAnimation(parent: ViewGroup, ids: Set<ViewIdToTranslate>) { + viewsToTranslate = + ids.mapNotNull { (id, dir, pred) -> + parent.findViewById<View>(id)?.let { view -> + ViewToTranslate(WeakReference(view), dir, pred) + } + } + } + + /** Represents a view to animate. [rootView] should contain a view with [viewId] inside. */ + data class ViewIdToTranslate( + val viewId: Int, + val direction: Direction, + val shouldBeAnimated: () -> Boolean = { true } + ) + + private data class ViewToTranslate( + val view: WeakReference<View>, + val direction: Direction, + val shouldBeAnimated: () -> Boolean + ) + + /** Direction of the animation. */ + enum class Direction(val multiplier: Float) { + LEFT(-1f), + RIGHT(1f), + } +} diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/animation/UnfoldMoveFromCenterAnimator.kt b/packages/SystemUI/shared/src/com/android/systemui/shared/animation/UnfoldMoveFromCenterAnimator.kt index 9010d5154156..fc6bb500562e 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/animation/UnfoldMoveFromCenterAnimator.kt +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/animation/UnfoldMoveFromCenterAnimator.kt @@ -42,7 +42,9 @@ class UnfoldMoveFromCenterAnimator @JvmOverloads constructor( * are different than actual bounds (e.g. view container may * have larger width than width of the items in the container) */ - private val viewCenterProvider: ViewCenterProvider = object : ViewCenterProvider {} + private val viewCenterProvider: ViewCenterProvider = object : ViewCenterProvider {}, + /** Allows to set the alpha based on the progress. */ + private val alphaProvider: AlphaProvider? = null ) : UnfoldTransitionProgressProvider.TransitionProgressListener { private val screenSize = Point() @@ -99,17 +101,27 @@ class UnfoldMoveFromCenterAnimator @JvmOverloads constructor( override fun onTransitionProgress(progress: Float) { animatedViews.forEach { - it.view.get()?.let { view -> - translationApplier.apply( - view = view, - x = it.startTranslationX * (1 - progress), - y = it.startTranslationY * (1 - progress) - ) - } + it.applyTransition(progress) + it.applyAlpha(progress) } lastAnimationProgress = progress } + private fun AnimatedView.applyTransition(progress: Float) { + view.get()?.let { view -> + translationApplier.apply( + view = view, + x = startTranslationX * (1 - progress), + y = startTranslationY * (1 - progress) + ) + } + } + + private fun AnimatedView.applyAlpha(progress: Float) { + if (alphaProvider == null) return + view.get()?.alpha = alphaProvider.getAlpha(progress) + } + private fun createAnimatedView(view: View): AnimatedView = AnimatedView(view = WeakReference(view)).updateAnimatedView(view) @@ -146,6 +158,13 @@ class UnfoldMoveFromCenterAnimator @JvmOverloads constructor( } } + /** Allows to set a custom alpha based on the progress. */ + interface AlphaProvider { + + /** Returns the alpha views should have at a given progress. */ + fun getAlpha(progress: Float): Float + } + /** * Interface that allows to use custom logic to get the center of the view */ diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/media/INearbyMediaDevicesProvider.aidl b/packages/SystemUI/shared/src/com/android/systemui/shared/media/INearbyMediaDevicesProvider.aidl new file mode 100644 index 000000000000..6db06f046c55 --- /dev/null +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/media/INearbyMediaDevicesProvider.aidl @@ -0,0 +1,43 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.shared.media; + +import com.android.systemui.shared.media.INearbyMediaDevicesUpdateCallback; +import com.android.systemui.shared.media.NearbyDevice; + +/** + * An interface that provides information about nearby devices that are able to play media. + * + * External clients will implement this interface and System UI will invoke it if it's passed to + * SystemUI via {@link INearbyMediaDevicesService.registerProvider}. + */ +interface INearbyMediaDevicesProvider { + /** + * Returns a list of nearby devices that are able to play media. + */ + List<NearbyDevice> getCurrentNearbyDevices() = 1; + + /** + * Registers a callback that will be notified each time the status of a nearby device changes. + */ + oneway void registerNearbyDevicesCallback(in INearbyMediaDevicesUpdateCallback callback) = 2; + + /** + * Unregisters a callback. See {@link registerNearbyDevicesCallback}. + */ + oneway void unregisterNearbyDevicesCallback(in INearbyMediaDevicesUpdateCallback callback) = 3; +} diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/media/INearbyMediaDevicesService.aidl b/packages/SystemUI/shared/src/com/android/systemui/shared/media/INearbyMediaDevicesService.aidl new file mode 100644 index 000000000000..4f3e10d801f0 --- /dev/null +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/media/INearbyMediaDevicesService.aidl @@ -0,0 +1,33 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.shared.media; + +import com.android.systemui.shared.media.INearbyMediaDevicesProvider; + +/** + * An interface that can be invoked to notify System UI of nearby media devices. + * + * External clients wanting to notify System UI about the status of nearby media devices should + * implement {@link INearbyMediaDevicesProvider} and then register it with system UI using this + * service. + * + * System UI will implement this interface and external clients will invoke it. + */ +interface INearbyMediaDevicesService { + /** Registers a new provider. */ + oneway void registerProvider(INearbyMediaDevicesProvider provider) = 1; +} diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/media/INearbyMediaDevicesUpdateCallback.aidl b/packages/SystemUI/shared/src/com/android/systemui/shared/media/INearbyMediaDevicesUpdateCallback.aidl new file mode 100644 index 000000000000..a835f5227852 --- /dev/null +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/media/INearbyMediaDevicesUpdateCallback.aidl @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.shared.media; + +/** + * A callback used to notify implementors of changes in the status of nearby devices that are able + * to play media. + * + * External clients may allow registration of these callbacks and external clients will be + * responsible for notifying the callbacks appropriately. System UI is only a mediator between the + * external client and these callbacks. + */ +interface INearbyMediaDevicesUpdateCallback { + /** Unknown distance range. */ + const int RANGE_UNKNOWN = 0; + /** Distance is very far away from the peer device. */ + const int RANGE_FAR = 1; + /** Distance is relatively long from the peer device, typically a few meters. */ + const int RANGE_LONG = 2; + /** Distance is close to the peer device, typically with one or two meter. */ + const int RANGE_CLOSE = 3; + /** Distance is very close to the peer device, typically within one meter or less. */ + const int RANGE_WITHIN_REACH = 4; + + /** Invoked by external clients when media device changes are detected. */ + oneway void nearbyDeviceUpdate(in String routeId, in int rangeZone) = 1; +} diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/mediattt/DeviceInfo.aidl b/packages/SystemUI/shared/src/com/android/systemui/shared/media/NearbyDevice.aidl index 861a4ed8eaf9..62b50ed5f953 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/mediattt/DeviceInfo.aidl +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/media/NearbyDevice.aidl @@ -14,6 +14,6 @@ * limitations under the License. */ -package com.android.systemui.shared.mediattt; +package com.android.systemui.shared.media; -parcelable DeviceInfo; +parcelable NearbyDevice; diff --git a/packages/SystemUI/src/com/android/systemui/media/nearby/NearbyDevice.kt b/packages/SystemUI/shared/src/com/android/systemui/shared/media/NearbyDevice.kt index 96b853f394d4..9cab3ab355dd 100644 --- a/packages/SystemUI/src/com/android/systemui/media/nearby/NearbyDevice.kt +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/media/NearbyDevice.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.media.nearby +package com.android.systemui.shared.media import android.os.Parcel import android.os.Parcelable @@ -26,14 +26,15 @@ import android.os.Parcelable * - [routeId] identifying the media route * - [rangeZone] specifying how far away the device with the media route is from this device. */ -class NearbyDevice(parcel: Parcel) : Parcelable { - var routeId: String? = null +class NearbyDevice( + val routeId: String?, @RangeZone val rangeZone: Int +) : Parcelable { - init { - routeId = parcel.readString() ?: "unknown" + private constructor(parcel: Parcel) : this( + routeId = parcel.readString() ?: null, rangeZone = parcel.readInt() - } + ) override fun describeContents() = 0 diff --git a/packages/SystemUI/src/com/android/systemui/media/nearby/RangeZone.kt b/packages/SystemUI/shared/src/com/android/systemui/shared/media/RangeZone.kt index 3c890bc9efab..b5eaff6e1cd9 100644 --- a/packages/SystemUI/src/com/android/systemui/media/nearby/RangeZone.kt +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/media/RangeZone.kt @@ -14,31 +14,18 @@ * limitations under the License. */ -package com.android.systemui.media.nearby +package com.android.systemui.shared.media import androidx.annotation.IntDef import kotlin.annotation.AnnotationRetention @IntDef( - RangeZone.RANGE_UNKNOWN, - RangeZone.RANGE_FAR, - RangeZone.RANGE_LONG, - RangeZone.RANGE_CLOSE, - RangeZone.RANGE_WITHIN_REACH + INearbyMediaDevicesUpdateCallback.RANGE_UNKNOWN, + INearbyMediaDevicesUpdateCallback.RANGE_FAR, + INearbyMediaDevicesUpdateCallback.RANGE_LONG, + INearbyMediaDevicesUpdateCallback.RANGE_CLOSE, + INearbyMediaDevicesUpdateCallback.RANGE_WITHIN_REACH ) @Retention(AnnotationRetention.SOURCE) /** The various range zones a device can be in, in relation to the current device. */ -annotation class RangeZone { - companion object { - /** Unknown distance range. */ - const val RANGE_UNKNOWN = 0 - /** Distance is very far away from the peer device. */ - const val RANGE_FAR = 1 - /** Distance is relatively long from the peer device, typically a few meters. */ - const val RANGE_LONG = 2 - /** Distance is close to the peer device, typically with one or two meter. */ - const val RANGE_CLOSE = 3 - /** Distance is very close to the peer device, typically within one meter or less. */ - const val RANGE_WITHIN_REACH = 4 - } -} +annotation class RangeZone diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/mediattt/DeviceInfo.kt b/packages/SystemUI/shared/src/com/android/systemui/shared/mediattt/DeviceInfo.kt deleted file mode 100644 index d41aaf30a12f..000000000000 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/mediattt/DeviceInfo.kt +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (C) 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.systemui.shared.mediattt - -import android.os.Parcel -import android.os.Parcelable - -/** - * Represents a device that can send or receive media. Includes any device information necessary for - * SysUI to display an informative chip to the user. - */ -class DeviceInfo(val name: String) : Parcelable { - constructor(parcel: Parcel) : this(parcel.readString()) - - override fun writeToParcel(dest: Parcel?, flags: Int) { - dest?.writeString(name) - } - - override fun describeContents() = 0 - - override fun toString() = "name: $name" - - companion object CREATOR : Parcelable.Creator<DeviceInfo> { - override fun createFromParcel(parcel: Parcel) = DeviceInfo(parcel) - override fun newArray(size: Int) = arrayOfNulls<DeviceInfo?>(size) - } -} diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/mediattt/IDeviceSenderService.aidl b/packages/SystemUI/shared/src/com/android/systemui/shared/mediattt/IDeviceSenderService.aidl deleted file mode 100644 index eb1c9d058e20..000000000000 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/mediattt/IDeviceSenderService.aidl +++ /dev/null @@ -1,133 +0,0 @@ -/* - * Copyright (C) 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.systemui.shared.mediattt; - -import android.media.MediaRoute2Info; -import com.android.systemui.shared.mediattt.DeviceInfo; -import com.android.systemui.shared.mediattt.IUndoTransferCallback; - -/** - * An interface that can be invoked to trigger media transfer events on System UI. - * - * This interface is for the *sender* device, which is the device currently playing media. This - * sender device can transfer the media to a different device, called the receiver. - * - * System UI will implement this interface and other services will invoke it. - */ -interface IDeviceSenderService { - /** - * Invoke to notify System UI that this device (the sender) is close to a receiver device, so - * the user can potentially *start* a cast to the receiver device if the user moves their device - * a bit closer. - * - * Important notes: - * - When this callback triggers, the device is close enough to inform the user that - * transferring is an option, but the device is *not* close enough to actually initiate a - * transfer yet. - * - This callback is for *starting* a cast. It should be used when this device is currently - * playing media locally and the media should be transferred to be played on the receiver - * device instead. - */ - oneway void closeToReceiverToStartCast( - in MediaRoute2Info mediaInfo, in DeviceInfo otherDeviceInfo); - - /** - * Invoke to notify System UI that this device (the sender) is close to a receiver device, so - * the user can potentially *end* a cast on the receiver device if the user moves this device a - * bit closer. - * - * Important notes: - * - When this callback triggers, the device is close enough to inform the user that - * transferring is an option, but the device is *not* close enough to actually initiate a - * transfer yet. - * - This callback is for *ending* a cast. It should be used when media is currently being - * played on the receiver device and the media should be transferred to play locally - * instead. - */ - oneway void closeToReceiverToEndCast( - in MediaRoute2Info mediaInfo, in DeviceInfo otherDeviceInfo); - - /** - * Invoke to notify System UI that a media transfer from this device (the sender) to a receiver - * device has been started. - * - * Important notes: - * - This callback is for *starting* a cast. It should be used when this device is currently - * playing media locally and the media has started being transferred to the receiver device - * instead. - */ - oneway void transferToReceiverTriggered( - in MediaRoute2Info mediaInfo, in DeviceInfo otherDeviceInfo); - - /** - * Invoke to notify System UI that a media transfer from the receiver and back to this device - * (the sender) has been started. - * - * Important notes: - * - This callback is for *ending* a cast. It should be used when media is currently being - * played on the receiver device and the media has started being transferred to play locally - * instead. - */ - oneway void transferToThisDeviceTriggered( - in MediaRoute2Info mediaInfo, in DeviceInfo otherDeviceInfo); - - /** - * Invoke to notify System UI that a media transfer from this device (the sender) to a receiver - * device has finished successfully. - * - * Important notes: - * - This callback is for *starting* a cast. It should be used when this device had previously - * been playing media locally and the media has successfully been transferred to the - * receiver device instead. - * - * @param undoCallback will be invoked if the user chooses to undo this transfer. - */ - oneway void transferToReceiverSucceeded( - in MediaRoute2Info mediaInfo, - in DeviceInfo otherDeviceInfo, - in IUndoTransferCallback undoCallback); - - /** - * Invoke to notify System UI that a media transfer from the receiver and back to this device - * (the sender) has finished successfully. - * - * Important notes: - * - This callback is for *ending* a cast. It should be used when media was previously being - * played on the receiver device and has been successfully transferred to play locally on - * this device instead. - * - * @param undoCallback will be invoked if the user chooses to undo this transfer. - */ - oneway void transferToThisDeviceSucceeded( - in MediaRoute2Info mediaInfo, - in DeviceInfo otherDeviceInfo, - in IUndoTransferCallback undoCallback); - - /** - * Invoke to notify System UI that the attempted transfer has failed. - * - * This callback will be used for both the transfer that should've *started* playing the media - * on the receiver and the transfer that should've *ended* the playing on the receiver. - */ - oneway void transferFailed(in MediaRoute2Info mediaInfo, in DeviceInfo otherDeviceInfo); - - /** - * Invoke to notify System UI that this device is no longer close to the receiver device. - */ - oneway void noLongerCloseToReceiver( - in MediaRoute2Info mediaInfo, in DeviceInfo otherDeviceInfo); -} diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardUnfoldTransition.kt b/packages/SystemUI/src/com/android/keyguard/KeyguardUnfoldTransition.kt index cb25e1a2a40e..89d6fb5f062f 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardUnfoldTransition.kt +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardUnfoldTransition.kt @@ -17,11 +17,13 @@ package com.android.keyguard import android.content.Context -import android.view.View import android.view.ViewGroup import com.android.systemui.R +import com.android.systemui.shared.animation.UnfoldConstantTranslateAnimator +import com.android.systemui.shared.animation.UnfoldConstantTranslateAnimator.Direction.LEFT +import com.android.systemui.shared.animation.UnfoldConstantTranslateAnimator.Direction.RIGHT +import com.android.systemui.shared.animation.UnfoldConstantTranslateAnimator.ViewIdToTranslate import com.android.systemui.unfold.SysUIUnfoldScope -import com.android.systemui.unfold.UnfoldTransitionProgressProvider.TransitionProgressListener import com.android.systemui.unfold.util.NaturalRotationUnfoldProgressProvider import javax.inject.Inject @@ -30,84 +32,37 @@ import javax.inject.Inject * the set of ids, which also dictact which direction to move and when, via a filter function. */ @SysUIUnfoldScope -class KeyguardUnfoldTransition @Inject constructor( - val context: Context, - val unfoldProgressProvider: NaturalRotationUnfoldProgressProvider +class KeyguardUnfoldTransition +@Inject +constructor( + private val context: Context, + unfoldProgressProvider: NaturalRotationUnfoldProgressProvider ) { - companion object { - final val LEFT = -1 - final val RIGHT = 1 - } + /** Certain views only need to move if they are not currently centered */ + var statusViewCentered = false private val filterSplitShadeOnly = { !statusViewCentered } private val filterNever = { true } - private val ids = setOf( - Triple(R.id.keyguard_status_area, LEFT, filterNever), - Triple(R.id.controls_button, LEFT, filterNever), - Triple(R.id.lockscreen_clock_view_large, LEFT, filterSplitShadeOnly), - Triple(R.id.lockscreen_clock_view, LEFT, filterNever), - Triple(R.id.notification_stack_scroller, RIGHT, filterSplitShadeOnly), - Triple(R.id.wallet_button, RIGHT, filterNever) - ) - private var parent: ViewGroup? = null - private var views = listOf<Triple<View, Int, () -> Boolean>>() - private var xTranslationMax = 0f - - /** - * Certain views only need to move if they are not currently centered - */ - var statusViewCentered = false - - init { - unfoldProgressProvider.addCallback( - object : TransitionProgressListener { - override fun onTransitionStarted() { - findViews() - } - - override fun onTransitionProgress(progress: Float) { - translateViews(progress) - } - - override fun onTransitionFinished() { - translateViews(1f) - } - } - ) + private val translateAnimator by lazy { + UnfoldConstantTranslateAnimator( + viewsIdToTranslate = + setOf( + ViewIdToTranslate(R.id.keyguard_status_area, LEFT, filterNever), + ViewIdToTranslate(R.id.controls_button, LEFT, filterNever), + ViewIdToTranslate(R.id.lockscreen_clock_view_large, LEFT, filterSplitShadeOnly), + ViewIdToTranslate(R.id.lockscreen_clock_view, LEFT, filterNever), + ViewIdToTranslate( + R.id.notification_stack_scroller, RIGHT, filterSplitShadeOnly), + ViewIdToTranslate(R.id.wallet_button, RIGHT, filterNever)), + progressProvider = unfoldProgressProvider) } - /** - * Relies on the [parent] to locate views to translate - */ + /** Relies on the [parent] to locate views to translate. */ fun setup(parent: ViewGroup) { - this.parent = parent - xTranslationMax = context.resources.getDimensionPixelSize( - R.dimen.keyguard_unfold_translation_x).toFloat() - } - - /** - * Manually translate views based on set direction. At the moment - * [UnfoldMoveFromCenterAnimator] exists but moves all views a dynamic distance - * from their mid-point. This code instead will only ever translate by a fixed amount. - */ - private fun translateViews(progress: Float) { - val xTrans = progress * xTranslationMax - xTranslationMax - views.forEach { - (view, direction, pred) -> if (pred()) { - view.setTranslationX(xTrans * direction) - } - } - } - - private fun findViews() { - parent?.let { p -> - views = ids.mapNotNull { - (id, direction, pred) -> p.findViewById<View>(id)?.let { - Triple(it, direction, pred) - } - } - } + val translationMax = + context.resources.getDimensionPixelSize(R.dimen.keyguard_unfold_translation_x).toFloat() + translateAnimator.init(parent, translationMax) } } diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java index f2d0427c39d3..d7a8a7aa2c10 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java @@ -680,6 +680,13 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab } /** + * Whether the secure camera is currently showing over the keyguard. + */ + public boolean isSecureCameraLaunchedOverKeyguard() { + return mSecureCameraLaunched; + } + + /** * @return a cached version of DreamManager.isDreaming() */ public boolean isDreaming() { @@ -1196,6 +1203,21 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab return fingerprintAllowed || faceAllowed; } + /** + * Returns whether the user is unlocked with a biometric that is currently bypassing + * the lock screen. + */ + public boolean getUserUnlockedWithBiometricAndIsBypassing(int userId) { + BiometricAuthenticated fingerprint = mUserFingerprintAuthenticated.get(userId); + BiometricAuthenticated face = mUserFaceAuthenticated.get(userId); + // fingerprint always bypasses + boolean fingerprintAllowed = fingerprint != null && fingerprint.mAuthenticated + && isUnlockingWithBiometricAllowed(fingerprint.mIsStrongBiometric); + boolean faceAllowed = face != null && face.mAuthenticated + && isUnlockingWithBiometricAllowed(face.mIsStrongBiometric); + return fingerprintAllowed || faceAllowed && mKeyguardBypassController.canBypass(); + } + public boolean getUserTrustIsManaged(int userId) { return mUserTrustIsManaged.get(userId) && !isTrustDisabled(userId); } diff --git a/packages/SystemUI/src/com/android/systemui/Dependency.java b/packages/SystemUI/src/com/android/systemui/Dependency.java index 08ed24caec44..b32c2b639f16 100644 --- a/packages/SystemUI/src/com/android/systemui/Dependency.java +++ b/packages/SystemUI/src/com/android/systemui/Dependency.java @@ -49,6 +49,7 @@ import com.android.systemui.dock.DockManager; import com.android.systemui.dump.DumpManager; import com.android.systemui.flags.FeatureFlags; import com.android.systemui.fragments.FragmentService; +import com.android.systemui.hdmi.HdmiCecSetMenuLanguageHelper; import com.android.systemui.keyguard.ScreenLifecycle; import com.android.systemui.keyguard.WakefulnessLifecycle; import com.android.systemui.media.dialog.MediaOutputDialogFactory; @@ -250,6 +251,7 @@ public class Dependency { @Inject Lazy<LocationController> mLocationController; @Inject Lazy<RotationLockController> mRotationLockController; @Inject Lazy<ZenModeController> mZenModeController; + @Inject Lazy<HdmiCecSetMenuLanguageHelper> mHdmiCecSetMenuLanguageHelper; @Inject Lazy<HotspotController> mHotspotController; @Inject Lazy<CastController> mCastController; @Inject Lazy<FlashlightController> mFlashlightController; diff --git a/packages/SystemUI/src/com/android/systemui/DualToneHandler.kt b/packages/SystemUI/src/com/android/systemui/DualToneHandler.kt index fdc3229ab8d7..2b8d3e046ffa 100644 --- a/packages/SystemUI/src/com/android/systemui/DualToneHandler.kt +++ b/packages/SystemUI/src/com/android/systemui/DualToneHandler.kt @@ -54,11 +54,11 @@ class DualToneHandler(context: Context) { Utils.getThemeAttr(context, R.attr.lightIconTheme)) darkColor = Color( Utils.getColorAttrDefaultColor(dualToneDarkTheme, R.attr.singleToneColor), - Utils.getColorAttrDefaultColor(dualToneDarkTheme, R.attr.backgroundColor), + Utils.getColorAttrDefaultColor(dualToneDarkTheme, R.attr.iconBackgroundColor), Utils.getColorAttrDefaultColor(dualToneDarkTheme, R.attr.fillColor)) lightColor = Color( Utils.getColorAttrDefaultColor(dualToneLightTheme, R.attr.singleToneColor), - Utils.getColorAttrDefaultColor(dualToneLightTheme, R.attr.backgroundColor), + Utils.getColorAttrDefaultColor(dualToneLightTheme, R.attr.iconBackgroundColor), Utils.getColorAttrDefaultColor(dualToneLightTheme, R.attr.fillColor)) } diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/SystemActions.java b/packages/SystemUI/src/com/android/systemui/accessibility/SystemActions.java index 20d6e3247cd1..881e6a917a45 100644 --- a/packages/SystemUI/src/com/android/systemui/accessibility/SystemActions.java +++ b/packages/SystemUI/src/com/android/systemui/accessibility/SystemActions.java @@ -120,6 +120,13 @@ public class SystemActions extends CoreStartable { AccessibilityService.GLOBAL_ACTION_TAKE_SCREENSHOT; // = 9 /** + * Action ID to send the KEYCODE_HEADSETHOOK KeyEvent, which is used to answer/hang up calls and + * play/stop media + */ + private static final int SYSTEM_ACTION_ID_KEYCODE_HEADSETHOOK = + AccessibilityService.GLOBAL_ACTION_KEYCODE_HEADSETHOOK; // = 10 + + /** * Action ID to trigger the accessibility button */ public static final int SYSTEM_ACTION_ID_ACCESSIBILITY_BUTTON = @@ -137,6 +144,36 @@ public class SystemActions extends CoreStartable { public static final int SYSTEM_ACTION_ID_ACCESSIBILITY_DISMISS_NOTIFICATION_SHADE = AccessibilityService.GLOBAL_ACTION_DISMISS_NOTIFICATION_SHADE; // 15 + /** + * Action ID to trigger the dpad up button + */ + private static final int SYSTEM_ACTION_ID_DPAD_UP = + AccessibilityService.GLOBAL_ACTION_DPAD_UP; // 16 + + /** + * Action ID to trigger the dpad down button + */ + private static final int SYSTEM_ACTION_ID_DPAD_DOWN = + AccessibilityService.GLOBAL_ACTION_DPAD_DOWN; // 17 + + /** + * Action ID to trigger the dpad left button + */ + private static final int SYSTEM_ACTION_ID_DPAD_LEFT = + AccessibilityService.GLOBAL_ACTION_DPAD_LEFT; // 18 + + /** + * Action ID to trigger the dpad right button + */ + private static final int SYSTEM_ACTION_ID_DPAD_RIGHT = + AccessibilityService.GLOBAL_ACTION_DPAD_RIGHT; // 19 + + /** + * Action ID to trigger dpad center keyevent + */ + private static final int SYSTEM_ACTION_ID_DPAD_CENTER = + AccessibilityService.GLOBAL_ACTION_DPAD_CENTER; // 20 + private static final String PERMISSION_SELF = "com.android.systemui.permission.SELF"; private final SystemActionsBroadcastReceiver mReceiver; @@ -222,10 +259,34 @@ public class SystemActions extends CoreStartable { R.string.accessibility_system_action_screenshot_label, SystemActionsBroadcastReceiver.INTENT_ACTION_TAKE_SCREENSHOT); + RemoteAction actionHeadsetHook = createRemoteAction( + R.string.accessibility_system_action_headset_hook_label, + SystemActionsBroadcastReceiver.INTENT_ACTION_HEADSET_HOOK); + RemoteAction actionAccessibilityShortcut = createRemoteAction( R.string.accessibility_system_action_hardware_a11y_shortcut_label, SystemActionsBroadcastReceiver.INTENT_ACTION_ACCESSIBILITY_SHORTCUT); + RemoteAction actionDpadUp = createRemoteAction( + R.string.accessibility_system_action_dpad_up_label, + SystemActionsBroadcastReceiver.INTENT_ACTION_DPAD_UP); + + RemoteAction actionDpadDown = createRemoteAction( + R.string.accessibility_system_action_dpad_down_label, + SystemActionsBroadcastReceiver.INTENT_ACTION_DPAD_DOWN); + + RemoteAction actionDpadLeft = createRemoteAction( + R.string.accessibility_system_action_dpad_left_label, + SystemActionsBroadcastReceiver.INTENT_ACTION_DPAD_LEFT); + + RemoteAction actionDpadRight = createRemoteAction( + R.string.accessibility_system_action_dpad_right_label, + SystemActionsBroadcastReceiver.INTENT_ACTION_DPAD_RIGHT); + + RemoteAction actionDpadCenter = createRemoteAction( + R.string.accessibility_system_action_dpad_center_label, + SystemActionsBroadcastReceiver.INTENT_ACTION_DPAD_CENTER); + mA11yManager.registerSystemAction(actionBack, SYSTEM_ACTION_ID_BACK); mA11yManager.registerSystemAction(actionHome, SYSTEM_ACTION_ID_HOME); mA11yManager.registerSystemAction(actionRecents, SYSTEM_ACTION_ID_RECENTS); @@ -234,8 +295,14 @@ public class SystemActions extends CoreStartable { mA11yManager.registerSystemAction(actionPowerDialog, SYSTEM_ACTION_ID_POWER_DIALOG); mA11yManager.registerSystemAction(actionLockScreen, SYSTEM_ACTION_ID_LOCK_SCREEN); mA11yManager.registerSystemAction(actionTakeScreenshot, SYSTEM_ACTION_ID_TAKE_SCREENSHOT); + mA11yManager.registerSystemAction(actionHeadsetHook, SYSTEM_ACTION_ID_KEYCODE_HEADSETHOOK); mA11yManager.registerSystemAction( actionAccessibilityShortcut, SYSTEM_ACTION_ID_ACCESSIBILITY_SHORTCUT); + mA11yManager.registerSystemAction(actionDpadUp, SYSTEM_ACTION_ID_DPAD_UP); + mA11yManager.registerSystemAction(actionDpadDown, SYSTEM_ACTION_ID_DPAD_DOWN); + mA11yManager.registerSystemAction(actionDpadLeft, SYSTEM_ACTION_ID_DPAD_LEFT); + mA11yManager.registerSystemAction(actionDpadRight, SYSTEM_ACTION_ID_DPAD_RIGHT); + mA11yManager.registerSystemAction(actionDpadCenter, SYSTEM_ACTION_ID_DPAD_CENTER); registerOrUnregisterDismissNotificationShadeAction(); } @@ -305,6 +372,10 @@ public class SystemActions extends CoreStartable { labelId = R.string.accessibility_system_action_screenshot_label; intent = SystemActionsBroadcastReceiver.INTENT_ACTION_TAKE_SCREENSHOT; break; + case SYSTEM_ACTION_ID_KEYCODE_HEADSETHOOK: + labelId = R.string.accessibility_system_action_headset_hook_label; + intent = SystemActionsBroadcastReceiver.INTENT_ACTION_HEADSET_HOOK; + break; case SYSTEM_ACTION_ID_ACCESSIBILITY_BUTTON: labelId = R.string.accessibility_system_action_on_screen_a11y_shortcut_label; intent = SystemActionsBroadcastReceiver.INTENT_ACTION_ACCESSIBILITY_BUTTON; @@ -323,6 +394,26 @@ public class SystemActions extends CoreStartable { intent = SystemActionsBroadcastReceiver .INTENT_ACTION_ACCESSIBILITY_DISMISS_NOTIFICATION_SHADE; break; + case SYSTEM_ACTION_ID_DPAD_UP: + labelId = R.string.accessibility_system_action_dpad_up_label; + intent = SystemActionsBroadcastReceiver.INTENT_ACTION_DPAD_UP; + break; + case SYSTEM_ACTION_ID_DPAD_DOWN: + labelId = R.string.accessibility_system_action_dpad_down_label; + intent = SystemActionsBroadcastReceiver.INTENT_ACTION_DPAD_DOWN; + break; + case SYSTEM_ACTION_ID_DPAD_LEFT: + labelId = R.string.accessibility_system_action_dpad_left_label; + intent = SystemActionsBroadcastReceiver.INTENT_ACTION_DPAD_LEFT; + break; + case SYSTEM_ACTION_ID_DPAD_RIGHT: + labelId = R.string.accessibility_system_action_dpad_right_label; + intent = SystemActionsBroadcastReceiver.INTENT_ACTION_DPAD_RIGHT; + break; + case SYSTEM_ACTION_ID_DPAD_CENTER: + labelId = R.string.accessibility_system_action_dpad_center_label; + intent = SystemActionsBroadcastReceiver.INTENT_ACTION_DPAD_CENTER; + break; default: return; } @@ -411,6 +502,10 @@ public class SystemActions extends CoreStartable { SCREENSHOT_ACCESSIBILITY_ACTIONS, new Handler(Looper.getMainLooper()), null); } + private void handleHeadsetHook() { + sendDownAndUpKeyEvents(KeyEvent.KEYCODE_HEADSETHOOK); + } + private void handleAccessibilityButton() { AccessibilityManager.getInstance(mContext).notifyAccessibilityButtonClicked( Display.DEFAULT_DISPLAY); @@ -434,6 +529,26 @@ public class SystemActions extends CoreStartable { CommandQueue.FLAG_EXCLUDE_NONE, false /* force */)); } + private void handleDpadUp() { + sendDownAndUpKeyEvents(KeyEvent.KEYCODE_DPAD_UP); + } + + private void handleDpadDown() { + sendDownAndUpKeyEvents(KeyEvent.KEYCODE_DPAD_DOWN); + } + + private void handleDpadLeft() { + sendDownAndUpKeyEvents(KeyEvent.KEYCODE_DPAD_LEFT); + } + + private void handleDpadRight() { + sendDownAndUpKeyEvents(KeyEvent.KEYCODE_DPAD_RIGHT); + } + + private void handleDpadCenter() { + sendDownAndUpKeyEvents(KeyEvent.KEYCODE_DPAD_CENTER); + } + private class SystemActionsBroadcastReceiver extends BroadcastReceiver { private static final String INTENT_ACTION_BACK = "SYSTEM_ACTION_BACK"; private static final String INTENT_ACTION_HOME = "SYSTEM_ACTION_HOME"; @@ -443,6 +558,7 @@ public class SystemActions extends CoreStartable { private static final String INTENT_ACTION_POWER_DIALOG = "SYSTEM_ACTION_POWER_DIALOG"; private static final String INTENT_ACTION_LOCK_SCREEN = "SYSTEM_ACTION_LOCK_SCREEN"; private static final String INTENT_ACTION_TAKE_SCREENSHOT = "SYSTEM_ACTION_TAKE_SCREENSHOT"; + private static final String INTENT_ACTION_HEADSET_HOOK = "SYSTEM_ACTION_HEADSET_HOOK"; private static final String INTENT_ACTION_ACCESSIBILITY_BUTTON = "SYSTEM_ACTION_ACCESSIBILITY_BUTTON"; private static final String INTENT_ACTION_ACCESSIBILITY_BUTTON_CHOOSER = @@ -451,6 +567,11 @@ public class SystemActions extends CoreStartable { "SYSTEM_ACTION_ACCESSIBILITY_SHORTCUT"; private static final String INTENT_ACTION_ACCESSIBILITY_DISMISS_NOTIFICATION_SHADE = "SYSTEM_ACTION_ACCESSIBILITY_DISMISS_NOTIFICATION_SHADE"; + private static final String INTENT_ACTION_DPAD_UP = "SYSTEM_ACTION_DPAD_UP"; + private static final String INTENT_ACTION_DPAD_DOWN = "SYSTEM_ACTION_DPAD_DOWN"; + private static final String INTENT_ACTION_DPAD_LEFT = "SYSTEM_ACTION_DPAD_LEFT"; + private static final String INTENT_ACTION_DPAD_RIGHT = "SYSTEM_ACTION_DPAD_RIGHT"; + private static final String INTENT_ACTION_DPAD_CENTER = "SYSTEM_ACTION_DPAD_CENTER"; private PendingIntent createPendingIntent(Context context, String intentAction) { switch (intentAction) { @@ -462,10 +583,16 @@ public class SystemActions extends CoreStartable { case INTENT_ACTION_POWER_DIALOG: case INTENT_ACTION_LOCK_SCREEN: case INTENT_ACTION_TAKE_SCREENSHOT: + case INTENT_ACTION_HEADSET_HOOK: case INTENT_ACTION_ACCESSIBILITY_BUTTON: case INTENT_ACTION_ACCESSIBILITY_BUTTON_CHOOSER: case INTENT_ACTION_ACCESSIBILITY_SHORTCUT: - case INTENT_ACTION_ACCESSIBILITY_DISMISS_NOTIFICATION_SHADE: { + case INTENT_ACTION_ACCESSIBILITY_DISMISS_NOTIFICATION_SHADE: + case INTENT_ACTION_DPAD_UP: + case INTENT_ACTION_DPAD_DOWN: + case INTENT_ACTION_DPAD_LEFT: + case INTENT_ACTION_DPAD_RIGHT: + case INTENT_ACTION_DPAD_CENTER: { Intent intent = new Intent(intentAction); intent.setPackage(context.getPackageName()); return PendingIntent.getBroadcast(context, 0, intent, @@ -487,10 +614,16 @@ public class SystemActions extends CoreStartable { intentFilter.addAction(INTENT_ACTION_POWER_DIALOG); intentFilter.addAction(INTENT_ACTION_LOCK_SCREEN); intentFilter.addAction(INTENT_ACTION_TAKE_SCREENSHOT); + intentFilter.addAction(INTENT_ACTION_HEADSET_HOOK); intentFilter.addAction(INTENT_ACTION_ACCESSIBILITY_BUTTON); intentFilter.addAction(INTENT_ACTION_ACCESSIBILITY_BUTTON_CHOOSER); intentFilter.addAction(INTENT_ACTION_ACCESSIBILITY_SHORTCUT); intentFilter.addAction(INTENT_ACTION_ACCESSIBILITY_DISMISS_NOTIFICATION_SHADE); + intentFilter.addAction(INTENT_ACTION_DPAD_UP); + intentFilter.addAction(INTENT_ACTION_DPAD_DOWN); + intentFilter.addAction(INTENT_ACTION_DPAD_LEFT); + intentFilter.addAction(INTENT_ACTION_DPAD_RIGHT); + intentFilter.addAction(INTENT_ACTION_DPAD_CENTER); return intentFilter; } @@ -530,6 +663,10 @@ public class SystemActions extends CoreStartable { handleTakeScreenshot(); break; } + case INTENT_ACTION_HEADSET_HOOK: { + handleHeadsetHook(); + break; + } case INTENT_ACTION_ACCESSIBILITY_BUTTON: { handleAccessibilityButton(); break; @@ -546,6 +683,26 @@ public class SystemActions extends CoreStartable { handleAccessibilityDismissNotificationShade(); break; } + case INTENT_ACTION_DPAD_UP: { + handleDpadUp(); + break; + } + case INTENT_ACTION_DPAD_DOWN: { + handleDpadDown(); + break; + } + case INTENT_ACTION_DPAD_LEFT: { + handleDpadLeft(); + break; + } + case INTENT_ACTION_DPAD_RIGHT: { + handleDpadRight(); + break; + } + case INTENT_ACTION_DPAD_CENTER: { + handleDpadCenter(); + break; + } default: break; } diff --git a/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardListener.java b/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardListener.java index 72b40d42b7b8..54664f2fdd93 100644 --- a/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardListener.java +++ b/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardListener.java @@ -48,7 +48,7 @@ public class ClipboardListener extends CoreStartable @Override public void start() { if (DeviceConfig.getBoolean( - DeviceConfig.NAMESPACE_SYSTEMUI, CLIPBOARD_OVERLAY_ENABLED, false)) { + DeviceConfig.NAMESPACE_SYSTEMUI, CLIPBOARD_OVERLAY_ENABLED, true)) { mClipboardManager = requireNonNull(mContext.getSystemService(ClipboardManager.class)); mClipboardManager.addPrimaryClipChangedListener(this); } diff --git a/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardOverlayController.java b/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardOverlayController.java index 12759f489a26..f6d64643b3cd 100644 --- a/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardOverlayController.java +++ b/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardOverlayController.java @@ -74,7 +74,7 @@ import android.widget.TextView; import com.android.internal.policy.PhoneWindow; import com.android.systemui.R; import com.android.systemui.screenshot.FloatingWindowUtil; -import com.android.systemui.screenshot.ScreenshotActionChip; +import com.android.systemui.screenshot.OverlayActionChip; import com.android.systemui.screenshot.TimeoutHandler; import java.io.IOException; @@ -103,15 +103,16 @@ public class ClipboardOverlayController { private final AccessibilityManager mAccessibilityManager; private final TextClassifier mTextClassifier; + private final FrameLayout mContainer; private final DraggableConstraintLayout mView; private final ImageView mImagePreview; private final TextView mTextPreview; - private final ScreenshotActionChip mEditChip; - private final ScreenshotActionChip mRemoteCopyChip; + private final OverlayActionChip mEditChip; + private final OverlayActionChip mRemoteCopyChip; private final View mActionContainerBackground; private final View mDismissButton; private final LinearLayout mActionContainer; - private final ArrayList<ScreenshotActionChip> mActionChips = new ArrayList<>(); + private final ArrayList<OverlayActionChip> mActionChips = new ArrayList<>(); private Runnable mOnSessionCompleteListener; @@ -147,8 +148,9 @@ public class ClipboardOverlayController { mWindow = FloatingWindowUtil.getFloatingWindow(mContext); mWindow.setWindowManager(mWindowManager, null, null); - mView = (DraggableConstraintLayout) + mContainer = (FrameLayout) LayoutInflater.from(mContext).inflate(R.layout.clipboard_overlay, null); + mView = requireNonNull(mContainer.findViewById(R.id.clipboard_ui)); mActionContainerBackground = requireNonNull(mView.findViewById(R.id.actions_container_background)); mActionContainer = requireNonNull(mView.findViewById(R.id.actions)); @@ -180,7 +182,7 @@ public class ClipboardOverlayController { attachWindow(); withWindowAttached(() -> { - mWindow.setContentView(mView); + mWindow.setContentView(mContainer); updateInsets(mWindowManager.getCurrentWindowMetrics().getWindowInsets()); mView.requestLayout(); mView.post(this::animateIn); @@ -251,7 +253,7 @@ public class ClipboardOverlayController { for (RemoteAction action : actions) { Intent targetIntent = action.getActionIntent().getIntent(); if (!TextUtils.equals(source, targetIntent.getComponent().getPackageName())) { - ScreenshotActionChip chip = constructActionChip(action); + OverlayActionChip chip = constructActionChip(action); mActionContainer.addView(chip); mActionChips.add(chip); } @@ -259,9 +261,9 @@ public class ClipboardOverlayController { }); } - private ScreenshotActionChip constructActionChip(RemoteAction action) { - ScreenshotActionChip chip = (ScreenshotActionChip) LayoutInflater.from(mContext).inflate( - R.layout.screenshot_action_chip, mActionContainer, false); + private OverlayActionChip constructActionChip(RemoteAction action) { + OverlayActionChip chip = (OverlayActionChip) LayoutInflater.from(mContext).inflate( + R.layout.overlay_action_chip, mActionContainer, false); chip.setText(action.getTitle()); chip.setIcon(action.getIcon(), false); chip.setPendingIntent(action.getActionIntent(), this::animateOut); @@ -341,7 +343,7 @@ public class ClipboardOverlayController { mEditChip.setAlpha(1f); ContentResolver resolver = mContext.getContentResolver(); try { - int size = mContext.getResources().getDimensionPixelSize(R.dimen.screenshot_x_scale); + int size = mContext.getResources().getDimensionPixelSize(R.dimen.overlay_x_scale); // The width of the view is capped, height maintains aspect ratio, so allow it to be // taller if needed. Bitmap thumbnail = resolver.loadThumbnail(uri, new Size(size, size * 4), null); @@ -365,13 +367,13 @@ public class ClipboardOverlayController { } private void animateOut() { - getExitAnimation().start(); + mView.dismiss(); } private ValueAnimator getEnterAnimation() { ValueAnimator anim = ValueAnimator.ofFloat(0, 1); - mView.setAlpha(0); + mContainer.setAlpha(0); mDismissButton.setVisibility(View.GONE); final View previewBorder = requireNonNull(mView.findViewById(R.id.preview_border)); final View actionBackground = requireNonNull( @@ -383,7 +385,7 @@ public class ClipboardOverlayController { } anim.addUpdateListener(animation -> { - mView.setAlpha(animation.getAnimatedFraction()); + mContainer.setAlpha(animation.getAnimatedFraction()); float scale = 0.6f + 0.4f * animation.getAnimatedFraction(); mView.setPivotY(mView.getHeight() - previewBorder.getHeight() / 2f); mView.setPivotX(actionBackground.getWidth() / 2f); @@ -394,35 +396,13 @@ public class ClipboardOverlayController { @Override public void onAnimationEnd(Animator animation) { super.onAnimationEnd(animation); - mView.setAlpha(1); + mContainer.setAlpha(1); mTimeoutHandler.resetTimeout(); } }); return anim; } - private ValueAnimator getExitAnimation() { - ValueAnimator anim = ValueAnimator.ofFloat(0, 1); - - anim.addUpdateListener(animation -> { - mView.setAlpha(1 - animation.getAnimatedFraction()); - final View actionBackground = requireNonNull( - mView.findViewById(R.id.actions_container_background)); - mView.setTranslationX( - -animation.getAnimatedFraction() * actionBackground.getWidth() / 2); - }); - - anim.addListener(new AnimatorListenerAdapter() { - @Override - public void onAnimationEnd(Animator animation) { - super.onAnimationEnd(animation); - hideImmediate(); - } - }); - - return anim; - } - private void hideImmediate() { // Note this may be called multiple times if multiple dismissal events happen at the same // time. @@ -453,7 +433,7 @@ public class ClipboardOverlayController { } private void resetActionChips() { - for (ScreenshotActionChip chip : mActionChips) { + for (OverlayActionChip chip : mActionChips) { mActionContainer.removeView(chip); } mActionChips.clear(); @@ -461,7 +441,7 @@ public class ClipboardOverlayController { private void reset() { mView.setTranslationX(0); - mView.setAlpha(0); + mContainer.setAlpha(0); resetActionChips(); mTimeoutHandler.cancelTimeout(); } diff --git a/packages/SystemUI/src/com/android/systemui/clipboardoverlay/DraggableConstraintLayout.java b/packages/SystemUI/src/com/android/systemui/clipboardoverlay/DraggableConstraintLayout.java index 6a4be6ee5eae..8843462413b5 100644 --- a/packages/SystemUI/src/com/android/systemui/clipboardoverlay/DraggableConstraintLayout.java +++ b/packages/SystemUI/src/com/android/systemui/clipboardoverlay/DraggableConstraintLayout.java @@ -98,10 +98,23 @@ public class DraggableConstraintLayout extends ConstraintLayout { return mSwipeDetector.onTouchEvent(ev); } + /** + * Dismiss the view, with animation controlled by SwipeDismissHandler + */ + public void dismiss() { + mSwipeDismissHandler.dismiss(); + } + + /** + * Set the callback to be run after view is dismissed + */ public void setOnDismissCallback(Runnable callback) { mOnDismiss = callback; } + /** + * Set the callback to be run when the view is interacted with (e.g. tapped) + */ public void setOnInteractionCallback(Runnable callback) { mOnInteraction = callback; } diff --git a/packages/SystemUI/src/com/android/systemui/clipboardoverlay/EditTextActivity.java b/packages/SystemUI/src/com/android/systemui/clipboardoverlay/EditTextActivity.java index be10c359f3c1..a57a1351779f 100644 --- a/packages/SystemUI/src/com/android/systemui/clipboardoverlay/EditTextActivity.java +++ b/packages/SystemUI/src/com/android/systemui/clipboardoverlay/EditTextActivity.java @@ -22,9 +22,12 @@ import android.app.Activity; import android.content.ClipData; import android.content.ClipboardManager; import android.content.Intent; +import android.content.pm.PackageManager; import android.os.Bundle; +import android.util.Log; import android.view.inputmethod.InputMethodManager; import android.widget.EditText; +import android.widget.TextView; import com.android.systemui.R; @@ -32,8 +35,11 @@ import com.android.systemui.R; * Lightweight activity for editing text clipboard contents */ public class EditTextActivity extends Activity { + private static final String TAG = "EditTextActivity"; + private EditText mEditText; private ClipboardManager mClipboardManager; + private TextView mAttribution; @Override protected void onCreate(Bundle savedInstanceState) { @@ -42,6 +48,7 @@ public class EditTextActivity extends Activity { findViewById(R.id.copy_button).setOnClickListener((v) -> saveToClipboard()); findViewById(R.id.share).setOnClickListener((v) -> share()); mEditText = findViewById(R.id.edit_text); + mAttribution = findViewById(R.id.attribution); mClipboardManager = requireNonNull(getSystemService(ClipboardManager.class)); } @@ -53,7 +60,15 @@ public class EditTextActivity extends Activity { finish(); return; } - // TODO: put clip attribution in R.id.attribution TextView + PackageManager pm = getApplicationContext().getPackageManager(); + try { + CharSequence label = pm.getApplicationLabel( + pm.getApplicationInfo(mClipboardManager.getPrimaryClipSource(), + PackageManager.ApplicationInfoFlags.of(0))); + mAttribution.setText(getResources().getString(R.string.clipboard_edit_source, label)); + } catch (PackageManager.NameNotFoundException e) { + Log.w(TAG, "Package not found: " + mClipboardManager.getPrimaryClipSource(), e); + } mEditText.setText(clip.getItemAt(0).getText()); mEditText.requestFocus(); } diff --git a/packages/SystemUI/src/com/android/systemui/dagger/DefaultActivityBinder.java b/packages/SystemUI/src/com/android/systemui/dagger/DefaultActivityBinder.java index bce878434aa1..1653e0adadb5 100644 --- a/packages/SystemUI/src/com/android/systemui/dagger/DefaultActivityBinder.java +++ b/packages/SystemUI/src/com/android/systemui/dagger/DefaultActivityBinder.java @@ -19,6 +19,7 @@ package com.android.systemui.dagger; import android.app.Activity; import com.android.systemui.ForegroundServicesDialog; +import com.android.systemui.hdmi.HdmiCecSetMenuLanguageActivity; import com.android.systemui.keyguard.WorkLockActivity; import com.android.systemui.people.PeopleSpaceActivity; import com.android.systemui.people.widget.LaunchConversationActivity; @@ -120,4 +121,11 @@ public abstract class DefaultActivityBinder { @IntoMap @ClassKey(TvUnblockSensorActivity.class) public abstract Activity bindTvUnblockSensorActivity(TvUnblockSensorActivity activity); + + /** Inject into HdmiCecSetMenuLanguageActivity. */ + @Binds + @IntoMap + @ClassKey(HdmiCecSetMenuLanguageActivity.class) + public abstract Activity bindHdmiCecSetMenuLanguageActivity( + HdmiCecSetMenuLanguageActivity activity); } diff --git a/packages/SystemUI/src/com/android/systemui/dagger/SystemUIBinder.java b/packages/SystemUI/src/com/android/systemui/dagger/SystemUIBinder.java index 41287b60fbf8..ec2beb15959e 100644 --- a/packages/SystemUI/src/com/android/systemui/dagger/SystemUIBinder.java +++ b/packages/SystemUI/src/com/android/systemui/dagger/SystemUIBinder.java @@ -27,6 +27,9 @@ import com.android.systemui.biometrics.AuthController; import com.android.systemui.clipboardoverlay.ClipboardListener; import com.android.systemui.dreams.DreamOverlayRegistrant; import com.android.systemui.dreams.SmartSpaceComplication; +import com.android.systemui.dreams.complication.DreamClockDateComplication; +import com.android.systemui.dreams.complication.DreamClockTimeComplication; +import com.android.systemui.dreams.complication.DreamWeatherComplication; import com.android.systemui.globalactions.GlobalActionsComponent; import com.android.systemui.keyguard.KeyguardViewMediator; import com.android.systemui.keyguard.dagger.KeyguardModule; @@ -234,4 +237,25 @@ public abstract class SystemUIBinder { @ClassKey(MediaDreamSentinel.class) public abstract CoreStartable bindMediaDreamSentinel( MediaDreamSentinel sentinel); + + /** Inject into DreamClockTimeComplication.Registrant */ + @Binds + @IntoMap + @ClassKey(DreamClockTimeComplication.Registrant.class) + public abstract CoreStartable bindDreamClockTimeComplicationRegistrant( + DreamClockTimeComplication.Registrant registrant); + + /** Inject into DreamClockDateComplication.Registrant */ + @Binds + @IntoMap + @ClassKey(DreamClockDateComplication.Registrant.class) + public abstract CoreStartable bindDreamClockDateComplicationRegistrant( + DreamClockDateComplication.Registrant registrant); + + /** Inject into DreamWeatherComplication.Registrant */ + @Binds + @IntoMap + @ClassKey(DreamWeatherComplication.Registrant.class) + public abstract CoreStartable bindDreamWeatherComplicationRegistrant( + DreamWeatherComplication.Registrant registrant); } diff --git a/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayService.java b/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayService.java index 2160744c6803..77997e437e33 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayService.java +++ b/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayService.java @@ -31,8 +31,10 @@ import androidx.lifecycle.ViewModelStore; import com.android.internal.policy.PhoneWindow; import com.android.keyguard.KeyguardUpdateMonitor; import com.android.keyguard.KeyguardUpdateMonitorCallback; +import com.android.settingslib.dream.DreamBackend; import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.dreams.complication.Complication; +import com.android.systemui.dreams.complication.ComplicationUtils; import com.android.systemui.dreams.dagger.DreamOverlayComponent; import com.android.systemui.dreams.touch.DreamOverlayTouchMonitor; @@ -57,6 +59,7 @@ public class DreamOverlayService extends android.service.dreams.DreamOverlayServ // content area). private final DreamOverlayContainerViewController mDreamOverlayContainerViewController; private final KeyguardUpdateMonitor mKeyguardUpdateMonitor; + private final DreamBackend mDreamBackend; // A reference to the {@link Window} used to hold the dream overlay. private Window mWindow; @@ -109,6 +112,7 @@ public class DreamOverlayService extends android.service.dreams.DreamOverlayServ setCurrentState(Lifecycle.State.CREATED); mLifecycleRegistry = component.getLifecycleRegistry(); mDreamOverlayTouchMonitor = component.getDreamOverlayTouchMonitor(); + mDreamBackend = component.getDreamBackend(); mDreamOverlayTouchMonitor.init(); } @@ -130,6 +134,9 @@ public class DreamOverlayService extends android.service.dreams.DreamOverlayServ public void onStartDream(@NonNull WindowManager.LayoutParams layoutParams) { setCurrentState(Lifecycle.State.STARTED); mExecutor.execute(() -> { + mStateController.setAvailableComplicationTypes( + ComplicationUtils.convertComplicationTypes( + mDreamBackend.getEnabledComplications())); addOverlayWindowLocked(layoutParams); setCurrentState(Lifecycle.State.RESUMED); mStateController.setOverlayActive(true); diff --git a/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayStateController.java b/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayStateController.java index ac7457d90e49..bc5a52a40a35 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayStateController.java +++ b/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayStateController.java @@ -131,9 +131,7 @@ public class DreamOverlayStateController implements .filter(complication -> { @Complication.ComplicationType final int requiredTypes = complication.getRequiredTypeAvailability(); - - return requiredTypes == Complication.COMPLICATION_TYPE_NONE - || (requiredTypes & getAvailableComplicationTypes()) == requiredTypes; + return (requiredTypes & getAvailableComplicationTypes()) == requiredTypes; }) .collect(Collectors.toCollection(HashSet::new)) : mComplications); diff --git a/packages/SystemUI/src/com/android/systemui/dreams/complication/ComplicationUtils.java b/packages/SystemUI/src/com/android/systemui/dreams/complication/ComplicationUtils.java index 3a2a6ef60f03..a4a0075e742a 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/complication/ComplicationUtils.java +++ b/packages/SystemUI/src/com/android/systemui/dreams/complication/ComplicationUtils.java @@ -25,6 +25,8 @@ import static com.android.systemui.dreams.complication.Complication.COMPLICATION import com.android.settingslib.dream.DreamBackend; +import java.util.Set; + /** * A collection of utility methods for working with {@link Complication}. */ @@ -50,4 +52,14 @@ public class ComplicationUtils { return COMPLICATION_TYPE_NONE; } } + + /** + * Converts a set of {@link com.android.settingslib.dream.DreamBackend.ComplicationType} to + * a combined complications types state. + */ + @Complication.ComplicationType + public static int convertComplicationTypes(@DreamBackend.ComplicationType Set<Integer> types) { + return types.stream().mapToInt(ComplicationUtils::convertComplicationType).reduce( + COMPLICATION_TYPE_NONE, (a, b) -> a | b); + } } diff --git a/packages/SystemUI/src/com/android/systemui/dreams/complication/DreamClockDateComplication.java b/packages/SystemUI/src/com/android/systemui/dreams/complication/DreamClockDateComplication.java new file mode 100644 index 000000000000..6861c7479161 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/dreams/complication/DreamClockDateComplication.java @@ -0,0 +1,111 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.dreams.complication; + +import static com.android.systemui.dreams.complication.dagger.DreamClockDateComplicationComponent.DreamClockDateComplicationModule.DREAM_CLOCK_DATE_COMPLICATION_LAYOUT_PARAMS; +import static com.android.systemui.dreams.complication.dagger.DreamClockDateComplicationComponent.DreamClockDateComplicationModule.DREAM_CLOCK_DATE_COMPLICATION_VIEW; + +import android.content.Context; +import android.view.View; + +import com.android.systemui.CoreStartable; +import com.android.systemui.dreams.DreamOverlayStateController; +import com.android.systemui.dreams.complication.dagger.DreamClockDateComplicationComponent; + +import javax.inject.Inject; +import javax.inject.Named; + +/** + * Clock Date Complication that produce Clock Date view holder. + */ +public class DreamClockDateComplication implements Complication { + DreamClockDateComplicationComponent.Factory mComponentFactory; + + /** + * Default constructor for {@link DreamClockDateComplication}. + */ + @Inject + public DreamClockDateComplication( + DreamClockDateComplicationComponent.Factory componentFactory) { + mComponentFactory = componentFactory; + } + + @Override + public int getRequiredTypeAvailability() { + return COMPLICATION_TYPE_DATE; + } + + /** + * Create {@link DreamClockDateViewHolder}. + */ + @Override + public ViewHolder createView(ComplicationViewModel model) { + return mComponentFactory.create().getViewHolder(); + } + + /** + * {@link CoreStartable} responsbile for registering {@link DreamClockDateComplication} with + * SystemUI. + */ + public static class Registrant extends CoreStartable { + private final DreamOverlayStateController mDreamOverlayStateController; + private final DreamClockDateComplication mComplication; + + /** + * Default constructor to register {@link DreamClockDateComplication}. + */ + @Inject + public Registrant(Context context, + DreamOverlayStateController dreamOverlayStateController, + DreamClockDateComplication dreamClockDateComplication) { + super(context); + mDreamOverlayStateController = dreamOverlayStateController; + mComplication = dreamClockDateComplication; + } + + @Override + public void start() { + mDreamOverlayStateController.addComplication(mComplication); + } + } + + /** + * ViewHolder to contain value/logic associated with a Clock Date Complication View. + */ + public static class DreamClockDateViewHolder implements ViewHolder { + private final View mView; + private final ComplicationLayoutParams mLayoutParams; + + @Inject + DreamClockDateViewHolder(@Named(DREAM_CLOCK_DATE_COMPLICATION_VIEW) View view, + @Named(DREAM_CLOCK_DATE_COMPLICATION_LAYOUT_PARAMS) + ComplicationLayoutParams layoutParams) { + mView = view; + mLayoutParams = layoutParams; + } + + @Override + public View getView() { + return mView; + } + + @Override + public ComplicationLayoutParams getLayoutParams() { + return mLayoutParams; + } + } +} diff --git a/packages/SystemUI/src/com/android/systemui/dreams/complication/DreamClockTimeComplication.java b/packages/SystemUI/src/com/android/systemui/dreams/complication/DreamClockTimeComplication.java new file mode 100644 index 000000000000..936767a60233 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/dreams/complication/DreamClockTimeComplication.java @@ -0,0 +1,111 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.dreams.complication; + +import static com.android.systemui.dreams.complication.dagger.DreamClockTimeComplicationComponent.DreamClockTimeComplicationModule.DREAM_CLOCK_TIME_COMPLICATION_LAYOUT_PARAMS; +import static com.android.systemui.dreams.complication.dagger.DreamClockTimeComplicationComponent.DreamClockTimeComplicationModule.DREAM_CLOCK_TIME_COMPLICATION_VIEW; + +import android.content.Context; +import android.view.View; + +import com.android.systemui.CoreStartable; +import com.android.systemui.dreams.DreamOverlayStateController; +import com.android.systemui.dreams.complication.dagger.DreamClockTimeComplicationComponent; + +import javax.inject.Inject; +import javax.inject.Named; + +/** + * Clock Time Complication that produce Clock Time view holder. + */ +public class DreamClockTimeComplication implements Complication { + DreamClockTimeComplicationComponent.Factory mComponentFactory; + + /** + * Default constructor for {@link DreamClockTimeComplication}. + */ + @Inject + public DreamClockTimeComplication( + DreamClockTimeComplicationComponent.Factory componentFactory) { + mComponentFactory = componentFactory; + } + + @Override + public int getRequiredTypeAvailability() { + return COMPLICATION_TYPE_TIME; + } + + /** + * Create {@link DreamClockTimeViewHolder}. + */ + @Override + public ViewHolder createView(ComplicationViewModel model) { + return mComponentFactory.create().getViewHolder(); + } + + /** + * {@link CoreStartable} responsbile for registering {@link DreamClockTimeComplication} with + * SystemUI. + */ + public static class Registrant extends CoreStartable { + private final DreamOverlayStateController mDreamOverlayStateController; + private final DreamClockTimeComplication mComplication; + + /** + * Default constructor to register {@link DreamClockTimeComplication}. + */ + @Inject + public Registrant(Context context, + DreamOverlayStateController dreamOverlayStateController, + DreamClockTimeComplication dreamClockTimeComplication) { + super(context); + mDreamOverlayStateController = dreamOverlayStateController; + mComplication = dreamClockTimeComplication; + } + + @Override + public void start() { + mDreamOverlayStateController.addComplication(mComplication); + } + } + + /** + * ViewHolder to contain value/logic associated with a Clock Time Complication View. + */ + public static class DreamClockTimeViewHolder implements ViewHolder { + private final View mView; + private final ComplicationLayoutParams mLayoutParams; + + @Inject + DreamClockTimeViewHolder(@Named(DREAM_CLOCK_TIME_COMPLICATION_VIEW) View view, + @Named(DREAM_CLOCK_TIME_COMPLICATION_LAYOUT_PARAMS) + ComplicationLayoutParams layoutParams) { + mView = view; + mLayoutParams = layoutParams; + } + + @Override + public View getView() { + return mView; + } + + @Override + public ComplicationLayoutParams getLayoutParams() { + return mLayoutParams; + } + } +} diff --git a/packages/SystemUI/src/com/android/systemui/dreams/complication/DreamWeatherComplication.java b/packages/SystemUI/src/com/android/systemui/dreams/complication/DreamWeatherComplication.java new file mode 100644 index 000000000000..f5c5a434a077 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/dreams/complication/DreamWeatherComplication.java @@ -0,0 +1,185 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.dreams.complication; + +import static com.android.systemui.dreams.complication.dagger.DreamWeatherComplicationComponent.DreamWeatherComplicationModule.DREAM_WEATHER_COMPLICATION_LAYOUT_PARAMS; +import static com.android.systemui.dreams.complication.dagger.DreamWeatherComplicationComponent.DreamWeatherComplicationModule.DREAM_WEATHER_COMPLICATION_VIEW; + +import android.app.smartspace.SmartspaceAction; +import android.app.smartspace.SmartspaceTarget; +import android.content.Context; +import android.graphics.drawable.Drawable; +import android.graphics.drawable.Icon; +import android.text.TextUtils; +import android.widget.TextView; + +import com.android.systemui.CoreStartable; +import com.android.systemui.R; +import com.android.systemui.dreams.DreamOverlayStateController; +import com.android.systemui.dreams.complication.dagger.DreamWeatherComplicationComponent; +import com.android.systemui.plugins.BcSmartspaceDataPlugin.SmartspaceTargetListener; +import com.android.systemui.statusbar.lockscreen.LockscreenSmartspaceController; +import com.android.systemui.util.ViewController; + +import javax.inject.Inject; +import javax.inject.Named; + +/** + * Weather Complication that produce Weather view holder. + */ +public class DreamWeatherComplication implements Complication { + DreamWeatherComplicationComponent.Factory mComponentFactory; + + /** + * Default constructor for {@link DreamWeatherComplication}. + */ + @Inject + public DreamWeatherComplication( + DreamWeatherComplicationComponent.Factory componentFactory) { + mComponentFactory = componentFactory; + } + + @Override + public int getRequiredTypeAvailability() { + return COMPLICATION_TYPE_WEATHER; + } + + /** + * Create {@link DreamWeatherViewHolder}. + */ + @Override + public ViewHolder createView(ComplicationViewModel model) { + return mComponentFactory.create().getViewHolder(); + } + + /** + * {@link CoreStartable} for registering {@link DreamWeatherComplication} with SystemUI. + */ + public static class Registrant extends CoreStartable { + private final LockscreenSmartspaceController mSmartSpaceController; + private final DreamOverlayStateController mDreamOverlayStateController; + private final DreamWeatherComplication mComplication; + + /** + * Default constructor to register {@link DreamWeatherComplication}. + */ + @Inject + public Registrant(Context context, + LockscreenSmartspaceController smartspaceController, + DreamOverlayStateController dreamOverlayStateController, + DreamWeatherComplication dreamWeatherComplication) { + super(context); + mSmartSpaceController = smartspaceController; + mDreamOverlayStateController = dreamOverlayStateController; + mComplication = dreamWeatherComplication; + } + + @Override + public void start() { + if (mSmartSpaceController.isEnabled()) { + mDreamOverlayStateController.addComplication(mComplication); + } + } + } + + /** + * ViewHolder to contain value/logic associated with a Weather Complication View. + */ + public static class DreamWeatherViewHolder implements ViewHolder { + private final TextView mView; + private final ComplicationLayoutParams mLayoutParams; + private final DreamWeatherViewController mViewController; + + @Inject + DreamWeatherViewHolder( + @Named(DREAM_WEATHER_COMPLICATION_VIEW) TextView view, + DreamWeatherViewController controller, + @Named(DREAM_WEATHER_COMPLICATION_LAYOUT_PARAMS) + ComplicationLayoutParams layoutParams) { + mView = view; + mLayoutParams = layoutParams; + mViewController = controller; + mViewController.init(); + } + + @Override + public TextView getView() { + return mView; + } + + @Override + public ComplicationLayoutParams getLayoutParams() { + return mLayoutParams; + } + } + + /** + * ViewController to contain value/logic associated with a Weather Complication View. + */ + static class DreamWeatherViewController extends ViewController<TextView> { + private final LockscreenSmartspaceController mSmartSpaceController; + private SmartspaceTargetListener mSmartspaceTargetListener; + + @Inject + DreamWeatherViewController( + @Named(DREAM_WEATHER_COMPLICATION_VIEW) TextView view, + LockscreenSmartspaceController smartspaceController + ) { + super(view); + mSmartSpaceController = smartspaceController; + } + + @Override + protected void onViewAttached() { + mSmartspaceTargetListener = targets -> targets.forEach( + t -> { + if (t instanceof SmartspaceTarget + && ((SmartspaceTarget) t).getFeatureType() + == SmartspaceTarget.FEATURE_WEATHER) { + final SmartspaceTarget target = (SmartspaceTarget) t; + final SmartspaceAction headerAction = target.getHeaderAction(); + if (headerAction == null || TextUtils.isEmpty( + headerAction.getTitle())) { + return; + } + + String temperature = headerAction.getTitle().toString(); + mView.setText(temperature); + final Icon icon = headerAction.getIcon(); + if (icon != null) { + final int iconSize = + getResources().getDimensionPixelSize( + R.dimen.smart_action_button_icon_size); + final Drawable iconDrawable = icon.loadDrawable(getContext()); + iconDrawable.setBounds(0, 0, iconSize, iconSize); + mView.setCompoundDrawables(iconDrawable, null, null, null); + mView.setCompoundDrawablePadding( + getResources().getDimensionPixelSize( + R.dimen.smart_action_button_icon_padding)); + + } + } + }); + mSmartSpaceController.addListener(mSmartspaceTargetListener); + } + + @Override + protected void onViewDetached() { + mSmartSpaceController.removeListener(mSmartspaceTargetListener); + } + } +} diff --git a/packages/SystemUI/src/com/android/systemui/dreams/complication/dagger/DreamClockDateComplicationComponent.java b/packages/SystemUI/src/com/android/systemui/dreams/complication/dagger/DreamClockDateComplicationComponent.java new file mode 100644 index 000000000000..eaffb1ca5b3e --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/dreams/complication/dagger/DreamClockDateComplicationComponent.java @@ -0,0 +1,111 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.dreams.complication.dagger; + + +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import com.android.internal.util.Preconditions; +import com.android.systemui.R; +import com.android.systemui.dreams.complication.ComplicationLayoutParams; +import com.android.systemui.dreams.complication.DreamClockDateComplication.DreamClockDateViewHolder; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; + +import javax.inject.Named; +import javax.inject.Scope; + +import dagger.Module; +import dagger.Provides; +import dagger.Subcomponent; + +/** + * {@link DreamClockDateComplicationComponent} is responsible for generating dependencies + * surrounding the + * Clock Date {@link com.android.systemui.dreams.complication.Complication}, such as the layout + * details. + */ +@Subcomponent(modules = { + DreamClockDateComplicationComponent.DreamClockDateComplicationModule.class, +}) +@DreamClockDateComplicationComponent.DreamClockDateComplicationScope +public interface DreamClockDateComplicationComponent { + /** + * Creates {@link DreamClockDateViewHolder}. + */ + DreamClockDateViewHolder getViewHolder(); + + @Documented + @Retention(RUNTIME) + @Scope + @interface DreamClockDateComplicationScope { + } + + /** + * Generates {@link DreamClockDateComplicationComponent}. + */ + @Subcomponent.Factory + interface Factory { + DreamClockDateComplicationComponent create(); + } + + /** + * Scoped values for {@link DreamClockDateComplicationComponent}. + */ + @Module + interface DreamClockDateComplicationModule { + String DREAM_CLOCK_DATE_COMPLICATION_VIEW = "clock_date_complication_view"; + String DREAM_CLOCK_DATE_COMPLICATION_LAYOUT_PARAMS = + "clock_date_complication_layout_params"; + // Order weight of insert into parent container + int INSERT_ORDER_WEIGHT = 2; + + /** + * Provides the complication view. + */ + @Provides + @DreamClockDateComplicationScope + @Named(DREAM_CLOCK_DATE_COMPLICATION_VIEW) + static View provideComplicationView(LayoutInflater layoutInflater) { + return Preconditions.checkNotNull( + layoutInflater.inflate(R.layout.dream_overlay_complication_clock_date, + null, false), + "R.layout.dream_overlay_complication_clock_date did not properly inflated"); + } + + /** + * Provides the layout parameters for the complication view. + */ + @Provides + @DreamClockDateComplicationScope + @Named(DREAM_CLOCK_DATE_COMPLICATION_LAYOUT_PARAMS) + static ComplicationLayoutParams provideLayoutParams() { + return new ComplicationLayoutParams(0, + ViewGroup.LayoutParams.WRAP_CONTENT, + ComplicationLayoutParams.POSITION_BOTTOM + | ComplicationLayoutParams.POSITION_START, + ComplicationLayoutParams.DIRECTION_END, + INSERT_ORDER_WEIGHT, + true); + } + } +} diff --git a/packages/SystemUI/src/com/android/systemui/dreams/complication/dagger/DreamClockTimeComplicationComponent.java b/packages/SystemUI/src/com/android/systemui/dreams/complication/dagger/DreamClockTimeComplicationComponent.java new file mode 100644 index 000000000000..d539f5c2b870 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/dreams/complication/dagger/DreamClockTimeComplicationComponent.java @@ -0,0 +1,116 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.dreams.complication.dagger; + + +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextClock; + +import com.android.internal.util.Preconditions; +import com.android.systemui.R; +import com.android.systemui.dreams.complication.ComplicationLayoutParams; +import com.android.systemui.dreams.complication.DreamClockTimeComplication.DreamClockTimeViewHolder; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; + +import javax.inject.Named; +import javax.inject.Scope; + +import dagger.Module; +import dagger.Provides; +import dagger.Subcomponent; + +/** + * {@link DreamClockTimeComplicationComponent} is responsible for generating dependencies + * surrounding the + * Clock Time {@link com.android.systemui.dreams.complication.Complication}, such as the layout + * details. + */ +@Subcomponent(modules = { + DreamClockTimeComplicationComponent.DreamClockTimeComplicationModule.class, +}) +@DreamClockTimeComplicationComponent.DreamClockTimeComplicationScope +public interface DreamClockTimeComplicationComponent { + /** + * Creates {@link DreamClockTimeViewHolder}. + */ + DreamClockTimeViewHolder getViewHolder(); + + @Documented + @Retention(RUNTIME) + @Scope + @interface DreamClockTimeComplicationScope { + } + + /** + * Generates {@link DreamClockTimeComplicationComponent}. + */ + @Subcomponent.Factory + interface Factory { + DreamClockTimeComplicationComponent create(); + } + + /** + * Scoped values for {@link DreamClockTimeComplicationComponent}. + */ + @Module + interface DreamClockTimeComplicationModule { + String DREAM_CLOCK_TIME_COMPLICATION_VIEW = "clock_time_complication_view"; + String DREAM_CLOCK_TIME_COMPLICATION_LAYOUT_PARAMS = + "clock_time_complication_layout_params"; + // Order weight of insert into parent container + int INSERT_ORDER_WEIGHT = 0; + String TAG_WEIGHT = "'wght' "; + int WEIGHT = 200; + + /** + * Provides the complication view. + */ + @Provides + @DreamClockTimeComplicationScope + @Named(DREAM_CLOCK_TIME_COMPLICATION_VIEW) + static View provideComplicationView(LayoutInflater layoutInflater) { + final TextClock view = Preconditions.checkNotNull((TextClock) + layoutInflater.inflate(R.layout.dream_overlay_complication_clock_time, + null, false), + "R.layout.dream_overlay_complication_clock_time did not properly inflated"); + view.setFontVariationSettings(TAG_WEIGHT + WEIGHT); + return view; + } + + /** + * Provides the layout parameters for the complication view. + */ + @Provides + @DreamClockTimeComplicationScope + @Named(DREAM_CLOCK_TIME_COMPLICATION_LAYOUT_PARAMS) + static ComplicationLayoutParams provideLayoutParams() { + return new ComplicationLayoutParams(0, + ViewGroup.LayoutParams.WRAP_CONTENT, + ComplicationLayoutParams.POSITION_BOTTOM + | ComplicationLayoutParams.POSITION_START, + ComplicationLayoutParams.DIRECTION_UP, + INSERT_ORDER_WEIGHT, + true); + } + } +} diff --git a/packages/SystemUI/src/com/android/systemui/dreams/complication/dagger/DreamWeatherComplicationComponent.java b/packages/SystemUI/src/com/android/systemui/dreams/complication/dagger/DreamWeatherComplicationComponent.java new file mode 100644 index 000000000000..a282594ff282 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/dreams/complication/dagger/DreamWeatherComplicationComponent.java @@ -0,0 +1,111 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.dreams.complication.dagger; + + +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import android.view.LayoutInflater; +import android.view.ViewGroup; +import android.widget.TextView; + +import com.android.internal.util.Preconditions; +import com.android.systemui.R; +import com.android.systemui.dreams.complication.ComplicationLayoutParams; +import com.android.systemui.dreams.complication.DreamWeatherComplication.DreamWeatherViewHolder; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; + +import javax.inject.Named; +import javax.inject.Scope; + +import dagger.Module; +import dagger.Provides; +import dagger.Subcomponent; + +/** + * {@link DreamWeatherComplicationComponent} is responsible for generating dependencies surrounding + * the + * Clock Date {@link com.android.systemui.dreams.complication.Complication}, such as the layout + * details. + */ +@Subcomponent(modules = { + DreamWeatherComplicationComponent.DreamWeatherComplicationModule.class, +}) +@DreamWeatherComplicationComponent.DreamWeatherComplicationScope +public interface DreamWeatherComplicationComponent { + /** + * Creates {@link DreamWeatherViewHolder}. + */ + DreamWeatherViewHolder getViewHolder(); + + @Documented + @Retention(RUNTIME) + @Scope + @interface DreamWeatherComplicationScope { + } + + /** + * Generates {@link DreamWeatherComplicationComponent}. + */ + @Subcomponent.Factory + interface Factory { + DreamWeatherComplicationComponent create(); + } + + /** + * Scoped values for {@link DreamWeatherComplicationComponent}. + */ + @Module + interface DreamWeatherComplicationModule { + String DREAM_WEATHER_COMPLICATION_VIEW = "weather_complication_view"; + String DREAM_WEATHER_COMPLICATION_LAYOUT_PARAMS = + "weather_complication_layout_params"; + // Order weight of insert into parent container + int INSERT_ORDER_WEIGHT = 1; + + /** + * Provides the complication view. + */ + @Provides + @DreamWeatherComplicationScope + @Named(DREAM_WEATHER_COMPLICATION_VIEW) + static TextView provideComplicationView(LayoutInflater layoutInflater) { + return Preconditions.checkNotNull((TextView) + layoutInflater.inflate(R.layout.dream_overlay_complication_weather, + null, false), + "R.layout.dream_overlay_complication_weather did not properly inflated"); + } + + /** + * Provides the layout parameters for the complication view. + */ + @Provides + @DreamWeatherComplicationScope + @Named(DREAM_WEATHER_COMPLICATION_LAYOUT_PARAMS) + static ComplicationLayoutParams provideLayoutParams() { + return new ComplicationLayoutParams(0, + ViewGroup.LayoutParams.WRAP_CONTENT, + ComplicationLayoutParams.POSITION_BOTTOM + | ComplicationLayoutParams.POSITION_START, + ComplicationLayoutParams.DIRECTION_END, + INSERT_ORDER_WEIGHT, + true); + } + } +} diff --git a/packages/SystemUI/src/com/android/systemui/dreams/complication/dagger/RegisteredComplicationsModule.java b/packages/SystemUI/src/com/android/systemui/dreams/complication/dagger/RegisteredComplicationsModule.java new file mode 100644 index 000000000000..8e4fb3783f4a --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/dreams/complication/dagger/RegisteredComplicationsModule.java @@ -0,0 +1,33 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.dreams.complication.dagger; + +import com.android.systemui.dagger.SystemUIBinder; + +import dagger.Module; + +/** + * Module for all components with corresponding dream layer complications registered in + * {@link SystemUIBinder}. + */ +@Module(subcomponents = { + DreamClockTimeComplicationComponent.class, + DreamClockDateComplicationComponent.class, + DreamWeatherComplicationComponent.class, +}) +public interface RegisteredComplicationsModule { +} diff --git a/packages/SystemUI/src/com/android/systemui/dreams/dagger/DreamModule.java b/packages/SystemUI/src/com/android/systemui/dreams/dagger/DreamModule.java index 3d2f924563f3..d8af9e5f1f4a 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/dagger/DreamModule.java +++ b/packages/SystemUI/src/com/android/systemui/dreams/dagger/DreamModule.java @@ -16,6 +16,7 @@ package com.android.systemui.dreams.dagger; +import com.android.systemui.dreams.complication.dagger.RegisteredComplicationsModule; import com.android.systemui.dreams.touch.dagger.DreamTouchModule; import dagger.Module; @@ -25,6 +26,7 @@ import dagger.Module; */ @Module(includes = { DreamTouchModule.class, + RegisteredComplicationsModule.class, }, subcomponents = { DreamOverlayComponent.class, diff --git a/packages/SystemUI/src/com/android/systemui/dreams/dagger/DreamOverlayComponent.java b/packages/SystemUI/src/com/android/systemui/dreams/dagger/DreamOverlayComponent.java index 05ab9015fecc..60278a9da7eb 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/dagger/DreamOverlayComponent.java +++ b/packages/SystemUI/src/com/android/systemui/dreams/dagger/DreamOverlayComponent.java @@ -22,6 +22,7 @@ import androidx.lifecycle.LifecycleOwner; import androidx.lifecycle.LifecycleRegistry; import androidx.lifecycle.ViewModelStore; +import com.android.settingslib.dream.DreamBackend; import com.android.systemui.dreams.DreamOverlayContainerViewController; import com.android.systemui.dreams.complication.Complication; import com.android.systemui.dreams.complication.dagger.ComplicationModule; @@ -68,4 +69,7 @@ public interface DreamOverlayComponent { /** Builds a {@link DreamOverlayTouchMonitor} */ DreamOverlayTouchMonitor getDreamOverlayTouchMonitor(); + + /** Builds a ${@link DreamBackend} */ + DreamBackend getDreamBackend(); } diff --git a/packages/SystemUI/src/com/android/systemui/dreams/dagger/DreamOverlayModule.java b/packages/SystemUI/src/com/android/systemui/dreams/dagger/DreamOverlayModule.java index 4eb5cb97607a..efa063f4dfc8 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/dagger/DreamOverlayModule.java +++ b/packages/SystemUI/src/com/android/systemui/dreams/dagger/DreamOverlayModule.java @@ -17,6 +17,7 @@ package com.android.systemui.dreams.dagger; import android.content.ContentResolver; +import android.content.Context; import android.content.res.Resources; import android.os.Handler; import android.view.LayoutInflater; @@ -27,6 +28,7 @@ import androidx.lifecycle.LifecycleOwner; import androidx.lifecycle.LifecycleRegistry; import com.android.internal.util.Preconditions; +import com.android.settingslib.dream.DreamBackend; import com.android.systemui.R; import com.android.systemui.battery.BatteryMeterView; import com.android.systemui.battery.BatteryMeterViewController; @@ -147,4 +149,10 @@ public abstract class DreamOverlayModule { static Lifecycle providesLifecycle(LifecycleOwner lifecycleOwner) { return lifecycleOwner.getLifecycle(); } + + @Provides + @DreamOverlayComponent.DreamOverlayScope + static DreamBackend providesDreamBackend(Context context) { + return DreamBackend.getInstance(context); + } } diff --git a/packages/SystemUI/src/com/android/systemui/fgsmanager/FgsManagerDialog.kt b/packages/SystemUI/src/com/android/systemui/fgsmanager/FgsManagerDialog.kt deleted file mode 100644 index 42f3512129a3..000000000000 --- a/packages/SystemUI/src/com/android/systemui/fgsmanager/FgsManagerDialog.kt +++ /dev/null @@ -1,141 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.android.systemui.fgsmanager - -import android.content.Context -import android.os.Bundle -import android.text.format.DateUtils -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.Button -import android.widget.ImageView -import android.widget.TextView -import androidx.annotation.GuardedBy -import androidx.recyclerview.widget.DiffUtil -import androidx.recyclerview.widget.LinearLayoutManager -import androidx.recyclerview.widget.RecyclerView -import com.android.systemui.R -import com.android.systemui.dagger.qualifiers.Background -import com.android.systemui.fgsmanager.FgsManagerDialogController.RunningApp -import com.android.systemui.statusbar.phone.SystemUIDialog -import com.android.systemui.util.time.SystemClock -import java.util.concurrent.Executor - -/** - * Dialog which shows a list of running foreground services and offers controls to them - */ -class FgsManagerDialog( - context: Context, - private val executor: Executor, - @Background private val backgroundExecutor: Executor, - private val systemClock: SystemClock, - private val fgsManagerDialogController: FgsManagerDialogController -) : SystemUIDialog(context, R.style.Theme_SystemUI_Dialog) { - - private val appListRecyclerView: RecyclerView = RecyclerView(this.context) - private val adapter: AppListAdapter = AppListAdapter() - - init { - setTitle(R.string.fgs_manager_dialog_title) - setView(appListRecyclerView) - } - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - appListRecyclerView.layoutManager = LinearLayoutManager(context) - fgsManagerDialogController.registerDialogForChanges( - object : FgsManagerDialogController.FgsManagerDialogCallback { - override fun onRunningAppsChanged(apps: List<RunningApp>) { - executor.execute { - adapter.setData(apps) - } - } - } - ) - appListRecyclerView.adapter = adapter - backgroundExecutor.execute { adapter.setData(fgsManagerDialogController.runningAppList) } - } - - private inner class AppListAdapter : RecyclerView.Adapter<AppItemViewHolder>() { - private val lock = Any() - - @GuardedBy("lock") - private val data: MutableList<RunningApp> = ArrayList() - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): AppItemViewHolder { - return AppItemViewHolder(LayoutInflater.from(context) - .inflate(R.layout.fgs_manager_app_item, parent, false)) - } - - override fun onBindViewHolder(holder: AppItemViewHolder, position: Int) { - var runningApp: RunningApp - synchronized(lock) { - runningApp = data[position] - } - with(holder) { - iconView.setImageDrawable(runningApp.mIcon) - appLabelView.text = runningApp.mAppLabel - durationView.text = DateUtils.formatDuration( - Math.max(systemClock.elapsedRealtime() - runningApp.mTimeStarted, 60000), - DateUtils.LENGTH_MEDIUM) - stopButton.setOnClickListener { - fgsManagerDialogController - .stopAllFgs(runningApp.mUserId, runningApp.mPackageName) - } - } - } - - override fun getItemCount(): Int { - synchronized(lock) { return data.size } - } - - fun setData(newData: List<RunningApp>) { - var oldData: List<RunningApp> - synchronized(lock) { - oldData = ArrayList(data) - data.clear() - data.addAll(newData) - } - - DiffUtil.calculateDiff(object : DiffUtil.Callback() { - override fun getOldListSize(): Int { - return oldData.size - } - - override fun getNewListSize(): Int { - return newData.size - } - - override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int): - Boolean { - return oldData[oldItemPosition] == newData[newItemPosition] - } - - override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int): - Boolean { - return true // TODO, look into updating the time subtext - } - }).dispatchUpdatesTo(this) - } - } - - private class AppItemViewHolder(parent: View) : RecyclerView.ViewHolder(parent) { - val appLabelView: TextView = parent.requireViewById(R.id.fgs_manager_app_item_label) - val durationView: TextView = parent.requireViewById(R.id.fgs_manager_app_item_duration) - val iconView: ImageView = parent.requireViewById(R.id.fgs_manager_app_item_icon) - val stopButton: Button = parent.requireViewById(R.id.fgs_manager_app_item_stop_button) - } -}
\ No newline at end of file diff --git a/packages/SystemUI/src/com/android/systemui/fgsmanager/FgsManagerDialogController.kt b/packages/SystemUI/src/com/android/systemui/fgsmanager/FgsManagerDialogController.kt deleted file mode 100644 index 159ed39025a1..000000000000 --- a/packages/SystemUI/src/com/android/systemui/fgsmanager/FgsManagerDialogController.kt +++ /dev/null @@ -1,151 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.android.systemui.fgsmanager - -import android.content.pm.PackageManager -import android.content.pm.PackageManager.NameNotFoundException -import android.graphics.drawable.Drawable -import android.os.Handler -import android.os.UserHandle -import android.util.ArrayMap -import android.util.Log -import androidx.annotation.GuardedBy -import com.android.systemui.dagger.qualifiers.Background -import com.android.systemui.statusbar.policy.RunningFgsController -import com.android.systemui.statusbar.policy.RunningFgsController.UserPackageTime -import javax.inject.Inject - -/** - * Controls events relevant to FgsManagerDialog - */ -class FgsManagerDialogController @Inject constructor( - private val packageManager: PackageManager, - @Background private val backgroundHandler: Handler, - private val runningFgsController: RunningFgsController -) : RunningFgsController.Callback { - private val lock = Any() - private val clearCacheToken = Any() - - @GuardedBy("lock") - private var runningApps: Map<UserPackageTime, RunningApp>? = null - @GuardedBy("lock") - private var listener: FgsManagerDialogCallback? = null - - interface FgsManagerDialogCallback { - fun onRunningAppsChanged(apps: List<RunningApp>) - } - - data class RunningApp( - val mUserId: Int, - val mPackageName: String, - val mAppLabel: CharSequence, - val mIcon: Drawable, - val mTimeStarted: Long - ) - - val runningAppList: List<RunningApp> - get() { - synchronized(lock) { - if (runningApps == null) { - onFgsPackagesChangedLocked(runningFgsController.getPackagesWithFgs()) - } - return convertToRunningAppList(runningApps!!) - } - } - - fun registerDialogForChanges(callback: FgsManagerDialogCallback) { - synchronized(lock) { - runningFgsController.addCallback(this) - listener = callback - backgroundHandler.removeCallbacksAndMessages(clearCacheToken) - } - } - - fun onFinishDialog() { - synchronized(lock) { - listener = null - // Keep data such as icons cached for some time since loading can be slow - backgroundHandler.postDelayed( - { - synchronized(lock) { - runningFgsController.removeCallback(this) - runningApps = null - } - }, clearCacheToken, RUNNING_APP_CACHE_TIMEOUT_MILLIS) - } - } - - private fun onRunningAppsChanged(apps: ArrayMap<UserPackageTime, RunningApp>) { - listener?.let { - backgroundHandler.post { it.onRunningAppsChanged(convertToRunningAppList(apps)) } - } - } - - override fun onFgsPackagesChanged(packages: List<UserPackageTime>) { - backgroundHandler.post { - synchronized(lock) { onFgsPackagesChangedLocked(packages) } - } - } - - /** - * Run on background thread - */ - private fun onFgsPackagesChangedLocked(packages: List<UserPackageTime>) { - val newRunningApps = ArrayMap<UserPackageTime, RunningApp>() - for (packageWithFgs in packages) { - val ra = runningApps?.get(packageWithFgs) - if (ra == null) { - val userId = packageWithFgs.userId - val packageName = packageWithFgs.packageName - try { - val ai = packageManager.getApplicationInfo(packageName, 0) - var icon = packageManager.getApplicationIcon(ai) - icon = packageManager.getUserBadgedIcon(icon, - UserHandle.of(userId)) - val label = packageManager.getApplicationLabel(ai) - newRunningApps[packageWithFgs] = RunningApp(userId, packageName, - label, icon, packageWithFgs.startTimeMillis) - } catch (e: NameNotFoundException) { - Log.e(LOG_TAG, - "Application info not found: $packageName", e) - } - } else { - newRunningApps[packageWithFgs] = ra - } - } - runningApps = newRunningApps - onRunningAppsChanged(newRunningApps) - } - - fun stopAllFgs(userId: Int, packageName: String) { - runningFgsController.stopFgs(userId, packageName) - } - - companion object { - private val LOG_TAG = FgsManagerDialogController::class.java.simpleName - private const val RUNNING_APP_CACHE_TIMEOUT_MILLIS: Long = 20_000 - - private fun convertToRunningAppList(apps: Map<UserPackageTime, RunningApp>): - List<RunningApp> { - val result = mutableListOf<RunningApp>() - result.addAll(apps.values) - result.sortWith { a: RunningApp, b: RunningApp -> - b.mTimeStarted.compareTo(a.mTimeStarted) - } - return result - } - } -} diff --git a/packages/SystemUI/src/com/android/systemui/fgsmanager/FgsManagerDialogFactory.kt b/packages/SystemUI/src/com/android/systemui/fgsmanager/FgsManagerDialogFactory.kt deleted file mode 100644 index 28749296c4cf..000000000000 --- a/packages/SystemUI/src/com/android/systemui/fgsmanager/FgsManagerDialogFactory.kt +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.android.systemui.fgsmanager - -import android.content.Context -import com.android.systemui.dagger.SysUISingleton -import com.android.systemui.animation.DialogLaunchAnimator -import android.content.DialogInterface -import android.view.View -import com.android.systemui.dagger.qualifiers.Background -import com.android.systemui.dagger.qualifiers.Main -import com.android.systemui.util.time.SystemClock -import java.util.concurrent.Executor -import javax.inject.Inject - -/** - * Factory to create [FgsManagerDialog] instances - */ -@SysUISingleton -class FgsManagerDialogFactory -@Inject constructor( - private val context: Context, - @Main private val executor: Executor, - @Background private val backgroundExecutor: Executor, - private val systemClock: SystemClock, - private val dialogLaunchAnimator: DialogLaunchAnimator, - private val fgsManagerDialogController: FgsManagerDialogController -) { - - val lock = Any() - - companion object { - private var fgsManagerDialog: FgsManagerDialog? = null - } - - /** - * Creates the dialog if it doesn't exist - */ - fun create(viewLaunchedFrom: View?) { - if (fgsManagerDialog == null) { - fgsManagerDialog = FgsManagerDialog(context, executor, backgroundExecutor, - systemClock, fgsManagerDialogController) - fgsManagerDialog!!.setOnDismissListener { i: DialogInterface? -> - fgsManagerDialogController.onFinishDialog() - fgsManagerDialog = null - } - dialogLaunchAnimator.showFromView(fgsManagerDialog!!, viewLaunchedFrom!!) - } - } -}
\ No newline at end of file diff --git a/packages/SystemUI/src/com/android/systemui/flags/Flags.java b/packages/SystemUI/src/com/android/systemui/flags/Flags.java index 97edf3bac4a8..357a68fc6502 100644 --- a/packages/SystemUI/src/com/android/systemui/flags/Flags.java +++ b/packages/SystemUI/src/com/android/systemui/flags/Flags.java @@ -107,11 +107,16 @@ public class Flags { public static final ResourceBooleanFlag QS_USER_DETAIL_SHORTCUT = new ResourceBooleanFlag(503, R.bool.flag_lockscreen_qs_user_detail_shortcut); + public static final BooleanFlag NEW_FOOTER = new BooleanFlag(504, false); + /***************************************/ // 600- status bar public static final BooleanFlag COMBINED_STATUS_BAR_SIGNAL_ICONS = new BooleanFlag(601, false); + public static final BooleanFlag STATUS_BAR_USER_SWITCHER = + new BooleanFlag(602, false); + /***************************************/ // 700 - dialer/calls public static final BooleanFlag ONGOING_CALL_STATUS_BAR_CHIP = diff --git a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsPopupMenu.java b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsPopupMenu.java index d1a103e3a8fa..de67ba8a6ded 100644 --- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsPopupMenu.java +++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsPopupMenu.java @@ -40,6 +40,7 @@ public class GlobalActionsPopupMenu extends ListPopupWindow { private boolean mIsDropDownMode; private int mMenuVerticalPadding = 0; private int mGlobalActionsSidePadding = 0; + private int mMaximumWidthThresholdDp = 800; private ListAdapter mAdapter; private AdapterView.OnItemLongClickListener mOnItemLongClickListener; @@ -92,6 +93,8 @@ public class GlobalActionsPopupMenu extends ListPopupWindow { // width should be between [.5, .9] of screen int parentWidth = res.getSystem().getDisplayMetrics().widthPixels; + float parentDensity = res.getSystem().getDisplayMetrics().density; + float parentWidthDp = parentWidth / parentDensity; int widthSpec = MeasureSpec.makeMeasureSpec( (int) (parentWidth * 0.9), MeasureSpec.AT_MOST); int maxWidth = 0; @@ -101,9 +104,12 @@ public class GlobalActionsPopupMenu extends ListPopupWindow { int w = child.getMeasuredWidth(); maxWidth = Math.max(w, maxWidth); } - int width = Math.max(maxWidth, (int) (parentWidth * 0.5)); - listView.setPadding(0, mMenuVerticalPadding, 0, mMenuVerticalPadding); + int width = maxWidth; + if (parentWidthDp < mMaximumWidthThresholdDp) { + width = Math.max(maxWidth, (int) (parentWidth * 0.5)); + } + listView.setPadding(0, mMenuVerticalPadding, 0, mMenuVerticalPadding); setWidth(width); if (getAnchorView().getLayoutDirection() == LayoutDirection.LTR) { setHorizontalOffset(getAnchorView().getWidth() - mGlobalActionsSidePadding - width); diff --git a/packages/SystemUI/src/com/android/systemui/hdmi/HdmiCecSetMenuLanguageActivity.java b/packages/SystemUI/src/com/android/systemui/hdmi/HdmiCecSetMenuLanguageActivity.java new file mode 100644 index 000000000000..b304c3ca737a --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/hdmi/HdmiCecSetMenuLanguageActivity.java @@ -0,0 +1,98 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.hdmi; + +import android.hardware.hdmi.HdmiControlManager; +import android.os.Bundle; +import android.view.View; +import android.view.WindowManager; +import android.widget.Button; +import android.widget.ImageView; +import android.widget.TextView; + +import com.android.systemui.R; +import com.android.systemui.tv.TvBottomSheetActivity; + +import javax.inject.Inject; + +/** + * Confirmation dialog shown when Set Menu Language CEC message was received. + */ +public class HdmiCecSetMenuLanguageActivity extends TvBottomSheetActivity + implements View.OnClickListener { + private static final String TAG = HdmiCecSetMenuLanguageActivity.class.getSimpleName(); + + private final HdmiCecSetMenuLanguageHelper mHdmiCecSetMenuLanguageHelper; + + @Inject + public HdmiCecSetMenuLanguageActivity( + HdmiCecSetMenuLanguageHelper hdmiCecSetMenuLanguageHelper) { + mHdmiCecSetMenuLanguageHelper = hdmiCecSetMenuLanguageHelper; + } + + @Override + public final void onCreate(Bundle b) { + super.onCreate(b); + getWindow().addPrivateFlags( + WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS); + String languageTag = getIntent().getStringExtra(HdmiControlManager.EXTRA_LOCALE); + mHdmiCecSetMenuLanguageHelper.setLocale(languageTag); + if (mHdmiCecSetMenuLanguageHelper.isLocaleDenylisted()) { + finish(); + } + } + + @Override + public void onResume() { + super.onResume(); + CharSequence title = getString(R.string.hdmi_cec_set_menu_language_title, + mHdmiCecSetMenuLanguageHelper.getLocale().getDisplayLanguage()); + CharSequence text = getString(R.string.hdmi_cec_set_menu_language_description); + initUI(title, text); + } + + @Override + public void onClick(View v) { + if (v.getId() == R.id.bottom_sheet_positive_button) { + mHdmiCecSetMenuLanguageHelper.acceptLocale(); + } else { + mHdmiCecSetMenuLanguageHelper.declineLocale(); + } + finish(); + } + + void initUI(CharSequence title, CharSequence text) { + TextView titleTextView = findViewById(R.id.bottom_sheet_title); + TextView contentTextView = findViewById(R.id.bottom_sheet_body); + ImageView icon = findViewById(R.id.bottom_sheet_icon); + ImageView secondIcon = findViewById(R.id.bottom_sheet_second_icon); + Button okButton = findViewById(R.id.bottom_sheet_positive_button); + Button cancelButton = findViewById(R.id.bottom_sheet_negative_button); + + titleTextView.setText(title); + contentTextView.setText(text); + icon.setImageResource(com.android.internal.R.drawable.ic_settings_language); + secondIcon.setVisibility(View.GONE); + + okButton.setText(R.string.hdmi_cec_set_menu_language_accept); + okButton.setOnClickListener(this); + + cancelButton.setText(R.string.hdmi_cec_set_menu_language_decline); + cancelButton.setOnClickListener(this); + cancelButton.requestFocus(); + } +} diff --git a/packages/SystemUI/src/com/android/systemui/hdmi/HdmiCecSetMenuLanguageHelper.java b/packages/SystemUI/src/com/android/systemui/hdmi/HdmiCecSetMenuLanguageHelper.java new file mode 100644 index 000000000000..1f58112c5dc6 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/hdmi/HdmiCecSetMenuLanguageHelper.java @@ -0,0 +1,97 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.hdmi; + +import android.provider.Settings; + +import com.android.internal.app.LocalePicker; +import com.android.systemui.dagger.SysUISingleton; +import com.android.systemui.dagger.qualifiers.Background; +import com.android.systemui.util.settings.SecureSettings; + +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; +import java.util.Locale; +import java.util.concurrent.Executor; + +import javax.inject.Inject; + +/** + * Helper class to separate model and view for system language change initiated by HDMI CEC. + */ +@SysUISingleton +public class HdmiCecSetMenuLanguageHelper { + private static final String TAG = HdmiCecSetMenuLanguageHelper.class.getSimpleName(); + private static final String SEPARATOR = ","; + + private final Executor mBackgroundExecutor; + private final SecureSettings mSecureSettings; + + private Locale mLocale; + private HashSet<String> mDenylist; + + @Inject + public HdmiCecSetMenuLanguageHelper(@Background Executor executor, + SecureSettings secureSettings) { + mBackgroundExecutor = executor; + mSecureSettings = secureSettings; + String denylist = mSecureSettings.getString( + Settings.Secure.HDMI_CEC_SET_MENU_LANGUAGE_DENYLIST); + mDenylist = new HashSet<>(denylist == null + ? Collections.EMPTY_SET + : Arrays.asList(denylist.split(SEPARATOR))); + } + + /** + * Set internal locale based on given language tag. + */ + public void setLocale(String languageTag) { + mLocale = Locale.forLanguageTag(languageTag); + } + + /** + * Returns the locale from {@code <Set Menu Language>} CEC message. + */ + public Locale getLocale() { + return mLocale; + } + + /** + * Returns whether the locale from {@code <Set Menu Language>} CEC message was already + * denylisted. + */ + public boolean isLocaleDenylisted() { + return mDenylist.contains(mLocale.toLanguageTag()); + } + + /** + * Accepts the new locale and updates system language. + */ + public void acceptLocale() { + mBackgroundExecutor.execute(() -> LocalePicker.updateLocale(mLocale)); + } + + /** + * Declines the locale and puts it on the denylist. + */ + public void declineLocale() { + mDenylist.add(mLocale.toLanguageTag()); + mSecureSettings.putString(Settings.Secure.HDMI_CEC_SET_MENU_LANGUAGE_DENYLIST, + String.join(SEPARATOR, mDenylist)); + } +} diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java index e88011e0d3fe..88555edd1e8b 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java @@ -233,10 +233,13 @@ public class KeyguardService extends Service { mKeyguardViewMediator = keyguardViewMediator; mKeyguardLifecyclesDispatcher = keyguardLifecyclesDispatcher; mShellTransitions = shellTransitions; + } - if (shellTransitions != null && Transitions.ENABLE_SHELL_TRANSITIONS) { - // Nothing here. Initialization for this happens in onCreate. - } else { + @Override + public void onCreate() { + ((SystemUIApplication) getApplication()).startServicesIfNeeded(); + + if (mShellTransitions == null || !Transitions.ENABLE_SHELL_TRANSITIONS) { RemoteAnimationDefinition definition = new RemoteAnimationDefinition(); if (sEnableRemoteKeyguardGoingAwayAnimation) { final RemoteAnimationAdapter exitAnimationAdapter = @@ -248,22 +251,19 @@ public class KeyguardService extends Service { } if (sEnableRemoteKeyguardOccludeAnimation) { final RemoteAnimationAdapter occludeAnimationAdapter = - new RemoteAnimationAdapter(mOccludeAnimationRunner, 0, 0); + new RemoteAnimationAdapter( + mKeyguardViewMediator.getOccludeAnimationRunner(), 0, 0); definition.addRemoteAnimation(TRANSIT_OLD_KEYGUARD_OCCLUDE, occludeAnimationAdapter); + + final RemoteAnimationAdapter unoccludeAnimationAdapter = + new RemoteAnimationAdapter( + mKeyguardViewMediator.getUnoccludeAnimationRunner(), 0, 0); definition.addRemoteAnimation(TRANSIT_OLD_KEYGUARD_UNOCCLUDE, - occludeAnimationAdapter); + unoccludeAnimationAdapter); } ActivityTaskManager.getInstance().registerRemoteAnimationsForDisplay( DEFAULT_DISPLAY, definition); - } - } - - @Override - public void onCreate() { - ((SystemUIApplication) getApplication()).startServicesIfNeeded(); - - if (mShellTransitions == null || !Transitions.ENABLE_SHELL_TRANSITIONS) { return; } if (sEnableRemoteKeyguardGoingAwayAnimation) { @@ -354,33 +354,6 @@ public class KeyguardService extends Service { } }; - private final IRemoteAnimationRunner.Stub mOccludeAnimationRunner = - new IRemoteAnimationRunner.Stub() { - @Override // Binder interface - public void onAnimationStart(@WindowManager.TransitionOldType int transit, - RemoteAnimationTarget[] apps, - RemoteAnimationTarget[] wallpapers, - RemoteAnimationTarget[] nonApps, - IRemoteAnimationFinishedCallback finishedCallback) { - Slog.d(TAG, "mOccludeAnimationRunner.onAnimationStart: transit=" + transit); - try { - if (transit == TRANSIT_OLD_KEYGUARD_OCCLUDE) { - mBinder.setOccluded(true /* isOccluded */, true /* animate */); - } else if (transit == TRANSIT_OLD_KEYGUARD_UNOCCLUDE) { - mBinder.setOccluded(false /* isOccluded */, false /* animate */); - } - // TODO(bc-unlock): Implement (un)occlude animation. - finishedCallback.onAnimationFinished(); - } catch (RemoteException e) { - Slog.e(TAG, "RemoteException"); - } - } - - @Override // Binder interface - public void onAnimationCancelled() { - } - }; - final IRemoteTransition mOccludeAnimation = new IRemoteTransition.Stub() { @Override public void startAnimation(IBinder transition, TransitionInfo info, diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java index fd2c6dd3ca36..0f08a1863e08 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java @@ -77,11 +77,13 @@ import android.view.IRemoteAnimationRunner; import android.view.RemoteAnimationTarget; import android.view.SyncRtSurfaceTransactionApplier; import android.view.View; +import android.view.ViewGroup; import android.view.WindowManager; import android.view.WindowManagerPolicyConstants; import android.view.animation.Animation; import android.view.animation.AnimationUtils; +import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.android.internal.jank.InteractionJankMonitor; @@ -89,6 +91,7 @@ import com.android.internal.jank.InteractionJankMonitor.Configuration; import com.android.internal.policy.IKeyguardDismissCallback; import com.android.internal.policy.IKeyguardExitCallback; import com.android.internal.policy.IKeyguardStateCallback; +import com.android.internal.policy.ScreenDecorationsUtils; import com.android.internal.util.LatencyTracker; import com.android.internal.widget.LockPatternUtils; import com.android.keyguard.KeyguardConstants; @@ -102,7 +105,10 @@ import com.android.keyguard.mediator.ScreenOnCoordinator; import com.android.systemui.CoreStartable; import com.android.systemui.DejankUtils; import com.android.systemui.Dumpable; +import com.android.systemui.R; +import com.android.systemui.animation.ActivityLaunchAnimator; import com.android.systemui.animation.Interpolators; +import com.android.systemui.animation.LaunchAnimator; import com.android.systemui.broadcast.BroadcastDispatcher; import com.android.systemui.classifier.FalsingCollector; import com.android.systemui.dagger.qualifiers.UiBackground; @@ -375,6 +381,9 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, private int mUnlockSoundId; private int mTrustedSoundId; private int mLockSoundStreamId; + private final float mPowerButtonY; + private final float mWindowCornerRadius; + /** * The animation used for hiding keyguard. This is used to fetch the animation timings if * WindowManager is not providing us with them. @@ -815,6 +824,109 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, } }; + /** + * Animation launch controller for activities that occlude the keyguard. + */ + private final ActivityLaunchAnimator.Controller mOccludeAnimationController = + new ActivityLaunchAnimator.Controller() { + @Override + public void onLaunchAnimationStart(boolean isExpandingFullyAbove) { + setOccluded(true /* occluded */, false /* animate */); + } + + @Override + public void onLaunchAnimationCancelled() { + setOccluded(true /* occluded */, false /* animate */); + } + + @NonNull + @Override + public ViewGroup getLaunchContainer() { + return ((ViewGroup) mKeyguardViewControllerLazy.get() + .getViewRootImpl().getView()); + } + + @Override + public void setLaunchContainer(@NonNull ViewGroup launchContainer) { + // No-op, launch container is always the shade. + Log.wtf(TAG, "Someone tried to change the launch container for the " + + "ActivityLaunchAnimator, which should never happen."); + } + + @NonNull + @Override + public LaunchAnimator.State createAnimatorState() { + final int width = getLaunchContainer().getWidth(); + final int height = getLaunchContainer().getHeight(); + + final float initialHeight = height / 3f; + final float initialWidth = width / 3f; + + if (mUpdateMonitor.isSecureCameraLaunchedOverKeyguard()) { + // Start the animation near the power button, at one-third size, since the + // camera was launched from the power button. + return new LaunchAnimator.State( + (int) (mPowerButtonY - initialHeight / 2f) /* top */, + (int) (mPowerButtonY + initialHeight / 2f) /* bottom */, + (int) (width - initialWidth) /* left */, + width /* right */, + mWindowCornerRadius, mWindowCornerRadius); + } else { + // Start the animation in the center of the screen, scaled down. + return new LaunchAnimator.State( + height / 2, height / 2, width / 2, width / 2, + mWindowCornerRadius, mWindowCornerRadius); + } + } + }; + + /** + * Animation controller for activities that unocclude the keyguard. This will play the launch + * animation in reverse. + */ + private final ActivityLaunchAnimator.Controller mUnoccludeAnimationController = + new ActivityLaunchAnimator.Controller() { + @Override + public void onLaunchAnimationEnd(boolean isExpandingFullyAbove) { + setOccluded(false /* isOccluded */, false /* animate */); + } + + @Override + public void onLaunchAnimationCancelled() { + setOccluded(false /* isOccluded */, false /* animate */); + } + + @NonNull + @Override + public ViewGroup getLaunchContainer() { + return ((ViewGroup) mKeyguardViewControllerLazy.get() + .getViewRootImpl().getView()); + } + + @Override + public void setLaunchContainer(@NonNull ViewGroup launchContainer) { + // No-op, launch container is always the shade. + Log.wtf(TAG, "Someone tried to change the launch container for the " + + "ActivityLaunchAnimator, which should never happen."); + } + + @NonNull + @Override + public LaunchAnimator.State createAnimatorState() { + final int width = getLaunchContainer().getWidth(); + final int height = getLaunchContainer().getHeight(); + + // TODO(b/207399883): Unocclude animation. This currently ends instantly. + return new LaunchAnimator.State( + 0, height, 0, width, mWindowCornerRadius, mWindowCornerRadius); + } + }; + + private IRemoteAnimationRunner mOccludeAnimationRunner = + new ActivityLaunchRemoteAnimationRunner(mOccludeAnimationController); + private IRemoteAnimationRunner mUnoccludeAnimationRunner = + new ActivityLaunchRemoteAnimationRunner(mUnoccludeAnimationController); + private DeviceConfigProxy mDeviceConfig; private DozeParameters mDozeParameters; @@ -824,6 +936,8 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, private boolean mWallpaperSupportsAmbientMode; private ScreenOnCoordinator mScreenOnCoordinator; + private Lazy<ActivityLaunchAnimator> mActivityLaunchAnimator; + /** * Injected constructor. See {@link KeyguardModule}. */ @@ -850,7 +964,8 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, ScreenOnCoordinator screenOnCoordinator, InteractionJankMonitor interactionJankMonitor, DreamOverlayStateController dreamOverlayStateController, - Lazy<NotificationShadeWindowController> notificationShadeWindowControllerLazy) { + Lazy<NotificationShadeWindowController> notificationShadeWindowControllerLazy, + Lazy<ActivityLaunchAnimator> activityLaunchAnimator) { super(context); mFalsingCollector = falsingCollector; mLockPatternUtils = lockPatternUtils; @@ -890,6 +1005,12 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, mScreenOffAnimationController = screenOffAnimationController; mInteractionJankMonitor = interactionJankMonitor; mDreamOverlayStateController = dreamOverlayStateController; + + mActivityLaunchAnimator = activityLaunchAnimator; + + mPowerButtonY = context.getResources().getDimensionPixelSize( + R.dimen.physical_power_button_center_screen_location_y); + mWindowCornerRadius = ScreenDecorationsUtils.getWindowCornerRadius(context); } public void userActivity() { @@ -1440,6 +1561,14 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, Trace.endSection(); } + public IRemoteAnimationRunner getOccludeAnimationRunner() { + return mOccludeAnimationRunner; + } + + public IRemoteAnimationRunner getUnoccludeAnimationRunner() { + return mUnoccludeAnimationRunner; + } + public boolean isHiding() { return mHiding; } @@ -2868,4 +2997,36 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, return mMessage; } } + + /** + * Implementation of RemoteAnimationRunner that creates a new + * {@link ActivityLaunchAnimator.Runner} whenever onAnimationStart is called, delegating the + * remote animation methods to that runner. + */ + private class ActivityLaunchRemoteAnimationRunner extends IRemoteAnimationRunner.Stub { + + private final ActivityLaunchAnimator.Controller mActivityLaunchController; + @Nullable private ActivityLaunchAnimator.Runner mRunner; + + ActivityLaunchRemoteAnimationRunner(ActivityLaunchAnimator.Controller controller) { + mActivityLaunchController = controller; + } + + @Override + public void onAnimationCancelled() throws RemoteException { + if (mRunner != null) { + mRunner.onAnimationCancelled(); + } + } + + @Override + public void onAnimationStart(int transit, RemoteAnimationTarget[] apps, + RemoteAnimationTarget[] wallpapers, + RemoteAnimationTarget[] nonApps, + IRemoteAnimationFinishedCallback finishedCallback) + throws RemoteException { + mRunner = mActivityLaunchAnimator.get().createRunner(mActivityLaunchController); + mRunner.onAnimationStart(transit, apps, wallpapers, nonApps, finishedCallback); + } + } } 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 b49b49cbbb6d..195ef1a84c43 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/dagger/KeyguardModule.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/dagger/KeyguardModule.java @@ -32,6 +32,7 @@ import com.android.keyguard.dagger.KeyguardStatusBarViewComponent; import com.android.keyguard.dagger.KeyguardStatusViewComponent; import com.android.keyguard.dagger.KeyguardUserSwitcherComponent; import com.android.keyguard.mediator.ScreenOnCoordinator; +import com.android.systemui.animation.ActivityLaunchAnimator; import com.android.systemui.broadcast.BroadcastDispatcher; import com.android.systemui.classifier.FalsingCollector; import com.android.systemui.classifier.FalsingModule; @@ -102,7 +103,8 @@ public class KeyguardModule { ScreenOnCoordinator screenOnCoordinator, InteractionJankMonitor interactionJankMonitor, DreamOverlayStateController dreamOverlayStateController, - Lazy<NotificationShadeWindowController> notificationShadeWindowController) { + Lazy<NotificationShadeWindowController> notificationShadeWindowController, + Lazy<ActivityLaunchAnimator> activityLaunchAnimator) { return new KeyguardViewMediator( context, falsingCollector, @@ -128,8 +130,8 @@ public class KeyguardModule { screenOnCoordinator, interactionJankMonitor, dreamOverlayStateController, - notificationShadeWindowController - ); + notificationShadeWindowController, + activityLaunchAnimator); } @SysUISingleton diff --git a/packages/SystemUI/src/com/android/systemui/log/LogBuffer.kt b/packages/SystemUI/src/com/android/systemui/log/LogBuffer.kt index b15807c0475c..6d589aac2079 100644 --- a/packages/SystemUI/src/com/android/systemui/log/LogBuffer.kt +++ b/packages/SystemUI/src/com/android/systemui/log/LogBuffer.kt @@ -176,14 +176,9 @@ class LogBuffer @JvmOverloads constructor( buffer.removeFirst() } buffer.add(message as LogMessageImpl) - if (systrace) { - val messageStr = message.printer(message) - Trace.instantForTrack(Trace.TRACE_TAG_APP, "UI Events", "$name - $messageStr") - } - if (logcatEchoTracker.isBufferLoggable(name, message.level) || - logcatEchoTracker.isTagLoggable(message.tag, message.level)) { - echo(message) - } + val includeInLogcat = logcatEchoTracker.isBufferLoggable(name, message.level) || + logcatEchoTracker.isTagLoggable(message.tag, message.level) + echo(message, toLogcat = includeInLogcat, toSystrace = systrace) } /** Converts the entire buffer to a newline-delimited string */ @@ -232,8 +227,24 @@ class LogBuffer @JvmOverloads constructor( pw.println(message.printer(message)) } - private fun echo(message: LogMessage) { - val strMessage = message.printer(message) + private fun echo(message: LogMessage, toLogcat: Boolean, toSystrace: Boolean) { + if (toLogcat || toSystrace) { + val strMessage = message.printer(message) + if (toSystrace) { + echoToSystrace(message, strMessage) + } + if (toLogcat) { + echoToLogcat(message, strMessage) + } + } + } + + private fun echoToSystrace(message: LogMessage, strMessage: String) { + Trace.instantForTrack(Trace.TRACE_TAG_APP, "UI Events", + "$name - ${message.level.shortString} ${message.tag}: $strMessage") + } + + private fun echoToLogcat(message: LogMessage, strMessage: String) { when (message.level) { LogLevel.VERBOSE -> Log.v(message.tag, strMessage) LogLevel.DEBUG -> Log.d(message.tag, strMessage) diff --git a/packages/SystemUI/src/com/android/systemui/media/KeyguardMediaController.kt b/packages/SystemUI/src/com/android/systemui/media/KeyguardMediaController.kt index 44727f29888d..48f48266fda5 100644 --- a/packages/SystemUI/src/com/android/systemui/media/KeyguardMediaController.kt +++ b/packages/SystemUI/src/com/android/systemui/media/KeyguardMediaController.kt @@ -159,8 +159,7 @@ class KeyguardMediaController @Inject constructor( } fun refreshMediaPosition() { - val keyguardOrUserSwitcher = (statusBarStateController.state == StatusBarState.KEYGUARD || - statusBarStateController.state == StatusBarState.FULLSCREEN_USER_SWITCHER) + val keyguardOrUserSwitcher = (statusBarStateController.state == StatusBarState.KEYGUARD) // mediaHost.visible required for proper animations handling visible = mediaHost.visible && !bypassController.bypassEnabled && @@ -196,4 +195,4 @@ class KeyguardMediaController @Inject constructor( visibilityChangedListener?.invoke(newVisibility == View.VISIBLE) } } -}
\ No newline at end of file +} diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaCarouselController.kt b/packages/SystemUI/src/com/android/systemui/media/MediaCarouselController.kt index c404f7aa0fb4..f893f363b4c8 100644 --- a/packages/SystemUI/src/com/android/systemui/media/MediaCarouselController.kt +++ b/packages/SystemUI/src/com/android/systemui/media/MediaCarouselController.kt @@ -411,7 +411,6 @@ class MediaCarouselController @Inject constructor( // Returns true if new player is added private fun addOrUpdatePlayer(key: String, oldKey: String?, data: MediaData): Boolean { - val dataCopy = data.copy(backgroundColor = bgColor) MediaPlayerData.moveIfExists(oldKey, key) val existingPlayer = MediaPlayerData.getMediaPlayer(key) val curVisibleMediaKey = MediaPlayerData.playerKeys() @@ -431,14 +430,14 @@ class MediaCarouselController @Inject constructor( val lp = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT) newPlayer.mediaViewHolder?.player?.setLayoutParams(lp) - newPlayer.bindPlayer(dataCopy, key) + newPlayer.bindPlayer(data, key) newPlayer.setListening(currentlyExpanded) - MediaPlayerData.addMediaPlayer(key, dataCopy, newPlayer, systemClock) + MediaPlayerData.addMediaPlayer(key, data, newPlayer, systemClock) updatePlayerToState(newPlayer, noAnimation = true) reorderAllPlayers(curVisibleMediaKey) } else { - existingPlayer.bindPlayer(dataCopy, key) - MediaPlayerData.addMediaPlayer(key, dataCopy, existingPlayer, systemClock) + existingPlayer.bindPlayer(data, key) + MediaPlayerData.addMediaPlayer(key, data, existingPlayer, systemClock) if (visualStabilityManager.isReorderingAllowed || shouldScrollToActivePlayer) { reorderAllPlayers(curVisibleMediaKey) } else { @@ -543,7 +542,11 @@ class MediaCarouselController @Inject constructor( } private fun getForegroundColor(): Int { - return context.getColor(android.R.color.system_accent2_900) + return if (mediaFlags.useMediaSessionLayout()) { + context.getColor(android.R.color.system_neutral2_200) + } else { + context.getColor(android.R.color.system_accent2_900) + } } private fun updatePageIndicator() { diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java b/packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java index 69a7ec3447aa..b3e66829a72b 100644 --- a/packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java +++ b/packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java @@ -19,6 +19,7 @@ package com.android.systemui.media; import static android.provider.Settings.ACTION_MEDIA_CONTROLS_SETTINGS; import android.app.PendingIntent; +import android.app.WallpaperColors; import android.app.smartspace.SmartspaceAction; import android.content.Context; import android.content.Intent; @@ -40,6 +41,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.ImageButton; import android.widget.ImageView; +import android.widget.SeekBar; import android.widget.TextView; import androidx.annotation.NonNull; @@ -54,6 +56,7 @@ import com.android.systemui.animation.ActivityLaunchAnimator; import com.android.systemui.animation.GhostedViewLaunchAnimatorController; import com.android.systemui.dagger.qualifiers.Background; import com.android.systemui.media.dialog.MediaOutputDialogFactory; +import com.android.systemui.monet.ColorScheme; import com.android.systemui.plugins.ActivityStarter; import com.android.systemui.plugins.FalsingManager; import com.android.systemui.shared.system.SysUiStatsLog; @@ -405,7 +408,7 @@ public class MediaControlPanel { seamlessView.setContentDescription(deviceString); // Dismiss - mMediaViewHolder.getDismissLabel().setAlpha(isDismissible ? 1 : DISABLED_ALPHA); + mMediaViewHolder.getDismissText().setAlpha(isDismissible ? 1 : DISABLED_ALPHA); mMediaViewHolder.getDismiss().setEnabled(isDismissible); mMediaViewHolder.getDismiss().setOnClickListener(v -> { if (mFalsingManager.isFalseTap(FalsingManager.LOW_PENALTY)) return; @@ -438,11 +441,10 @@ public class MediaControlPanel { ConstraintSet collapsedSet = mMediaViewController.getCollapsedLayout(); // Album art - PlayerViewHolder playerHolder = (PlayerViewHolder) mMediaViewHolder; - ImageView albumView = playerHolder.getAlbumView(); + ImageView albumView = mMediaViewHolder.getAlbumView(); boolean hasArtwork = data.getArtwork() != null; if (hasArtwork) { - Drawable artwork = scaleDrawable(data.getArtwork()); + Drawable artwork = getScaledThumbnail(data.getArtwork()); albumView.setPadding(0, 0, 0, 0); albumView.setImageDrawable(artwork); } else { @@ -548,6 +550,19 @@ public class MediaControlPanel { /** Bind elements specific to PlayerSessionViewHolder */ private void bindSessionPlayer(@NonNull MediaData data, String key) { + // Default colors + int surfaceColor = mBackgroundColor; + int accentPrimary = com.android.settingslib.Utils.getColorAttr(mContext, + com.android.internal.R.attr.textColorPrimary).getDefaultColor(); + int textPrimary = com.android.settingslib.Utils.getColorAttr(mContext, + com.android.internal.R.attr.textColorPrimary).getDefaultColor(); + int textPrimaryInverse = com.android.settingslib.Utils.getColorAttr(mContext, + com.android.internal.R.attr.textColorPrimaryInverse).getDefaultColor(); + int textSecondary = com.android.settingslib.Utils.getColorAttr(mContext, + com.android.internal.R.attr.textColorSecondary).getDefaultColor(); + int textTertiary = com.android.settingslib.Utils.getColorAttr(mContext, + com.android.internal.R.attr.textColorTertiary).getDefaultColor(); + // App icon - use launcher icon ImageView appIconView = mMediaViewHolder.getAppIcon(); appIconView.clearColorFilter(); @@ -567,26 +582,106 @@ public class MediaControlPanel { appIconView.setColorFilter(color); } + // Album art + ColorScheme colorScheme = null; + ImageView albumView = mMediaViewHolder.getAlbumView(); + boolean hasArtwork = data.getArtwork() != null; + if (hasArtwork) { + colorScheme = new ColorScheme(WallpaperColors.fromBitmap(data.getArtwork().getBitmap()), + true); + + // Scale artwork to fit background + int width = mMediaViewHolder.getPlayer().getWidth(); + int height = mMediaViewHolder.getPlayer().getHeight(); + Drawable artwork = getScaledBackground(data.getArtwork(), width, height); + albumView.setPadding(0, 0, 0, 0); + albumView.setImageDrawable(artwork); + albumView.setClipToOutline(true); + } else { + // If there's no artwork, use colors from the app icon + try { + Drawable icon = mContext.getPackageManager().getApplicationIcon( + data.getPackageName()); + colorScheme = new ColorScheme(WallpaperColors.fromDrawable(icon), true); + } catch (PackageManager.NameNotFoundException e) { + Log.w(TAG, "Cannot find icon for package " + data.getPackageName(), e); + } + } + + // Get colors for player + if (colorScheme != null) { + surfaceColor = colorScheme.getAccent2().get(9); // A2-800 + accentPrimary = colorScheme.getAccent1().get(2); // A1-100 + textPrimary = colorScheme.getNeutral1().get(1); // N1-50 + textPrimaryInverse = colorScheme.getNeutral1().get(10); // N1-900 + textSecondary = colorScheme.getNeutral2().get(3); // N2-200 + textTertiary = colorScheme.getNeutral2().get(5); // N2-400 + } + + ColorStateList bgColorList = ColorStateList.valueOf(surfaceColor); + ColorStateList accentColorList = ColorStateList.valueOf(accentPrimary); + ColorStateList textColorList = ColorStateList.valueOf(textPrimary); + + // Gradient and background (visible when there is no art) + albumView.setForegroundTintList(ColorStateList.valueOf(surfaceColor)); + albumView.setBackgroundTintList( + ColorStateList.valueOf(surfaceColor)); + mMediaViewHolder.getPlayer().setBackgroundTintList(bgColorList); + + // Metadata text + mMediaViewHolder.getTitleText().setTextColor(textPrimary); + mMediaViewHolder.getArtistText().setTextColor(textSecondary); + + // Seekbar + SeekBar seekbar = mMediaViewHolder.getSeekBar(); + seekbar.getThumb().setTintList(textColorList); + seekbar.setProgressTintList(textColorList); + seekbar.setProgressBackgroundTintList(ColorStateList.valueOf(textTertiary)); + + // Output switcher + View seamlessView = mMediaViewHolder.getSeamlessButton(); + seamlessView.setBackgroundTintList(accentColorList); + ImageView seamlessIconView = mMediaViewHolder.getSeamlessIcon(); + seamlessIconView.setImageTintList(bgColorList); + TextView seamlessText = mMediaViewHolder.getSeamlessText(); + seamlessText.setTextColor(surfaceColor); + // Media action buttons MediaButton semanticActions = data.getSemanticActions(); if (semanticActions != null) { PlayerSessionViewHolder sessionHolder = (PlayerSessionViewHolder) mMediaViewHolder; - setSemanticButton(sessionHolder.getActionPlayPause(), - semanticActions.getPlayOrPause()); - setSemanticButton(sessionHolder.getActionNext(), - semanticActions.getNextOrCustom()); - setSemanticButton(sessionHolder.getActionPrev(), - semanticActions.getPrevOrCustom()); - setSemanticButton(sessionHolder.getActionStart(), - semanticActions.getStartCustom()); - setSemanticButton(sessionHolder.getActionEnd(), - semanticActions.getEndCustom()); + + // Play/pause button has a background + sessionHolder.getActionPlayPause().setBackgroundTintList(accentColorList); + setSemanticButton(sessionHolder.getActionPlayPause(), semanticActions.getPlayOrPause(), + ColorStateList.valueOf(textPrimaryInverse)); + + setSemanticButton(sessionHolder.getActionNext(), semanticActions.getNextOrCustom(), + textColorList); + setSemanticButton(sessionHolder.getActionPrev(), semanticActions.getPrevOrCustom(), + textColorList); + setSemanticButton(sessionHolder.getActionStart(), semanticActions.getStartCustom(), + textColorList); + setSemanticButton(sessionHolder.getActionEnd(), semanticActions.getEndCustom(), + textColorList); } else { Log.w(TAG, "Using semantic player, but did not get buttons"); } + + // Long press buttons + mMediaViewHolder.getLongPressText().setTextColor(textColorList); + mMediaViewHolder.getSettingsText().setTextColor(textColorList); + mMediaViewHolder.getSettingsText().setBackgroundTintList(accentColorList); + mMediaViewHolder.getCancelText().setTextColor(textColorList); + mMediaViewHolder.getCancelText().setBackgroundTintList(accentColorList); + mMediaViewHolder.getDismissText().setTextColor(textColorList); + mMediaViewHolder.getDismissText().setBackgroundTintList(accentColorList); + } - private void setSemanticButton(final ImageButton button, MediaAction mediaAction) { + private void setSemanticButton(final ImageButton button, MediaAction mediaAction, + ColorStateList fgColor) { + button.setImageTintList(fgColor); if (mediaAction != null) { button.setImageIcon(mediaAction.getIcon()); button.setContentDescription(mediaAction.getContentDescription()); @@ -844,8 +939,11 @@ public class MediaControlPanel { mMediaViewController.openGuts(); } + /** + * Scale drawable to fit into the square album art thumbnail + */ @UiThread - private Drawable scaleDrawable(Icon icon) { + private Drawable getScaledThumbnail(Icon icon) { if (icon == null) { return null; } @@ -870,6 +968,25 @@ public class MediaControlPanel { } /** + * Scale artwork to fill the background of the panel + */ + @UiThread + private Drawable getScaledBackground(Icon icon, int width, int height) { + if (icon == null) { + return null; + } + Drawable drawable = icon.loadDrawable(mContext); + Rect bounds = new Rect(0, 0, width, height); + if (bounds.width() > width || bounds.height() > height) { + float offsetX = (bounds.width() - width) / 2.0f; + float offsetY = (bounds.height() - height) / 2.0f; + bounds.offset((int) -offsetX, (int) -offsetY); + } + drawable.setBounds(bounds); + return drawable; + } + + /** * Get the current media controller * * @return the controller diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt b/packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt index d926e7de358d..0223c6042499 100644 --- a/packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt +++ b/packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt @@ -30,9 +30,7 @@ import android.content.IntentFilter import android.content.pm.ApplicationInfo import android.content.pm.PackageManager import android.graphics.Bitmap -import android.graphics.Canvas import android.graphics.ImageDecoder -import android.graphics.drawable.Drawable import android.graphics.drawable.Icon import android.media.MediaDescription import android.media.MediaMetadata @@ -562,7 +560,7 @@ class MediaDataManager( val mediaController = mediaControllerFactory.create(token) val metadata = mediaController.metadata - // Foreground and Background colors computed from album art + // Album art val notif: Notification = sbn.notification var artworkBitmap = metadata?.getBitmap(MediaMetadata.METADATA_KEY_ART) if (artworkBitmap == null) { @@ -576,24 +574,6 @@ class MediaDataManager( } else { Icon.createWithBitmap(artworkBitmap) } - if (artWorkIcon != null) { - // If we have art, get colors from that - if (artworkBitmap == null) { - if (artWorkIcon.type == Icon.TYPE_BITMAP || - artWorkIcon.type == Icon.TYPE_ADAPTIVE_BITMAP) { - artworkBitmap = artWorkIcon.bitmap - } else { - val drawable: Drawable = artWorkIcon.loadDrawable(context) - artworkBitmap = Bitmap.createBitmap( - drawable.intrinsicWidth, - drawable.intrinsicHeight, - Bitmap.Config.ARGB_8888) - val canvas = Canvas(artworkBitmap) - drawable.setBounds(0, 0, drawable.intrinsicWidth, drawable.intrinsicHeight) - drawable.draw(canvas) - } - } - } // App name val builder = Notification.Builder.recoverBuilder(context, notif) @@ -787,30 +767,28 @@ class MediaDataManager( return when (action) { PlaybackState.ACTION_PLAY -> { MediaAction( - Icon.createWithResource(context, com.android.internal.R.drawable.ic_media_play), + Icon.createWithResource(context, R.drawable.ic_media_play), { controller.transportControls.play() }, context.getString(R.string.controls_media_button_play) ) } PlaybackState.ACTION_PAUSE -> { MediaAction( - Icon.createWithResource(context, - com.android.internal.R.drawable.ic_media_pause), + Icon.createWithResource(context, R.drawable.ic_media_pause), { controller.transportControls.pause() }, context.getString(R.string.controls_media_button_pause) ) } PlaybackState.ACTION_SKIP_TO_PREVIOUS -> { MediaAction( - Icon.createWithResource(context, - com.android.internal.R.drawable.ic_media_previous), + Icon.createWithResource(context, R.drawable.ic_media_prev), { controller.transportControls.skipToPrevious() }, context.getString(R.string.controls_media_button_prev) ) } PlaybackState.ACTION_SKIP_TO_NEXT -> { MediaAction( - Icon.createWithResource(context, com.android.internal.R.drawable.ic_media_next), + Icon.createWithResource(context, R.drawable.ic_media_next), { controller.transportControls.skipToNext() }, context.getString(R.string.controls_media_button_next) ) @@ -900,7 +878,7 @@ class MediaDataManager( private fun getResumeMediaAction(action: Runnable): MediaAction { return MediaAction( - Icon.createWithResource(context, R.drawable.lb_ic_play).setTint(themeText), + Icon.createWithResource(context, R.drawable.ic_media_play).setTint(themeText), action, context.getString(R.string.controls_media_resume) ) diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaHierarchyManager.kt b/packages/SystemUI/src/com/android/systemui/media/MediaHierarchyManager.kt index 64ebe568c790..6145f0ffebad 100644 --- a/packages/SystemUI/src/com/android/systemui/media/MediaHierarchyManager.kt +++ b/packages/SystemUI/src/com/android/systemui/media/MediaHierarchyManager.kt @@ -567,8 +567,7 @@ class MediaHierarchyManager @Inject constructor( previousLocation = this.desiredLocation } else if (forceStateUpdate) { val onLockscreen = (!bypassController.bypassEnabled && - (statusbarState == StatusBarState.KEYGUARD || - statusbarState == StatusBarState.FULLSCREEN_USER_SWITCHER)) + (statusbarState == StatusBarState.KEYGUARD)) if (desiredLocation == LOCATION_QS && previousLocation == LOCATION_LOCKSCREEN && !onLockscreen) { // If media active state changed and the device is now unlocked, update the @@ -955,8 +954,7 @@ class MediaHierarchyManager @Inject constructor( return desiredLocation } val onLockscreen = (!bypassController.bypassEnabled && - (statusbarState == StatusBarState.KEYGUARD || - statusbarState == StatusBarState.FULLSCREEN_USER_SWITCHER)) + (statusbarState == StatusBarState.KEYGUARD)) val allowedOnLockscreen = notifLockscreenUserManager.shouldShowLockscreenNotifications() val location = when { dreamOverlayActive -> LOCATION_DREAM_OVERLAY @@ -1087,4 +1085,4 @@ private annotation class TransformationType @IntDef(prefix = ["LOCATION_"], value = [MediaHierarchyManager.LOCATION_QS, MediaHierarchyManager.LOCATION_QQS, MediaHierarchyManager.LOCATION_LOCKSCREEN]) @Retention(AnnotationRetention.SOURCE) -annotation class MediaLocation
\ No newline at end of file +annotation class MediaLocation diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaViewHolder.kt b/packages/SystemUI/src/com/android/systemui/media/MediaViewHolder.kt index c333b504e607..e57b247da055 100644 --- a/packages/SystemUI/src/com/android/systemui/media/MediaViewHolder.kt +++ b/packages/SystemUI/src/com/android/systemui/media/MediaViewHolder.kt @@ -35,6 +35,7 @@ abstract class MediaViewHolder constructor(itemView: View) { val player = itemView as TransitionLayout // Player information + val albumView = itemView.requireViewById<ImageView>(R.id.album_art) val appIcon = itemView.requireViewById<ImageView>(R.id.icon) val titleText = itemView.requireViewById<TextView>(R.id.header_title) val artistText = itemView.requireViewById<TextView>(R.id.header_artist) @@ -53,8 +54,9 @@ abstract class MediaViewHolder constructor(itemView: View) { // Settings screen val longPressText = itemView.requireViewById<TextView>(R.id.remove_text) val cancel = itemView.requireViewById<View>(R.id.cancel) + val cancelText = itemView.requireViewById<TextView>(R.id.cancel_text) val dismiss = itemView.requireViewById<ViewGroup>(R.id.dismiss) - val dismissLabel = dismiss.getChildAt(0) + val dismissText = itemView.requireViewById<TextView>(R.id.dismiss_text) val settings = itemView.requireViewById<View>(R.id.settings) val settingsText = itemView.requireViewById<TextView>(R.id.settings_text) diff --git a/packages/SystemUI/src/com/android/systemui/media/PlayerViewHolder.kt b/packages/SystemUI/src/com/android/systemui/media/PlayerViewHolder.kt index a1faa402d0ff..20b2d4a452f5 100644 --- a/packages/SystemUI/src/com/android/systemui/media/PlayerViewHolder.kt +++ b/packages/SystemUI/src/com/android/systemui/media/PlayerViewHolder.kt @@ -20,7 +20,6 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.ImageButton -import android.widget.ImageView import android.widget.TextView import com.android.systemui.R @@ -29,9 +28,6 @@ import com.android.systemui.R */ class PlayerViewHolder private constructor(itemView: View) : MediaViewHolder(itemView) { - // Player information - val albumView = itemView.requireViewById<ImageView>(R.id.album_art) - // Seek bar val progressTimes = itemView.requireViewById<ViewGroup>(R.id.notification_media_progress_time) override val elapsedTimeView = itemView.requireViewById<TextView>(R.id.media_elapsed_time) diff --git a/packages/SystemUI/src/com/android/systemui/media/dagger/MediaModule.java b/packages/SystemUI/src/com/android/systemui/media/dagger/MediaModule.java index 2bc910e4a21a..663877ce1388 100644 --- a/packages/SystemUI/src/com/android/systemui/media/dagger/MediaModule.java +++ b/packages/SystemUI/src/com/android/systemui/media/dagger/MediaModule.java @@ -21,19 +21,22 @@ import android.content.Context; import android.view.WindowManager; import com.android.systemui.dagger.SysUISingleton; +import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.media.MediaDataManager; import com.android.systemui.media.MediaHierarchyManager; import com.android.systemui.media.MediaHost; import com.android.systemui.media.MediaHostStatesManager; import com.android.systemui.media.dream.dagger.MediaComplicationComponent; +import com.android.systemui.media.nearby.NearbyMediaDevicesService; import com.android.systemui.media.taptotransfer.MediaTttCommandLineHelper; import com.android.systemui.media.taptotransfer.MediaTttFlags; import com.android.systemui.media.taptotransfer.receiver.MediaTttChipControllerReceiver; import com.android.systemui.media.taptotransfer.sender.MediaTttChipControllerSender; -import com.android.systemui.media.taptotransfer.sender.MediaTttSenderService; +import com.android.systemui.statusbar.CommandQueue; import com.android.systemui.statusbar.commandline.CommandRegistry; import java.util.Optional; +import java.util.concurrent.Executor; import javax.inject.Named; @@ -98,12 +101,13 @@ public interface MediaModule { @SysUISingleton static Optional<MediaTttChipControllerSender> providesMediaTttChipControllerSender( MediaTttFlags mediaTttFlags, + CommandQueue commandQueue, Context context, WindowManager windowManager) { if (!mediaTttFlags.isMediaTttEnabled()) { return Optional.empty(); } - return Optional.of(new MediaTttChipControllerSender(context, windowManager)); + return Optional.of(new MediaTttChipControllerSender(commandQueue, context, windowManager)); } /** */ @@ -126,6 +130,7 @@ public interface MediaModule { MediaTttFlags mediaTttFlags, CommandRegistry commandRegistry, Context context, + @Main Executor mainExecutor, MediaTttChipControllerReceiver mediaTttChipControllerReceiver) { if (!mediaTttFlags.isMediaTttEnabled()) { return Optional.empty(); @@ -134,12 +139,13 @@ public interface MediaModule { new MediaTttCommandLineHelper( commandRegistry, context, + mainExecutor, mediaTttChipControllerReceiver)); } - /** Inject into MediaTttSenderService. */ + /** Inject into NearbyMediaDevicesService. */ @Binds @IntoMap - @ClassKey(MediaTttSenderService.class) - Service bindMediaTttSenderService(MediaTttSenderService service); + @ClassKey(NearbyMediaDevicesService.class) + Service bindMediaNearbyDevicesService(NearbyMediaDevicesService service); } diff --git a/packages/SystemUI/src/com/android/systemui/media/dream/MediaDreamComplication.java b/packages/SystemUI/src/com/android/systemui/media/dream/MediaDreamComplication.java index 2c35db337cda..7c0481049098 100644 --- a/packages/SystemUI/src/com/android/systemui/media/dream/MediaDreamComplication.java +++ b/packages/SystemUI/src/com/android/systemui/media/dream/MediaDreamComplication.java @@ -37,6 +37,11 @@ public class MediaDreamComplication implements Complication { } @Override + public int getRequiredTypeAvailability() { + return COMPLICATION_TYPE_CAST_INFO; + } + + @Override public ViewHolder createView(ComplicationViewModel model) { return mComponentFactory.create().getViewHolder(); } diff --git a/packages/SystemUI/src/com/android/systemui/media/nearby/MediaNearbyDevicesManager.kt b/packages/SystemUI/src/com/android/systemui/media/nearby/MediaNearbyDevicesManager.kt deleted file mode 100644 index 0453fdb45931..000000000000 --- a/packages/SystemUI/src/com/android/systemui/media/nearby/MediaNearbyDevicesManager.kt +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (C) 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.systemui.media.nearby - -import com.android.systemui.dagger.SysUISingleton - -/** - * A manager that returns information about devices that are nearby and can receive media transfers. - */ -@SysUISingleton -class MediaNearbyDevicesManager { - - /** Returns a list containing the current nearby devices. */ - fun getCurrentNearbyDevices(): List<NearbyDevice> { - // TODO(b/216313420): Implement this function. - return emptyList() - } - - /** - * Registers [callback] to be notified each time a device's range changes or when a new device - * comes within range. - */ - fun registerNearbyDevicesCallback( - callback: (device: NearbyDevice) -> Unit - ) { - // TODO(b/216313420): Implement this function. - } - - /** - * Un-registers [callback]. See [registerNearbyDevicesCallback]. - */ - fun unregisterNearbyDevicesCallback( - callback: (device: NearbyDevice) -> Unit - ) { - // TODO(b/216313420): Implement this function. - } -} diff --git a/packages/SystemUI/src/com/android/systemui/media/nearby/NearbyMediaDevicesService.kt b/packages/SystemUI/src/com/android/systemui/media/nearby/NearbyMediaDevicesService.kt new file mode 100644 index 000000000000..eaf2bd96e37a --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/media/nearby/NearbyMediaDevicesService.kt @@ -0,0 +1,81 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.media.nearby + +import android.app.Service +import android.content.Intent +import android.os.IBinder +import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.shared.media.INearbyMediaDevicesProvider +import com.android.systemui.shared.media.INearbyMediaDevicesService +import com.android.systemui.shared.media.INearbyMediaDevicesUpdateCallback +import com.android.systemui.shared.media.NearbyDevice +import javax.inject.Inject + +/** + * A service that acts as a bridge between (1) external clients that have data on nearby devices + * that are able to play media and (2) internal clients (like media Output Switcher) that need data + * on these nearby devices. + * + * TODO(b/216313420): Add logging to this class. + */ +@SysUISingleton +class NearbyMediaDevicesService @Inject constructor() : Service() { + + private var provider: INearbyMediaDevicesProvider? = null + + private val binder: IBinder = object : INearbyMediaDevicesService.Stub() { + override fun registerProvider(newProvider: INearbyMediaDevicesProvider) { + provider = newProvider + newProvider.asBinder().linkToDeath( + { + // We might've gotten a new provider before the old provider died, so we only + // need to clear our provider if the most recent provider died. + if (provider == newProvider) { + provider = null + } + }, + /* flags= */ 0 + ) + } + } + + override fun onBind(intent: Intent?): IBinder = binder + + /** Returns a list containing the current nearby devices. */ + fun getCurrentNearbyDevices(): List<NearbyDevice> { + val currentProvider = provider ?: return emptyList() + return currentProvider.currentNearbyDevices + } + + /** + * Registers [callback] to be notified each time a device's range changes or when a new device + * comes within range. + */ + fun registerNearbyDevicesCallback(callback: INearbyMediaDevicesUpdateCallback) { + val currentProvider = provider ?: return + currentProvider.registerNearbyDevicesCallback(callback) + } + + /** + * Un-registers [callback]. See [registerNearbyDevicesCallback]. + */ + fun unregisterNearbyDevicesCallback(callback: INearbyMediaDevicesUpdateCallback) { + val currentProvider = provider ?: return + currentProvider.unregisterNearbyDevicesCallback(callback) + } +} diff --git a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/MediaTttCommandLineHelper.kt b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/MediaTttCommandLineHelper.kt index 37208515120a..1ea21ce7728b 100644 --- a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/MediaTttCommandLineHelper.kt +++ b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/MediaTttCommandLineHelper.kt @@ -16,34 +16,29 @@ package com.android.systemui.media.taptotransfer -import android.content.ComponentName +import android.app.StatusBarManager import android.content.Context -import android.content.Intent -import android.content.ServiceConnection import android.graphics.Color import android.graphics.drawable.Icon import android.media.MediaRoute2Info -import android.os.IBinder import android.util.Log import androidx.annotation.VisibleForTesting import com.android.systemui.R import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.media.taptotransfer.receiver.MediaTttChipControllerReceiver import com.android.systemui.media.taptotransfer.receiver.ChipStateReceiver -import com.android.systemui.media.taptotransfer.sender.MediaTttSenderService -import com.android.systemui.media.taptotransfer.sender.MoveCloserToEndCast -import com.android.systemui.media.taptotransfer.sender.MoveCloserToStartCast +import com.android.systemui.media.taptotransfer.sender.AlmostCloseToEndCast +import com.android.systemui.media.taptotransfer.sender.AlmostCloseToStartCast import com.android.systemui.media.taptotransfer.sender.TransferFailed import com.android.systemui.media.taptotransfer.sender.TransferToReceiverTriggered import com.android.systemui.media.taptotransfer.sender.TransferToThisDeviceSucceeded import com.android.systemui.media.taptotransfer.sender.TransferToThisDeviceTriggered import com.android.systemui.media.taptotransfer.sender.TransferToReceiverSucceeded -import com.android.systemui.shared.mediattt.DeviceInfo -import com.android.systemui.shared.mediattt.IDeviceSenderService -import com.android.systemui.shared.mediattt.IUndoTransferCallback import com.android.systemui.statusbar.commandline.Command import com.android.systemui.statusbar.commandline.CommandRegistry import java.io.PrintWriter +import java.util.concurrent.Executor import javax.inject.Inject /** @@ -54,16 +49,36 @@ import javax.inject.Inject class MediaTttCommandLineHelper @Inject constructor( commandRegistry: CommandRegistry, private val context: Context, + @Main private val mainExecutor: Executor, private val mediaTttChipControllerReceiver: MediaTttChipControllerReceiver, ) { - private var senderService: IDeviceSenderService? = null - private val senderServiceConnection = SenderServiceConnection() - private val appIconDrawable = Icon.createWithResource(context, R.drawable.ic_avatar_user).loadDrawable(context).also { it.setTint(Color.YELLOW) } + /** + * A map from a display state string typed in the command line to the display int it represents. + */ + private val stateStringToStateInt: Map<String, Int> = mapOf( + AlmostCloseToStartCast::class.simpleName!! + to StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_ALMOST_CLOSE_TO_START_CAST, + AlmostCloseToEndCast::class.simpleName!! + to StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_ALMOST_CLOSE_TO_END_CAST, + TransferToReceiverTriggered::class.simpleName!! + to StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_RECEIVER_TRIGGERED, + TransferToThisDeviceTriggered::class.simpleName!! + to StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_THIS_DEVICE_TRIGGERED, + TransferToReceiverSucceeded::class.simpleName!! + to StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_RECEIVER_SUCCEEDED, + TransferToThisDeviceSucceeded::class.simpleName!! + to StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_THIS_DEVICE_SUCCEEDED, + TransferFailed::class.simpleName!! + to StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_RECEIVER_FAILED, + FAR_FROM_RECEIVER_STATE + to StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_FAR_FROM_RECEIVER + ) + init { commandRegistry.registerCommand(SENDER_COMMAND) { SenderCommand() } commandRegistry.registerCommand( @@ -75,117 +90,63 @@ class MediaTttCommandLineHelper @Inject constructor( /** All commands for the sender device. */ inner class SenderCommand : Command { override fun execute(pw: PrintWriter, args: List<String>) { - val otherDeviceName = args[0] - val mediaInfo = MediaRoute2Info.Builder("id", "Test Name") - .addFeature("feature") - .build() - val otherDeviceInfo = DeviceInfo(otherDeviceName) - - when (args[1]) { - MOVE_CLOSER_TO_START_CAST_COMMAND_NAME -> { - runOnService { senderService -> - senderService.closeToReceiverToStartCast(mediaInfo, otherDeviceInfo) - } - } - MOVE_CLOSER_TO_END_CAST_COMMAND_NAME -> { - runOnService { senderService -> - senderService.closeToReceiverToEndCast(mediaInfo, otherDeviceInfo) - } - } - TRANSFER_TO_RECEIVER_TRIGGERED_COMMAND_NAME -> { - runOnService { senderService -> - senderService.transferToReceiverTriggered(mediaInfo, otherDeviceInfo) - } - } - TRANSFER_TO_THIS_DEVICE_TRIGGERED_COMMAND_NAME -> { - runOnService { senderService -> - senderService.transferToThisDeviceTriggered(mediaInfo, otherDeviceInfo) - } - } - TRANSFER_TO_RECEIVER_SUCCEEDED_COMMAND_NAME -> { - val undoCallback = object : IUndoTransferCallback.Stub() { - override fun onUndoTriggered() { - Log.i(TAG, "Undo transfer to receiver callback triggered") - // The external services that implement this callback would kick off a - // transfer back to this device, so mimic that here. - runOnService { senderService -> - senderService - .transferToThisDeviceTriggered(mediaInfo, otherDeviceInfo) - } - } - } - runOnService { senderService -> - senderService - .transferToReceiverSucceeded(mediaInfo, otherDeviceInfo, undoCallback) - } - } - TRANSFER_TO_THIS_DEVICE_SUCCEEDED_COMMAND_NAME -> { - val undoCallback = object : IUndoTransferCallback.Stub() { - override fun onUndoTriggered() { - Log.i(TAG, "Undo transfer to this device callback triggered") - // The external services that implement this callback would kick off a - // transfer back to the receiver, so mimic that here. - runOnService { senderService -> - senderService - .transferToReceiverTriggered(mediaInfo, otherDeviceInfo) - } - } - } - runOnService { senderService -> - senderService - .transferToThisDeviceSucceeded(mediaInfo, otherDeviceInfo, undoCallback) - } - } - TRANSFER_FAILED_COMMAND_NAME -> { - runOnService { senderService -> - senderService.transferFailed(mediaInfo, otherDeviceInfo) - } - } - NO_LONGER_CLOSE_TO_RECEIVER_COMMAND_NAME -> { - runOnService { senderService -> - senderService.noLongerCloseToReceiver(mediaInfo, otherDeviceInfo) - context.unbindService(senderServiceConnection) - } - } - else -> { - pw.println("Sender command must be one of " + - "$MOVE_CLOSER_TO_START_CAST_COMMAND_NAME, " + - "$MOVE_CLOSER_TO_END_CAST_COMMAND_NAME, " + - "$TRANSFER_TO_RECEIVER_TRIGGERED_COMMAND_NAME, " + - "$TRANSFER_TO_THIS_DEVICE_TRIGGERED_COMMAND_NAME, " + - "$TRANSFER_TO_RECEIVER_SUCCEEDED_COMMAND_NAME, " + - "$TRANSFER_TO_THIS_DEVICE_SUCCEEDED_COMMAND_NAME, " + - "$TRANSFER_FAILED_COMMAND_NAME, " + - NO_LONGER_CLOSE_TO_RECEIVER_COMMAND_NAME - ) - } + val routeInfo = MediaRoute2Info.Builder("id", args[0]) + .addFeature("feature") + .build() + + @StatusBarManager.MediaTransferSenderState + val displayState = stateStringToStateInt[args[1]] + if (displayState == null) { + pw.println("Invalid command name") + return } + + val statusBarManager = context.getSystemService(Context.STATUS_BAR_SERVICE) + as StatusBarManager + statusBarManager.updateMediaTapToTransferSenderDisplay( + displayState, + routeInfo, + getUndoExecutor(displayState), + getUndoCallback(displayState) + ) } - override fun help(pw: PrintWriter) { - pw.println("Usage: adb shell cmd statusbar $SENDER_COMMAND <deviceName> <chipStatus>") + private fun getUndoExecutor( + @StatusBarManager.MediaTransferSenderState displayState: Int + ): Executor? { + return if (isSucceededState(displayState)) { + mainExecutor + } else { + null + } } - private fun runOnService(command: SenderServiceCommand) { - val currentService = senderService - if (currentService != null) { - command.run(currentService) + private fun getUndoCallback( + @StatusBarManager.MediaTransferSenderState displayState: Int + ): Runnable? { + return if (isSucceededState(displayState)) { + Runnable { Log.i(CLI_TAG, "Undo triggered for $displayState") } } else { - bindService(command) + null } } - private fun bindService(command: SenderServiceCommand) { - senderServiceConnection.pendingCommand = command - val binding = context.bindService( - Intent(context, MediaTttSenderService::class.java), - senderServiceConnection, - Context.BIND_AUTO_CREATE - ) - Log.i(TAG, "Starting service binding? $binding") + private fun isSucceededState( + @StatusBarManager.MediaTransferSenderState displayState: Int + ): Boolean { + return displayState == + StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_RECEIVER_SUCCEEDED || + displayState == + StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_THIS_DEVICE_SUCCEEDED + } + + override fun help(pw: PrintWriter) { + pw.println("Usage: adb shell cmd statusbar $SENDER_COMMAND <deviceName> <chipState>") } } + // TODO(b/216318437): Migrate the receiver callbacks to StatusBarManager. + /** A command to DISPLAY the media ttt chip on the RECEIVER device. */ inner class AddChipCommandReceiver : Command { override fun execute(pw: PrintWriter, args: List<String>) { @@ -207,57 +168,20 @@ class MediaTttCommandLineHelper @Inject constructor( pw.println("Usage: adb shell cmd statusbar $REMOVE_CHIP_COMMAND_RECEIVER_TAG") } } - - /** A service connection for [IDeviceSenderService]. */ - private inner class SenderServiceConnection : ServiceConnection { - // A command that should be run when the service gets connected. - var pendingCommand: SenderServiceCommand? = null - - override fun onServiceConnected(className: ComponentName, service: IBinder) { - val newCallback = IDeviceSenderService.Stub.asInterface(service) - senderService = newCallback - pendingCommand?.run(newCallback) - pendingCommand = null - } - - override fun onServiceDisconnected(className: ComponentName) { - senderService = null - } - } - - /** An interface defining a command that should be run on the sender service. */ - private fun interface SenderServiceCommand { - /** Runs the command on the provided [senderService]. */ - fun run(senderService: IDeviceSenderService) - } } @VisibleForTesting const val SENDER_COMMAND = "media-ttt-chip-sender" @VisibleForTesting -const val REMOVE_CHIP_COMMAND_SENDER_TAG = "media-ttt-chip-remove-sender" -@VisibleForTesting const val ADD_CHIP_COMMAND_RECEIVER_TAG = "media-ttt-chip-add-receiver" @VisibleForTesting const val REMOVE_CHIP_COMMAND_RECEIVER_TAG = "media-ttt-chip-remove-receiver" @VisibleForTesting -val MOVE_CLOSER_TO_START_CAST_COMMAND_NAME = MoveCloserToStartCast::class.simpleName!! -@VisibleForTesting -val MOVE_CLOSER_TO_END_CAST_COMMAND_NAME = MoveCloserToEndCast::class.simpleName!! -@VisibleForTesting -val TRANSFER_TO_RECEIVER_TRIGGERED_COMMAND_NAME = TransferToReceiverTriggered::class.simpleName!! -@VisibleForTesting -val TRANSFER_TO_THIS_DEVICE_TRIGGERED_COMMAND_NAME = - TransferToThisDeviceTriggered::class.simpleName!! -@VisibleForTesting -val TRANSFER_TO_RECEIVER_SUCCEEDED_COMMAND_NAME = TransferToReceiverSucceeded::class.simpleName!! -@VisibleForTesting -val TRANSFER_TO_THIS_DEVICE_SUCCEEDED_COMMAND_NAME = - TransferToThisDeviceSucceeded::class.simpleName!! -@VisibleForTesting -val TRANSFER_FAILED_COMMAND_NAME = TransferFailed::class.simpleName!! -@VisibleForTesting -val NO_LONGER_CLOSE_TO_RECEIVER_COMMAND_NAME = "NoLongerCloseToReceiver" +val FAR_FROM_RECEIVER_STATE = "FarFromReceiver" private const val APP_ICON_CONTENT_DESCRIPTION = "Fake media app icon" -private const val TAG = "MediaTapToTransferCli" +private const val CLI_TAG = "MediaTransferCli" + +private val routeInfo = MediaRoute2Info.Builder("id", "Test Name") + .addFeature("feature") + .build()
\ No newline at end of file diff --git a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/ChipStateSender.kt b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/ChipStateSender.kt index c656df2e0a35..05baf7806bda 100644 --- a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/ChipStateSender.kt +++ b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/ChipStateSender.kt @@ -19,9 +19,9 @@ package com.android.systemui.media.taptotransfer.sender import android.content.Context import android.graphics.drawable.Drawable import android.view.View +import com.android.internal.statusbar.IUndoMediaTransferCallback import com.android.systemui.R import com.android.systemui.media.taptotransfer.common.MediaTttChipState -import com.android.systemui.shared.mediattt.IUndoTransferCallback /** * A class that stores all the information necessary to display the media tap-to-transfer chip on @@ -59,7 +59,7 @@ sealed class ChipStateSender( * * @property otherDeviceName the name of the other device involved in the transfer. */ -class MoveCloserToStartCast( +class AlmostCloseToStartCast( appIconDrawable: Drawable, appIconContentDescription: String, private val otherDeviceName: String, @@ -76,7 +76,7 @@ class MoveCloserToStartCast( * * @property otherDeviceName the name of the other device involved in the transfer. */ -class MoveCloserToEndCast( +class AlmostCloseToEndCast( appIconDrawable: Drawable, appIconContentDescription: String, private val otherDeviceName: String, @@ -130,7 +130,7 @@ class TransferToReceiverSucceeded( appIconDrawable: Drawable, appIconContentDescription: String, private val otherDeviceName: String, - val undoCallback: IUndoTransferCallback? = null + val undoCallback: IUndoMediaTransferCallback? = null ) : ChipStateSender(appIconDrawable, appIconContentDescription) { override fun getChipTextString(context: Context): String { return context.getString(R.string.media_transfer_playing_different_device, otherDeviceName) @@ -169,7 +169,7 @@ class TransferToThisDeviceSucceeded( appIconDrawable: Drawable, appIconContentDescription: String, private val otherDeviceName: String, - val undoCallback: IUndoTransferCallback? = null + val undoCallback: IUndoMediaTransferCallback? = null ) : ChipStateSender(appIconDrawable, appIconContentDescription) { override fun getChipTextString(context: Context): String { return context.getString(R.string.media_transfer_playing_this_device) diff --git a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/MediaTttChipControllerSender.kt b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/MediaTttChipControllerSender.kt index 453e3d627bc8..d1790d2fd5e1 100644 --- a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/MediaTttChipControllerSender.kt +++ b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/MediaTttChipControllerSender.kt @@ -16,14 +16,21 @@ package com.android.systemui.media.taptotransfer.sender +import android.app.StatusBarManager import android.content.Context +import android.graphics.Color +import android.graphics.drawable.Icon +import android.media.MediaRoute2Info +import android.util.Log import android.view.View import android.view.ViewGroup import android.view.WindowManager import android.widget.TextView +import com.android.internal.statusbar.IUndoMediaTransferCallback import com.android.systemui.R import com.android.systemui.dagger.SysUISingleton import com.android.systemui.media.taptotransfer.common.MediaTttChipControllerCommon +import com.android.systemui.statusbar.CommandQueue import javax.inject.Inject /** @@ -32,11 +39,93 @@ import javax.inject.Inject */ @SysUISingleton class MediaTttChipControllerSender @Inject constructor( + commandQueue: CommandQueue, context: Context, windowManager: WindowManager, ) : MediaTttChipControllerCommon<ChipStateSender>( context, windowManager, R.layout.media_ttt_chip ) { + // TODO(b/216141276): Use app icon from media route info instead of this fake one. + private val fakeAppIconDrawable = + Icon.createWithResource(context, R.drawable.ic_avatar_user).loadDrawable(context).also { + it.setTint(Color.YELLOW) + } + + private val commandQueueCallbacks = object : CommandQueue.Callbacks { + override fun updateMediaTapToTransferSenderDisplay( + @StatusBarManager.MediaTransferSenderState displayState: Int, + routeInfo: MediaRoute2Info, + undoCallback: IUndoMediaTransferCallback? + ) { + this@MediaTttChipControllerSender.updateMediaTapToTransferSenderDisplay( + displayState, routeInfo, undoCallback + ) + } + } + + init { + commandQueue.addCallback(commandQueueCallbacks) + } + + private fun updateMediaTapToTransferSenderDisplay( + @StatusBarManager.MediaTransferSenderState displayState: Int, + routeInfo: MediaRoute2Info, + undoCallback: IUndoMediaTransferCallback? + ) { + // TODO(b/217418566): This app icon content description is incorrect -- + // routeInfo.name is the name of the device, not the name of the app. + val appIconContentDescription = routeInfo.name.toString() + val otherDeviceName = routeInfo.name.toString() + val chipState = when(displayState) { + StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_ALMOST_CLOSE_TO_START_CAST -> + AlmostCloseToStartCast( + fakeAppIconDrawable, appIconContentDescription, otherDeviceName + ) + StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_ALMOST_CLOSE_TO_END_CAST -> + AlmostCloseToEndCast( + fakeAppIconDrawable, appIconContentDescription, otherDeviceName + ) + StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_RECEIVER_TRIGGERED -> + TransferToReceiverTriggered( + fakeAppIconDrawable, appIconContentDescription, otherDeviceName + ) + StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_THIS_DEVICE_TRIGGERED -> + TransferToThisDeviceTriggered( + fakeAppIconDrawable, appIconContentDescription + ) + StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_RECEIVER_SUCCEEDED -> + TransferToReceiverSucceeded( + fakeAppIconDrawable, + appIconContentDescription, + otherDeviceName, + undoCallback + ) + StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_THIS_DEVICE_SUCCEEDED -> + TransferToThisDeviceSucceeded( + fakeAppIconDrawable, + appIconContentDescription, + otherDeviceName, + undoCallback + ) + StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_RECEIVER_FAILED, + StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_THIS_DEVICE_FAILED -> + TransferFailed( + fakeAppIconDrawable, appIconContentDescription + ) + StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_FAR_FROM_RECEIVER -> { + removeChip() + null + } + else -> { + Log.e(SENDER_TAG, "Unhandled MediaTransferSenderState $displayState") + null + } + } + + chipState?.let { + displayChip(it) + } + } /** Displays the chip view for the given state. */ override fun updateChipView(chipState: ChipStateSender, currentChipView: ViewGroup) { @@ -64,3 +153,5 @@ class MediaTttChipControllerSender @Inject constructor( if (showFailure) { View.VISIBLE } else { View.GONE } } } + +const val SENDER_TAG = "MediaTapToTransferSender" diff --git a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/MediaTttSenderService.kt b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/MediaTttSenderService.kt deleted file mode 100644 index 717752e536b0..000000000000 --- a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/MediaTttSenderService.kt +++ /dev/null @@ -1,182 +0,0 @@ -/* - * Copyright (C) 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.systemui.media.taptotransfer.sender - -import android.app.Service -import android.content.Context -import android.content.Intent -import android.graphics.Color -import android.graphics.drawable.Icon -import android.media.MediaRoute2Info -import android.os.IBinder -import com.android.systemui.R -import com.android.systemui.shared.mediattt.DeviceInfo -import com.android.systemui.shared.mediattt.IUndoTransferCallback -import com.android.systemui.shared.mediattt.IDeviceSenderService -import javax.inject.Inject - -/** - * Service that allows external handlers to trigger the media chip on the sender device. - */ -class MediaTttSenderService @Inject constructor( - context: Context, - val controller: MediaTttChipControllerSender -) : Service() { - - // TODO(b/203800643): Add logging when callbacks trigger. - private val binder: IBinder = object : IDeviceSenderService.Stub() { - override fun closeToReceiverToStartCast( - mediaInfo: MediaRoute2Info, otherDeviceInfo: DeviceInfo - ) { - this@MediaTttSenderService.closeToReceiverToStartCast(mediaInfo, otherDeviceInfo) - } - - override fun closeToReceiverToEndCast( - mediaInfo: MediaRoute2Info, otherDeviceInfo: DeviceInfo - ) { - this@MediaTttSenderService.closeToReceiverToEndCast(mediaInfo, otherDeviceInfo) - } - - override fun transferFailed( - mediaInfo: MediaRoute2Info, otherDeviceInfo: DeviceInfo - ) { - this@MediaTttSenderService.transferFailed(mediaInfo) - } - - override fun transferToReceiverTriggered( - mediaInfo: MediaRoute2Info, otherDeviceInfo: DeviceInfo - ) { - this@MediaTttSenderService.transferToReceiverTriggered(mediaInfo, otherDeviceInfo) - } - - override fun transferToThisDeviceTriggered( - mediaInfo: MediaRoute2Info, otherDeviceInfo: DeviceInfo - ) { - this@MediaTttSenderService.transferToThisDeviceTriggered(mediaInfo) - } - - override fun transferToReceiverSucceeded( - mediaInfo: MediaRoute2Info, - otherDeviceInfo: DeviceInfo, - undoCallback: IUndoTransferCallback - ) { - this@MediaTttSenderService.transferToReceiverSucceeded( - mediaInfo, otherDeviceInfo, undoCallback - ) - } - - override fun transferToThisDeviceSucceeded( - mediaInfo: MediaRoute2Info, - otherDeviceInfo: DeviceInfo, - undoCallback: IUndoTransferCallback - ) { - this@MediaTttSenderService.transferToThisDeviceSucceeded( - mediaInfo, otherDeviceInfo, undoCallback - ) - } - - override fun noLongerCloseToReceiver( - mediaInfo: MediaRoute2Info, - otherDeviceInfo: DeviceInfo - ) { - this@MediaTttSenderService.noLongerCloseToReceiver() - } - } - - // TODO(b/203800643): Use the app icon from the media info instead of a fake one. - private val fakeAppIconDrawable = - Icon.createWithResource(context, R.drawable.ic_avatar_user).loadDrawable(context).also { - it.setTint(Color.YELLOW) - } - - override fun onBind(intent: Intent?): IBinder = binder - - private fun closeToReceiverToStartCast( - mediaInfo: MediaRoute2Info, otherDeviceInfo: DeviceInfo - ) { - val chipState = MoveCloserToStartCast( - appIconDrawable = fakeAppIconDrawable, - appIconContentDescription = mediaInfo.name.toString(), - otherDeviceName = otherDeviceInfo.name - ) - controller.displayChip(chipState) - } - - private fun closeToReceiverToEndCast(mediaInfo: MediaRoute2Info, otherDeviceInfo: DeviceInfo) { - val chipState = MoveCloserToEndCast( - appIconDrawable = fakeAppIconDrawable, - appIconContentDescription = mediaInfo.name.toString(), - otherDeviceName = otherDeviceInfo.name - ) - controller.displayChip(chipState) - } - - private fun transferFailed(mediaInfo: MediaRoute2Info) { - val chipState = TransferFailed( - appIconDrawable = fakeAppIconDrawable, - appIconContentDescription = mediaInfo.name.toString() - ) - controller.displayChip(chipState) - } - - private fun transferToReceiverTriggered( - mediaInfo: MediaRoute2Info, otherDeviceInfo: DeviceInfo - ) { - val chipState = TransferToReceiverTriggered( - appIconDrawable = fakeAppIconDrawable, - appIconContentDescription = mediaInfo.name.toString(), - otherDeviceName = otherDeviceInfo.name - ) - controller.displayChip(chipState) - } - - private fun transferToThisDeviceTriggered(mediaInfo: MediaRoute2Info) { - val chipState = TransferToThisDeviceTriggered( - appIconDrawable = fakeAppIconDrawable, - appIconContentDescription = mediaInfo.name.toString() - ) - controller.displayChip(chipState) - } - - private fun transferToReceiverSucceeded( - mediaInfo: MediaRoute2Info, otherDeviceInfo: DeviceInfo, undoCallback: IUndoTransferCallback - ) { - val chipState = TransferToReceiverSucceeded( - appIconDrawable = fakeAppIconDrawable, - appIconContentDescription = mediaInfo.name.toString(), - otherDeviceName = otherDeviceInfo.name, - undoCallback = undoCallback - ) - controller.displayChip(chipState) - } - - private fun transferToThisDeviceSucceeded( - mediaInfo: MediaRoute2Info, otherDeviceInfo: DeviceInfo, undoCallback: IUndoTransferCallback - ) { - val chipState = TransferToThisDeviceSucceeded( - appIconDrawable = fakeAppIconDrawable, - appIconContentDescription = mediaInfo.name.toString(), - otherDeviceName = otherDeviceInfo.name, - undoCallback = undoCallback - ) - controller.displayChip(chipState) - } - - private fun noLongerCloseToReceiver() { - controller.removeChip() - } -} diff --git a/packages/SystemUI/src/com/android/systemui/qs/FgsManagerController.kt b/packages/SystemUI/src/com/android/systemui/qs/FgsManagerController.kt new file mode 100644 index 000000000000..eb3415639db6 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/qs/FgsManagerController.kt @@ -0,0 +1,430 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.qs + +import android.app.IActivityManager +import android.app.IForegroundServiceObserver +import android.content.Context +import android.content.pm.PackageManager +import android.graphics.drawable.Drawable +import android.os.IBinder +import android.os.PowerExemptionManager +import android.os.RemoteException +import android.provider.DeviceConfig.NAMESPACE_SYSTEMUI +import android.text.format.DateUtils +import android.util.ArrayMap +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.Button +import android.widget.ImageView +import android.widget.TextView +import androidx.annotation.GuardedBy +import androidx.recyclerview.widget.DiffUtil +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView +import com.android.internal.config.sysui.SystemUiDeviceConfigFlags.TASK_MANAGER_ENABLED +import com.android.systemui.R +import com.android.systemui.animation.DialogLaunchAnimator +import com.android.systemui.dagger.qualifiers.Background +import com.android.systemui.dagger.qualifiers.Main +import com.android.systemui.statusbar.phone.SystemUIDialog +import com.android.systemui.util.DeviceConfigProxy +import com.android.systemui.util.time.SystemClock +import java.util.Objects +import java.util.concurrent.Executor +import javax.inject.Inject +import kotlin.math.max + +class FgsManagerController @Inject constructor( + private val context: Context, + @Main private val mainExecutor: Executor, + @Background private val backgroundExecutor: Executor, + private val systemClock: SystemClock, + private val activityManager: IActivityManager, + private val packageManager: PackageManager, + private val deviceConfigProxy: DeviceConfigProxy, + private val dialogLaunchAnimator: DialogLaunchAnimator +) : IForegroundServiceObserver.Stub() { + + companion object { + private val LOG_TAG = FgsManagerController::class.java.simpleName + } + + private var isAvailable = false + + private val lock = Any() + + @GuardedBy("lock") + var initialized = false + + @GuardedBy("lock") + private val runningServiceTokens = mutableMapOf<UserPackage, StartTimeAndTokens>() + + @GuardedBy("lock") + private var dialog: SystemUIDialog? = null + + @GuardedBy("lock") + private val appListAdapter: AppListAdapter = AppListAdapter() + + @GuardedBy("lock") + private var runningApps: ArrayMap<UserPackage, RunningApp> = ArrayMap() + + interface OnNumberOfPackagesChangedListener { + fun onNumberOfPackagesChanged(numPackages: Int) + } + + interface OnDialogDismissedListener { + fun onDialogDismissed() + } + + fun init() { + synchronized(lock) { + if (initialized) { + return + } + try { + activityManager.registerForegroundServiceObserver(this) + } catch (e: RemoteException) { + e.rethrowFromSystemServer() + } + + deviceConfigProxy.addOnPropertiesChangedListener(NAMESPACE_SYSTEMUI, + backgroundExecutor) { + isAvailable = it.getBoolean(TASK_MANAGER_ENABLED, isAvailable) + } + + isAvailable = deviceConfigProxy + .getBoolean(NAMESPACE_SYSTEMUI, TASK_MANAGER_ENABLED, false) + + initialized = true + } + } + + override fun onForegroundStateChanged( + token: IBinder, + packageName: String, + userId: Int, + isForeground: Boolean + ) { + synchronized(lock) { + val numPackagesBefore = getNumRunningPackagesLocked() + val userPackageKey = UserPackage(userId, packageName) + if (isForeground) { + runningServiceTokens.getOrPut(userPackageKey, { StartTimeAndTokens(systemClock) }) + .addToken(token) + } else { + if (runningServiceTokens[userPackageKey]?.also { + it.removeToken(token) }?.isEmpty() == true) { + runningServiceTokens.remove(userPackageKey) + } + } + + val numPackagesAfter = getNumRunningPackagesLocked() + + if (numPackagesAfter != numPackagesBefore) { + onNumberOfPackagesChangedListeners.forEach { + backgroundExecutor.execute { it.onNumberOfPackagesChanged(numPackagesAfter) } + } + } + + updateAppItemsLocked() + } + } + + @GuardedBy("lock") + val onNumberOfPackagesChangedListeners: MutableSet<OnNumberOfPackagesChangedListener> = + mutableSetOf() + + @GuardedBy("lock") + val onDialogDismissedListeners: MutableSet<OnDialogDismissedListener> = mutableSetOf() + + fun addOnNumberOfPackagesChangedListener(listener: OnNumberOfPackagesChangedListener) { + synchronized(lock) { + onNumberOfPackagesChangedListeners.add(listener) + } + } + + fun removeOnNumberOfPackagesChangedListener(listener: OnNumberOfPackagesChangedListener) { + synchronized(lock) { + onNumberOfPackagesChangedListeners.remove(listener) + } + } + + fun addOnDialogDismissedListener(listener: OnDialogDismissedListener) { + synchronized(lock) { + onDialogDismissedListeners.add(listener) + } + } + + fun removeOnDialogDismissedListener(listener: OnDialogDismissedListener) { + synchronized(lock) { + onDialogDismissedListeners.remove(listener) + } + } + + fun isAvailable(): Boolean { + return isAvailable + } + + fun getNumRunningPackages(): Int { + synchronized(lock) { + return getNumRunningPackagesLocked() + } + } + + private fun getNumRunningPackagesLocked() = + runningServiceTokens.keys.count { it.uiControl != UIControl.HIDE_ENTRY } + + fun shouldUpdateFooterVisibility() = dialog == null + + fun showDialog(viewLaunchedFrom: View?) { + synchronized(lock) { + if (dialog == null) { + + val dialog = SystemUIDialog(context) + dialog.setTitle(R.string.fgs_manager_dialog_title) + + val dialogContext = dialog.context + + val recyclerView = RecyclerView(dialogContext) + recyclerView.layoutManager = LinearLayoutManager(dialogContext) + recyclerView.adapter = appListAdapter + + dialog.setView(recyclerView) + + this.dialog = dialog + + dialog.setOnDismissListener { + synchronized(lock) { + this.dialog = null + updateAppItemsLocked() + } + onDialogDismissedListeners.forEach { + mainExecutor.execute(it::onDialogDismissed) + } + } + + mainExecutor.execute { + viewLaunchedFrom + ?.let { dialogLaunchAnimator.showFromView(dialog, it) } ?: dialog.show() + } + + backgroundExecutor.execute { + synchronized(lock) { + updateAppItemsLocked() + } + } + } + } + } + + @GuardedBy("lock") + private fun updateAppItemsLocked() { + if (dialog == null) { + runningApps.clear() + return + } + + val addedPackages = runningServiceTokens.keys.filter { + it.uiControl != UIControl.HIDE_ENTRY && runningApps[it]?.stopped != true + } + val removedPackages = runningApps.keys.filter { !runningServiceTokens.containsKey(it) } + + addedPackages.forEach { + val ai = packageManager.getApplicationInfoAsUser(it.packageName, 0, it.userId) + runningApps[it] = RunningApp(it.userId, it.packageName, + runningServiceTokens[it]!!.startTime, it.uiControl, + ai.loadLabel(packageManager), ai.loadIcon(packageManager)) + } + + removedPackages.forEach { pkg -> + val ra = runningApps[pkg]!! + val ra2 = ra.copy().also { + it.stopped = true + it.appLabel = ra.appLabel + it.icon = ra.icon + } + runningApps[pkg] = ra2 + } + + mainExecutor.execute { + appListAdapter + .setData(runningApps.values.toList().sortedByDescending { it.timeStarted }) + } + } + + private fun stopPackage(userId: Int, packageName: String) { + activityManager.stopAppForUser(packageName, userId) + } + + private inner class AppListAdapter : RecyclerView.Adapter<AppItemViewHolder>() { + private val lock = Any() + + @GuardedBy("lock") + private var data: List<RunningApp> = listOf() + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): AppItemViewHolder { + return AppItemViewHolder(LayoutInflater.from(parent.context) + .inflate(R.layout.fgs_manager_app_item, parent, false)) + } + + override fun onBindViewHolder(holder: AppItemViewHolder, position: Int) { + var runningApp: RunningApp + synchronized(lock) { + runningApp = data[position] + } + with(holder) { + iconView.setImageDrawable(runningApp.icon) + appLabelView.text = runningApp.appLabel + durationView.text = DateUtils.formatDuration( + max(systemClock.elapsedRealtime() - runningApp.timeStarted, 60000), + DateUtils.LENGTH_MEDIUM) + stopButton.setOnClickListener { + stopButton.setText(R.string.fgs_manager_app_item_stop_button_stopped_label) + stopPackage(runningApp.userId, runningApp.packageName) + } + if (runningApp.uiControl == UIControl.HIDE_BUTTON) { + stopButton.visibility = View.INVISIBLE + } + if (runningApp.stopped) { + stopButton.isEnabled = false + stopButton.setText(R.string.fgs_manager_app_item_stop_button_stopped_label) + durationView.visibility = View.GONE + } else { + stopButton.isEnabled = true + stopButton.setText(R.string.fgs_manager_app_item_stop_button_label) + durationView.visibility = View.VISIBLE + } + } + } + + override fun getItemCount(): Int { + return data.size + } + + fun setData(newData: List<RunningApp>) { + var oldData = data + data = newData + + DiffUtil.calculateDiff(object : DiffUtil.Callback() { + override fun getOldListSize(): Int { + return oldData.size + } + + override fun getNewListSize(): Int { + return newData.size + } + + override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int): + Boolean { + return oldData[oldItemPosition] == newData[newItemPosition] + } + + override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int): + Boolean { + return oldData[oldItemPosition].stopped == newData[newItemPosition].stopped + } + }).dispatchUpdatesTo(this) + } + } + + private inner class UserPackage( + val userId: Int, + val packageName: String + ) { + val uiControl: UIControl by lazy { + val uid = packageManager.getPackageUidAsUser(packageName, userId) + + when (activityManager.getBackgroundRestrictionExemptionReason(uid)) { + PowerExemptionManager.REASON_SYSTEM_UID, + PowerExemptionManager.REASON_DEVICE_DEMO_MODE -> UIControl.HIDE_ENTRY + + PowerExemptionManager.REASON_DEVICE_OWNER, + PowerExemptionManager.REASON_PROFILE_OWNER, + PowerExemptionManager.REASON_PROC_STATE_PERSISTENT, + PowerExemptionManager.REASON_PROC_STATE_PERSISTENT_UI, + PowerExemptionManager.REASON_ROLE_DIALER, + PowerExemptionManager.REASON_SYSTEM_MODULE -> UIControl.HIDE_BUTTON + else -> UIControl.NORMAL + } + } + + override fun equals(other: Any?): Boolean { + if (other !is UserPackage) { + return false + } + return other.packageName == packageName && other.userId == userId + } + + override fun hashCode(): Int = Objects.hash(userId, packageName) + } + + private data class StartTimeAndTokens( + val systemClock: SystemClock + ) { + val startTime = systemClock.elapsedRealtime() + val tokens = mutableSetOf<IBinder>() + + fun addToken(token: IBinder) { + tokens.add(token) + } + + fun removeToken(token: IBinder) { + tokens.remove(token) + } + + fun isEmpty(): Boolean { + return tokens.isEmpty() + } + } + + private class AppItemViewHolder(parent: View) : RecyclerView.ViewHolder(parent) { + val appLabelView: TextView = parent.requireViewById(R.id.fgs_manager_app_item_label) + val durationView: TextView = parent.requireViewById(R.id.fgs_manager_app_item_duration) + val iconView: ImageView = parent.requireViewById(R.id.fgs_manager_app_item_icon) + val stopButton: Button = parent.requireViewById(R.id.fgs_manager_app_item_stop_button) + } + + private data class RunningApp( + val userId: Int, + val packageName: String, + val timeStarted: Long, + val uiControl: UIControl + ) { + constructor( + userId: Int, + packageName: String, + timeStarted: Long, + uiControl: UIControl, + appLabel: CharSequence, + icon: Drawable + ) : this(userId, packageName, timeStarted, uiControl) { + this.appLabel = appLabel + this.icon = icon + } + + // variables to keep out of the generated equals() + var appLabel: CharSequence = "" + var icon: Drawable? = null + var stopped = false + } + + private enum class UIControl { + NORMAL, HIDE_BUTTON, HIDE_ENTRY + } +} diff --git a/packages/SystemUI/src/com/android/systemui/qs/FooterActionsController.kt b/packages/SystemUI/src/com/android/systemui/qs/FooterActionsController.kt index 7ac9205c7922..4aedbc983d9c 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/FooterActionsController.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/FooterActionsController.kt @@ -29,14 +29,16 @@ import com.android.internal.logging.MetricsLogger import com.android.internal.logging.UiEventLogger import com.android.internal.logging.nano.MetricsProto import com.android.keyguard.KeyguardUpdateMonitor +import com.android.settingslib.Utils import com.android.systemui.R import com.android.systemui.animation.ActivityLaunchAnimator +import com.android.systemui.flags.FeatureFlags +import com.android.systemui.flags.Flags import com.android.systemui.globalactions.GlobalActionsDialogLite import com.android.systemui.plugins.ActivityStarter import com.android.systemui.plugins.FalsingManager -import com.android.systemui.qs.FooterActionsController.ExpansionState.COLLAPSED -import com.android.systemui.qs.FooterActionsController.ExpansionState.EXPANDED import com.android.systemui.qs.dagger.QSFlagsModule.PM_LITE_ENABLED +import com.android.systemui.qs.dagger.QSScope import com.android.systemui.settings.UserTracker import com.android.systemui.statusbar.phone.MultiUserSwitchController import com.android.systemui.statusbar.phone.SettingsButton @@ -54,13 +56,14 @@ import javax.inject.Named * Main difference between QS and QQS behaviour is condition when buttons should be visible, * determined by [buttonsVisibleState] */ +@QSScope class FooterActionsController @Inject constructor( view: FooterActionsView, + multiUserSwitchControllerFactory: MultiUserSwitchController.Factory, private val activityStarter: ActivityStarter, private val userManager: UserManager, private val userTracker: UserTracker, private val userInfoController: UserInfoController, - private val multiUserSwitchController: MultiUserSwitchController, private val deviceProvisionedController: DeviceProvisionedController, private val falsingManager: FalsingManager, private val metricsLogger: MetricsLogger, @@ -68,20 +71,34 @@ class FooterActionsController @Inject constructor( private val globalActionsDialog: GlobalActionsDialogLite, private val uiEventLogger: UiEventLogger, @Named(PM_LITE_ENABLED) private val showPMLiteButton: Boolean, - private val buttonsVisibleState: ExpansionState, private val globalSetting: GlobalSettings, - private val handler: Handler + private val handler: Handler, + private val featureFlags: FeatureFlags ) : ViewController<FooterActionsView>(view) { - enum class ExpansionState { COLLAPSED, EXPANDED } - + private var lastExpansion = -1f private var listening: Boolean = false - var expanded = false + private val alphaAnimator = TouchAnimator.Builder() + .addFloat(mView, "alpha", 0f, 1f) + .setStartDelay(0.9f) + .build() + + var visible = true + set(value) { + field = value + updateVisibility() + } + + init { + view.elevation = resources.displayMetrics.density * 4f + view.setBackgroundColor(Utils.getColorAttrDefaultColor(context, R.attr.underSurfaceColor)) + } private val settingsButton: SettingsButton = view.findViewById(R.id.settings_button) private val settingsButtonContainer: View? = view.findViewById(R.id.settings_button_container) private val powerMenuLite: View = view.findViewById(R.id.pm_lite) + private val multiUserSwitchController = multiUserSwitchControllerFactory.create(view) private val onUserInfoChangedListener = OnUserInfoChangedListener { _, picture, _ -> val isGuestUser: Boolean = userManager.isGuestUser(KeyguardUpdateMonitor.getCurrentUser()) @@ -99,9 +116,8 @@ class FooterActionsController @Inject constructor( } private val onClickListener = View.OnClickListener { v -> - // Don't do anything until views are unhidden. Don't do anything if the tap looks - // suspicious. - if (!buttonsVisible() || falsingManager.isFalseTap(FalsingManager.LOW_PENALTY)) { + // Don't do anything if the tap looks suspicious. + if (!visible || falsingManager.isFalseTap(FalsingManager.LOW_PENALTY)) { return@OnClickListener } if (v === settingsButton) { @@ -110,9 +126,7 @@ class FooterActionsController @Inject constructor( activityStarter.postQSRunnableDismissingKeyguard {} return@OnClickListener } - metricsLogger.action( - if (expanded) MetricsProto.MetricsEvent.ACTION_QS_EXPANDED_SETTINGS_LAUNCH - else MetricsProto.MetricsEvent.ACTION_QS_COLLAPSED_SETTINGS_LAUNCH) + metricsLogger.action(MetricsProto.MetricsEvent.ACTION_QS_EXPANDED_SETTINGS_LAUNCH) if (settingsButton.isTunerClick) { activityStarter.postQSRunnableDismissingKeyguard { if (isTunerEnabled()) { @@ -135,24 +149,14 @@ class FooterActionsController @Inject constructor( } } - private fun buttonsVisible(): Boolean { - return when (buttonsVisibleState) { - EXPANDED -> expanded - COLLAPSED -> !expanded - } - } - override fun onInit() { multiUserSwitchController.init() } - fun hideFooter() { - mView.visibility = View.GONE - } - - fun showFooter() { - mView.visibility = View.VISIBLE - updateView() + private fun updateVisibility() { + val previousVisibility = mView.visibility + mView.visibility = if (visible) View.VISIBLE else View.INVISIBLE + if (previousVisibility != mView.visibility) updateView() } private fun startSettingsActivity() { @@ -204,24 +208,23 @@ class FooterActionsController @Inject constructor( } fun setExpansion(headerExpansionFraction: Float) { - mView.setExpansion(headerExpansionFraction) - } - - fun updateAnimator(width: Int, numTiles: Int) { - mView.updateAnimator(width, numTiles) - } - - fun setKeyguardShowing() { - mView.setKeyguardShowing() - } - - fun refreshVisibility(shouldBeVisible: Boolean) { - if (shouldBeVisible) { - showFooter() + if (featureFlags.isEnabled(Flags.NEW_FOOTER)) { + if (headerExpansionFraction != lastExpansion) { + if (headerExpansionFraction >= 1f) { + mView.animate().alpha(1f).setDuration(500L).start() + } else if (lastExpansion >= 1f && headerExpansionFraction < 1f) { + mView.animate().alpha(0f).setDuration(250L).start() + } + lastExpansion = headerExpansionFraction + } } else { - hideFooter() + alphaAnimator.setPosition(headerExpansionFraction) } } + fun setKeyguardShowing(showing: Boolean) { + setExpansion(lastExpansion) + } + private fun isTunerEnabled() = tunerService.isTunerEnabled } diff --git a/packages/SystemUI/src/com/android/systemui/qs/FooterActionsControllerBuilder.kt b/packages/SystemUI/src/com/android/systemui/qs/FooterActionsControllerBuilder.kt deleted file mode 100644 index 7694be51cba6..000000000000 --- a/packages/SystemUI/src/com/android/systemui/qs/FooterActionsControllerBuilder.kt +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.systemui.qs - -import android.os.Handler -import android.os.UserManager -import com.android.internal.logging.MetricsLogger -import com.android.internal.logging.UiEventLogger -import com.android.systemui.dagger.qualifiers.Main -import com.android.systemui.globalactions.GlobalActionsDialogLite -import com.android.systemui.plugins.ActivityStarter -import com.android.systemui.plugins.FalsingManager -import com.android.systemui.qs.FooterActionsController.ExpansionState -import com.android.systemui.qs.dagger.QSFlagsModule -import com.android.systemui.settings.UserTracker -import com.android.systemui.statusbar.phone.MultiUserSwitchController -import com.android.systemui.statusbar.policy.DeviceProvisionedController -import com.android.systemui.statusbar.policy.UserInfoController -import com.android.systemui.tuner.TunerService -import com.android.systemui.util.settings.GlobalSettings -import javax.inject.Inject -import javax.inject.Named - -class FooterActionsControllerBuilder @Inject constructor( - private val activityStarter: ActivityStarter, - private val userManager: UserManager, - private val userTracker: UserTracker, - private val userInfoController: UserInfoController, - private val multiUserSwitchControllerFactory: MultiUserSwitchController.Factory, - private val deviceProvisionedController: DeviceProvisionedController, - private val falsingManager: FalsingManager, - private val metricsLogger: MetricsLogger, - private val tunerService: TunerService, - private val globalActionsDialog: GlobalActionsDialogLite, - private val uiEventLogger: UiEventLogger, - @Named(QSFlagsModule.PM_LITE_ENABLED) private val showPMLiteButton: Boolean, - private val globalSettings: GlobalSettings, - @Main private val handler: Handler -) { - private lateinit var view: FooterActionsView - private lateinit var buttonsVisibleState: ExpansionState - - fun withView(view: FooterActionsView): FooterActionsControllerBuilder { - this.view = view - return this - } - - fun withButtonsVisibleWhen(state: ExpansionState): FooterActionsControllerBuilder { - buttonsVisibleState = state - return this - } - - fun build(): FooterActionsController { - return FooterActionsController(view, activityStarter, userManager, - userTracker, userInfoController, multiUserSwitchControllerFactory.create(view), - deviceProvisionedController, falsingManager, metricsLogger, tunerService, - globalActionsDialog, uiEventLogger, showPMLiteButton, buttonsVisibleState, - globalSettings, handler) - } -}
\ No newline at end of file diff --git a/packages/SystemUI/src/com/android/systemui/qs/FooterActionsView.kt b/packages/SystemUI/src/com/android/systemui/qs/FooterActionsView.kt index e6fa2ae8dad1..18e0cfa910ad 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/FooterActionsView.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/FooterActionsView.kt @@ -44,8 +44,6 @@ class FooterActionsView(context: Context?, attrs: AttributeSet?) : LinearLayout( private lateinit var multiUserAvatar: ImageView private lateinit var tunerIcon: View - private var settingsCogAnimator: TouchAnimator? = null - private var qsDisabled = false private var expansionAmount = 0f @@ -66,19 +64,6 @@ class FooterActionsView(context: Context?, attrs: AttributeSet?) : LinearLayout( importantForAccessibility = View.IMPORTANT_FOR_ACCESSIBILITY_YES } - fun updateAnimator(width: Int, numTiles: Int) { - val size = (mContext.resources.getDimensionPixelSize(R.dimen.qs_quick_tile_size) - - mContext.resources.getDimensionPixelSize(R.dimen.qs_tile_padding)) - val remaining = (width - numTiles * size) / (numTiles - 1) - val defSpace = mContext.resources.getDimensionPixelOffset(R.dimen.default_gear_space) - val translation = if (isLayoutRtl) (remaining - defSpace) else -(remaining - defSpace) - settingsCogAnimator = TouchAnimator.Builder() - .addFloat(settingsButton, "translationX", translation.toFloat(), 0f) - .addFloat(settingsButton, "rotation", -120f, 0f) - .build() - setExpansion(expansionAmount) - } - override fun onConfigurationChanged(newConfig: Configuration) { super.onConfigurationChanged(newConfig) updateResources() @@ -95,15 +80,6 @@ class FooterActionsView(context: Context?, attrs: AttributeSet?) : LinearLayout( tunerIcon.translationX = if (isLayoutRtl) (-tunerIconTranslation) else tunerIconTranslation } - fun setKeyguardShowing() { - setExpansion(expansionAmount) - } - - fun setExpansion(headerExpansionFraction: Float) { - expansionAmount = headerExpansionFraction - if (settingsCogAnimator != null) settingsCogAnimator!!.setPosition(headerExpansionFraction) - } - fun disable( state2: Int, isTunerEnabled: Boolean, diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java b/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java index ded6ae0ac2ff..d1b569f7f438 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java @@ -14,9 +14,6 @@ package com.android.systemui.qs; -import static com.android.systemui.qs.dagger.QSFragmentModule.QQS_FOOTER; -import static com.android.systemui.qs.dagger.QSFragmentModule.QS_FOOTER; - import android.animation.TimeInterpolator; import android.animation.ValueAnimator; import android.util.Log; @@ -49,7 +46,6 @@ import java.util.List; import java.util.concurrent.Executor; import javax.inject.Inject; -import javax.inject.Named; /** */ @QSScope @@ -88,8 +84,6 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha private final QSFgsManagerFooter mFgsManagerFooter; private final QSSecurityFooter mSecurityFooter; private final QS mQs; - private final View mQSFooterActions; - private final View mQQSFooterActions; @Nullable private PagedTileLayout mPagedLayout; @@ -154,16 +148,12 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha QuickQSPanelController quickQSPanelController, QSTileHost qsTileHost, QSFgsManagerFooter fgsManagerFooter, QSSecurityFooter securityFooter, @Main Executor executor, TunerService tunerService, - QSExpansionPathInterpolator qsExpansionPathInterpolator, - @Named(QS_FOOTER) FooterActionsView qsFooterActionsView, - @Named(QQS_FOOTER) FooterActionsView qqsFooterActionsView) { + QSExpansionPathInterpolator qsExpansionPathInterpolator) { mQs = qs; mQuickQsPanel = quickPanel; mQsPanelController = qsPanelController; mQuickQSPanelController = quickQSPanelController; mQuickStatusBarHeader = quickStatusBarHeader; - mQQSFooterActions = qqsFooterActionsView; - mQSFooterActions = qsFooterActionsView; mFgsManagerFooter = fgsManagerFooter; mSecurityFooter = securityFooter; mHost = qsTileHost; @@ -476,12 +466,6 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha .setListener(this) .build(); - if (mQQSFooterActions.getVisibility() != View.GONE) { - // only when qqs footer is present (which means split shade mode) it needs to - // be animated - updateQQSFooterAnimation(); - } - // Fade in the security footer and the divider as we reach the final position Builder builder = new Builder().setStartDelay(EXPANDED_TILE_DELAY); builder.addFloat(mFgsManagerFooter.getView(), "alpha", 0, 1); @@ -627,14 +611,6 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha } } - private void updateQQSFooterAnimation() { - int translationY = getRelativeTranslationY(mQSFooterActions, mQQSFooterActions); - mQQSFooterActionsAnimator = new TouchAnimator.Builder() - .addFloat(mQQSFooterActions, "translationY", 0, translationY) - .build(); - mAnimatedQsViews.add(mQSFooterActions); - } - private int getRelativeTranslationY(View view1, View view2) { int[] qsPosition = new int[2]; int[] qqsPosition = new int[2]; diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSContainerImpl.java b/packages/SystemUI/src/com/android/systemui/qs/QSContainerImpl.java index e230e1bf8051..7800027ea967 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSContainerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSContainerImpl.java @@ -19,10 +19,8 @@ package com.android.systemui.qs; import static android.app.StatusBarManager.DISABLE2_QUICK_SETTINGS; import android.content.Context; -import android.content.res.Configuration; import android.graphics.Canvas; import android.graphics.Path; -import android.graphics.Point; import android.graphics.PointF; import android.util.AttributeSet; import android.view.View; @@ -41,7 +39,6 @@ import java.io.PrintWriter; */ public class QSContainerImpl extends FrameLayout implements Dumpable { - private final Point mSizePoint = new Point(); private int mFancyClippingTop; private int mFancyClippingBottom; private final float[] mFancyClippingRadii = new float[] {0, 0, 0, 0, 0, 0, 0, 0}; @@ -78,12 +75,6 @@ public class QSContainerImpl extends FrameLayout implements Dumpable { } @Override - protected void onConfigurationChanged(Configuration newConfig) { - super.onConfigurationChanged(newConfig); - mSizePoint.set(0, 0); // Will be retrieved on next measure pass. - } - - @Override public boolean performClick() { // Want to receive clicks so missing QQS tiles doesn't cause collapse, but // don't want to do anything with them. @@ -152,10 +143,10 @@ public class QSContainerImpl extends FrameLayout implements Dumpable { void updateResources(QSPanelController qsPanelController, QuickStatusBarHeaderController quickStatusBarHeaderController) { mQSPanelContainer.setPaddingRelative( - getPaddingStart(), + mQSPanelContainer.getPaddingStart(), Utils.getQsHeaderSystemIconsAreaHeight(mContext), - getPaddingEnd(), - getPaddingBottom() + mQSPanelContainer.getPaddingEnd(), + mQSPanelContainer.getPaddingBottom() ); int sideMargins = getResources().getDimensionPixelSize(R.dimen.notification_side_paddings); @@ -241,13 +232,6 @@ public class QSContainerImpl extends FrameLayout implements Dumpable { } } - private int getDisplayHeight() { - if (mSizePoint.y == 0) { - getDisplay().getRealSize(mSizePoint); - } - return mSizePoint.y; - } - /** * Clip QS bottom using a concave shape. */ diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSFgsManagerFooter.java b/packages/SystemUI/src/com/android/systemui/qs/QSFgsManagerFooter.java index 082de1609423..55d4a53ced7b 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSFgsManagerFooter.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSFgsManagerFooter.java @@ -16,13 +16,9 @@ package com.android.systemui.qs; -import static android.provider.DeviceConfig.NAMESPACE_SYSTEMUI; - -import static com.android.internal.config.sysui.SystemUiDeviceConfigFlags.TASK_MANAGER_ENABLED; import static com.android.systemui.qs.dagger.QSFragmentModule.QS_FGS_MANAGER_FOOTER_VIEW; import android.content.Context; -import android.provider.DeviceConfig; import android.view.View; import android.widget.ImageView; import android.widget.TextView; @@ -30,8 +26,6 @@ import android.widget.TextView; import com.android.systemui.R; import com.android.systemui.dagger.qualifiers.Background; import com.android.systemui.dagger.qualifiers.Main; -import com.android.systemui.fgsmanager.FgsManagerDialogFactory; -import com.android.systemui.statusbar.policy.RunningFgsController; import java.util.concurrent.Executor; @@ -41,24 +35,25 @@ import javax.inject.Named; /** * Footer entry point for the foreground service manager */ -public class QSFgsManagerFooter implements View.OnClickListener { +public class QSFgsManagerFooter implements View.OnClickListener, + FgsManagerController.OnDialogDismissedListener, + FgsManagerController.OnNumberOfPackagesChangedListener { private final View mRootView; private final TextView mFooterText; private final Context mContext; private final Executor mMainExecutor; private final Executor mExecutor; - private final RunningFgsController mRunningFgsController; - private final FgsManagerDialogFactory mFgsManagerDialogFactory; + + private final FgsManagerController mFgsManagerController; private boolean mIsInitialized = false; - private boolean mIsAvailable = false; + private int mNumPackages; @Inject QSFgsManagerFooter(@Named(QS_FGS_MANAGER_FOOTER_VIEW) View rootView, - @Main Executor mainExecutor, RunningFgsController runningFgsController, - @Background Executor executor, - FgsManagerDialogFactory fgsManagerDialogFactory) { + @Main Executor mainExecutor, @Background Executor executor, + FgsManagerController fgsManagerController) { mRootView = rootView; mFooterText = mRootView.findViewById(R.id.footer_text); ImageView icon = mRootView.findViewById(R.id.primary_footer_icon); @@ -66,8 +61,7 @@ public class QSFgsManagerFooter implements View.OnClickListener { mContext = rootView.getContext(); mMainExecutor = mainExecutor; mExecutor = executor; - mRunningFgsController = runningFgsController; - mFgsManagerDialogFactory = fgsManagerDialogFactory; + mFgsManagerController = fgsManagerController; } public void init() { @@ -75,22 +69,28 @@ public class QSFgsManagerFooter implements View.OnClickListener { return; } - mRootView.setOnClickListener(this); - - mRunningFgsController.addCallback(packages -> refreshState()); + mFgsManagerController.init(); - DeviceConfig.addOnPropertiesChangedListener(NAMESPACE_SYSTEMUI, mExecutor, - (DeviceConfig.OnPropertiesChangedListener) properties -> { - mIsAvailable = properties.getBoolean(TASK_MANAGER_ENABLED, mIsAvailable); - }); - mIsAvailable = DeviceConfig.getBoolean(NAMESPACE_SYSTEMUI, TASK_MANAGER_ENABLED, false); + mRootView.setOnClickListener(this); mIsInitialized = true; } + public void setListening(boolean listening) { + if (listening) { + mFgsManagerController.addOnDialogDismissedListener(this); + mFgsManagerController.addOnNumberOfPackagesChangedListener(this); + mNumPackages = mFgsManagerController.getNumRunningPackages(); + refreshState(); + } else { + mFgsManagerController.removeOnDialogDismissedListener(this); + mFgsManagerController.removeOnNumberOfPackagesChangedListener(this); + } + } + @Override public void onClick(View view) { - mFgsManagerDialogFactory.create(mRootView); + mFgsManagerController.showDialog(mRootView); } public void refreshState() { @@ -101,17 +101,25 @@ public class QSFgsManagerFooter implements View.OnClickListener { return mRootView; } - private boolean isAvailable() { - return mIsAvailable; - } - public void handleRefreshState() { - int numPackages = mRunningFgsController.getPackagesWithFgs().size(); mMainExecutor.execute(() -> { mFooterText.setText(mContext.getResources().getQuantityString( - R.plurals.fgs_manager_footer_label, numPackages, numPackages)); - mRootView.setVisibility(numPackages > 0 && isAvailable() ? View.VISIBLE : View.GONE); + R.plurals.fgs_manager_footer_label, mNumPackages, mNumPackages)); + if (mFgsManagerController.shouldUpdateFooterVisibility()) { + mRootView.setVisibility(mNumPackages > 0 + && mFgsManagerController.isAvailable() ? View.VISIBLE : View.GONE); + } }); } + @Override + public void onDialogDismissed() { + refreshState(); + } + + @Override + public void onNumberOfPackagesChanged(int numPackages) { + mNumPackages = numPackages; + refreshState(); + } } diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSFooter.java b/packages/SystemUI/src/com/android/systemui/qs/QSFooter.java index 0e0681b94c62..aac5672aa3f9 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSFooter.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSFooter.java @@ -42,11 +42,6 @@ public interface QSFooter { */ void setExpansion(float expansion); - /** - * Sets whether or not this footer should set itself to listen for changes in any callbacks - * that it has implemented. - */ - void setListening(boolean listening); /** * Sets whether or not the keyguard is currently being shown. diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSFooterView.java b/packages/SystemUI/src/com/android/systemui/qs/QSFooterView.java index 4622660a6c15..6c0ca49c81a8 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSFooterView.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSFooterView.java @@ -46,7 +46,6 @@ import com.android.systemui.R; public class QSFooterView extends FrameLayout { private PageIndicator mPageIndicator; private TextView mBuildText; - private View mActionsContainer; private View mEditButton; @Nullable @@ -78,7 +77,6 @@ public class QSFooterView extends FrameLayout { protected void onFinishInflate() { super.onFinishInflate(); mPageIndicator = findViewById(R.id.footer_page_indicator); - mActionsContainer = requireViewById(R.id.qs_footer_actions); mBuildText = findViewById(R.id.build); mEditButton = findViewById(android.R.id.edit); @@ -105,10 +103,6 @@ public class QSFooterView extends FrameLayout { } } - void updateExpansion() { - setExpansion(mExpansionAmount); - } - @Override protected void onConfigurationChanged(Configuration newConfig) { super.onConfigurationChanged(newConfig); @@ -129,7 +123,6 @@ public class QSFooterView extends FrameLayout { @Nullable private TouchAnimator createFooterAnimator() { TouchAnimator.Builder builder = new TouchAnimator.Builder() - .addFloat(mActionsContainer, "alpha", 0, 1) .addFloat(mPageIndicator, "alpha", 0, 1) .addFloat(mBuildText, "alpha", 0, 1) .addFloat(mEditButton, "alpha", 0, 1) diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSFooterViewController.java b/packages/SystemUI/src/com/android/systemui/qs/QSFooterViewController.java index 5327b7e3ba26..bef4f43b9d11 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSFooterViewController.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSFooterViewController.java @@ -16,8 +16,6 @@ package com.android.systemui.qs; -import static com.android.systemui.qs.dagger.QSFragmentModule.QS_FOOTER; - import android.content.ClipData; import android.content.ClipboardManager; import android.text.TextUtils; @@ -33,7 +31,6 @@ import com.android.systemui.settings.UserTracker; import com.android.systemui.util.ViewController; import javax.inject.Inject; -import javax.inject.Named; /** * Controller for {@link QSFooterView}. @@ -43,8 +40,6 @@ public class QSFooterViewController extends ViewController<QSFooterView> impleme private final UserTracker mUserTracker; private final QSPanelController mQsPanelController; - private final QuickQSPanelController mQuickQSPanelController; - private final FooterActionsController mFooterActionsController; private final TextView mBuildText; private final PageIndicator mPageIndicator; private final View mEditButton; @@ -56,14 +51,10 @@ public class QSFooterViewController extends ViewController<QSFooterView> impleme UserTracker userTracker, FalsingManager falsingManager, ActivityStarter activityStarter, - QSPanelController qsPanelController, - QuickQSPanelController quickQSPanelController, - @Named(QS_FOOTER) FooterActionsController footerActionsController) { + QSPanelController qsPanelController) { super(view); mUserTracker = userTracker; mQsPanelController = qsPanelController; - mQuickQSPanelController = quickQSPanelController; - mFooterActionsController = footerActionsController; mFalsingManager = falsingManager; mActivityStarter = activityStarter; @@ -73,21 +64,7 @@ public class QSFooterViewController extends ViewController<QSFooterView> impleme } @Override - protected void onInit() { - super.onInit(); - mFooterActionsController.init(); - } - - @Override protected void onViewAttached() { - mView.addOnLayoutChangeListener( - (v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) -> { - mView.updateExpansion(); - mFooterActionsController.updateAnimator(right - left, - mQuickQSPanelController.getNumQuickTiles()); - } - ); - mBuildText.setOnLongClickListener(view -> { CharSequence buildText = mBuildText.getText(); if (!TextUtils.isEmpty(buildText)) { @@ -114,9 +91,7 @@ public class QSFooterViewController extends ViewController<QSFooterView> impleme } @Override - protected void onViewDetached() { - setListening(false); - } + protected void onViewDetached() {} @Override public void setVisibility(int visibility) { @@ -126,25 +101,17 @@ public class QSFooterViewController extends ViewController<QSFooterView> impleme @Override public void setExpanded(boolean expanded) { - mFooterActionsController.setExpanded(expanded); mView.setExpanded(expanded); } @Override public void setExpansion(float expansion) { mView.setExpansion(expansion); - mFooterActionsController.setExpansion(expansion); - } - - @Override - public void setListening(boolean listening) { - mFooterActionsController.setListening(listening); } @Override public void setKeyguardShowing(boolean keyguardShowing) { mView.setKeyguardShowing(); - mFooterActionsController.setKeyguardShowing(); } /** */ @@ -156,6 +123,5 @@ public class QSFooterViewController extends ViewController<QSFooterView> impleme @Override public void disable(int state1, int state2, boolean animate) { mView.disable(state2); - mFooterActionsController.disable(state2); } } diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java b/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java index 259b786dafb7..50952bd0ec28 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java @@ -118,6 +118,7 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca private QSPanelController mQSPanelController; private QuickQSPanelController mQuickQSPanelController; private QSCustomizerController mQSCustomizerController; + private FooterActionsController mQSFooterActionController; @Nullable private ScrollListener mScrollListener; /** @@ -188,9 +189,11 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca QSFragmentComponent qsFragmentComponent = mQsComponentFactory.create(this); mQSPanelController = qsFragmentComponent.getQSPanelController(); mQuickQSPanelController = qsFragmentComponent.getQuickQSPanelController(); + mQSFooterActionController = qsFragmentComponent.getQSFooterActionController(); mQSPanelController.init(); mQuickQSPanelController.init(); + mQSFooterActionController.init(); mQSPanelScrollView = view.findViewById(R.id.expanded_qs_scroll_view); mQSPanelScrollView.addOnLayoutChangeListener( @@ -380,6 +383,7 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca mContainer.disable(state1, state2, animate); mHeader.disable(state1, state2, animate); mFooter.disable(state1, state2, animate); + mQSFooterActionController.disable(state2); updateQsState(); } @@ -396,10 +400,10 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca : View.INVISIBLE); mHeader.setExpanded((keyguardShowing && !mHeaderAnimating && !mShowCollapsedOnKeyguard) || (expanded && !mStackScrollerOverscrolling), mQuickQSPanelController); - mFooter.setVisibility(!mQsDisabled && (expanded || !keyguardShowing || mHeaderAnimating - || mShowCollapsedOnKeyguard) - ? View.VISIBLE - : View.INVISIBLE); + boolean footerVisible = !mQsDisabled && (expanded || !keyguardShowing || mHeaderAnimating + || mShowCollapsedOnKeyguard); + mFooter.setVisibility(footerVisible ? View.VISIBLE : View.INVISIBLE); + mQSFooterActionController.setVisible(footerVisible); mFooter.setExpanded((keyguardShowing && !mHeaderAnimating && !mShowCollapsedOnKeyguard) || (expanded && !mStackScrollerOverscrolling)); mQSPanelController.setVisibility( @@ -465,6 +469,7 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca } mFooter.setKeyguardShowing(keyguardShowing); + mQSFooterActionController.setKeyguardShowing(keyguardShowing); updateQsState(); } @@ -480,14 +485,13 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca if (DEBUG) Log.d(TAG, "setListening " + listening); mListening = listening; mQSContainerImplController.setListening(listening); - mFooter.setListening(listening); + mQSFooterActionController.setListening(listening); mQSPanelController.setListening(mListening, mQsExpanded); } @Override public void setHeaderListening(boolean listening) { mQSContainerImplController.setListening(listening); - mFooter.setListening(listening); } @Override @@ -561,6 +565,7 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca } } mFooter.setExpansion(onKeyguardAndExpanded ? 1 : expansion); + mQSFooterActionController.setExpansion(onKeyguardAndExpanded ? 1 : expansion); mQSPanelController.setRevealExpansion(expansion); mQSPanelController.getTileLayout().setExpansion(expansion, proposedTranslation); mQuickQSPanelController.getTileLayout().setExpansion(expansion, proposedTranslation); @@ -711,6 +716,7 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca boolean customizing = isCustomizing(); mQSPanelScrollView.setVisibility(!customizing ? View.VISIBLE : View.INVISIBLE); mFooter.setVisibility(!customizing ? View.VISIBLE : View.INVISIBLE); + mQSFooterActionController.setVisible(!customizing); mHeader.setVisibility(!customizing ? View.VISIBLE : View.INVISIBLE); // Let the panel know the position changed and it needs to update where notifications // and whatnot are. diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSPanelController.java b/packages/SystemUI/src/com/android/systemui/qs/QSPanelController.java index cbfe944a2c23..8f268b5cffe4 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSPanelController.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSPanelController.java @@ -192,6 +192,7 @@ public class QSPanelController extends QSPanelControllerBase<QSPanel> { refreshAllTiles(); } + mQSFgsManagerFooter.setListening(listening); mQsSecurityFooter.setListening(listening); // Set the listening as soon as the QS fragment starts listening regardless of the diff --git a/packages/SystemUI/src/com/android/systemui/qs/QuickQSPanelController.java b/packages/SystemUI/src/com/android/systemui/qs/QuickQSPanelController.java index 92690c7d1202..2d2fa1f08452 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QuickQSPanelController.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QuickQSPanelController.java @@ -17,7 +17,6 @@ package com.android.systemui.qs; import static com.android.systemui.media.dagger.MediaModule.QUICK_QS_PANEL; -import static com.android.systemui.qs.dagger.QSFragmentModule.QQS_FOOTER; import static com.android.systemui.qs.dagger.QSFragmentModule.QS_USING_MEDIA_PLAYER; import com.android.internal.logging.MetricsLogger; @@ -54,7 +53,6 @@ public class QuickQSPanelController extends QSPanelControllerBase<QuickQSPanel> // brightness is visible only in split shade private final QuickQSBrightnessController mBrightnessController; private final BrightnessMirrorHandler mBrightnessMirrorHandler; - private final FooterActionsController mFooterActionsController; @Inject QuickQSPanelController(QuickQSPanel view, QSTileHost qsTileHost, @@ -63,14 +61,12 @@ public class QuickQSPanelController extends QSPanelControllerBase<QuickQSPanel> @Named(QUICK_QS_PANEL) MediaHost mediaHost, MetricsLogger metricsLogger, UiEventLogger uiEventLogger, QSLogger qsLogger, DumpManager dumpManager, - QuickQSBrightnessController quickQSBrightnessController, - @Named(QQS_FOOTER) FooterActionsController footerActionsController + QuickQSBrightnessController quickQSBrightnessController ) { super(view, qsTileHost, qsCustomizerController, usingMediaPlayer, mediaHost, metricsLogger, uiEventLogger, qsLogger, dumpManager); mBrightnessController = quickQSBrightnessController; mBrightnessMirrorHandler = new BrightnessMirrorHandler(mBrightnessController); - mFooterActionsController = footerActionsController; } @Override @@ -80,8 +76,6 @@ public class QuickQSPanelController extends QSPanelControllerBase<QuickQSPanel> mMediaHost.setShowsOnlyActiveMedia(true); mMediaHost.init(MediaHierarchyManager.LOCATION_QQS); mBrightnessController.init(mShouldUseSplitNotificationShade); - mFooterActionsController.init(); - mFooterActionsController.refreshVisibility(mShouldUseSplitNotificationShade); } @Override @@ -102,7 +96,6 @@ public class QuickQSPanelController extends QSPanelControllerBase<QuickQSPanel> void setListening(boolean listening) { super.setListening(listening); mBrightnessController.setListening(listening); - mFooterActionsController.setListening(listening); } public boolean isListening() { @@ -123,7 +116,6 @@ public class QuickQSPanelController extends QSPanelControllerBase<QuickQSPanel> @Override protected void onConfigurationChanged() { mBrightnessController.refreshVisibility(mShouldUseSplitNotificationShade); - mFooterActionsController.refreshVisibility(mShouldUseSplitNotificationShade); } @Override diff --git a/packages/SystemUI/src/com/android/systemui/qs/dagger/QSFragmentComponent.java b/packages/SystemUI/src/com/android/systemui/qs/dagger/QSFragmentComponent.java index 63cbc21ddf74..594f4f86a680 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/dagger/QSFragmentComponent.java +++ b/packages/SystemUI/src/com/android/systemui/qs/dagger/QSFragmentComponent.java @@ -16,6 +16,7 @@ package com.android.systemui.qs.dagger; +import com.android.systemui.qs.FooterActionsController; import com.android.systemui.qs.QSAnimator; import com.android.systemui.qs.QSContainerImplController; import com.android.systemui.qs.QSFooter; @@ -61,4 +62,7 @@ public interface QSFragmentComponent { /** Construct a {@link QSSquishinessController}. */ QSSquishinessController getQSSquishinessController(); + + /** Construct a {@link FooterActionsController}. */ + FooterActionsController getQSFooterActionController(); } diff --git a/packages/SystemUI/src/com/android/systemui/qs/dagger/QSFragmentModule.java b/packages/SystemUI/src/com/android/systemui/qs/dagger/QSFragmentModule.java index 1958cafb0fb9..776ee1021db2 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/dagger/QSFragmentModule.java +++ b/packages/SystemUI/src/com/android/systemui/qs/dagger/QSFragmentModule.java @@ -21,15 +21,15 @@ import static com.android.systemui.util.Utils.useQsMediaPlayer; import android.content.Context; import android.view.LayoutInflater; import android.view.View; +import android.view.ViewStub; import com.android.systemui.R; import com.android.systemui.battery.BatteryMeterView; import com.android.systemui.dagger.qualifiers.RootView; +import com.android.systemui.flags.FeatureFlags; +import com.android.systemui.flags.Flags; import com.android.systemui.plugins.qs.QS; import com.android.systemui.privacy.OngoingPrivacyChip; -import com.android.systemui.qs.FooterActionsController; -import com.android.systemui.qs.FooterActionsController.ExpansionState; -import com.android.systemui.qs.FooterActionsControllerBuilder; import com.android.systemui.qs.FooterActionsView; import com.android.systemui.qs.QSContainerImpl; import com.android.systemui.qs.QSFooter; @@ -55,8 +55,6 @@ import dagger.Provides; public interface QSFragmentModule { String QS_FGS_MANAGER_FOOTER_VIEW = "qs_fgs_manager_footer"; String QS_SECURITY_FOOTER_VIEW = "qs_security_footer"; - String QQS_FOOTER = "qqs_footer"; - String QS_FOOTER = "qs_footer"; String QS_USING_MEDIA_PLAYER = "qs_using_media_player"; /** @@ -122,46 +120,26 @@ public interface QSFragmentModule { return view.findViewById(R.id.qs_footer); } - /** */ + /** + * Provides a {@link FooterActionsView}. + * + * This will replace a ViewStub either in {@link QSFooterView} or in {@link QSContainerImpl}. + */ @Provides - @Named(QS_FOOTER) - static FooterActionsView providesQSFooterActionsView(@RootView View view) { + static FooterActionsView providesQSFooterActionsView(@RootView View view, + FeatureFlags featureFlags) { + ViewStub stub; + if (featureFlags.isEnabled(Flags.NEW_FOOTER)) { + stub = view.requireViewById(R.id.container_stub); + } else { + stub = view.requireViewById(R.id.footer_stub); + } + stub.inflate(); return view.findViewById(R.id.qs_footer_actions); } /** */ @Provides - @Named(QQS_FOOTER) - static FooterActionsView providesQQSFooterActionsView(@RootView View view) { - return view.findViewById(R.id.qqs_footer_actions); - } - - /** */ - @Provides - @Named(QQS_FOOTER) - static FooterActionsController providesQQSFooterActionsController( - FooterActionsControllerBuilder footerActionsControllerBuilder, - @Named(QQS_FOOTER) FooterActionsView qqsFooterActionsView) { - return footerActionsControllerBuilder - .withView(qqsFooterActionsView) - .withButtonsVisibleWhen(ExpansionState.COLLAPSED) - .build(); - } - - /** */ - @Provides - @Named(QS_FOOTER) - static FooterActionsController providesQSFooterActionsController( - FooterActionsControllerBuilder footerActionsControllerBuilder, - @Named(QS_FOOTER) FooterActionsView qsFooterActionsView) { - return footerActionsControllerBuilder - .withView(qsFooterActionsView) - .withButtonsVisibleWhen(ExpansionState.EXPANDED) - .build(); - } - - /** */ - @Provides @QSScope static QSFooter providesQSFooter(QSFooterViewController qsFooterViewController) { qsFooterViewController.init(); diff --git a/packages/SystemUI/src/com/android/systemui/qs/dagger/QSModule.java b/packages/SystemUI/src/com/android/systemui/qs/dagger/QSModule.java index 48255b5360fc..6d1bbeed5372 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/dagger/QSModule.java +++ b/packages/SystemUI/src/com/android/systemui/qs/dagger/QSModule.java @@ -34,8 +34,6 @@ import com.android.systemui.statusbar.policy.CastController; import com.android.systemui.statusbar.policy.DataSaverController; import com.android.systemui.statusbar.policy.DeviceControlsController; import com.android.systemui.statusbar.policy.HotspotController; -import com.android.systemui.statusbar.policy.RunningFgsController; -import com.android.systemui.statusbar.policy.RunningFgsControllerImpl; import com.android.systemui.statusbar.policy.WalletController; import com.android.systemui.util.settings.SecureSettings; @@ -91,9 +89,4 @@ public interface QSModule { /** */ @Binds QSHost provideQsHost(QSTileHost controllerImpl); - - /** */ - @Binds - RunningFgsController provideRunningFgsController( - RunningFgsControllerImpl runningFgsController); } diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotActionChip.java b/packages/SystemUI/src/com/android/systemui/screenshot/OverlayActionChip.java index dec5afdaccfe..c4ea67e0f79e 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotActionChip.java +++ b/packages/SystemUI/src/com/android/systemui/screenshot/OverlayActionChip.java @@ -16,6 +16,8 @@ package com.android.systemui.screenshot; +import static java.util.Objects.requireNonNull; + import android.app.PendingIntent; import android.content.Context; import android.graphics.drawable.Icon; @@ -28,10 +30,11 @@ import android.widget.TextView; import com.android.systemui.R; + /** * View for a chip with an icon and text. */ -public class ScreenshotActionChip extends FrameLayout { +public class OverlayActionChip extends FrameLayout { private static final String TAG = "ScreenshotActionChip"; @@ -39,27 +42,27 @@ public class ScreenshotActionChip extends FrameLayout { private TextView mTextView; private boolean mIsPending = false; - public ScreenshotActionChip(Context context) { + public OverlayActionChip(Context context) { this(context, null); } - public ScreenshotActionChip(Context context, AttributeSet attrs) { + public OverlayActionChip(Context context, AttributeSet attrs) { this(context, attrs, 0); } - public ScreenshotActionChip(Context context, AttributeSet attrs, int defStyleAttr) { + public OverlayActionChip(Context context, AttributeSet attrs, int defStyleAttr) { this(context, attrs, defStyleAttr, 0); } - public ScreenshotActionChip( + public OverlayActionChip( Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { super(context, attrs, defStyleAttr, defStyleRes); } @Override protected void onFinishInflate() { - mIconView = findViewById(R.id.screenshot_action_chip_icon); - mTextView = findViewById(R.id.screenshot_action_chip_text); + mIconView = requireNonNull(findViewById(R.id.overlay_action_chip_icon)); + mTextView = requireNonNull(findViewById(R.id.overlay_action_chip_text)); updatePadding(mTextView.getText().length() > 0); } @@ -116,15 +119,15 @@ public class ScreenshotActionChip extends FrameLayout { (LinearLayout.LayoutParams) mTextView.getLayoutParams(); if (hasText) { int paddingHorizontal = mContext.getResources().getDimensionPixelSize( - R.dimen.screenshot_action_chip_padding_horizontal); + R.dimen.overlay_action_chip_padding_horizontal); int spacing = mContext.getResources().getDimensionPixelSize( - R.dimen.screenshot_action_chip_spacing); + R.dimen.overlay_action_chip_spacing); iconParams.setMarginStart(paddingHorizontal); iconParams.setMarginEnd(spacing); textParams.setMarginEnd(paddingHorizontal); } else { int paddingHorizontal = mContext.getResources().getDimensionPixelSize( - R.dimen.screenshot_action_chip_icon_only_padding_horizontal); + R.dimen.overlay_action_chip_icon_only_padding_horizontal); iconParams.setMarginStart(paddingHorizontal); iconParams.setMarginEnd(paddingHorizontal); } diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java index 83d8d19a6d4d..30456a8c4cc7 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java +++ b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java @@ -344,7 +344,7 @@ public class ScreenshotController { }; mContext.registerReceiver(mCopyBroadcastReceiver, new IntentFilter( ClipboardOverlayController.COPY_OVERLAY_ACTION), - ClipboardOverlayController.SELF_PERMISSION, null); + ClipboardOverlayController.SELF_PERMISSION, null, Context.RECEIVER_NOT_EXPORTED); } void takeScreenshotFullscreen(ComponentName topComponent, Consumer<Uri> finisher, diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotView.java b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotView.java index e5649a126807..f9827905b69a 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotView.java +++ b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotView.java @@ -131,9 +131,9 @@ public class ScreenshotView extends FrameLayout implements private final Resources mResources; private final Interpolator mFastOutSlowIn; private final DisplayMetrics mDisplayMetrics; - private final float mCornerSizeX; - private final float mDismissDeltaY; + private final float mFixedSize; private final AccessibilityManager mAccessibilityManager; + private final GestureDetector mSwipeDetector; private int mNavMode; private boolean mOrientationPortrait; @@ -151,23 +151,21 @@ public class ScreenshotView extends FrameLayout implements private LinearLayout mActionsView; private ImageView mBackgroundProtection; private FrameLayout mDismissButton; - private ScreenshotActionChip mShareChip; - private ScreenshotActionChip mEditChip; - private ScreenshotActionChip mScrollChip; - private ScreenshotActionChip mQuickShareChip; + private OverlayActionChip mShareChip; + private OverlayActionChip mEditChip; + private OverlayActionChip mScrollChip; + private OverlayActionChip mQuickShareChip; private UiEventLogger mUiEventLogger; private ScreenshotViewCallback mCallbacks; - private Animator mDismissAnimation; private boolean mPendingSharedTransition; - private GestureDetector mSwipeDetector; private SwipeDismissHandler mSwipeDismissHandler; private InputMonitorCompat mInputMonitor; private InputChannelCompat.InputEventReceiver mInputEventReceiver; private boolean mShowScrollablePreview; private String mPackageName = ""; - private final ArrayList<ScreenshotActionChip> mSmartChips = new ArrayList<>(); + private final ArrayList<OverlayActionChip> mSmartChips = new ArrayList<>(); private PendingInteraction mPendingInteraction; private enum PendingInteraction { @@ -194,9 +192,7 @@ public class ScreenshotView extends FrameLayout implements super(context, attrs, defStyleAttr, defStyleRes); mResources = mContext.getResources(); - mCornerSizeX = mResources.getDimensionPixelSize(R.dimen.screenshot_x_scale); - mDismissDeltaY = mResources.getDimensionPixelSize( - R.dimen.screenshot_dismissal_height_delta); + mFixedSize = mResources.getDimensionPixelSize(R.dimen.overlay_x_scale); // standard material ease mFastOutSlowIn = @@ -474,16 +470,14 @@ public class ScreenshotView extends FrameLayout implements int orientation = mContext.getResources().getConfiguration().orientation; mOrientationPortrait = (orientation == ORIENTATION_PORTRAIT); updateInsets(insets); - int screenshotFixedSize = - mContext.getResources().getDimensionPixelSize(R.dimen.screenshot_x_scale); ViewGroup.LayoutParams params = mScreenshotPreview.getLayoutParams(); if (mOrientationPortrait) { - params.width = screenshotFixedSize; + params.width = (int) mFixedSize; params.height = LayoutParams.WRAP_CONTENT; mScreenshotPreview.setScaleType(ImageView.ScaleType.FIT_START); } else { params.width = LayoutParams.WRAP_CONTENT; - params.height = screenshotFixedSize; + params.height = (int) mFixedSize; mScreenshotPreview.setScaleType(ImageView.ScaleType.FIT_END); } @@ -500,7 +494,7 @@ public class ScreenshotView extends FrameLayout implements // ratio of preview width, end vs. start size float cornerScale = - mCornerSizeX / (mOrientationPortrait ? bounds.width() : bounds.height()); + mFixedSize / (mOrientationPortrait ? bounds.width() : bounds.height()); final float currentScale = 1 / cornerScale; AnimatorSet dropInAnimation = new AnimatorSet(); @@ -651,7 +645,7 @@ public class ScreenshotView extends FrameLayout implements } catch (RemoteException e) { } - ArrayList<ScreenshotActionChip> chips = new ArrayList<>(); + ArrayList<OverlayActionChip> chips = new ArrayList<>(); mShareChip.setContentDescription(mContext.getString(R.string.screenshot_share_description)); mShareChip.setIcon(Icon.createWithResource(mContext, R.drawable.ic_screenshot_share), true); @@ -716,7 +710,7 @@ public class ScreenshotView extends FrameLayout implements + (t * (1 - SCREENSHOT_ACTIONS_START_SCALE_X)); mActionsContainer.setScaleX(containerScale); mActionsContainerBackground.setScaleX(containerScale); - for (ScreenshotActionChip chip : chips) { + for (OverlayActionChip chip : chips) { chip.setAlpha(t); chip.setScaleX(1 / containerScale); // invert to keep size of children constant } @@ -772,8 +766,8 @@ public class ScreenshotView extends FrameLayout implements LayoutInflater inflater = LayoutInflater.from(mContext); for (Notification.Action smartAction : imageData.smartActions) { - ScreenshotActionChip actionChip = (ScreenshotActionChip) inflater.inflate( - R.layout.screenshot_action_chip, mActionsView, false); + OverlayActionChip actionChip = (OverlayActionChip) inflater.inflate( + R.layout.overlay_action_chip, mActionsView, false); actionChip.setText(smartAction.title); actionChip.setIcon(smartAction.getIcon(), false); actionChip.setPendingIntent(smartAction.actionIntent, @@ -792,8 +786,8 @@ public class ScreenshotView extends FrameLayout implements void addQuickShareChip(Notification.Action quickShareAction) { if (mPendingInteraction == null) { LayoutInflater inflater = LayoutInflater.from(mContext); - mQuickShareChip = (ScreenshotActionChip) inflater.inflate( - R.layout.screenshot_action_chip, mActionsView, false); + mQuickShareChip = (OverlayActionChip) inflater.inflate( + R.layout.overlay_action_chip, mActionsView, false); mQuickShareChip.setText(quickShareAction.title); mQuickShareChip.setIcon(quickShareAction.getIcon(), false); mQuickShareChip.setOnClickListener(v -> { @@ -894,7 +888,7 @@ public class ScreenshotView extends FrameLayout implements if (mShowScrollablePreview) { Rect scrollableArea = scrollableAreaOnScreen(response); - float scale = mCornerSizeX + float scale = mFixedSize / (mOrientationPortrait ? screenBitmap.getWidth() : screenBitmap.getHeight()); ConstraintLayout.LayoutParams params = (ConstraintLayout.LayoutParams) mScrollablePreview.getLayoutParams(); @@ -945,7 +939,7 @@ public class ScreenshotView extends FrameLayout implements } boolean isDismissing() { - return (mDismissAnimation != null && mDismissAnimation.isRunning()); + return mSwipeDismissHandler.isDismissing(); } boolean isPendingSharedTransition() { @@ -961,12 +955,6 @@ public class ScreenshotView extends FrameLayout implements Log.d(TAG, "reset screenshot view"); } - if (mDismissAnimation != null && mDismissAnimation.isRunning()) { - if (DEBUG_ANIM) { - Log.d(TAG, "cancelling dismiss animation"); - } - mDismissAnimation.cancel(); - } mSwipeDismissHandler.cancel(); if (DEBUG_WINDOW) { Log.d(TAG, "removing OnComputeInternalInsetsListener"); @@ -994,7 +982,7 @@ public class ScreenshotView extends FrameLayout implements mShareChip.setIsPending(false); mEditChip.setIsPending(false); mPendingInteraction = null; - for (ScreenshotActionChip chip : mSmartChips) { + for (OverlayActionChip chip : mSmartChips) { mActionsView.removeView(chip); } mSmartChips.clear(); @@ -1019,31 +1007,6 @@ public class ScreenshotView extends FrameLayout implements } } - private AnimatorSet createScreenshotTranslateDismissAnimation() { - ValueAnimator alphaAnim = ValueAnimator.ofFloat(0, 1); - alphaAnim.setStartDelay(SCREENSHOT_DISMISS_ALPHA_OFFSET_MS); - alphaAnim.setDuration(SCREENSHOT_DISMISS_ALPHA_DURATION_MS); - alphaAnim.addUpdateListener(animation -> { - setAlpha(1 - animation.getAnimatedFraction()); - }); - - ValueAnimator xAnim = ValueAnimator.ofFloat(0, 1); - xAnim.setInterpolator(mAccelerateInterpolator); - xAnim.setDuration(SCREENSHOT_DISMISS_X_DURATION_MS); - float deltaX = mDirectionLTR - ? -1 * (mScreenshotPreviewBorder.getX() + mScreenshotPreviewBorder.getWidth()) - : (mDisplayMetrics.widthPixels - mScreenshotPreviewBorder.getX()); - xAnim.addUpdateListener(animation -> { - float currXDelta = MathUtils.lerp(0, deltaX, animation.getAnimatedFraction()); - mScreenshotStatic.setTranslationX(currXDelta); - }); - - AnimatorSet animSet = new AnimatorSet(); - animSet.play(xAnim).with(alphaAnim); - - return animSet; - } - ValueAnimator createScreenshotFadeDismissAnimation() { ValueAnimator alphaAnim = ValueAnimator.ofFloat(0, 1); alphaAnim.addUpdateListener(animation -> { diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/SwipeDismissHandler.java b/packages/SystemUI/src/com/android/systemui/screenshot/SwipeDismissHandler.java index 4e960037bb7b..451fb1311ebb 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/SwipeDismissHandler.java +++ b/packages/SystemUI/src/com/android/systemui/screenshot/SwipeDismissHandler.java @@ -16,6 +16,7 @@ package com.android.systemui.screenshot; +import static com.android.systemui.screenshot.LogConfig.DEBUG_ANIM; import static com.android.systemui.screenshot.LogConfig.DEBUG_DISMISS; import android.animation.Animator; @@ -137,10 +138,20 @@ public class SwipeDismissHandler implements View.OnTouchListener { } /** + * Return whether the view is currently being dismissed + */ + public boolean isDismissing() { + return (mDismissAnimation != null && mDismissAnimation.isRunning()); + } + + /** * Cancel the currently-running dismissal animation, if any. */ public void cancel() { - if (mDismissAnimation != null && mDismissAnimation.isRunning()) { + if (isDismissing()) { + if (DEBUG_ANIM) { + Log.d(TAG, "cancelling dismiss animation"); + } mDismissAnimation.cancel(); } } @@ -182,7 +193,13 @@ public class SwipeDismissHandler implements View.OnTouchListener { // make sure the UI gets all the way off the screen in the direction of movement // (the actions container background is guaranteed to be both the leftmost and // rightmost UI element in LTR and RTL) - float finalX = startX <= 0 ? -1 * mView.getRight() : mDisplayMetrics.widthPixels; + float finalX; + int layoutDir = mView.getContext().getResources().getConfiguration().getLayoutDirection(); + if (startX > 0 || (startX == 0 && layoutDir == View.LAYOUT_DIRECTION_RTL)) { + finalX = mDisplayMetrics.widthPixels; + } else { + finalX = -1 * mView.getRight(); + } float distance = Math.abs(finalX - startX); anim.addUpdateListener(animation -> { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java b/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java index 9d43d303b834..2f5eaa621283 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java @@ -43,6 +43,7 @@ import android.hardware.biometrics.PromptInfo; import android.hardware.display.DisplayManager; import android.hardware.fingerprint.IUdfpsHbmListener; import android.inputmethodservice.InputMethodService.BackDispositionMode; +import android.media.MediaRoute2Info; import android.os.Bundle; import android.os.Handler; import android.os.IBinder; @@ -63,6 +64,7 @@ import androidx.annotation.NonNull; import com.android.internal.os.SomeArgs; import com.android.internal.statusbar.IAddTileResultCallback; import com.android.internal.statusbar.IStatusBar; +import com.android.internal.statusbar.IUndoMediaTransferCallback; import com.android.internal.statusbar.StatusBarIcon; import com.android.internal.util.GcUtils; import com.android.internal.view.AppearanceRegion; @@ -156,6 +158,8 @@ public class CommandQueue extends IStatusBar.Stub implements private static final int MSG_TILE_SERVICE_REQUEST_ADD = 61 << MSG_SHIFT; private static final int MSG_TILE_SERVICE_REQUEST_CANCEL = 62 << MSG_SHIFT; private static final int MSG_SET_BIOMETRICS_LISTENER = 63 << MSG_SHIFT; + private static final int MSG_MEDIA_TRANSFER_SENDER_STATE = 64 << MSG_SHIFT; + private static final int MSG_MEDIA_TRANSFER_RECEIVER_STATE = 65 << MSG_SHIFT; public static final int FLAG_EXCLUDE_NONE = 0; public static final int FLAG_EXCLUDE_SEARCH_PANEL = 1 << 0; @@ -439,6 +443,17 @@ public class CommandQueue extends IStatusBar.Stub implements * @see IStatusBar#cancelRequestAddTile */ default void cancelRequestAddTile(@NonNull String packageName) {} + + /** @see IStatusBar#updateMediaTapToTransferSenderDisplay */ + default void updateMediaTapToTransferSenderDisplay( + @StatusBarManager.MediaTransferSenderState int displayState, + @NonNull MediaRoute2Info routeInfo, + @Nullable IUndoMediaTransferCallback undoCallback) {} + + /** @see IStatusBar#updateMediaTapToTransferReceiverDisplay */ + default void updateMediaTapToTransferReceiverDisplay( + @StatusBarManager.MediaTransferReceiverState int displayState, + @NonNull MediaRoute2Info routeInfo) {} } public CommandQueue(Context context) { @@ -1177,6 +1192,29 @@ public class CommandQueue extends IStatusBar.Stub implements mHandler.obtainMessage(MSG_TILE_SERVICE_REQUEST_CANCEL, s).sendToTarget(); } + @Override + public void updateMediaTapToTransferSenderDisplay( + @StatusBarManager.MediaTransferSenderState int displayState, + MediaRoute2Info routeInfo, + IUndoMediaTransferCallback undoCallback + ) throws RemoteException { + SomeArgs args = SomeArgs.obtain(); + args.arg1 = displayState; + args.arg2 = routeInfo; + args.arg3 = undoCallback; + mHandler.obtainMessage(MSG_MEDIA_TRANSFER_SENDER_STATE, args).sendToTarget(); + } + + @Override + public void updateMediaTapToTransferReceiverDisplay( + int displayState, + MediaRoute2Info routeInfo) { + SomeArgs args = SomeArgs.obtain(); + args.arg1 = displayState; + args.arg2 = routeInfo; + mHandler.obtainMessage(MSG_MEDIA_TRANSFER_RECEIVER_STATE, args).sendToTarget(); + } + private final class H extends Handler { private H(Looper l) { super(l); @@ -1574,6 +1612,29 @@ public class CommandQueue extends IStatusBar.Stub implements for (int i = 0; i < mCallbacks.size(); i++) { mCallbacks.get(i).cancelRequestAddTile(packageName); } + break; + case MSG_MEDIA_TRANSFER_SENDER_STATE: + args = (SomeArgs) msg.obj; + int displayState = (int) args.arg1; + MediaRoute2Info routeInfo = (MediaRoute2Info) args.arg2; + IUndoMediaTransferCallback undoCallback = + (IUndoMediaTransferCallback) args.arg3; + for (int i = 0; i < mCallbacks.size(); i++) { + mCallbacks.get(i).updateMediaTapToTransferSenderDisplay( + displayState, routeInfo, undoCallback); + } + args.recycle(); + break; + case MSG_MEDIA_TRANSFER_RECEIVER_STATE: + args = (SomeArgs) msg.obj; + int receiverDisplayState = (int) args.arg1; + MediaRoute2Info receiverRouteInfo = (MediaRoute2Info) args.arg2; + for (int i = 0; i < mCallbacks.size(); i++) { + mCallbacks.get(i).updateMediaTapToTransferReceiverDisplay( + receiverDisplayState, receiverRouteInfo); + } + args.recycle(); + break; } } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationViewHierarchyManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationViewHierarchyManager.java index abfdfaf2115f..092e86daddb8 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationViewHierarchyManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationViewHierarchyManager.java @@ -27,6 +27,7 @@ import android.util.Log; import android.view.View; import android.view.ViewGroup; +import com.android.keyguard.KeyguardUpdateMonitor; import com.android.systemui.R; import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.flags.FeatureFlags; @@ -47,6 +48,7 @@ import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow import com.android.systemui.statusbar.notification.stack.ForegroundServiceSectionController; import com.android.systemui.statusbar.notification.stack.NotificationListContainer; import com.android.systemui.statusbar.phone.KeyguardBypassController; +import com.android.systemui.statusbar.policy.KeyguardStateController; import com.android.systemui.util.Assert; import com.android.wm.shell.bubbles.Bubbles; @@ -98,6 +100,8 @@ public class NotificationViewHierarchyManager implements DynamicPrivacyControlle private final ForegroundServiceSectionController mFgsSectionController; private final NotifPipelineFlags mNotifPipelineFlags; private AssistantFeedbackController mAssistantFeedbackController; + private final KeyguardStateController mKeyguardStateController; + private final KeyguardUpdateMonitor mKeyguardUpdateMonitor; private final Context mContext; private NotificationPresenter mPresenter; @@ -129,7 +133,9 @@ public class NotificationViewHierarchyManager implements DynamicPrivacyControlle DynamicChildBindController dynamicChildBindController, LowPriorityInflationHelper lowPriorityInflationHelper, AssistantFeedbackController assistantFeedbackController, - NotifPipelineFlags notifPipelineFlags) { + NotifPipelineFlags notifPipelineFlags, + KeyguardUpdateMonitor keyguardUpdateMonitor, + KeyguardStateController keyguardStateController) { mContext = context; mHandler = mainHandler; mFeatureFlags = featureFlags; @@ -149,6 +155,8 @@ public class NotificationViewHierarchyManager implements DynamicPrivacyControlle mDynamicChildBindController = dynamicChildBindController; mLowPriorityInflationHelper = lowPriorityInflationHelper; mAssistantFeedbackController = assistantFeedbackController; + mKeyguardUpdateMonitor = keyguardUpdateMonitor; + mKeyguardStateController = keyguardStateController; } public void setUpWithPresenter(NotificationPresenter presenter, @@ -171,9 +179,15 @@ public class NotificationViewHierarchyManager implements DynamicPrivacyControlle if (!mNotifPipelineFlags.checkLegacyPipelineEnabled()) { return; } + Trace.beginSection("NotificationViewHierarchyManager.updateNotificationViews"); beginUpdate(); + boolean dynamicallyUnlocked = mDynamicPrivacyController.isDynamicallyUnlocked() + && !(mStatusBarStateController.getState() == StatusBarState.KEYGUARD + && mKeyguardUpdateMonitor.getUserUnlockedWithBiometricAndIsBypassing( + KeyguardUpdateMonitor.getCurrentUser())) + && !mKeyguardStateController.isKeyguardGoingAway(); List<NotificationEntry> activeNotifications = mEntryManager.getVisibleNotifications(); ArrayList<ExpandableNotificationRow> toShow = new ArrayList<>(activeNotifications.size()); final int N = activeNotifications.size(); @@ -192,7 +206,7 @@ public class NotificationViewHierarchyManager implements DynamicPrivacyControlle boolean devicePublic = mLockscreenUserManager.isLockscreenPublicMode(currentUserId); boolean userPublic = devicePublic || mLockscreenUserManager.isLockscreenPublicMode(userId); - if (userPublic && mDynamicPrivacyController.isDynamicallyUnlocked() + if (userPublic && dynamicallyUnlocked && (userId == currentUserId || userId == UserHandle.USER_ALL || !mLockscreenUserManager.needsSeparateWorkChallenge(userId))) { userPublic = false; @@ -340,6 +354,7 @@ public class NotificationViewHierarchyManager implements DynamicPrivacyControlle mListContainer.onNotificationViewUpdateFinished(); endUpdate(); + Trace.endSection(); } /** @@ -349,6 +364,7 @@ public class NotificationViewHierarchyManager implements DynamicPrivacyControlle * {@link com.android.systemui.statusbar.notification.collection.coordinator.StackCoordinator} */ private void updateNotifStats() { + Trace.beginSection("NotificationViewHierarchyManager.updateNotifStats"); boolean hasNonClearableAlertingNotifs = false; boolean hasClearableAlertingNotifs = false; boolean hasNonClearableSilentNotifs = false; @@ -390,6 +406,7 @@ public class NotificationViewHierarchyManager implements DynamicPrivacyControlle hasNonClearableSilentNotifs /* hasNonClearableSilentNotifs */, hasClearableSilentNotifs /* hasClearableSilentNotifs */ )); + Trace.endSection(); } /** @@ -507,7 +524,7 @@ public class NotificationViewHierarchyManager implements DynamicPrivacyControlle } private void updateRowStatesInternal() { - Trace.beginSection("NotificationViewHierarchyManager#updateRowStates"); + Trace.beginSection("NotificationViewHierarchyManager.updateRowStates"); final int N = mListContainer.getContainerChildCount(); int visibleNotifications = 0; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarState.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarState.java index c0148c0ecb21..16bc951e0323 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarState.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarState.java @@ -37,12 +37,6 @@ public class StatusBarState { */ public static final int SHADE_LOCKED = 2; - /** - * Status bar is locked and shows the full screen user switcher. - */ - public static final int FULLSCREEN_USER_SWITCHER = 3; - - public static String toShortString(int x) { switch (x) { case SHADE: @@ -51,8 +45,6 @@ public class StatusBarState { return "SHD_LCK"; case KEYGUARD: return "KGRD"; - case FULLSCREEN_USER_SWITCHER: - return "FS_USRSW"; default: return "bad_value_" + x; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarStateControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarStateControllerImpl.java index f56602ee2bcd..ee12cc5679fe 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarStateControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarStateControllerImpl.java @@ -76,7 +76,7 @@ public class StatusBarStateControllerImpl implements // Must be a power of 2 private static final int HISTORY_SIZE = 32; - private static final int MAX_STATE = StatusBarState.FULLSCREEN_USER_SWITCHER; + private static final int MAX_STATE = StatusBarState.SHADE_LOCKED; private static final int MIN_STATE = StatusBarState.SHADE; private static final Comparator<RankedListener> sComparator = diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarStateEvent.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarStateEvent.java index 8330169980d4..b66a48e07777 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarStateEvent.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarStateEvent.java @@ -34,10 +34,7 @@ public enum StatusBarStateEvent implements UiEventLogger.UiEventEnum { STATUS_BAR_STATE_KEYGUARD(430), @UiEvent(doc = "StatusBarState changed to SHADE_LOCKED state") - STATUS_BAR_STATE_SHADE_LOCKED(431), - - @UiEvent(doc = "StatusBarState changed to FULLSCREEN_USER_SWITCHER state") - STATUS_BAR_STATE_FULLSCREEN_USER_SWITCHER(432); + STATUS_BAR_STATE_SHADE_LOCKED(431); private int mId; StatusBarStateEvent(int id) { @@ -60,8 +57,6 @@ public enum StatusBarStateEvent implements UiEventLogger.UiEventEnum { return STATUS_BAR_STATE_KEYGUARD; case StatusBarState.SHADE_LOCKED: return STATUS_BAR_STATE_SHADE_LOCKED; - case StatusBarState.FULLSCREEN_USER_SWITCHER: - return STATUS_BAR_STATE_FULLSCREEN_USER_SWITCHER; default: return STATUS_BAR_STATE_UNKNOWN; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/dagger/StatusBarDependenciesModule.java b/packages/SystemUI/src/com/android/systemui/statusbar/dagger/StatusBarDependenciesModule.java index d574cdabced6..e3d0d9802b8d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/dagger/StatusBarDependenciesModule.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/dagger/StatusBarDependenciesModule.java @@ -23,6 +23,7 @@ import android.os.Handler; import android.service.dreams.IDreamManager; import com.android.internal.statusbar.IStatusBarService; +import com.android.keyguard.KeyguardUpdateMonitor; import com.android.systemui.animation.ActivityLaunchAnimator; import com.android.systemui.animation.DialogLaunchAnimator; import com.android.systemui.dagger.SysUISingleton; @@ -72,6 +73,7 @@ import com.android.systemui.statusbar.phone.StatusBarRemoteInputCallback; import com.android.systemui.statusbar.phone.ongoingcall.OngoingCallController; import com.android.systemui.statusbar.phone.ongoingcall.OngoingCallFlags; import com.android.systemui.statusbar.phone.ongoingcall.OngoingCallLogger; +import com.android.systemui.statusbar.policy.KeyguardStateController; import com.android.systemui.statusbar.policy.RemoteInputUriController; import com.android.systemui.statusbar.window.StatusBarWindowController; import com.android.systemui.tracing.ProtoTracer; @@ -214,7 +216,9 @@ public interface StatusBarDependenciesModule { DynamicChildBindController dynamicChildBindController, LowPriorityInflationHelper lowPriorityInflationHelper, AssistantFeedbackController assistantFeedbackController, - NotifPipelineFlags notifPipelineFlags) { + NotifPipelineFlags notifPipelineFlags, + KeyguardUpdateMonitor keyguardUpdateMonitor, + KeyguardStateController keyguardStateController) { return new NotificationViewHierarchyManager( context, mainHandler, @@ -231,7 +235,9 @@ public interface StatusBarDependenciesModule { dynamicChildBindController, lowPriorityInflationHelper, assistantFeedbackController, - notifPipelineFlags); + notifPipelineFlags, + keyguardUpdateMonitor, + keyguardStateController); } /** diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationEntryManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationEntryManager.java index c33160858d0f..ad9f12ec3bc0 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationEntryManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationEntryManager.java @@ -24,6 +24,7 @@ import android.app.Notification; import android.app.NotificationChannel; import android.os.RemoteException; import android.os.SystemClock; +import android.os.Trace; import android.os.UserHandle; import android.service.notification.NotificationListenerService; import android.service.notification.NotificationListenerService.Ranking; @@ -343,11 +344,14 @@ public class NotificationEntryManager implements private final InflationCallback mInflationCallback = new InflationCallback() { @Override public void handleInflationException(NotificationEntry entry, Exception e) { + Trace.beginSection("NotificationEntryManager.handleInflationException"); NotificationEntryManager.this.handleInflationException(entry.getSbn(), e); + Trace.endSection(); } @Override public void onAsyncInflationFinished(NotificationEntry entry) { + Trace.beginSection("NotificationEntryManager.onAsyncInflationFinished"); mPendingNotifications.remove(entry.getKey()); // If there was an async task started after the removal, we don't want to add it back to // the list, otherwise we might get leaks. @@ -369,6 +373,7 @@ public class NotificationEntryManager implements } } } + Trace.endSection(); } }; @@ -463,6 +468,7 @@ public class NotificationEntryManager implements boolean forceRemove, DismissedByUserStats dismissedByUserStats, int reason) { + Trace.beginSection("NotificationEntryManager.removeNotificationInternal"); final NotificationEntry entry = getActiveNotificationUnfiltered(key); @@ -470,6 +476,7 @@ public class NotificationEntryManager implements if (interceptor.onNotificationRemoveRequested(key, entry, reason)) { // Remove intercepted; log and skip mLogger.logRemovalIntercepted(key); + Trace.endSection(); return; } } @@ -557,6 +564,7 @@ public class NotificationEntryManager implements mLeakDetector.trackGarbage(entry); } } + Trace.endSection(); } private void sendNotificationRemovalToServer( @@ -620,6 +628,7 @@ public class NotificationEntryManager implements private void addNotificationInternal( StatusBarNotification notification, RankingMap rankingMap) throws InflationException { + Trace.beginSection("NotificationEntryManager.addNotificationInternal"); String key = notification.getKey(); if (DEBUG) { Log.d(TAG, "addNotification key=" + key); @@ -667,6 +676,7 @@ public class NotificationEntryManager implements for (NotifCollectionListener listener : mNotifCollectionListeners) { listener.onRankingApplied(); } + Trace.endSection(); } public void addNotification(StatusBarNotification notification, RankingMap ranking) { @@ -679,12 +689,14 @@ public class NotificationEntryManager implements private void updateNotificationInternal(StatusBarNotification notification, RankingMap ranking) throws InflationException { + Trace.beginSection("NotificationEntryManager.updateNotificationInternal"); if (DEBUG) Log.d(TAG, "updateNotification(" + notification + ")"); final String key = notification.getKey(); abortExistingInflation(key, "updateNotification"); final NotificationEntry entry = getActiveNotificationUnfiltered(key); if (entry == null) { + Trace.endSection(); return; } @@ -721,6 +733,7 @@ public class NotificationEntryManager implements for (NotifCollectionListener listener : mNotifCollectionListeners) { listener.onRankingApplied(); } + Trace.endSection(); } public void updateNotification(StatusBarNotification notification, RankingMap ranking) { @@ -740,14 +753,17 @@ public class NotificationEntryManager implements mLogger.logUseWhileNewPipelineActive("updateNotifications", reason); return; } + Trace.beginSection("NotificationEntryManager.updateNotifications"); reapplyFilterAndSort(reason); if (mPresenter != null) { mPresenter.updateNotificationViews(reason); } mNotifLiveDataStore.setActiveNotifList(getVisibleNotifications()); + Trace.endSection(); } public void updateNotificationRanking(RankingMap rankingMap) { + Trace.beginSection("NotificationEntryManager.updateNotificationRanking"); List<NotificationEntry> entries = new ArrayList<>(); entries.addAll(getVisibleNotifications()); entries.addAll(mPendingNotifications.values()); @@ -788,6 +804,7 @@ public class NotificationEntryManager implements for (NotifCollectionListener listener : mNotifCollectionListeners) { listener.onRankingApplied(); } + Trace.endSection(); } void notifyChannelModified( @@ -887,6 +904,7 @@ public class NotificationEntryManager implements /** @return list of active notifications filtered for the current user */ public List<NotificationEntry> getActiveNotificationsForCurrentUser() { + Trace.beginSection("NotificationEntryManager.getActiveNotificationsForCurrentUser"); Assert.isMainThread(); ArrayList<NotificationEntry> filtered = new ArrayList<>(); @@ -898,7 +916,7 @@ public class NotificationEntryManager implements } filtered.add(entry); } - + Trace.endSection(); return filtered; } @@ -908,10 +926,12 @@ public class NotificationEntryManager implements * @param reason the reason for calling this method, which will be logged */ public void updateRanking(RankingMap rankingMap, String reason) { + Trace.beginSection("NotificationEntryManager.updateRanking"); updateRankingAndSort(rankingMap, reason); for (NotifCollectionListener listener : mNotifCollectionListeners) { listener.onRankingApplied(); } + Trace.endSection(); } /** Resorts / filters the current notification set with the current RankingMap */ @@ -920,7 +940,9 @@ public class NotificationEntryManager implements mLogger.logUseWhileNewPipelineActive("reapplyFilterAndSort", reason); return; } + Trace.beginSection("NotificationEntryManager.reapplyFilterAndSort"); updateRankingAndSort(mRanker.getRankingMap(), reason); + Trace.endSection(); } /** Calls to NotificationRankingManager and updates mSortedAndFiltered */ @@ -929,9 +951,11 @@ public class NotificationEntryManager implements mLogger.logUseWhileNewPipelineActive("updateRankingAndSort", reason); return; } + Trace.beginSection("NotificationEntryManager.updateRankingAndSort"); mSortedAndFiltered.clear(); mSortedAndFiltered.addAll(mRanker.updateRanking( rankingMap, mActiveNotifications.values(), reason)); + Trace.endSection(); } /** dump the current active notification list. Called from StatusBar */ diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/ShadeListBuilder.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/ShadeListBuilder.java index 74c97fdbddca..b328ae8cd0bb 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/ShadeListBuilder.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/ShadeListBuilder.java @@ -226,8 +226,13 @@ public class ShadeListBuilder implements Dumpable { mNotifSections.clear(); for (NotifSectioner sectioner : sectioners) { - mNotifSections.add(new NotifSection(sectioner, mNotifSections.size())); + final NotifSection section = new NotifSection(sectioner, mNotifSections.size()); + final NotifComparator sectionComparator = section.getComparator(); + mNotifSections.add(section); sectioner.setInvalidationListener(this::onNotifSectionInvalidated); + if (sectionComparator != null) { + sectionComparator.setInvalidationListener(this::onNotifComparatorInvalidated); + } } mNotifSections.add(new NotifSection(DEFAULT_SECTIONER, mNotifSections.size())); @@ -426,14 +431,18 @@ public class ShadeListBuilder implements Dumpable { } Trace.endSection(); + Trace.beginSection("ShadeListBuilder.logEndBuildList"); // Step 9: We're done! mLogger.logEndBuildList( mIterationCount, mReadOnlyNotifList.size(), countChildren(mReadOnlyNotifList)); if (mAlwaysLogList || mIterationCount % 10 == 0) { + Trace.beginSection("ShadeListBuilder.logFinalList"); mLogger.logFinalList(mNotifList); + Trace.endSection(); } + Trace.endSection(); mPipelineState.setState(STATE_IDLE); mIterationCount++; Trace.endSection(); @@ -996,16 +1005,20 @@ public class ShadeListBuilder implements Dumpable { } private void freeEmptyGroups() { + Trace.beginSection("ShadeListBuilder.freeEmptyGroups"); mGroups.values().removeIf(ge -> ge.getSummary() == null && ge.getChildren().isEmpty()); + Trace.endSection(); } private void logChanges() { + Trace.beginSection("ShadeListBuilder.logChanges"); for (NotificationEntry entry : mAllEntries) { logAttachStateChanges(entry); } for (GroupEntry group : mGroups.values()) { logAttachStateChanges(group); } + Trace.endSection(); } private void logAttachStateChanges(ListEntry entry) { @@ -1083,16 +1096,23 @@ public class ShadeListBuilder implements Dumpable { } private void cleanupPluggables() { + Trace.beginSection("ShadeListBuilder.cleanupPluggables"); callOnCleanup(mNotifPreGroupFilters); callOnCleanup(mNotifPromoters); callOnCleanup(mNotifFinalizeFilters); callOnCleanup(mNotifComparators); for (int i = 0; i < mNotifSections.size(); i++) { - mNotifSections.get(i).getSectioner().onCleanup(); + final NotifSection notifSection = mNotifSections.get(i); + notifSection.getSectioner().onCleanup(); + final NotifComparator comparator = notifSection.getComparator(); + if (comparator != null) { + comparator.onCleanup(); + } } callOnCleanup(List.of(getStabilityManager())); + Trace.endSection(); } private void callOnCleanup(List<? extends Pluggable<?>> pluggables) { @@ -1101,6 +1121,19 @@ public class ShadeListBuilder implements Dumpable { } } + @Nullable + private NotifComparator getSectionComparator( + @NonNull ListEntry o1, @NonNull ListEntry o2) { + final NotifSection section = o1.getSection(); + if (section != o2.getSection()) { + throw new RuntimeException("Entry ordering should only be done within sections"); + } + if (section != null) { + return section.getComparator(); + } + return null; + } + private final Comparator<ListEntry> mTopLevelComparator = (o1, o2) -> { int cmp = Integer.compare( o1.getSectionIndex(), @@ -1112,6 +1145,12 @@ public class ShadeListBuilder implements Dumpable { cmp = Integer.compare(index1, index2); if (cmp != 0) return cmp; + NotifComparator sectionComparator = getSectionComparator(o1, o2); + if (sectionComparator != null) { + cmp = sectionComparator.compare(o1, o2); + if (cmp != 0) return cmp; + } + for (int i = 0; i < mNotifComparators.size(); i++) { cmp = mNotifComparators.get(i).compare(o1, o2); if (cmp != 0) return cmp; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/ConversationCoordinator.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/ConversationCoordinator.kt index ba88ad7844f1..a390e9f9b09d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/ConversationCoordinator.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/ConversationCoordinator.kt @@ -51,21 +51,18 @@ class ConversationCoordinator @Inject constructor( val sectioner = object : NotifSectioner("People", BUCKET_PEOPLE) { override fun isInSection(entry: ListEntry): Boolean = isConversation(entry) - override fun getHeaderNodeController() = - // TODO: remove SHOW_ALL_SECTIONS, this redundant method, and peopleHeaderController - if (RankingCoordinator.SHOW_ALL_SECTIONS) peopleHeaderController else null - } - val comparator = object : NotifComparator("People") { - override fun compare(entry1: ListEntry, entry2: ListEntry): Int { - assert(entry1.section === entry2.section) - if (entry1.section?.sectioner !== sectioner) { - return 0 + override fun getComparator() = object : NotifComparator("People") { + override fun compare(entry1: ListEntry, entry2: ListEntry): Int { + val type1 = getPeopleType(entry1) + val type2 = getPeopleType(entry2) + return type2.compareTo(type1) } - val type1 = getPeopleType(entry1) - val type2 = getPeopleType(entry2) - return type2.compareTo(type1) } + + override fun getHeaderNodeController() = + // TODO: remove SHOW_ALL_SECTIONS, this redundant method, and peopleHeaderController + if (RankingCoordinator.SHOW_ALL_SECTIONS) peopleHeaderController else null } override fun attach(pipeline: NotifPipeline) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/HeadsUpCoordinator.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/HeadsUpCoordinator.kt index 031132424115..41b070635d4f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/HeadsUpCoordinator.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/HeadsUpCoordinator.kt @@ -26,6 +26,7 @@ import com.android.systemui.statusbar.notification.collection.ListEntry import com.android.systemui.statusbar.notification.collection.NotifPipeline import com.android.systemui.statusbar.notification.collection.NotificationEntry import com.android.systemui.statusbar.notification.collection.coordinator.dagger.CoordinatorScope +import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifComparator import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifPromoter import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifSectioner import com.android.systemui.statusbar.notification.collection.notifcollection.NotifCollectionListener @@ -456,6 +457,13 @@ class HeadsUpCoordinator @Inject constructor( // TODO: This check won't notice if a child of the group is going to HUN... isGoingToShowHunNoRetract(entry) + override fun getComparator(): NotifComparator { + return object : NotifComparator("HeadsUp") { + override fun compare(o1: ListEntry, o2: ListEntry): Int = + mHeadsUpManager.compare(o1.representativeEntry, o2.representativeEntry) + } + } + override fun getHeaderNodeController(): NodeController? = // TODO: remove SHOW_ALL_SECTIONS, this redundant method, and mIncomingHeaderController if (RankingCoordinator.SHOW_ALL_SECTIONS) mIncomingHeaderController else null diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/KeyguardCoordinator.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/KeyguardCoordinator.java index 361f44e0c4b9..22300d8c180d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/KeyguardCoordinator.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/KeyguardCoordinator.java @@ -166,6 +166,8 @@ public class KeyguardCoordinator implements Coordinator { } } + // TODO(b/206118999): merge this class with SensitiveContentCoordinator which also depends on + // these same updates private void setupInvalidateNotifListCallbacks() { // register onKeyguardShowing callback mKeyguardStateController.addCallback(mKeyguardCallback); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/NotifCoordinators.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/NotifCoordinators.kt index 850cb4b88154..757fb5a2fe9a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/NotifCoordinators.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/NotifCoordinators.kt @@ -20,7 +20,6 @@ import com.android.systemui.dump.DumpManager import com.android.systemui.statusbar.notification.NotifPipelineFlags import com.android.systemui.statusbar.notification.collection.NotifPipeline import com.android.systemui.statusbar.notification.collection.coordinator.dagger.CoordinatorScope -import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifComparator import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifSectioner import java.io.FileDescriptor import java.io.PrintWriter @@ -64,7 +63,6 @@ class NotifCoordinatorsImpl @Inject constructor( private val mCoordinators: MutableList<Coordinator> = ArrayList() private val mOrderedSections: MutableList<NotifSectioner> = ArrayList() - private val mOrderedComparators: MutableList<NotifComparator> = ArrayList() /** * Creates all the coordinators. @@ -119,9 +117,6 @@ class NotifCoordinatorsImpl @Inject constructor( mOrderedSections.add(rankingCoordinator.alertingSectioner) // Alerting mOrderedSections.add(rankingCoordinator.silentSectioner) // Silent mOrderedSections.add(rankingCoordinator.minimizedSectioner) // Minimized - - // Manually add ordered comparators - mOrderedComparators.add(conversationCoordinator.comparator) } /** @@ -133,7 +128,6 @@ class NotifCoordinatorsImpl @Inject constructor( c.attach(pipeline) } pipeline.setSections(mOrderedSections) - pipeline.setComparators(mOrderedComparators) } override fun dump(fd: FileDescriptor, pw: PrintWriter, args: Array<String>) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/SensitiveContentCoordinator.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/SensitiveContentCoordinator.kt index a115e0400de3..9c82cb64a0d7 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/SensitiveContentCoordinator.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/SensitiveContentCoordinator.kt @@ -17,7 +17,10 @@ package com.android.systemui.statusbar.notification.collection.coordinator import android.os.UserHandle +import com.android.keyguard.KeyguardUpdateMonitor +import com.android.systemui.plugins.statusbar.StatusBarStateController import com.android.systemui.statusbar.NotificationLockscreenUserManager +import com.android.systemui.statusbar.StatusBarState import com.android.systemui.statusbar.notification.DynamicPrivacyController import com.android.systemui.statusbar.notification.collection.GroupEntry import com.android.systemui.statusbar.notification.collection.ListEntry @@ -26,6 +29,7 @@ import com.android.systemui.statusbar.notification.collection.NotificationEntry import com.android.systemui.statusbar.notification.collection.coordinator.dagger.CoordinatorScope import com.android.systemui.statusbar.notification.collection.listbuilder.OnBeforeRenderListListener import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.Invalidator +import com.android.systemui.statusbar.policy.KeyguardStateController import dagger.Module import dagger.Provides @@ -36,9 +40,13 @@ object SensitiveContentCoordinatorModule { @CoordinatorScope fun provideCoordinator( dynamicPrivacyController: DynamicPrivacyController, - lockscreenUserManager: NotificationLockscreenUserManager + lockscreenUserManager: NotificationLockscreenUserManager, + keyguardUpdateMonitor: KeyguardUpdateMonitor, + statusBarStateController: StatusBarStateController, + keyguardStateController: KeyguardStateController ): SensitiveContentCoordinator = - SensitiveContentCoordinatorImpl(dynamicPrivacyController, lockscreenUserManager) + SensitiveContentCoordinatorImpl(dynamicPrivacyController, lockscreenUserManager, + keyguardUpdateMonitor, statusBarStateController, keyguardStateController) } /** Coordinates re-inflation and post-processing of sensitive notification content. */ @@ -46,7 +54,10 @@ interface SensitiveContentCoordinator : Coordinator private class SensitiveContentCoordinatorImpl( private val dynamicPrivacyController: DynamicPrivacyController, - private val lockscreenUserManager: NotificationLockscreenUserManager + private val lockscreenUserManager: NotificationLockscreenUserManager, + private val keyguardUpdateMonitor: KeyguardUpdateMonitor, + private val statusBarStateController: StatusBarStateController, + private val keyguardStateController: KeyguardStateController ) : Invalidator("SensitiveContentInvalidator"), SensitiveContentCoordinator, DynamicPrivacyController.Listener, @@ -61,6 +72,19 @@ private class SensitiveContentCoordinatorImpl( override fun onDynamicPrivacyChanged(): Unit = invalidateList() override fun onBeforeRenderList(entries: List<ListEntry>) { + if (keyguardStateController.isKeyguardGoingAway() || + statusBarStateController.getState() == StatusBarState.KEYGUARD && + keyguardUpdateMonitor.getUserUnlockedWithBiometricAndIsBypassing( + KeyguardUpdateMonitor.getCurrentUser())) { + // don't update yet if: + // - the keyguard is currently going away + // - LS is about to be dismissed by a biometric that bypasses LS (avoid notif flash) + + // TODO(b/206118999): merge this class with KeyguardCoordinator which ensures the + // dependent state changes invalidate the pipeline + return + } + val currentUserId = lockscreenUserManager.currentUserId val devicePublic = lockscreenUserManager.isLockscreenPublicMode(currentUserId) val deviceSensitive = devicePublic && diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/StackCoordinator.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/StackCoordinator.kt index c6a8a69cfb0d..1c96e8ceb27f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/StackCoordinator.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/StackCoordinator.kt @@ -23,6 +23,7 @@ import com.android.systemui.statusbar.notification.collection.render.NotifStackC import com.android.systemui.statusbar.notification.collection.render.NotifStats import com.android.systemui.statusbar.notification.stack.BUCKET_SILENT import com.android.systemui.statusbar.phone.NotificationIconAreaController +import com.android.systemui.util.traceSection import javax.inject.Inject /** @@ -38,10 +39,11 @@ class StackCoordinator @Inject internal constructor( pipeline.addOnAfterRenderListListener(::onAfterRenderList) } - fun onAfterRenderList(entries: List<ListEntry>, controller: NotifStackController) { - controller.setNotifStats(calculateNotifStats(entries)) - notificationIconAreaController.updateNotificationIcons(entries) - } + fun onAfterRenderList(entries: List<ListEntry>, controller: NotifStackController) = + traceSection("StackCoordinator.onAfterRenderList") { + controller.setNotifStats(calculateNotifStats(entries)) + notificationIconAreaController.updateNotificationIcons(entries) + } private fun calculateNotifStats(entries: List<ListEntry>): NotifStats { var hasNonClearableAlertingNotifs = false diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/listbuilder/NotifSection.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/listbuilder/NotifSection.kt index 8444287cbf60..263737e20a13 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/listbuilder/NotifSection.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/listbuilder/NotifSection.kt @@ -16,6 +16,7 @@ package com.android.systemui.statusbar.notification.collection.listbuilder +import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifComparator import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifSectioner import com.android.systemui.statusbar.notification.collection.render.NodeController import com.android.systemui.statusbar.notification.stack.PriorityBucket @@ -29,5 +30,7 @@ data class NotifSection( val headerController: NodeController? = sectioner.headerNodeController + val comparator: NotifComparator? = sectioner.comparator + @PriorityBucket val bucket: Int = sectioner.bucket } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/listbuilder/pluggable/NotifSectioner.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/listbuilder/pluggable/NotifSectioner.java index ef9ee11ef116..8c52c53ea6b2 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/listbuilder/pluggable/NotifSectioner.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/listbuilder/pluggable/NotifSectioner.java @@ -55,8 +55,22 @@ public abstract class NotifSectioner extends Pluggable<NotifSectioner> { public abstract boolean isInSection(ListEntry entry); /** + * Returns an optional {@link NotifComparator} to sort entries only in this section. + * {@link ListEntry} instances passed to this comparator are guaranteed to have this section, + * and this ordering will take precedence over any global comparators supplied to {@link + * com.android.systemui.statusbar.notification.collection.NotifPipeline#setComparators(List)}. + * + * NOTE: this method is only called once when the Sectioner is attached. + */ + public @Nullable NotifComparator getComparator() { + return null; + } + + /** * Returns an optional {@link NodeSpec} for the section header. If {@code null}, no header will * be used for the section. + * + * NOTE: this method is only called once when the Sectioner is attached. */ public @Nullable NodeController getHeaderNodeController() { return null; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/RootNodeController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/RootNodeController.kt index 4de8e7a5641c..b76169f111db 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/RootNodeController.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/RootNodeController.kt @@ -17,6 +17,7 @@ package com.android.systemui.statusbar.notification.collection.render import android.view.View +import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow import com.android.systemui.statusbar.notification.row.ExpandableView import com.android.systemui.statusbar.notification.stack.NotificationListContainer @@ -41,6 +42,7 @@ class RootNodeController( override fun addChildAt(child: NodeController, index: Int) { listContainer.addContainerViewAt(child.view, index) listContainer.onNotificationViewUpdateFinished() + (child.view as? ExpandableNotificationRow)?.isChangingPosition = false } override fun moveChildTo(child: NodeController, index: Int) { @@ -50,6 +52,7 @@ class RootNodeController( override fun removeChild(child: NodeController, isTransfer: Boolean) { if (isTransfer) { listContainer.setChildTransferInProgress(true) + (child.view as? ExpandableNotificationRow)?.isChangingPosition = true } listContainer.removeContainerView(child.view) if (isTransfer) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/ShadeViewDiffer.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/ShadeViewDiffer.kt index 28cd28594c3e..386e2d31380c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/ShadeViewDiffer.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/ShadeViewDiffer.kt @@ -104,19 +104,14 @@ class ShadeViewDiffer( views.remove(childNode.controller.view) } - if (childCompletelyRemoved && parentSpec == null) { - // If both the child and the parent are being removed at the same time, then - // keep the child attached to the parent for animation purposes - logger.logSkippingDetach(childNode.label, parentNode.label) - } else { - logger.logDetachingChild( - childNode.label, - !childCompletelyRemoved, - parentNode.label, - newParentNode?.label) - parentNode.removeChild(childNode, !childCompletelyRemoved) - childNode.parent = null - } + logger.logDetachingChild( + key = childNode.label, + isTransfer = !childCompletelyRemoved, + isParentRemoved = parentSpec == null, + oldParent = parentNode.label, + newParent = newParentNode?.label) + parentNode.removeChild(childNode, isTransfer = !childCompletelyRemoved) + childNode.parent = null } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/ShadeViewDifferLogger.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/ShadeViewDifferLogger.kt index d27455004c01..4c0357243d48 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/ShadeViewDifferLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/ShadeViewDifferLogger.kt @@ -28,25 +28,18 @@ class ShadeViewDifferLogger @Inject constructor( fun logDetachingChild( key: String, isTransfer: Boolean, + isParentRemoved: Boolean, oldParent: String?, newParent: String? ) { buffer.log(TAG, LogLevel.DEBUG, { str1 = key bool1 = isTransfer + bool2 = isParentRemoved str2 = oldParent str3 = newParent }, { - "Detach $str1 isTransfer=$bool1 oldParent=$str2 newParent=$str3" - }) - } - - fun logSkippingDetach(key: String, parent: String?) { - buffer.log(TAG, LogLevel.DEBUG, { - str1 = key - str2 = parent - }, { - "Skipping detach of $str1 because its parent $str2 is also being detached" + "Detach $str1 isTransfer=$bool1 isParentRemoved=$bool2 oldParent=$str2 newParent=$str3" }) } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java index dbd22db333ff..1f7d93012e39 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java @@ -49,6 +49,7 @@ import android.os.Build; import android.os.Bundle; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.Trace; import android.provider.Settings; import android.service.notification.StatusBarNotification; import android.util.ArraySet; @@ -1246,6 +1247,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView } private void reInflateViews() { + Trace.beginSection("ExpandableNotificationRow#reInflateViews"); // Let's update our childrencontainer. This is intentionally not guarded with // mIsSummaryWithChildren since we might have had children but not anymore. if (mChildrenContainer != null) { @@ -1277,6 +1279,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView RowContentBindParams params = mRowContentBindStage.getStageParams(mEntry); params.setNeedsReinflation(true); mRowContentBindStage.requestRebind(mEntry, null /* callback */); + Trace.endSection(); } @Override @@ -1737,6 +1740,29 @@ public class ExpandableNotificationRow extends ActivatableNotificationView } @Override + protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { + Trace.beginSection(appendTraceStyleTag("ExpNotRow#onMeasure")); + super.onMeasure(widthMeasureSpec, heightMeasureSpec); + Trace.endSection(); + } + + /** Generates and appends "(MessagingStyle)" type tag to passed string for tracing. */ + @NonNull + private String appendTraceStyleTag(@NonNull String traceTag) { + if (!Trace.isEnabled()) { + return traceTag; + } + + Class<? extends Notification.Style> style = + getEntry().getSbn().getNotification().getNotificationStyle(); + if (style == null) { + return traceTag + "(nostyle)"; + } else { + return traceTag + "(" + style.getSimpleName() + ")"; + } + } + + @Override protected void onFinishInflate() { super.onFinishInflate(); mPublicLayout = findViewById(R.id.expandedPublic); @@ -2542,6 +2568,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView @Override protected void onLayout(boolean changed, int left, int top, int right, int bottom) { + Trace.beginSection(appendTraceStyleTag("ExpNotRow#onLayout")); int intrinsicBefore = getIntrinsicHeight(); super.onLayout(changed, left, top, right, bottom); if (intrinsicBefore != getIntrinsicHeight() @@ -2555,6 +2582,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView if (mLayoutListener != null) { mLayoutListener.onLayout(); } + Trace.endSection(); } /** diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowController.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowController.java index 46efef66de43..2436ffdbeefa 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowController.java @@ -248,19 +248,25 @@ public class ExpandableNotificationRowController implements NotifViewController mView.addChildNotification((ExpandableNotificationRow) child.getView(), index); mListContainer.notifyGroupChildAdded(childView); + childView.setChangingPosition(false); } @Override public void moveChildTo(NodeController child, int index) { ExpandableNotificationRow childView = (ExpandableNotificationRow) child.getView(); + childView.setChangingPosition(true); mView.removeChildNotification(childView); mView.addChildNotification(childView, index); + childView.setChangingPosition(false); } @Override public void removeChild(NodeController child, boolean isTransfer) { ExpandableNotificationRow childView = (ExpandableNotificationRow) child.getView(); + if (isTransfer) { + childView.setChangingPosition(true); + } mView.removeChildNotification(childView); if (!isTransfer) { mListContainer.notifyGroupChildRemoved(childView, mView); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationSectionsManager.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationSectionsManager.kt index b02dc0cffdb9..54e26c34522d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationSectionsManager.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationSectionsManager.kt @@ -39,6 +39,7 @@ import com.android.systemui.statusbar.policy.ConfigurationController import com.android.systemui.util.children import com.android.systemui.util.foldToSparseArray import com.android.systemui.util.takeUntil +import com.android.systemui.util.traceSection import javax.inject.Inject /** @@ -157,7 +158,9 @@ class NotificationSectionsManager @Inject internal constructor( } } } - private fun logShadeContents() = parent.children.forEachIndexed(::logShadeChild) + private fun logShadeContents() = traceSection("NotifSectionsManager.logShadeContents") { + parent.children.forEachIndexed(::logShadeChild) + } private val isUsingMultipleSections: Boolean get() = sectionsFeatureManager.getNumberOfBuckets() > 1 @@ -221,10 +224,10 @@ class NotificationSectionsManager @Inject internal constructor( * Should be called whenever notifs are added, removed, or updated. Updates section boundary * bookkeeping and adds/moves/removes section headers if appropriate. */ - fun updateSectionBoundaries(reason: String) { + fun updateSectionBoundaries(reason: String) = traceSection("NotifSectionsManager.update") { notifPipelineFlags.checkLegacyPipelineEnabled() if (!isUsingMultipleSections) { - return + return@traceSection } logger.logStartSectionUpdate(reason) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java index 9f6a81d3a9ee..25b8a6545638 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java @@ -43,7 +43,6 @@ import android.graphics.Path; import android.graphics.PointF; import android.graphics.Rect; import android.os.Bundle; -import android.os.UserHandle; import android.provider.Settings; import android.util.AttributeSet; import android.util.IndentingPrintWriter; @@ -199,7 +198,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable private int mMaxTopPadding; private int mTopPadding; private boolean mAnimateNextTopPaddingChange; - private int mBottomMargin; + private int mBottomPadding; private int mBottomInset = 0; private float mQsExpansionFraction; private final int mSplitShadeMinContentHeight; @@ -696,8 +695,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable && mQsExpansionFraction != 1 && !mScreenOffAnimationController.shouldHideNotificationsFooter() && !mIsRemoteInputActive; - boolean showHistory = Settings.Secure.getIntForUser(mContext.getContentResolver(), - Settings.Secure.NOTIFICATION_HISTORY_ENABLED, 0, UserHandle.USER_CURRENT) == 1; + boolean showHistory = mController.isHistoryEnabled(); updateFooterView(showFooterView, showDismissView, showHistory); } @@ -981,7 +979,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable mMinTopOverScrollToEscape = res.getDimensionPixelSize( R.dimen.min_top_overscroll_to_qs); mStatusBarHeight = SystemBarUtils.getStatusBarHeight(mContext); - mBottomMargin = res.getDimensionPixelSize(R.dimen.notification_panel_margin_bottom); + mBottomPadding = res.getDimensionPixelSize(R.dimen.notification_panel_padding_bottom); mMinimumPaddings = res.getDimensionPixelSize(R.dimen.notification_side_paddings); mQsTilePadding = res.getDimensionPixelOffset(R.dimen.qs_tile_margin_horizontal); mSkinnyNotifsInLandscape = res.getBoolean(R.bool.config_skinnyNotifsInLandscape); @@ -2280,7 +2278,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable // The topPadding can be bigger than the regular padding when qs is expanded, in that // state the maxPanelHeight and the contentHeight should be bigger - mContentHeight = height + Math.max(mIntrinsicPadding, mTopPadding) + mBottomMargin; + mContentHeight = height + Math.max(mIntrinsicPadding, mTopPadding) + mBottomPadding; updateScrollability(); clampScrollPosition(); updateStackPosition(); @@ -5243,11 +5241,10 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable R.layout.status_bar_no_notifications, this, false); view.setText(R.string.empty_shade_text); view.setOnClickListener(v -> { - final boolean showHistory = Settings.Secure.getIntForUser(mContext.getContentResolver(), - Settings.Secure.NOTIFICATION_HISTORY_ENABLED, 0, UserHandle.USER_CURRENT) == 1; - Intent intent = showHistory ? new Intent( - Settings.ACTION_NOTIFICATION_HISTORY) : new Intent( - Settings.ACTION_NOTIFICATION_SETTINGS); + final boolean showHistory = mController.isHistoryEnabled(); + Intent intent = showHistory + ? new Intent(Settings.ACTION_NOTIFICATION_HISTORY) + : new Intent(Settings.ACTION_NOTIFICATION_SETTINGS); mStatusBar.startActivity(intent, true, true, Intent.FLAG_ACTIVITY_SINGLE_TOP); }); setEmptyShadeView(view); 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 334128a2b4ca..a2929f01f715 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 @@ -35,6 +35,8 @@ import android.content.res.Configuration; import android.content.res.Resources; import android.graphics.Point; import android.graphics.PointF; +import android.os.Trace; +import android.os.UserHandle; import android.provider.Settings; import android.service.notification.NotificationListenerService; import android.service.notification.StatusBarNotification; @@ -180,7 +182,6 @@ public class NotificationStackScrollLayoutController { private final NotificationLockscreenUserManager mLockscreenUserManager; // TODO: StatusBar should be encapsulated behind a Controller private final StatusBar mStatusBar; - private final NotificationGroupManagerLegacy mLegacyGroupManager; private final SectionHeaderController mSilentHeaderController; private final LockscreenShadeTransitionController mLockscreenShadeTransitionController; private final InteractionJankMonitor mJankMonitor; @@ -191,6 +192,7 @@ public class NotificationStackScrollLayoutController { private boolean mFadeNotificationsOnDismiss; private NotificationSwipeHelper mSwipeHelper; private boolean mShowEmptyShadeView; + @Nullable private Boolean mHistoryEnabled; private int mBarState; private HeadsUpAppearanceController mHeadsUpAppearanceController; @@ -340,6 +342,8 @@ public class NotificationStackScrollLayoutController { @Override public void onUserChanged(int userId) { mView.updateSensitiveness(false, mLockscreenUserManager.isAnyProfilePublicMode()); + mHistoryEnabled = null; + updateFooter(); } }; @@ -699,8 +703,6 @@ public class NotificationStackScrollLayoutController { } }); mNotifPipelineFlags = notifPipelineFlags; - mLegacyGroupManager = mNotifPipelineFlags.isNewPipelineEnabled() - ? null : legacyGroupManager; mSilentHeaderController = silentHeaderController; mNotifPipeline = notifPipeline; mNotifCollection = notifCollection; @@ -802,6 +804,7 @@ public class NotificationStackScrollLayoutController { (key, newValue) -> { switch (key) { case Settings.Secure.NOTIFICATION_HISTORY_ENABLED: + mHistoryEnabled = null; // invalidate updateFooter(); break; case HIGH_PRIORITY: @@ -1009,6 +1012,20 @@ public class NotificationStackScrollLayoutController { return mNotifStats.getNumActiveNotifs(); } + public boolean isHistoryEnabled() { + Boolean historyEnabled = mHistoryEnabled; + if (historyEnabled == null) { + if (mView == null || mView.getContext() == null) { + Log.wtf(TAG, "isHistoryEnabled failed to initialize its value"); + return false; + } + mHistoryEnabled = historyEnabled = + Settings.Secure.getIntForUser(mView.getContext().getContentResolver(), + Settings.Secure.NOTIFICATION_HISTORY_ENABLED, 0, UserHandle.USER_CURRENT) == 1; + } + return historyEnabled; + } + public int getIntrinsicContentHeight() { return mView.getIntrinsicContentHeight(); } @@ -1199,6 +1216,7 @@ public class NotificationStackScrollLayoutController { * are true. */ public void updateShowEmptyShadeView() { + Trace.beginSection("NSSLC.updateShowEmptyShadeView"); mShowEmptyShadeView = mBarState != KEYGUARD && (!mView.isQsExpanded() || mView.isUsingSplitNotificationShade()) && getVisibleNotificationCount() == 0; @@ -1206,6 +1224,7 @@ public class NotificationStackScrollLayoutController { mView.updateEmptyShadeView( mShowEmptyShadeView, mZenModeController.areNotificationsHiddenInShade()); + Trace.endSection(); } public boolean areNotificationsHiddenInShade() { @@ -1323,11 +1342,15 @@ public class NotificationStackScrollLayoutController { if (mNotifPipelineFlags.isNewPipelineEnabled()) { return; } + Trace.beginSection("NSSLC.updateSectionBoundaries"); mView.updateSectionBoundaries(reason); + Trace.endSection(); } public void updateFooter() { + Trace.beginSection("NSSLC.updateFooter"); mView.updateFooter(); + Trace.endSection(); } public void onUpdateRowStates() { 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 8f0579cc4693..e24cd3e9b016 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 @@ -46,7 +46,7 @@ import java.util.List; */ public class StackScrollAlgorithm { - public static final float START_FRACTION = 0.3f; + public static final float START_FRACTION = 0.5f; private static final String LOG_TAG = "StackScrollAlgorithm"; private final ViewGroup mHostView; @@ -61,7 +61,7 @@ public class StackScrollAlgorithm { @VisibleForTesting float mHeadsUpInset; private int mPinnedZTranslationExtra; private float mNotificationScrimPadding; - private int mCloseHandleUnderlapHeight; + private int mMarginBottom; public StackScrollAlgorithm( Context context, @@ -87,7 +87,7 @@ public class StackScrollAlgorithm { R.dimen.heads_up_pinned_elevation); mGapHeight = res.getDimensionPixelSize(R.dimen.notification_section_divider_height); mNotificationScrimPadding = res.getDimensionPixelSize(R.dimen.notification_side_paddings); - mCloseHandleUnderlapHeight = res.getDimensionPixelSize(R.dimen.close_handle_underlap); + mMarginBottom = res.getDimensionPixelSize(R.dimen.notification_panel_margin_bottom); } /** @@ -463,7 +463,7 @@ public class StackScrollAlgorithm { } } else { if (view instanceof EmptyShadeView) { - float fullHeight = ambientState.getLayoutMaxHeight() + mCloseHandleUnderlapHeight + float fullHeight = ambientState.getLayoutMaxHeight() + mMarginBottom - ambientState.getStackY(); viewState.yTranslation = (fullHeight - getMaxAllowedChildHeight(view)) / 2f; } else if (view != ambientState.getTrackedHeadsUpRow()) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/BiometricUnlockController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/BiometricUnlockController.java index 04d3e9a01d86..6a78370c7dab 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/BiometricUnlockController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/BiometricUnlockController.java @@ -180,6 +180,7 @@ public class BiometricUnlockController extends KeyguardUpdateMonitorCallback imp private final MetricsLogger mMetricsLogger; private final AuthController mAuthController; private final StatusBarStateController mStatusBarStateController; + private final LatencyTracker mLatencyTracker; private long mLastFpFailureUptimeMillis; private int mNumConsecutiveFpFailures; @@ -281,7 +282,8 @@ public class BiometricUnlockController extends KeyguardUpdateMonitorCallback imp AuthController authController, StatusBarStateController statusBarStateController, KeyguardUnlockAnimationController keyguardUnlockAnimationController, - SessionTracker sessionTracker) { + SessionTracker sessionTracker, + LatencyTracker latencyTracker) { mContext = context; mPowerManager = powerManager; mShadeController = shadeController; @@ -289,6 +291,7 @@ public class BiometricUnlockController extends KeyguardUpdateMonitorCallback imp mDozeParameters = dozeParameters; mUpdateMonitor.registerCallback(this); mMediaManager = notificationMediaManager; + mLatencyTracker = latencyTracker; wakefulnessLifecycle.addObserver(mWakefulnessObserver); screenLifecycle.addObserver(mScreenObserver); @@ -343,13 +346,13 @@ public class BiometricUnlockController extends KeyguardUpdateMonitorCallback imp public void onBiometricAcquired(BiometricSourceType biometricSourceType) { Trace.beginSection("BiometricUnlockController#onBiometricAcquired"); releaseBiometricWakeLock(); - if (!mUpdateMonitor.isDeviceInteractive()) { - if (LatencyTracker.isEnabled(mContext)) { + if (isWakeAndUnlock()) { + if (mLatencyTracker.isEnabled()) { int action = LatencyTracker.ACTION_FINGERPRINT_WAKE_AND_UNLOCK; if (biometricSourceType == BiometricSourceType.FACE) { action = LatencyTracker.ACTION_FACE_WAKE_AND_UNLOCK; } - LatencyTracker.getInstance(mContext).onActionStart(action); + mLatencyTracker.onActionStart(action); } mWakeLock = mPowerManager.newWakeLock( PowerManager.PARTIAL_WAKE_LOCK, BIOMETRIC_WAKE_LOCK_NAME); @@ -652,6 +655,14 @@ public class BiometricUnlockController extends KeyguardUpdateMonitorCallback imp Optional.ofNullable(BiometricUiEvent.FAILURE_EVENT_BY_SOURCE_TYPE.get(biometricSourceType)) .ifPresent(event -> UI_EVENT_LOGGER.log(event, getSessionId())); + if (mLatencyTracker.isEnabled()) { + int action = LatencyTracker.ACTION_FINGERPRINT_WAKE_AND_UNLOCK; + if (biometricSourceType == BiometricSourceType.FACE) { + action = LatencyTracker.ACTION_FACE_WAKE_AND_UNLOCK; + } + mLatencyTracker.onActionCancel(action); + } + if (biometricSourceType == BiometricSourceType.FINGERPRINT && mUpdateMonitor.isUdfpsSupported()) { long currUptimeMillis = SystemClock.uptimeMillis(); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java index 00b54e9e042a..2ec5f250eb48 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java @@ -16,7 +16,6 @@ package com.android.systemui.statusbar.phone; -import static com.android.systemui.DejankUtils.whitelistIpcs; import static com.android.systemui.ScreenDecorations.DisplayCutoutView.boundsFromDirection; import static com.android.systemui.util.Utils.getStatusBarHeaderHeightKeyguard; @@ -27,7 +26,6 @@ import android.content.res.Resources; import android.graphics.Color; import android.graphics.Rect; import android.graphics.drawable.Drawable; -import android.os.UserManager; import android.util.AttributeSet; import android.util.Pair; import android.util.TypedValue; @@ -47,7 +45,6 @@ import com.android.systemui.R; import com.android.systemui.animation.Interpolators; import com.android.systemui.battery.BatteryMeterView; import com.android.systemui.plugins.DarkIconDispatcher.DarkReceiver; -import com.android.systemui.statusbar.window.StatusBarWindowView; import java.io.FileDescriptor; import java.io.PrintWriter; @@ -72,7 +69,6 @@ public class KeyguardStatusBarView extends RelativeLayout { private StatusIconContainer mStatusIconContainer; private boolean mKeyguardUserSwitcherEnabled; - private final UserManager mUserManager; private boolean mIsPrivacyDotEnabled; private int mSystemIconsSwitcherHiddenExpandedMargin; @@ -99,10 +95,10 @@ public class KeyguardStatusBarView extends RelativeLayout { */ private int mTopClipping; private final Rect mClipRect = new Rect(0, 0, 0, 0); + private boolean mIsUserSwitcherEnabled; public KeyguardStatusBarView(Context context, AttributeSet attrs) { super(context, attrs); - mUserManager = UserManager.get(getContext()); } @Override @@ -163,6 +159,10 @@ public class KeyguardStatusBarView extends RelativeLayout { updateKeyguardStatusBarHeight(); } + public void setUserSwitcherEnabled(boolean enabled) { + mIsUserSwitcherEnabled = enabled; + } + private void updateKeyguardStatusBarHeight() { MarginLayoutParams lp = (MarginLayoutParams) getLayoutParams(); lp.height = getStatusBarHeaderHeightKeyguard(mContext); @@ -200,11 +200,7 @@ public class KeyguardStatusBarView extends RelativeLayout { // If we have no keyguard switcher, the screen width is under 600dp. In this case, // we only show the multi-user switch if it's enabled through UserManager as well as // by the user. - // TODO(b/138661450) Move IPC calls to background - boolean isMultiUserEnabled = whitelistIpcs(() -> mUserManager.isUserSwitcherEnabled( - mContext.getResources().getBoolean( - R.bool.qs_show_user_switcher_for_single_user))); - if (isMultiUserEnabled) { + if (mIsUserSwitcherEnabled) { mMultiUserAvatar.setVisibility(View.VISIBLE); } else { mMultiUserAvatar.setVisibility(View.GONE); 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 81871634fbaf..ee97fd631818 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarViewController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarViewController.java @@ -23,8 +23,10 @@ import static com.android.systemui.statusbar.events.SystemStatusAnimationSchedul import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.animation.ValueAnimator; +import android.content.res.Configuration; import android.content.res.Resources; import android.hardware.biometrics.BiometricSourceType; +import android.os.UserManager; import android.util.MathUtils; import android.view.View; @@ -92,6 +94,7 @@ public class KeyguardStatusBarViewController extends ViewController<KeyguardStat private final BiometricUnlockController mBiometricUnlockController; private final SysuiStatusBarStateController mStatusBarStateController; private final StatusBarContentInsetsProvider mInsetsProvider; + private final UserManager mUserManager; private final ConfigurationController.ConfigurationListener mConfigurationListener = new ConfigurationController.ConfigurationListener() { @@ -105,6 +108,11 @@ public class KeyguardStatusBarViewController extends ViewController<KeyguardStat mView.onOverlayChanged(); KeyguardStatusBarViewController.this.onThemeChanged(); } + + @Override + public void onConfigChanged(Configuration newConfig) { + updateUserSwitcher(); + } }; private final SystemStatusAnimationCallback mAnimationCallback = @@ -159,6 +167,13 @@ public class KeyguardStatusBarViewController extends ViewController<KeyguardStat } @Override + public void onKeyguardVisibilityChanged(boolean showing) { + if (showing) { + updateUserSwitcher(); + } + } + + @Override public void onBiometricRunningStateChanged( boolean running, BiometricSourceType biometricSourceType) { @@ -230,7 +245,8 @@ public class KeyguardStatusBarViewController extends ViewController<KeyguardStat KeyguardUpdateMonitor keyguardUpdateMonitor, BiometricUnlockController biometricUnlockController, SysuiStatusBarStateController statusBarStateController, - StatusBarContentInsetsProvider statusBarContentInsetsProvider + StatusBarContentInsetsProvider statusBarContentInsetsProvider, + UserManager userManager ) { super(view); mCarrierTextController = carrierTextController; @@ -248,6 +264,7 @@ public class KeyguardStatusBarViewController extends ViewController<KeyguardStat mBiometricUnlockController = biometricUnlockController; mStatusBarStateController = statusBarStateController; mInsetsProvider = statusBarContentInsetsProvider; + mUserManager = userManager; mFirstBypassAttempt = mKeyguardBypassController.getBypassEnabled(); mKeyguardStateController.addCallback( @@ -293,7 +310,7 @@ public class KeyguardStatusBarViewController extends ViewController<KeyguardStat } mView.setOnApplyWindowInsetsListener( (view, windowInsets) -> mView.updateWindowInsets(windowInsets, mInsetsProvider)); - + updateUserSwitcher(); onThemeChanged(); } @@ -437,6 +454,14 @@ 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))); + } + + /** * Update {@link KeyguardStatusBarView}'s visibility based on whether keyguard is showing and * whether heads up is visible. */ diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelUnfoldAnimationController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelUnfoldAnimationController.kt new file mode 100644 index 000000000000..ff48755f750a --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelUnfoldAnimationController.kt @@ -0,0 +1,52 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.statusbar.phone + +import android.content.Context +import android.view.ViewGroup +import com.android.systemui.R +import com.android.systemui.shared.animation.UnfoldConstantTranslateAnimator +import com.android.systemui.shared.animation.UnfoldConstantTranslateAnimator.Direction.LEFT +import com.android.systemui.shared.animation.UnfoldConstantTranslateAnimator.Direction.RIGHT +import com.android.systemui.shared.animation.UnfoldConstantTranslateAnimator.ViewIdToTranslate +import com.android.systemui.unfold.SysUIUnfoldScope +import com.android.systemui.unfold.util.NaturalRotationUnfoldProgressProvider +import javax.inject.Inject + +@SysUIUnfoldScope +class NotificationPanelUnfoldAnimationController +@Inject +constructor(private val context: Context, progressProvider: NaturalRotationUnfoldProgressProvider) { + + private val translateAnimator by lazy { + UnfoldConstantTranslateAnimator( + viewsIdToTranslate = + setOf( + ViewIdToTranslate(R.id.quick_settings_panel, LEFT), + ViewIdToTranslate(R.id.notification_stack_scroller, RIGHT), + ViewIdToTranslate(R.id.rightLayout, RIGHT), + ViewIdToTranslate(R.id.clock, LEFT), + ViewIdToTranslate(R.id.date, LEFT)), + progressProvider = progressProvider) + } + + fun setup(root: ViewGroup) { + val translationMax = + context.resources.getDimensionPixelSize(R.dimen.notification_side_paddings).toFloat() + translateAnimator.init(root, translationMax) + } +} diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java index bb0ed95cc6ca..3d3a1da1cf82 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java @@ -20,6 +20,7 @@ import static android.app.StatusBarManager.WINDOW_STATE_SHOWING; import static android.view.View.GONE; import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT; +import static androidx.constraintlayout.widget.ConstraintSet.BOTTOM; import static androidx.constraintlayout.widget.ConstraintSet.END; import static androidx.constraintlayout.widget.ConstraintSet.PARENT_ID; import static androidx.constraintlayout.widget.ConstraintSet.START; @@ -414,6 +415,7 @@ public class NotificationPanelViewController extends PanelViewController private int mDisplayTopInset = 0; // in pixels private int mDisplayRightInset = 0; // in pixels private int mSplitShadeStatusBarHeight; + private int mSplitShadeNotificationsScrimMarginBottom; private final KeyguardClockPositionAlgorithm mClockPositionAlgorithm = @@ -669,6 +671,8 @@ public class NotificationPanelViewController extends PanelViewController private boolean mStatusViewCentered = true; private Optional<KeyguardUnfoldTransition> mKeyguardUnfoldTransition; + private Optional<NotificationPanelUnfoldAnimationController> + mNotificationPanelUnfoldAnimationController; private final ListenerSet<Callbacks> mNotifEventSourceCallbacks = new ListenerSet<>(); @@ -929,6 +933,8 @@ public class NotificationPanelViewController extends PanelViewController mMaxKeyguardNotifications = resources.getInteger(R.integer.keyguard_max_notification_count); mKeyguardUnfoldTransition = unfoldComponent.map(c -> c.getKeyguardUnfoldTransition()); + mNotificationPanelUnfoldAnimationController = unfoldComponent.map( + SysUIUnfoldComponent::getNotificationPanelUnfoldAnimationController); mCommunalSourceMonitorCallback = (source) -> { mUiExecutor.execute(() -> setCommunalSource(source)); @@ -1064,6 +1070,8 @@ public class NotificationPanelViewController extends PanelViewController mTapAgainViewController.init(); mKeyguardUnfoldTransition.ifPresent(u -> u.setup(mView)); + mNotificationPanelUnfoldAnimationController.ifPresent(controller -> + controller.setup(mNotificationContainerParent)); } @Override @@ -1162,6 +1170,9 @@ public class NotificationPanelViewController extends PanelViewController public void updateResources() { mQuickQsOffsetHeight = SystemBarUtils.getQuickQsOffsetHeight(mView.getContext()); mSplitShadeStatusBarHeight = Utils.getSplitShadeStatusBarHeight(mView.getContext()); + mSplitShadeNotificationsScrimMarginBottom = + mResources.getDimensionPixelSize( + R.dimen.split_shade_notifications_scrim_margin_bottom); int qsWidth = mResources.getDimensionPixelSize(R.dimen.qs_panel_width); int panelWidth = mResources.getDimensionPixelSize(R.dimen.notification_panel_width); mShouldUseSplitNotificationShade = @@ -1171,6 +1182,8 @@ public class NotificationPanelViewController extends PanelViewController mQs.setInSplitShade(mShouldUseSplitNotificationShade); } + int notificationsBottomMargin = mResources.getDimensionPixelSize( + R.dimen.notification_panel_margin_bottom); int topMargin = mShouldUseSplitNotificationShade ? mSplitShadeStatusBarHeight : mResources.getDimensionPixelSize(R.dimen.notification_panel_margin_top); mSplitShadeHeaderController.setSplitShadeMode(mShouldUseSplitNotificationShade); @@ -1199,9 +1212,12 @@ public class NotificationPanelViewController extends PanelViewController constraintSet.getConstraint(R.id.notification_stack_scroller).layout.mWidth = panelWidth; constraintSet.getConstraint(R.id.qs_frame).layout.mWidth = qsWidth; constraintSet.setMargin(R.id.notification_stack_scroller, TOP, topMargin); + constraintSet.setMargin(R.id.notification_stack_scroller, BOTTOM, + notificationsBottomMargin); constraintSet.setMargin(R.id.qs_frame, TOP, topMargin); constraintSet.applyTo(mNotificationContainerParent); mAmbientState.setStackTopMargin(topMargin); + mNotificationsQSContainerController.updateMargins(); mNotificationsQSContainerController.setSplitShadeEnabled(mShouldUseSplitNotificationShade); updateKeyguardStatusViewAlignment(/* animate= */false); @@ -1319,6 +1335,7 @@ public class NotificationPanelViewController extends PanelViewController setKeyguardBottomAreaVisibility(mBarState, false); mKeyguardUnfoldTransition.ifPresent(u -> u.setup(mView)); + mNotificationPanelUnfoldAnimationController.ifPresent(u -> u.setup(mView)); } private void attachSplitShadeMediaPlayerContainer(FrameLayout container) { @@ -2558,7 +2575,8 @@ public class NotificationPanelViewController extends PanelViewController right = getView().getRight() + mDisplayRightInset; } else { top = Math.min(qsPanelBottomY, mSplitShadeStatusBarHeight); - bottom = top + mNotificationStackScrollLayoutController.getHeight(); + bottom = top + mNotificationStackScrollLayoutController.getHeight() + - mSplitShadeNotificationsScrimMarginBottom; left = mNotificationStackScrollLayoutController.getLeft(); right = mNotificationStackScrollLayoutController.getRight(); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationsQSContainerController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationsQSContainerController.kt index 34bb6d3e1a27..b457ebf60c71 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationsQSContainerController.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationsQSContainerController.kt @@ -1,6 +1,8 @@ package com.android.systemui.statusbar.phone import android.view.WindowInsets +import com.android.systemui.flags.FeatureFlags +import com.android.systemui.flags.Flags import com.android.systemui.navigationbar.NavigationModeController import com.android.systemui.plugins.qs.QS import com.android.systemui.plugins.qs.QSContainerController @@ -14,7 +16,8 @@ import javax.inject.Inject class NotificationsQSContainerController @Inject constructor( view: NotificationsQuickSettingsContainer, private val navigationModeController: NavigationModeController, - private val overviewProxyService: OverviewProxyService + private val overviewProxyService: OverviewProxyService, + private val featureFlags: FeatureFlags ) : ViewController<NotificationsQuickSettingsContainer>(view), QSContainerController { var qsExpanded = false @@ -63,7 +66,7 @@ class NotificationsQSContainerController @Inject constructor( } public override fun onViewAttached() { - notificationsBottomMargin = mView.defaultNotificationsMarginBottom + updateMargins() overviewProxyService.addCallback(taskbarVisibilityListener) mView.setInsetsChangedListener(windowInsetsListener) mView.setQSFragmentAttachedListener { qs: QS -> qs.setContainerController(this) } @@ -75,6 +78,10 @@ class NotificationsQSContainerController @Inject constructor( mView.removeQSFragmentAttachedListener() } + fun updateMargins() { + notificationsBottomMargin = mView.defaultNotificationsMarginBottom + } + override fun setCustomizerAnimating(animating: Boolean) { if (isQSCustomizerAnimating != animating) { isQSCustomizerAnimating = animating @@ -104,7 +111,11 @@ class NotificationsQSContainerController @Inject constructor( } mView.setPadding(0, 0, 0, containerPadding) mView.setNotificationsMarginBottom(notificationsMargin) - mView.setQSScrollPaddingBottom(qsScrollPaddingBottom) + if (featureFlags.isEnabled(Flags.NEW_FOOTER)) { + mView.setQSContainerPaddingBottom(notificationsMargin) + } else { + mView.setQSScrollPaddingBottom(qsScrollPaddingBottom) + } } private fun calculateBottomSpacing(): Pair<Int, Int> { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationsQuickSettingsContainer.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationsQuickSettingsContainer.java index 9210a8b5db80..95e3b70b4c5e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationsQuickSettingsContainer.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationsQuickSettingsContainer.java @@ -45,7 +45,6 @@ public class NotificationsQuickSettingsContainer extends ConstraintLayout private View mStackScroller; private View mKeyguardStatusBar; - private int mStackScrollerMargin; private ArrayList<View> mDrawingOrderedChildren = new ArrayList<>(); private ArrayList<View> mLayoutDrawingOrder = new ArrayList<>(); private final Comparator<View> mIndexComparator = Comparator.comparingInt(this::indexOfChild); @@ -53,6 +52,7 @@ public class NotificationsQuickSettingsContainer extends ConstraintLayout private Consumer<QS> mQSFragmentAttachedListener = qs -> {}; private QS mQs; private View mQSScrollView; + private View mQSContainer; public NotificationsQuickSettingsContainer(Context context, AttributeSet attrs) { super(context, attrs); @@ -63,7 +63,6 @@ public class NotificationsQuickSettingsContainer extends ConstraintLayout super.onFinishInflate(); mQsFrame = findViewById(R.id.qs_frame); mStackScroller = findViewById(R.id.notification_stack_scroller); - mStackScrollerMargin = ((LayoutParams) mStackScroller.getLayoutParams()).bottomMargin; mKeyguardStatusBar = findViewById(R.id.keyguard_header); } @@ -72,6 +71,7 @@ public class NotificationsQuickSettingsContainer extends ConstraintLayout mQs = (QS) fragment; mQSFragmentAttachedListener.accept(mQs); mQSScrollView = mQs.getView().findViewById(R.id.expanded_qs_scroll_view); + mQSContainer = mQs.getView().findViewById(R.id.quick_settings_container); } @Override @@ -91,13 +91,23 @@ public class NotificationsQuickSettingsContainer extends ConstraintLayout mQSScrollView.getPaddingLeft(), mQSScrollView.getPaddingTop(), mQSScrollView.getPaddingRight(), + paddingBottom); + } + } + + public void setQSContainerPaddingBottom(int paddingBottom) { + if (mQSContainer != null) { + mQSContainer.setPadding( + mQSContainer.getPaddingLeft(), + mQSContainer.getPaddingTop(), + mQSContainer.getPaddingRight(), paddingBottom ); } } public int getDefaultNotificationsMarginBottom() { - return mStackScrollerMargin; + return ((LayoutParams) mStackScroller.getLayoutParams()).bottomMargin; } public void setInsetsChangedListener(Consumer<WindowInsets> onInsetsChangedListener) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarViewController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarViewController.kt index 1cb19ab727aa..d6bf5f21c834 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarViewController.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarViewController.kt @@ -49,29 +49,29 @@ class PhoneStatusBarViewController private constructor( } override fun onViewAttached() { - moveFromCenterAnimationController?.let { animationController -> - val statusBarLeftSide: View = mView.findViewById(R.id.status_bar_left_side) - val systemIconArea: ViewGroup = mView.findViewById(R.id.system_icon_area) - - val viewsToAnimate = arrayOf( - statusBarLeftSide, - systemIconArea - ) - - mView.viewTreeObserver.addOnPreDrawListener(object : - ViewTreeObserver.OnPreDrawListener { - override fun onPreDraw(): Boolean { - animationController.onViewsReady(viewsToAnimate) - mView.viewTreeObserver.removeOnPreDrawListener(this) - return true - } - }) + if (moveFromCenterAnimationController == null) return + + val statusBarLeftSide: View = mView.findViewById(R.id.status_bar_left_side) + val systemIconArea: ViewGroup = mView.findViewById(R.id.system_icon_area) + + val viewsToAnimate = arrayOf( + statusBarLeftSide, + systemIconArea + ) + + mView.viewTreeObserver.addOnPreDrawListener(object : + ViewTreeObserver.OnPreDrawListener { + override fun onPreDraw(): Boolean { + moveFromCenterAnimationController.onViewsReady(viewsToAnimate) + mView.viewTreeObserver.removeOnPreDrawListener(this) + return true + } + }) - mView.addOnLayoutChangeListener { _, left, _, right, _, oldLeft, _, oldRight, _ -> - val widthChanged = right - left != oldRight - oldLeft - if (widthChanged) { - moveFromCenterAnimationController.onStatusBarWidthChanged() - } + mView.addOnLayoutChangeListener { _, left, _, right, _, oldLeft, _, oldRight, _ -> + val widthChanged = right - left != oldRight - oldLeft + if (widthChanged) { + moveFromCenterAnimationController.onStatusBarWidthChanged() } } @@ -162,9 +162,7 @@ class PhoneStatusBarViewController private constructor( PhoneStatusBarViewController( view, progressProvider.getOrNull(), - unfoldComponent.map { - it.getStatusBarMoveFromCenterAnimationController() - }.getOrNull(), + unfoldComponent.getOrNull()?.getStatusBarMoveFromCenterAnimationController(), touchEventHandler, configurationController ) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScreenOffAnimationController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScreenOffAnimationController.kt index 091831f36022..ea61a8b94e7e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScreenOffAnimationController.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScreenOffAnimationController.kt @@ -113,14 +113,16 @@ class ScreenOffAnimationController @Inject constructor( * the animation ends */ fun shouldDelayKeyguardShow(): Boolean = - animations.any { it.shouldPlayAnimation() } + animations.any { it.shouldDelayKeyguardShow() } /** * Return true while we want to ignore requests to show keyguard, we need to handle pending * keyguard lock requests manually + * + * @see [com.android.systemui.keyguard.KeyguardViewMediator.maybeHandlePendingLock] */ fun isKeyguardShowDelayed(): Boolean = - animations.any { it.isAnimationPlaying() } + animations.any { it.isKeyguardShowDelayed() } /** * Return true to ignore requests to hide keyguard @@ -211,6 +213,8 @@ interface ScreenOffAnimation { fun shouldAnimateInKeyguard(): Boolean = false fun animateInKeyguard(keyguardView: View, after: Runnable) = after.run() + fun shouldDelayKeyguardShow(): Boolean = false + fun isKeyguardShowDelayed(): Boolean = false fun isKeyguardHideDelayed(): Boolean = false fun shouldHideScrimOnWakeUp(): Boolean = false fun overrideNotificationsDozeAmount(): Boolean = false diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java index 2f3300a53ad6..c8cc807475f3 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java @@ -2935,14 +2935,6 @@ public class StatusBar extends CoreStartable implements return updateIsKeyguard(); } - /** - * stop(tag) - * @return True if StatusBar state is FULLSCREEN_USER_SWITCHER. - */ - public boolean isFullScreenUserSwitcherState() { - return mState == StatusBarState.FULLSCREEN_USER_SWITCHER; - } - boolean updateIsKeyguard() { return updateIsKeyguard(false /* forceStateChange */); } @@ -2996,9 +2988,7 @@ public class StatusBar extends CoreStartable implements onLaunchTransitionFadingEnded(); } mMessageRouter.cancelMessages(MSG_LAUNCH_TRANSITION_TIMEOUT); - if (mUserSwitcherController != null && mUserSwitcherController.useFullscreenUserSwitcher()) { - mStatusBarStateController.setState(StatusBarState.FULLSCREEN_USER_SWITCHER); - } else if (!mLockscreenShadeTransitionController.isWakingToShadeLocked()) { + if (!mLockscreenShadeTransitionController.isWakingToShadeLocked()) { mStatusBarStateController.setState(StatusBarState.KEYGUARD); } updatePanelExpansionForKeyguard(); @@ -3009,8 +2999,6 @@ public class StatusBar extends CoreStartable implements if (mState == StatusBarState.KEYGUARD && mBiometricUnlockController.getMode() != BiometricUnlockController.MODE_WAKE_AND_UNLOCK && !mBouncerShowing) { mShadeController.instantExpandNotificationsPanel(); - } else if (mState == StatusBarState.FULLSCREEN_USER_SWITCHER) { - instantCollapseNotificationPanel(); } } 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 b833c894c43f..d42a42364f21 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java @@ -49,7 +49,6 @@ import com.android.keyguard.KeyguardUpdateMonitor; import com.android.keyguard.KeyguardUpdateMonitorCallback; import com.android.keyguard.KeyguardViewController; import com.android.keyguard.ViewMediatorCallback; -import com.android.systemui.DejankUtils; import com.android.systemui.dagger.SysUISingleton; import com.android.systemui.dock.DockManager; import com.android.systemui.dreams.DreamOverlayStateController; @@ -214,6 +213,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb private final SysuiStatusBarStateController mStatusBarStateController; private final DockManager mDockManager; private final KeyguardUpdateMonitor mKeyguardUpdateManager; + private final LatencyTracker mLatencyTracker; private KeyguardBypassController mBypassController; @Nullable private AlternateAuthInterceptor mAlternateAuthInterceptor; @@ -246,7 +246,8 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb NotificationMediaManager notificationMediaManager, KeyguardBouncer.Factory keyguardBouncerFactory, KeyguardMessageAreaController.Factory keyguardMessageAreaFactory, - Lazy<ShadeController> shadeController) { + Lazy<ShadeController> shadeController, + LatencyTracker latencyTracker) { mContext = context; mViewMediatorCallback = callback; mLockPatternUtils = lockPatternUtils; @@ -262,6 +263,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb mKeyguardBouncerFactory = keyguardBouncerFactory; mKeyguardMessageAreaFactory = keyguardMessageAreaFactory; mShadeController = shadeController; + mLatencyTracker = latencyTracker; } @Override @@ -859,15 +861,11 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb } private void wakeAndUnlockDejank() { - if (mBiometricUnlockController.getMode() == MODE_WAKE_AND_UNLOCK - && LatencyTracker.isEnabled(mContext)) { + if (mBiometricUnlockController.isWakeAndUnlock() && mLatencyTracker.isEnabled()) { BiometricSourceType type = mBiometricUnlockController.getBiometricType(); - DejankUtils.postAfterTraversal(() -> { - LatencyTracker.getInstance(mContext).onActionEnd( - type == BiometricSourceType.FACE - ? LatencyTracker.ACTION_FACE_WAKE_AND_UNLOCK - : LatencyTracker.ACTION_FINGERPRINT_WAKE_AND_UNLOCK); - }); + mLatencyTracker.onActionEnd(type == BiometricSourceType.FACE + ? LatencyTracker.ACTION_FACE_WAKE_AND_UNLOCK + : LatencyTracker.ACTION_FINGERPRINT_WAKE_AND_UNLOCK); } } @@ -1186,7 +1184,6 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb // When a dream overlay is active, scrimming will cause any expansion to immediately expand. return (mOccluded && !mDreamOverlayStateController.isOverlayActive()) || mBouncer.willDismissWithAction() - || mStatusBar.isFullScreenUserSwitcherState() || (mBouncer.isShowing() && mBouncer.isScrimmed()) || mBouncer.isFullscreenBouncer(); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarMoveFromCenterAnimationController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarMoveFromCenterAnimationController.kt index 6d033477e3c9..79c0984d9bf7 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarMoveFromCenterAnimationController.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarMoveFromCenterAnimationController.kt @@ -18,11 +18,13 @@ package com.android.systemui.statusbar.phone import android.view.View import android.view.WindowManager import com.android.systemui.shared.animation.UnfoldMoveFromCenterAnimator +import com.android.systemui.shared.animation.UnfoldMoveFromCenterAnimator.AlphaProvider import com.android.systemui.statusbar.phone.PhoneStatusBarViewController.StatusBarViewsCenterProvider import com.android.systemui.unfold.SysUIUnfoldScope import com.android.systemui.unfold.UnfoldTransitionProgressProvider.TransitionProgressListener import com.android.systemui.unfold.util.ScopedUnfoldTransitionProgressProvider import javax.inject.Inject +import kotlin.math.max @SysUIUnfoldScope class StatusBarMoveFromCenterAnimationController @Inject constructor( @@ -31,8 +33,11 @@ class StatusBarMoveFromCenterAnimationController @Inject constructor( ) { private val transitionListener = TransitionListener() - private val moveFromCenterAnimator = UnfoldMoveFromCenterAnimator(windowManager, - viewCenterProvider = StatusBarViewsCenterProvider()) + private val moveFromCenterAnimator = UnfoldMoveFromCenterAnimator( + windowManager, + viewCenterProvider = StatusBarViewsCenterProvider(), + alphaProvider = StatusBarIconsAlphaProvider() + ) fun onViewsReady(viewsToAnimate: Array<View>) { moveFromCenterAnimator.updateDisplayProperties() @@ -65,4 +70,15 @@ class StatusBarMoveFromCenterAnimationController @Inject constructor( moveFromCenterAnimator.onTransitionProgress(1f) } } + + private class StatusBarIconsAlphaProvider : AlphaProvider { + override fun getAlpha(progress: Float): Float { + return max( + 0f, + (progress - ICONS_START_APPEARING_PROGRESS) / (1 - ICONS_START_APPEARING_PROGRESS) + ) + } + } } + +private const val ICONS_START_APPEARING_PROGRESS = 0.75F diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/UnlockedScreenOffAnimationController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/UnlockedScreenOffAnimationController.kt index cc65ca025139..0abe8e489638 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/UnlockedScreenOffAnimationController.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/UnlockedScreenOffAnimationController.kt @@ -136,6 +136,12 @@ class UnlockedScreenOffAnimationController @Inject constructor( globalSettings.getFloat(Settings.Global.ANIMATOR_DURATION_SCALE, 1f) } + override fun shouldDelayKeyguardShow(): Boolean = + shouldPlayAnimation() + + override fun isKeyguardShowDelayed(): Boolean = + isAnimationPlaying() + /** * Animates in the provided keyguard view, ending in the same position that it will be in on * AOD. diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpManager.java index 3084a957aeb5..784a54681484 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpManager.java @@ -350,11 +350,14 @@ public abstract class HeadsUpManager extends AlertingNotificationManager { * @return -1 if the first argument should be ranked higher than the second, 1 if the second * one should be ranked higher and 0 if they are equal. */ - public int compare(@NonNull NotificationEntry a, @NonNull NotificationEntry b) { + public int compare(@Nullable NotificationEntry a, @Nullable NotificationEntry b) { + if (a == null || b == null) { + return Boolean.compare(a == null, b == null); + } AlertEntry aEntry = getHeadsUpEntry(a.getKey()); AlertEntry bEntry = getHeadsUpEntry(b.getKey()); if (aEntry == null || bEntry == null) { - return aEntry == null ? 1 : -1; + return Boolean.compare(aEntry == null, bEntry == null); } return aEntry.compareTo(bEntry); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java index 48949f92413d..3205e097c03b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java @@ -118,6 +118,7 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene private boolean mColorized; private int mTint; private boolean mResetting; + private boolean mWasSpinning; // TODO(b/193539698): move these to a Controller private RemoteInputController mController; @@ -439,6 +440,10 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene mEditText.requestFocus(); } } + if (mWasSpinning) { + mController.addSpinning(mEntry.getKey(), mToken); + mWasSpinning = false; + } } @Override @@ -447,6 +452,7 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene mEditText.removeTextChangedListener(mTextWatcher); mEditText.setOnEditorActionListener(null); mEditText.mRemoteInputView = null; + mWasSpinning = mController.isSpinning(mEntry.getKey(), mToken); if (mEntry.getRow().isChangingPosition() || isTemporarilyDetached()) { return; } @@ -533,6 +539,8 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene if (isActive() && mWrapper != null) { mWrapper.setRemoteInputVisible(true); } + + mWasSpinning = false; } private void reset() { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/RunningFgsController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/policy/RunningFgsController.kt deleted file mode 100644 index c6dbdb1b09a5..000000000000 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/RunningFgsController.kt +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.android.systemui.statusbar.policy - -/** - * Interface for tracking packages with running foreground services and demoting foreground status - */ -interface RunningFgsController : CallbackController<RunningFgsController.Callback> { - - /** - * @return A list of [UserPackageTime]s which have running foreground service(s) - */ - fun getPackagesWithFgs(): List<UserPackageTime> - - /** - * Stops all foreground services running as a package - * @param userId the userId the package is running under - * @param packageName the packageName - */ - fun stopFgs(userId: Int, packageName: String) - - /** - * Returns when the list of packages with foreground services changes - */ - interface Callback { - /** - * The thing that - * @param packages the list of packages - */ - fun onFgsPackagesChanged(packages: List<UserPackageTime>) - } - - /** - * A triplet <user, packageName, timeMillis> where each element is a package running - * under a user that has had at least one foreground service running since timeMillis. - * Time should be derived from [SystemClock.elapsedRealtime]. - */ - data class UserPackageTime(val userId: Int, val packageName: String, val startTimeMillis: Long) -}
\ No newline at end of file diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/RunningFgsControllerImpl.kt b/packages/SystemUI/src/com/android/systemui/statusbar/policy/RunningFgsControllerImpl.kt deleted file mode 100644 index 6d3345df4f3e..000000000000 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/RunningFgsControllerImpl.kt +++ /dev/null @@ -1,171 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.android.systemui.statusbar.policy - -import android.app.IActivityManager -import android.app.IForegroundServiceObserver -import android.os.IBinder -import android.os.RemoteException -import android.util.Log -import androidx.annotation.GuardedBy -import androidx.lifecycle.Lifecycle -import androidx.lifecycle.LifecycleOwner -import com.android.systemui.dagger.SysUISingleton -import com.android.systemui.dagger.qualifiers.Background -import com.android.systemui.statusbar.policy.RunningFgsController.Callback -import com.android.systemui.statusbar.policy.RunningFgsController.UserPackageTime -import com.android.systemui.util.time.SystemClock -import java.util.concurrent.Executor -import javax.inject.Inject - -/** - * Implementation for [RunningFgsController] - */ -@SysUISingleton -class RunningFgsControllerImpl @Inject constructor( - @Background private val executor: Executor, - private val systemClock: SystemClock, - private val activityManager: IActivityManager -) : RunningFgsController, IForegroundServiceObserver.Stub() { - - companion object { - private val LOG_TAG = RunningFgsControllerImpl::class.java.simpleName - } - - private val lock = Any() - - @GuardedBy("lock") - var initialized = false - - @GuardedBy("lock") - private val runningServiceTokens = mutableMapOf<UserPackageKey, StartTimeAndTokensValue>() - - @GuardedBy("lock") - private val callbacks = mutableSetOf<Callback>() - - fun init() { - synchronized(lock) { - if (initialized) { - return - } - try { - activityManager.registerForegroundServiceObserver(this) - } catch (e: RemoteException) { - e.rethrowFromSystemServer() - } - - initialized = true - } - } - - override fun addCallback(listener: Callback) { - init() - synchronized(lock) { callbacks.add(listener) } - } - - override fun removeCallback(listener: Callback) { - init() - synchronized(lock) { - if (!callbacks.remove(listener)) { - Log.e(LOG_TAG, "Callback was not registered.", RuntimeException()) - } - } - } - - override fun observe(lifecycle: Lifecycle?, listener: Callback?): Callback { - init() - return super.observe(lifecycle, listener) - } - - override fun observe(owner: LifecycleOwner?, listener: Callback?): Callback { - init() - return super.observe(owner, listener) - } - - override fun getPackagesWithFgs(): List<UserPackageTime> { - init() - return synchronized(lock) { getPackagesWithFgsLocked() } - } - - private fun getPackagesWithFgsLocked(): List<UserPackageTime> = - runningServiceTokens.map { - UserPackageTime(it.key.userId, it.key.packageName, it.value.fgsStartTime) - } - - override fun stopFgs(userId: Int, packageName: String) { - init() - try { - activityManager.stopAppForUser(packageName, userId) - } catch (e: RemoteException) { - e.rethrowFromSystemServer() - } - } - - private data class UserPackageKey( - val userId: Int, - val packageName: String - ) - - private class StartTimeAndTokensValue(systemClock: SystemClock) { - val fgsStartTime = systemClock.elapsedRealtime() - var tokens = mutableSetOf<IBinder>() - fun addToken(token: IBinder): Boolean { - return tokens.add(token) - } - - fun removeToken(token: IBinder): Boolean { - return tokens.remove(token) - } - - val isEmpty: Boolean - get() = tokens.isEmpty() - } - - override fun onForegroundStateChanged( - token: IBinder, - packageName: String, - userId: Int, - isForeground: Boolean - ) { - val result = synchronized(lock) { - val userPackageKey = UserPackageKey(userId, packageName) - if (isForeground) { - var addedNew = false - runningServiceTokens.getOrPut(userPackageKey) { - addedNew = true - StartTimeAndTokensValue(systemClock) - }.addToken(token) - if (!addedNew) { - return - } - } else { - val startTimeAndTokensValue = runningServiceTokens[userPackageKey] - if (startTimeAndTokensValue?.removeToken(token) == false) { - Log.e(LOG_TAG, - "Stopped foreground service was not known to be running.") - return - } - if (!startTimeAndTokensValue!!.isEmpty) { - return - } - runningServiceTokens.remove(userPackageKey) - } - getPackagesWithFgsLocked().toList() - } - - callbacks.forEach { executor.execute { it.onFgsPackagesChanged(result) } } - } -}
\ No newline at end of file diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java index 49e712d386e5..1b73595beb7c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java @@ -19,7 +19,6 @@ package com.android.systemui.statusbar.policy; import static android.os.UserManager.SWITCHABILITY_STATUS_OK; import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; -import static com.android.systemui.DejankUtils.whitelistIpcs; import android.annotation.UserIdInt; import android.app.ActivityManager; @@ -427,22 +426,6 @@ public class UserSwitcherController implements Dumpable { return mSimpleUserSwitcher; } - public boolean useFullscreenUserSwitcher() { - // Use adb to override: - // adb shell settings put system enable_fullscreen_user_switcher 0 # Turn it off. - // adb shell settings put system enable_fullscreen_user_switcher 1 # Turn it on. - // Restart SystemUI or adb reboot. - final int DEFAULT = -1; - final int overrideUseFullscreenUserSwitcher = - whitelistIpcs(() -> Settings.System.getInt(mContext.getContentResolver(), - "enable_fullscreen_user_switcher", DEFAULT)); - if (overrideUseFullscreenUserSwitcher != DEFAULT) { - return overrideUseFullscreenUserSwitcher != 0; - } - // Otherwise default to the build setting. - return mContext.getResources().getBoolean(R.bool.config_enableFullscreenUserSwitcher); - } - public void setResumeUserOnGuestLogout(boolean resume) { mResumeUserOnGuestLogout = resume; } diff --git a/packages/SystemUI/src/com/android/systemui/unfold/FoldAodAnimationController.kt b/packages/SystemUI/src/com/android/systemui/unfold/FoldAodAnimationController.kt index c481fc94c526..2e627a872c24 100644 --- a/packages/SystemUI/src/com/android/systemui/unfold/FoldAodAnimationController.kt +++ b/packages/SystemUI/src/com/android/systemui/unfold/FoldAodAnimationController.kt @@ -20,7 +20,6 @@ import android.os.Handler import android.os.PowerManager import android.provider.Settings import com.android.systemui.dagger.qualifiers.Main -import com.android.systemui.keyguard.KeyguardViewMediator import com.android.systemui.keyguard.WakefulnessLifecycle import com.android.systemui.statusbar.LightRevealScrim import com.android.systemui.statusbar.phone.ScreenOffAnimation @@ -28,7 +27,6 @@ import com.android.systemui.statusbar.phone.StatusBar import com.android.systemui.statusbar.policy.CallbackController import com.android.systemui.unfold.FoldAodAnimationController.FoldAodAnimationStatus import com.android.systemui.util.settings.GlobalSettings -import dagger.Lazy import javax.inject.Inject /** @@ -40,7 +38,6 @@ class FoldAodAnimationController @Inject constructor( @Main private val handler: Handler, - private val keyguardViewMediatorLazy: Lazy<KeyguardViewMediator>, private val wakefulnessLifecycle: WakefulnessLifecycle, private val globalSettings: GlobalSettings ) : CallbackController<FoldAodAnimationStatus>, ScreenOffAnimation, WakefulnessLifecycle.Observer { @@ -57,7 +54,6 @@ constructor( statusBar.notificationPanelViewController.startFoldToAodAnimation { // End action isAnimationPlaying = false - keyguardViewMediatorLazy.get().maybeHandlePendingLock() } } diff --git a/packages/SystemUI/src/com/android/systemui/unfold/SysUIUnfoldModule.kt b/packages/SystemUI/src/com/android/systemui/unfold/SysUIUnfoldModule.kt index 07f9c5487c41..7350b37e4b66 100644 --- a/packages/SystemUI/src/com/android/systemui/unfold/SysUIUnfoldModule.kt +++ b/packages/SystemUI/src/com/android/systemui/unfold/SysUIUnfoldModule.kt @@ -18,6 +18,7 @@ package com.android.systemui.unfold import com.android.keyguard.KeyguardUnfoldTransition import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.statusbar.phone.NotificationPanelUnfoldAnimationController import com.android.systemui.statusbar.phone.StatusBarMoveFromCenterAnimationController import com.android.systemui.unfold.util.NaturalRotationUnfoldProgressProvider import com.android.systemui.unfold.util.ScopedUnfoldTransitionProgressProvider @@ -85,6 +86,8 @@ interface SysUIUnfoldComponent { fun getStatusBarMoveFromCenterAnimationController(): StatusBarMoveFromCenterAnimationController + fun getNotificationPanelUnfoldAnimationController(): NotificationPanelUnfoldAnimationController + fun getFoldAodAnimationController(): FoldAodAnimationController fun getUnfoldTransitionWallpaperController(): UnfoldTransitionWallpaperController diff --git a/packages/SystemUI/src/com/android/systemui/util/service/Observer.java b/packages/SystemUI/src/com/android/systemui/util/service/Observer.java new file mode 100644 index 000000000000..768743217cc7 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/util/service/Observer.java @@ -0,0 +1,45 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.util.service; + +/** + * The {@link Observer} interface specifies an entity which listeners + * can be informed of changes to the source, which will require updating. Note that this deals + * with changes to the source itself, not content which will be updated through the interface. + */ +public interface Observer { + /** + * Callback for receiving updates from the {@link Observer}. + */ + interface Callback { + /** + * Invoked when the source has changed. + */ + void onSourceChanged(); + } + + /** + * Adds a callback to receive future updates from the {@link Observer}. + */ + void addCallback(Callback callback); + + /** + * Removes a callback from receiving further updates. + * @param callback + */ + void removeCallback(Callback callback); +} diff --git a/packages/SystemUI/src/com/android/systemui/util/service/PackageObserver.java b/packages/SystemUI/src/com/android/systemui/util/service/PackageObserver.java new file mode 100644 index 000000000000..2ee7b20c1f93 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/util/service/PackageObserver.java @@ -0,0 +1,107 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.util.service; + +import android.content.BroadcastReceiver; +import android.content.ComponentName; +import android.content.Context; +import android.content.Intent; +import android.content.IntentFilter; +import android.os.PatternMatcher; +import android.util.Log; + +import com.android.systemui.communal.CommunalSource; + +import com.google.android.collect.Lists; + +import java.lang.ref.WeakReference; +import java.util.ArrayList; +import java.util.Iterator; + +import javax.inject.Inject; + +/** + * {@link PackageObserver} allows for monitoring the system for changes relating to a particular + * package. This can be used by {@link CommunalSource} clients to detect when a related package + * has changed and reloading is necessary. + */ +public class PackageObserver implements Observer { + private static final String TAG = "PackageObserver"; + private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG); + + private final ArrayList<WeakReference<Callback>> mCallbacks = Lists.newArrayList(); + + private final BroadcastReceiver mReceiver = new BroadcastReceiver() { + @Override + public void onReceive(Context context, Intent intent) { + if (DEBUG) { + Log.d(TAG, "package added receiver - onReceive"); + } + + final Iterator<WeakReference<Callback>> iter = mCallbacks.iterator(); + while (iter.hasNext()) { + final Callback callback = iter.next().get(); + if (callback != null) { + callback.onSourceChanged(); + } else { + iter.remove(); + } + } + } + }; + + private final String mPackageName; + private final Context mContext; + + @Inject + public PackageObserver(Context context, ComponentName component) { + mContext = context; + mPackageName = component.getPackageName(); + } + + @Override + public void addCallback(Callback callback) { + if (DEBUG) { + Log.d(TAG, "addCallback:" + callback); + } + mCallbacks.add(new WeakReference<>(callback)); + + // Only register for listening to package additions on first callback. + if (mCallbacks.size() > 1) { + return; + } + + final IntentFilter filter = new IntentFilter(Intent.ACTION_PACKAGE_ADDED); + filter.addDataScheme("package"); + filter.addDataSchemeSpecificPart(mPackageName, PatternMatcher.PATTERN_LITERAL); + // Note that we directly register the receiver here as data schemes are not supported by + // BroadcastDispatcher. + mContext.registerReceiver(mReceiver, filter, Context.RECEIVER_EXPORTED); + } + + @Override + public void removeCallback(Callback callback) { + if (DEBUG) { + Log.d(TAG, "removeCallback:" + callback); + } + final boolean removed = mCallbacks.removeIf(el -> el.get() == callback); + + if (removed && mCallbacks.isEmpty()) { + mContext.unregisterReceiver(mReceiver); + } + } +} diff --git a/packages/SystemUI/src/com/android/systemui/util/service/PersistentConnectionManager.java b/packages/SystemUI/src/com/android/systemui/util/service/PersistentConnectionManager.java new file mode 100644 index 000000000000..292c062369c1 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/util/service/PersistentConnectionManager.java @@ -0,0 +1,155 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.util.service; + +import static com.android.systemui.util.service.dagger.ObservableServiceModule.BASE_RECONNECT_DELAY_MS; +import static com.android.systemui.util.service.dagger.ObservableServiceModule.MAX_RECONNECT_ATTEMPTS; +import static com.android.systemui.util.service.dagger.ObservableServiceModule.MIN_CONNECTION_DURATION_MS; +import static com.android.systemui.util.service.dagger.ObservableServiceModule.OBSERVER; +import static com.android.systemui.util.service.dagger.ObservableServiceModule.SERVICE_CONNECTION; + +import android.util.Log; + +import com.android.systemui.util.concurrency.DelayableExecutor; +import com.android.systemui.util.time.SystemClock; + +import javax.inject.Inject; +import javax.inject.Named; + +/** + * The {@link PersistentConnectionManager} is responsible for maintaining a connection to a + * {@link ObservableServiceConnection}. + * @param <T> The transformed connection type handled by the service. + */ +public class PersistentConnectionManager<T> { + private static final String TAG = "PersistentConnManager"; + private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG); + + private final SystemClock mSystemClock; + private final DelayableExecutor mMainExecutor; + private final int mBaseReconnectDelayMs; + private final int mMaxReconnectAttempts; + private final int mMinConnectionDuration; + private final Observer mObserver; + + private int mReconnectAttempts = 0; + private Runnable mCurrentReconnectCancelable; + + private final ObservableServiceConnection<T> mConnection; + + private final Runnable mConnectRunnable = new Runnable() { + @Override + public void run() { + mCurrentReconnectCancelable = null; + mConnection.bind(); + } + }; + + private final Observer.Callback mObserverCallback = () -> initiateConnectionAttempt(); + + private final ObservableServiceConnection.Callback mConnectionCallback = + new ObservableServiceConnection.Callback() { + private long mStartTime; + + @Override + public void onConnected(ObservableServiceConnection connection, Object proxy) { + mStartTime = mSystemClock.currentTimeMillis(); + } + + @Override + public void onDisconnected(ObservableServiceConnection connection, int reason) { + if (mSystemClock.currentTimeMillis() - mStartTime > mMinConnectionDuration) { + initiateConnectionAttempt(); + } else { + scheduleConnectionAttempt(); + } + } + }; + + @Inject + public PersistentConnectionManager( + SystemClock clock, + DelayableExecutor mainExecutor, + @Named(SERVICE_CONNECTION) ObservableServiceConnection<T> serviceConnection, + @Named(MAX_RECONNECT_ATTEMPTS) int maxReconnectAttempts, + @Named(BASE_RECONNECT_DELAY_MS) int baseReconnectDelayMs, + @Named(MIN_CONNECTION_DURATION_MS) int minConnectionDurationMs, + @Named(OBSERVER) Observer observer) { + mSystemClock = clock; + mMainExecutor = mainExecutor; + mConnection = serviceConnection; + mObserver = observer; + + mMaxReconnectAttempts = maxReconnectAttempts; + mBaseReconnectDelayMs = baseReconnectDelayMs; + mMinConnectionDuration = minConnectionDurationMs; + } + + /** + * Begins the {@link PersistentConnectionManager} by connecting to the associated service. + */ + public void start() { + mConnection.addCallback(mConnectionCallback); + mObserver.addCallback(mObserverCallback); + initiateConnectionAttempt(); + } + + /** + * Brings down the {@link PersistentConnectionManager}, disconnecting from the service. + */ + public void stop() { + mConnection.removeCallback(mConnectionCallback); + mObserver.removeCallback(mObserverCallback); + mConnection.unbind(); + } + + private void initiateConnectionAttempt() { + // Reset attempts + mReconnectAttempts = 0; + + // The first attempt is always a direct invocation rather than delayed. + mConnection.bind(); + } + + private void scheduleConnectionAttempt() { + // always clear cancelable if present. + if (mCurrentReconnectCancelable != null) { + mCurrentReconnectCancelable.run(); + mCurrentReconnectCancelable = null; + } + + if (mReconnectAttempts >= mMaxReconnectAttempts) { + if (DEBUG) { + Log.d(TAG, "exceeded max connection attempts."); + } + return; + } + + final long reconnectDelayMs = + (long) Math.scalb(mBaseReconnectDelayMs, mReconnectAttempts); + + if (DEBUG) { + Log.d(TAG, + "scheduling connection attempt in " + reconnectDelayMs + "milliseconds"); + } + + mCurrentReconnectCancelable = mMainExecutor.executeDelayed(mConnectRunnable, + reconnectDelayMs); + + mReconnectAttempts++; + } +} diff --git a/packages/SystemUI/src/com/android/systemui/util/service/dagger/ObservableServiceModule.java b/packages/SystemUI/src/com/android/systemui/util/service/dagger/ObservableServiceModule.java new file mode 100644 index 000000000000..c62c95755ce8 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/util/service/dagger/ObservableServiceModule.java @@ -0,0 +1,65 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + +package com.android.systemui.util.service.dagger; + +import android.content.res.Resources; + +import com.android.systemui.R; +import com.android.systemui.dagger.qualifiers.Main; + +import javax.inject.Named; + +import dagger.Module; +import dagger.Provides; + +/** + * Module containing components and parameters for + * {@link com.android.systemui.util.service.ObservableServiceConnection} + * and {@link com.android.systemui.util.service.PersistentConnectionManager}. + */ +@Module(subcomponents = { + PackageObserverComponent.class, +}) +public class ObservableServiceModule { + public static final String MAX_RECONNECT_ATTEMPTS = "max_reconnect_attempts"; + public static final String BASE_RECONNECT_DELAY_MS = "base_reconnect_attempts"; + public static final String MIN_CONNECTION_DURATION_MS = "min_connection_duration_ms"; + public static final String SERVICE_CONNECTION = "service_connection"; + public static final String OBSERVER = "observer"; + + @Provides + @Named(MAX_RECONNECT_ATTEMPTS) + static int providesMaxReconnectAttempts(@Main Resources resources) { + return resources.getInteger( + R.integer.config_communalSourceMaxReconnectAttempts); + } + + @Provides + @Named(BASE_RECONNECT_DELAY_MS) + static int provideBaseReconnectDelayMs(@Main Resources resources) { + return resources.getInteger( + R.integer.config_communalSourceReconnectBaseDelay); + } + + @Provides + @Named(MIN_CONNECTION_DURATION_MS) + static int providesMinConnectionDuration(@Main Resources resources) { + return resources.getInteger( + R.integer.config_connectionMinDuration); + } +} diff --git a/packages/SystemUI/src/com/android/systemui/util/service/dagger/PackageObserverComponent.java b/packages/SystemUI/src/com/android/systemui/util/service/dagger/PackageObserverComponent.java new file mode 100644 index 000000000000..8ee39b34cdf5 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/util/service/dagger/PackageObserverComponent.java @@ -0,0 +1,42 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.systemui.util.service.dagger; + +import android.content.ComponentName; + +import com.android.systemui.util.service.PackageObserver; + +import dagger.BindsInstance; +import dagger.Subcomponent; + +/** + * Generates a scoped {@link PackageObserver}. + */ +@Subcomponent +public interface PackageObserverComponent { + /** + * Generates a {@link PackageObserverComponent} instance. + */ + @Subcomponent.Factory + interface Factory { + PackageObserverComponent create(@BindsInstance ComponentName component); + } + + /** + * Creates a {@link PackageObserver}. + */ + PackageObserver getPackageObserver(); +} diff --git a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUnfoldTransitionTest.kt b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUnfoldTransitionTest.kt index 164f83dda9b7..6c1f008e9337 100644 --- a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUnfoldTransitionTest.kt +++ b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUnfoldTransitionTest.kt @@ -20,23 +20,21 @@ import android.testing.AndroidTestingRunner import android.view.View import android.view.ViewGroup import androidx.test.filters.SmallTest -import com.android.keyguard.KeyguardUnfoldTransition.Companion.LEFT -import com.android.keyguard.KeyguardUnfoldTransition.Companion.RIGHT import com.android.systemui.R import com.android.systemui.SysuiTestCase import com.android.systemui.unfold.UnfoldTransitionProgressProvider.TransitionProgressListener import com.android.systemui.unfold.util.NaturalRotationUnfoldProgressProvider import com.android.systemui.util.mockito.capture -import org.junit.Assert.assertEquals +import com.google.common.truth.Truth.assertThat 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.MockitoAnnotations -import org.mockito.Mockito.`when` import org.mockito.Mockito.verify +import org.mockito.Mockito.`when` +import org.mockito.MockitoAnnotations /** * Translates items away/towards the hinge when the device is opened/closed. This is controlled by @@ -46,14 +44,11 @@ import org.mockito.Mockito.verify @RunWith(AndroidTestingRunner::class) class KeyguardUnfoldTransitionTest : SysuiTestCase() { - @Mock - private lateinit var progressProvider: NaturalRotationUnfoldProgressProvider + @Mock private lateinit var progressProvider: NaturalRotationUnfoldProgressProvider - @Captor - private lateinit var progressListenerCaptor: ArgumentCaptor<TransitionProgressListener> + @Captor private lateinit var progressListenerCaptor: ArgumentCaptor<TransitionProgressListener> - @Mock - private lateinit var parent: ViewGroup + @Mock private lateinit var parent: ViewGroup private lateinit var keyguardUnfoldTransition: KeyguardUnfoldTransition private lateinit var progressListener: TransitionProgressListener @@ -63,87 +58,35 @@ class KeyguardUnfoldTransitionTest : SysuiTestCase() { fun setup() { MockitoAnnotations.initMocks(this) - xTranslationMax = context.resources.getDimensionPixelSize( - R.dimen.keyguard_unfold_translation_x).toFloat() + xTranslationMax = + context.resources.getDimensionPixelSize(R.dimen.keyguard_unfold_translation_x).toFloat() - keyguardUnfoldTransition = KeyguardUnfoldTransition( - getContext(), - progressProvider - ) - - verify(progressProvider).addCallback(capture(progressListenerCaptor)) - progressListener = progressListenerCaptor.value + keyguardUnfoldTransition = KeyguardUnfoldTransition(context, progressProvider) keyguardUnfoldTransition.setup(parent) keyguardUnfoldTransition.statusViewCentered = false - } - - @Test - fun onTransition_noMatchingIds() { - // GIVEN no views matching any ids - // WHEN the transition starts - progressListener.onTransitionStarted() - progressListener.onTransitionProgress(.1f) - - // THEN nothing... no exceptions - } - @Test - fun onTransition_oneMovesLeft() { - // GIVEN one view with a matching id - val view = View(getContext()) - `when`(parent.findViewById<View>(R.id.keyguard_status_area)).thenReturn(view) - - moveAndValidate(listOf(view to LEFT)) - } - - @Test - fun onTransition_oneMovesLeftAndOneMovesRightMultipleTimes() { - // GIVEN two views with a matching id - val leftView = View(getContext()) - val rightView = View(getContext()) - `when`(parent.findViewById<View>(R.id.keyguard_status_area)).thenReturn(leftView) - `when`(parent.findViewById<View>(R.id.notification_stack_scroller)).thenReturn(rightView) - - moveAndValidate(listOf(leftView to LEFT, rightView to RIGHT)) - moveAndValidate(listOf(leftView to LEFT, rightView to RIGHT)) + verify(progressProvider).addCallback(capture(progressListenerCaptor)) + progressListener = progressListenerCaptor.value } @Test fun onTransition_centeredViewDoesNotMove() { keyguardUnfoldTransition.statusViewCentered = true - val view = View(getContext()) + val view = View(context) `when`(parent.findViewById<View>(R.id.lockscreen_clock_view_large)).thenReturn(view) - moveAndValidate(listOf(view to 0)) - } - - private fun moveAndValidate(list: List<Pair<View, Int>>) { - // Compare values as ints because -0f != 0f - - // WHEN the transition starts progressListener.onTransitionStarted() + assertThat(view.translationX).isZero() + progressListener.onTransitionProgress(0f) + assertThat(view.translationX).isZero() + + progressListener.onTransitionProgress(0.5f) + assertThat(view.translationX).isZero() - list.forEach { (view, direction) -> - assertEquals((-xTranslationMax * direction).toInt(), view.getTranslationX().toInt()) - } - - // WHEN the transition progresses, translation is updated - progressListener.onTransitionProgress(.5f) - list.forEach { (view, direction) -> - assertEquals( - (-xTranslationMax / 2f * direction).toInt(), - view.getTranslationX().toInt() - ) - } - - // WHEN the transition ends, translation is completed - progressListener.onTransitionProgress(1f) progressListener.onTransitionFinished() - list.forEach { (view, _) -> - assertEquals(0, view.getTranslationX().toInt()) - } + assertThat(view.translationX).isZero() } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/animation/DialogLaunchAnimatorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/animation/DialogLaunchAnimatorTest.kt index b951345a145b..61e78f5cb2fc 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/animation/DialogLaunchAnimatorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/animation/DialogLaunchAnimatorTest.kt @@ -43,7 +43,7 @@ class DialogLaunchAnimatorTest : SysuiTestCase() { @Before fun setUp() { dialogLaunchAnimator = DialogLaunchAnimator( - dreamManager, launchAnimator, isForTesting = true) + dreamManager, launchAnimator, forceDisableSynchronization = true) } @After diff --git a/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayServiceTest.java b/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayServiceTest.java index d5bd67adcf09..8adb55b8d6e2 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayServiceTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayServiceTest.java @@ -36,7 +36,9 @@ import androidx.lifecycle.LifecycleRegistry; import androidx.test.filters.SmallTest; import com.android.keyguard.KeyguardUpdateMonitor; +import com.android.settingslib.dream.DreamBackend; import com.android.systemui.SysuiTestCase; +import com.android.systemui.dreams.complication.Complication; import com.android.systemui.dreams.dagger.DreamOverlayComponent; import com.android.systemui.dreams.touch.DreamOverlayTouchMonitor; import com.android.systemui.util.concurrency.FakeExecutor; @@ -50,6 +52,10 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; + @SmallTest @RunWith(AndroidTestingRunner.class) public class DreamOverlayServiceTest extends SysuiTestCase { @@ -94,11 +100,13 @@ public class DreamOverlayServiceTest extends SysuiTestCase { @Mock DreamOverlayStateController mStateController; + @Mock + DreamBackend mDreamBackend; DreamOverlayService mService; @Before - public void setup() throws Exception { + public void setup() { MockitoAnnotations.initMocks(this); mContext.addMockSystemService(WindowManager.class, mWindowManager); @@ -110,6 +118,8 @@ public class DreamOverlayServiceTest extends SysuiTestCase { .thenReturn(mLifecycleRegistry); when(mDreamOverlayComponent.getDreamOverlayTouchMonitor()) .thenReturn(mDreamOverlayTouchMonitor); + when(mDreamOverlayComponent.getDreamBackend()) + .thenReturn(mDreamBackend); when(mDreamOverlayComponentFactory .create(any(), any())) .thenReturn(mDreamOverlayComponent); @@ -120,28 +130,34 @@ public class DreamOverlayServiceTest extends SysuiTestCase { mDreamOverlayComponentFactory, mStateController, mKeyguardUpdateMonitor); + } + + @Test + public void testOverlayContainerViewAddedToWindow() throws Exception { final IBinder proxy = mService.onBind(new Intent()); final IDreamOverlay overlay = IDreamOverlay.Stub.asInterface(proxy); // Inform the overlay service of dream starting. overlay.startDream(mWindowParams, mDreamOverlayCallback); mMainExecutor.runAllReady(); - } - @Test - public void testOverlayContainerViewAddedToWindow() { verify(mWindowManager).addView(any(), any()); } @Test - public void testDreamOverlayContainerViewControllerInitialized() { + public void testDreamOverlayContainerViewControllerInitialized() throws Exception { + final IBinder proxy = mService.onBind(new Intent()); + final IDreamOverlay overlay = IDreamOverlay.Stub.asInterface(proxy); + + // Inform the overlay service of dream starting. + overlay.startDream(mWindowParams, mDreamOverlayCallback); + mMainExecutor.runAllReady(); + verify(mDreamOverlayContainerViewController).init(); } @Test public void testShouldShowComplicationsTrueByDefault() { - assertThat(mService.shouldShowComplications()).isTrue(); - mService.onBind(new Intent()); assertThat(mService.shouldShowComplications()).isTrue(); @@ -155,4 +171,24 @@ public class DreamOverlayServiceTest extends SysuiTestCase { assertThat(mService.shouldShowComplications()).isFalse(); } + + @Test + public void testSetAvailableComplicationTypes() throws Exception { + final Set<Integer> enabledComplications = new HashSet<>( + Arrays.asList(DreamBackend.COMPLICATION_TYPE_TIME, + DreamBackend.COMPLICATION_TYPE_DATE, + DreamBackend.COMPLICATION_TYPE_WEATHER)); + when(mDreamBackend.getEnabledComplications()).thenReturn(enabledComplications); + + final IBinder proxy = mService.onBind(new Intent()); + final IDreamOverlay overlay = IDreamOverlay.Stub.asInterface(proxy); + + overlay.startDream(mWindowParams, mDreamOverlayCallback); + mMainExecutor.runAllReady(); + + final int expectedTypes = + Complication.COMPLICATION_TYPE_TIME | Complication.COMPLICATION_TYPE_DATE + | Complication.COMPLICATION_TYPE_WEATHER; + verify(mStateController).setAvailableComplicationTypes(expectedTypes); + } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/dreams/complication/ComplicationUtilsTest.java b/packages/SystemUI/tests/src/com/android/systemui/dreams/complication/ComplicationUtilsTest.java index f1978b214594..365c5291b118 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/dreams/complication/ComplicationUtilsTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/dreams/complication/ComplicationUtilsTest.java @@ -22,6 +22,7 @@ import static com.android.systemui.dreams.complication.Complication.COMPLICATION import static com.android.systemui.dreams.complication.Complication.COMPLICATION_TYPE_TIME; import static com.android.systemui.dreams.complication.Complication.COMPLICATION_TYPE_WEATHER; import static com.android.systemui.dreams.complication.ComplicationUtils.convertComplicationType; +import static com.android.systemui.dreams.complication.ComplicationUtils.convertComplicationTypes; import static com.google.common.truth.Truth.assertThat; @@ -36,6 +37,11 @@ import com.android.systemui.SysuiTestCase; import org.junit.Test; import org.junit.runner.RunWith; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; + @SmallTest @RunWith(AndroidTestingRunner.class) public class ComplicationUtilsTest extends SysuiTestCase { @@ -52,4 +58,37 @@ public class ComplicationUtilsTest extends SysuiTestCase { assertThat(convertComplicationType(DreamBackend.COMPLICATION_TYPE_CAST_INFO)) .isEqualTo(COMPLICATION_TYPE_CAST_INFO); } + + @Test + public void testConvertComplicationTypesEmpty() { + final Set<Integer> input = new HashSet<>(); + final int expected = Complication.COMPLICATION_TYPE_NONE; + + assertThat(convertComplicationTypes(input)).isEqualTo(expected); + } + + @Test + public void testConvertComplicationTypesSingleValue() { + final Set<Integer> input = new HashSet<>( + Collections.singleton(DreamBackend.COMPLICATION_TYPE_WEATHER)); + final int expected = Complication.COMPLICATION_TYPE_WEATHER; + + assertThat(convertComplicationTypes(input)).isEqualTo(expected); + } + + @Test + public void testConvertComplicationTypesSingleValueMultipleValues() { + final Set<Integer> input = new HashSet<>( + Arrays.asList(DreamBackend.COMPLICATION_TYPE_TIME, + DreamBackend.COMPLICATION_TYPE_DATE, + DreamBackend.COMPLICATION_TYPE_WEATHER, + DreamBackend.COMPLICATION_TYPE_AIR_QUALITY, + DreamBackend.COMPLICATION_TYPE_CAST_INFO)); + final int expected = + Complication.COMPLICATION_TYPE_TIME | Complication.COMPLICATION_TYPE_DATE + | Complication.COMPLICATION_TYPE_WEATHER | COMPLICATION_TYPE_AIR_QUALITY + | COMPLICATION_TYPE_CAST_INFO; + + assertThat(convertComplicationTypes(input)).isEqualTo(expected); + } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/dreams/complication/DreamClockDateComplicationTest.java b/packages/SystemUI/tests/src/com/android/systemui/dreams/complication/DreamClockDateComplicationTest.java new file mode 100644 index 000000000000..b02c506be8be --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/dreams/complication/DreamClockDateComplicationTest.java @@ -0,0 +1,66 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.systemui.dreams.complication; + +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.verify; + +import android.content.Context; +import android.testing.AndroidTestingRunner; + +import androidx.test.filters.SmallTest; + +import com.android.systemui.SysuiTestCase; +import com.android.systemui.dreams.DreamOverlayStateController; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; + +@SmallTest +@RunWith(AndroidTestingRunner.class) +public class DreamClockDateComplicationTest extends SysuiTestCase { + @SuppressWarnings("HidingField") + @Mock + private Context mContext; + + @Mock + private DreamOverlayStateController mDreamOverlayStateController; + + @Mock + private DreamClockDateComplication mComplication; + + @Before + public void setup() { + MockitoAnnotations.initMocks(this); + } + + /** + * Ensures {@link DreamClockDateComplication} is registered. + */ + @Test + public void testComplicationAdded() { + final DreamClockDateComplication.Registrant registrant = + new DreamClockDateComplication.Registrant( + mContext, + mDreamOverlayStateController, + mComplication); + registrant.start(); + verify(mDreamOverlayStateController).addComplication(eq(mComplication)); + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/dreams/complication/DreamClockTimeComplicationTest.java b/packages/SystemUI/tests/src/com/android/systemui/dreams/complication/DreamClockTimeComplicationTest.java new file mode 100644 index 000000000000..088b4d5136ff --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/dreams/complication/DreamClockTimeComplicationTest.java @@ -0,0 +1,66 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.systemui.dreams.complication; + +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.verify; + +import android.content.Context; +import android.testing.AndroidTestingRunner; + +import androidx.test.filters.SmallTest; + +import com.android.systemui.SysuiTestCase; +import com.android.systemui.dreams.DreamOverlayStateController; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; + +@SmallTest +@RunWith(AndroidTestingRunner.class) +public class DreamClockTimeComplicationTest extends SysuiTestCase { + @SuppressWarnings("HidingField") + @Mock + private Context mContext; + + @Mock + private DreamOverlayStateController mDreamOverlayStateController; + + @Mock + private DreamClockTimeComplication mComplication; + + @Before + public void setup() { + MockitoAnnotations.initMocks(this); + } + + /** + * Ensures {@link DreamClockTimeComplication} is registered. + */ + @Test + public void testComplicationAdded() { + final DreamClockTimeComplication.Registrant registrant = + new DreamClockTimeComplication.Registrant( + mContext, + mDreamOverlayStateController, + mComplication); + registrant.start(); + verify(mDreamOverlayStateController).addComplication(eq(mComplication)); + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/dreams/complication/DreamWeatherComplicationTest.java b/packages/SystemUI/tests/src/com/android/systemui/dreams/complication/DreamWeatherComplicationTest.java new file mode 100644 index 000000000000..151742af7e1a --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/dreams/complication/DreamWeatherComplicationTest.java @@ -0,0 +1,79 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.systemui.dreams.complication; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import android.content.Context; +import android.testing.AndroidTestingRunner; + +import androidx.test.filters.SmallTest; + +import com.android.systemui.SysuiTestCase; +import com.android.systemui.dreams.DreamOverlayStateController; +import com.android.systemui.statusbar.lockscreen.LockscreenSmartspaceController; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; + +@SmallTest +@RunWith(AndroidTestingRunner.class) +public class DreamWeatherComplicationTest extends SysuiTestCase { + @SuppressWarnings("HidingField") + @Mock + private Context mContext; + + @Mock + private LockscreenSmartspaceController mSmartspaceController; + + @Mock + private DreamOverlayStateController mDreamOverlayStateController; + + @Mock + private DreamWeatherComplication mComplication; + + @Before + public void setup() { + MockitoAnnotations.initMocks(this); + } + + /** + * Ensures {@link DreamWeatherComplication} is only registered when it is available. + */ + @Test + public void testComplicationAvailability() { + when(mSmartspaceController.isEnabled()).thenReturn(false); + final DreamWeatherComplication.Registrant registrant = + new DreamWeatherComplication.Registrant( + mContext, + mSmartspaceController, + mDreamOverlayStateController, + mComplication); + registrant.start(); + verify(mDreamOverlayStateController, never()).addComplication(any()); + + when(mSmartspaceController.isEnabled()).thenReturn(true); + registrant.start(); + verify(mDreamOverlayStateController).addComplication(eq(mComplication)); + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/hdmi/HdmiCecSetMenuLanguageHelperTest.java b/packages/SystemUI/tests/src/com/android/systemui/hdmi/HdmiCecSetMenuLanguageHelperTest.java new file mode 100644 index 000000000000..1171bd299c1f --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/hdmi/HdmiCecSetMenuLanguageHelperTest.java @@ -0,0 +1,104 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.hdmi; + +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import android.provider.Settings; +import android.test.suitebuilder.annotation.SmallTest; +import android.testing.AndroidTestingRunner; + +import com.android.systemui.SysuiTestCase; +import com.android.systemui.util.settings.SecureSettings; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; + +import java.util.Locale; +import java.util.concurrent.Executor; + +@SmallTest +@RunWith(AndroidTestingRunner.class) +public class HdmiCecSetMenuLanguageHelperTest extends SysuiTestCase { + + private HdmiCecSetMenuLanguageHelper mHdmiCecSetMenuLanguageHelper; + + @Mock + private Executor mExecutor; + + @Mock + private SecureSettings mSecureSettings; + + @Before + public void setUp() { + MockitoAnnotations.initMocks(this); + when(mSecureSettings.getString( + Settings.Secure.HDMI_CEC_SET_MENU_LANGUAGE_DENYLIST)).thenReturn(null); + mHdmiCecSetMenuLanguageHelper = + new HdmiCecSetMenuLanguageHelper(mExecutor, mSecureSettings); + } + + @Test + public void testSetGetLocale() { + mHdmiCecSetMenuLanguageHelper.setLocale("en"); + assertThat(mHdmiCecSetMenuLanguageHelper.getLocale()).isEqualTo(Locale.ENGLISH); + } + + @Test + public void testIsLocaleDenylisted_EmptyByDefault() { + mHdmiCecSetMenuLanguageHelper.setLocale("en"); + assertThat(mHdmiCecSetMenuLanguageHelper.isLocaleDenylisted()).isEqualTo(false); + } + + @Test + public void testIsLocaleDenylisted_AcceptLanguage() { + mHdmiCecSetMenuLanguageHelper.setLocale("de"); + mHdmiCecSetMenuLanguageHelper.acceptLocale(); + assertThat(mHdmiCecSetMenuLanguageHelper.isLocaleDenylisted()).isEqualTo(false); + verify(mExecutor).execute(any()); + } + + @Test + public void testIsLocaleDenylisted_DeclineLanguage() { + mHdmiCecSetMenuLanguageHelper.setLocale("de"); + mHdmiCecSetMenuLanguageHelper.declineLocale(); + assertThat(mHdmiCecSetMenuLanguageHelper.isLocaleDenylisted()).isEqualTo(true); + verify(mSecureSettings).putString( + Settings.Secure.HDMI_CEC_SET_MENU_LANGUAGE_DENYLIST, "de"); + } + + @Test + public void testIsLocaleDenylisted_DeclineTwoLanguages() { + mHdmiCecSetMenuLanguageHelper.setLocale("de"); + mHdmiCecSetMenuLanguageHelper.declineLocale(); + assertThat(mHdmiCecSetMenuLanguageHelper.isLocaleDenylisted()).isEqualTo(true); + verify(mSecureSettings).putString( + Settings.Secure.HDMI_CEC_SET_MENU_LANGUAGE_DENYLIST, "de"); + mHdmiCecSetMenuLanguageHelper.setLocale("pl"); + mHdmiCecSetMenuLanguageHelper.declineLocale(); + assertThat(mHdmiCecSetMenuLanguageHelper.isLocaleDenylisted()).isEqualTo(true); + verify(mSecureSettings).putString( + Settings.Secure.HDMI_CEC_SET_MENU_LANGUAGE_DENYLIST, "de,pl"); + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardViewMediatorTest.java b/packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardViewMediatorTest.java index d94e2eee9ffa..210cb82e1606 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardViewMediatorTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardViewMediatorTest.java @@ -46,6 +46,7 @@ import com.android.keyguard.KeyguardDisplayManager; import com.android.keyguard.KeyguardUpdateMonitor; import com.android.keyguard.mediator.ScreenOnCoordinator; import com.android.systemui.SysuiTestCase; +import com.android.systemui.animation.ActivityLaunchAnimator; import com.android.systemui.broadcast.BroadcastDispatcher; import com.android.systemui.classifier.FalsingCollectorFake; import com.android.systemui.dreams.DreamOverlayStateController; @@ -100,6 +101,7 @@ public class KeyguardViewMediatorTest extends SysuiTestCase { private @Mock ScreenOnCoordinator mScreenOnCoordinator; private @Mock Lazy<NotificationShadeWindowController> mNotificationShadeWindowControllerLazy; private @Mock DreamOverlayStateController mDreamOverlayStateController; + private @Mock ActivityLaunchAnimator mActivityLaunchAnimator; private DeviceConfigProxy mDeviceConfig = new DeviceConfigProxyFake(); private FakeExecutor mUiBgExecutor = new FakeExecutor(new FakeSystemClock()); @@ -205,7 +207,8 @@ public class KeyguardViewMediatorTest extends SysuiTestCase { mScreenOnCoordinator, mInteractionJankMonitor, mDreamOverlayStateController, - mNotificationShadeWindowControllerLazy); + mNotificationShadeWindowControllerLazy, + () -> mActivityLaunchAnimator); mViewMediator.start(); } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/KeyguardMediaControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/KeyguardMediaControllerTest.kt index 43d9a755269f..dc7026da2194 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/KeyguardMediaControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/media/KeyguardMediaControllerTest.kt @@ -95,7 +95,6 @@ class KeyguardMediaControllerTest : SysuiTestCase() { fun testVisibleOnKeyguardOrFullScreenUserSwitcher() { testStateVisibility(StatusBarState.SHADE, GONE) testStateVisibility(StatusBarState.SHADE_LOCKED, GONE) - testStateVisibility(StatusBarState.FULLSCREEN_USER_SWITCHER, VISIBLE) testStateVisibility(StatusBarState.KEYGUARD, VISIBLE) } diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/MediaControlPanelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/MediaControlPanelTest.kt index 140a395f1e27..609291a983ce 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/MediaControlPanelTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/media/MediaControlPanelTest.kt @@ -125,8 +125,9 @@ public class MediaControlPanelTest : SysuiTestCase() { private lateinit var settings: View private lateinit var settingsText: TextView private lateinit var cancel: View + private lateinit var cancelText: TextView private lateinit var dismiss: FrameLayout - private lateinit var dismissLabel: View + private lateinit var dismissText: TextView private lateinit var session: MediaSession private val device = MediaDeviceData(true, null, DEVICE_NAME) @@ -163,8 +164,9 @@ public class MediaControlPanelTest : SysuiTestCase() { settings = View(context) settingsText = TextView(context) cancel = View(context) + cancelText = TextView(context) dismiss = FrameLayout(context) - dismissLabel = View(context) + dismissText = TextView(context) initPlayerHolderMocks() initSessionHolderMocks() @@ -244,13 +246,15 @@ public class MediaControlPanelTest : SysuiTestCase() { whenever(holder.settings).thenReturn(settings) whenever(holder.settingsText).thenReturn(settingsText) whenever(holder.cancel).thenReturn(cancel) + whenever(holder.cancelText).thenReturn(cancelText) whenever(holder.dismiss).thenReturn(dismiss) - whenever(holder.dismissLabel).thenReturn(dismissLabel) + whenever(holder.dismissText).thenReturn(dismissText) } /** Mock view holder for session player */ private fun initSessionHolderMocks() { whenever(sessionHolder.player).thenReturn(view) + whenever(sessionHolder.albumView).thenReturn(albumView) whenever(sessionHolder.appIcon).thenReturn(appIcon) whenever(sessionHolder.titleText).thenReturn(titleText) whenever(sessionHolder.artistText).thenReturn(artistText) @@ -284,8 +288,9 @@ public class MediaControlPanelTest : SysuiTestCase() { whenever(sessionHolder.settings).thenReturn(settings) whenever(sessionHolder.settingsText).thenReturn(settingsText) whenever(sessionHolder.cancel).thenReturn(cancel) + whenever(sessionHolder.cancelText).thenReturn(cancelText) whenever(sessionHolder.dismiss).thenReturn(dismiss) - whenever(sessionHolder.dismissLabel).thenReturn(dismissLabel) + whenever(sessionHolder.dismissText).thenReturn(dismissText) } @After diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/nearby/NearbyMediaDevicesServiceTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/nearby/NearbyMediaDevicesServiceTest.kt new file mode 100644 index 000000000000..c26108619ff4 --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/media/nearby/NearbyMediaDevicesServiceTest.kt @@ -0,0 +1,124 @@ +package com.android.systemui.media.nearby + +import androidx.test.filters.SmallTest +import com.android.systemui.SysuiTestCase +import com.android.systemui.shared.media.INearbyMediaDevicesProvider +import com.android.systemui.shared.media.INearbyMediaDevicesService +import com.android.systemui.shared.media.INearbyMediaDevicesUpdateCallback +import com.android.systemui.shared.media.INearbyMediaDevicesUpdateCallback.RANGE_LONG +import com.android.systemui.shared.media.INearbyMediaDevicesUpdateCallback.RANGE_WITHIN_REACH +import com.android.systemui.shared.media.NearbyDevice +import com.google.common.truth.Truth.assertThat +import org.junit.Before +import org.junit.Test + +@SmallTest +class NearbyMediaDevicesServiceTest : SysuiTestCase() { + + private lateinit var service: NearbyMediaDevicesService + private lateinit var binderInterface: INearbyMediaDevicesService + + @Before + fun setUp() { + service = NearbyMediaDevicesService() + binderInterface = INearbyMediaDevicesService.Stub.asInterface(service.onBind(null)) + } + + @Test + fun getCurrentNearbyDevices_noProviderRegistered_returnsEmptyList() { + assertThat(service.getCurrentNearbyDevices()).isEmpty() + } + + @Test + fun getCurrentNearbyDevices_providerRegistered_returnsProviderInfo() { + val nearbyDevice1 = NearbyDevice("routeId1", RANGE_LONG) + val nearbyDevice2 = NearbyDevice("routeId2", RANGE_WITHIN_REACH) + val provider = object : INearbyMediaDevicesProvider.Stub() { + override fun getCurrentNearbyDevices(): List<NearbyDevice> { + return listOf(nearbyDevice1, nearbyDevice2) + } + + override fun registerNearbyDevicesCallback( + callback: INearbyMediaDevicesUpdateCallback? + ) {} + override fun unregisterNearbyDevicesCallback( + callback: INearbyMediaDevicesUpdateCallback? + ) {} + } + binderInterface.registerProvider(provider) + + val returnedNearbyDevices = service.getCurrentNearbyDevices() + + assertThat(returnedNearbyDevices).isEqualTo(listOf(nearbyDevice1, nearbyDevice2)) + } + + @Test + fun registerNearbyDevicesCallback_noProviderRegistered_noCrash() { + // No assert, just needs no crash + service.registerNearbyDevicesCallback(object : INearbyMediaDevicesUpdateCallback.Stub() { + override fun nearbyDeviceUpdate(routeId: String?, rangeZone: Int) {} + }) + } + + @Test + fun registerNearbyDevicesCallback_providerRegistered_providerReceivesCallback() { + val provider = object : INearbyMediaDevicesProvider.Stub() { + var registeredCallback: INearbyMediaDevicesUpdateCallback? = null + override fun getCurrentNearbyDevices(): List<NearbyDevice> = listOf() + + override fun registerNearbyDevicesCallback( + callback: INearbyMediaDevicesUpdateCallback? + ) { + registeredCallback = callback + } + + override fun unregisterNearbyDevicesCallback( + callback: INearbyMediaDevicesUpdateCallback? + ) {} + } + binderInterface.registerProvider(provider) + + val callback = object : INearbyMediaDevicesUpdateCallback.Stub() { + override fun nearbyDeviceUpdate(routeId: String?, rangeZone: Int) {} + } + + service.registerNearbyDevicesCallback(callback) + + assertThat(provider.registeredCallback).isEqualTo(callback) + } + + @Test + fun unregisterNearbyDevicesCallback_noProviderRegistered_noCrash() { + // No assert, just needs no crash + service.unregisterNearbyDevicesCallback(object : INearbyMediaDevicesUpdateCallback.Stub() { + override fun nearbyDeviceUpdate(routeId: String?, rangeZone: Int) {} + }) + } + + @Test + fun unregisterNearbyDevicesCallback_providerRegistered_providerReceivesCallback() { + val provider = object : INearbyMediaDevicesProvider.Stub() { + var unregisteredCallback: INearbyMediaDevicesUpdateCallback? = null + override fun getCurrentNearbyDevices(): List<NearbyDevice> = listOf() + + override fun registerNearbyDevicesCallback( + callback: INearbyMediaDevicesUpdateCallback? + ) {} + + override fun unregisterNearbyDevicesCallback( + callback: INearbyMediaDevicesUpdateCallback? + ) { + unregisteredCallback = callback + } + } + binderInterface.registerProvider(provider) + + val callback = object : INearbyMediaDevicesUpdateCallback.Stub() { + override fun nearbyDeviceUpdate(routeId: String?, rangeZone: Int) {} + } + + service.unregisterNearbyDevicesCallback(callback) + + assertThat(provider.unregisteredCallback).isEqualTo(callback) + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/MediaTttCommandLineHelperTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/MediaTttCommandLineHelperTest.kt index 81ae2093c830..c3d8d245baed 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/MediaTttCommandLineHelperTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/MediaTttCommandLineHelperTest.kt @@ -16,27 +16,35 @@ package com.android.systemui.media.taptotransfer -import android.content.ComponentName +import android.app.StatusBarManager +import android.content.Context +import android.media.MediaRoute2Info import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase import com.android.systemui.media.taptotransfer.receiver.ChipStateReceiver import com.android.systemui.media.taptotransfer.receiver.MediaTttChipControllerReceiver -import com.android.systemui.media.taptotransfer.sender.MediaTttSenderService -import com.android.systemui.shared.mediattt.DeviceInfo -import com.android.systemui.shared.mediattt.IDeviceSenderService +import com.android.systemui.media.taptotransfer.sender.AlmostCloseToEndCast +import com.android.systemui.media.taptotransfer.sender.AlmostCloseToStartCast +import com.android.systemui.media.taptotransfer.sender.TransferFailed +import com.android.systemui.media.taptotransfer.sender.TransferToReceiverTriggered +import com.android.systemui.media.taptotransfer.sender.TransferToThisDeviceSucceeded +import com.android.systemui.media.taptotransfer.sender.TransferToThisDeviceTriggered +import com.android.systemui.media.taptotransfer.sender.TransferToReceiverSucceeded import com.android.systemui.statusbar.commandline.Command import com.android.systemui.statusbar.commandline.CommandRegistry +import com.android.systemui.util.concurrency.FakeExecutor import com.android.systemui.util.mockito.any import com.android.systemui.util.mockito.argumentCaptor import com.android.systemui.util.mockito.capture +import com.android.systemui.util.mockito.eq +import com.android.systemui.util.mockito.nullable +import com.android.systemui.util.time.FakeSystemClock import com.google.common.truth.Truth.assertThat import org.junit.Before import org.junit.Ignore import org.junit.Test import org.mockito.Mock -import org.mockito.Mockito.anyString import org.mockito.Mockito.verify -import org.mockito.Mockito.`when` as whenever import org.mockito.MockitoAnnotations import java.io.PrintWriter import java.io.StringWriter @@ -53,24 +61,19 @@ class MediaTttCommandLineHelperTest : SysuiTestCase() { private lateinit var mediaTttCommandLineHelper: MediaTttCommandLineHelper @Mock - private lateinit var mediaTttChipControllerReceiver: MediaTttChipControllerReceiver + private lateinit var statusBarManager: StatusBarManager @Mock - private lateinit var mediaSenderService: IDeviceSenderService.Stub - private lateinit var mediaSenderServiceComponentName: ComponentName + private lateinit var mediaTttChipControllerReceiver: MediaTttChipControllerReceiver @Before fun setUp() { MockitoAnnotations.initMocks(this) - - mediaSenderServiceComponentName = ComponentName(context, MediaTttSenderService::class.java) - context.addMockService(mediaSenderServiceComponentName, mediaSenderService) - whenever(mediaSenderService.queryLocalInterface(anyString())).thenReturn(mediaSenderService) - whenever(mediaSenderService.asBinder()).thenReturn(mediaSenderService) - + context.addMockSystemService(Context.STATUS_BAR_SERVICE, statusBarManager) mediaTttCommandLineHelper = MediaTttCommandLineHelper( commandRegistry, context, + FakeExecutor(FakeSystemClock()), mediaTttChipControllerReceiver, ) } @@ -101,85 +104,113 @@ class MediaTttCommandLineHelperTest : SysuiTestCase() { } @Test - fun sender_moveCloserToStartCast_serviceCallbackCalled() { - commandRegistry.onShellCommand(pw, getMoveCloserToStartCastCommand()) - - assertThat(context.isBound(mediaSenderServiceComponentName)).isTrue() + fun sender_almostCloseToStartCast_serviceCallbackCalled() { + commandRegistry.onShellCommand( + pw, getSenderCommand(AlmostCloseToStartCast::class.simpleName!!) + ) - val deviceInfoCaptor = argumentCaptor<DeviceInfo>() - verify(mediaSenderService).closeToReceiverToStartCast(any(), capture(deviceInfoCaptor)) - assertThat(deviceInfoCaptor.value!!.name).isEqualTo(DEVICE_NAME) + val routeInfoCaptor = argumentCaptor<MediaRoute2Info>() + verify(statusBarManager).updateMediaTapToTransferSenderDisplay( + eq(StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_ALMOST_CLOSE_TO_START_CAST), + capture(routeInfoCaptor), + nullable(), + nullable()) + assertThat(routeInfoCaptor.value!!.name).isEqualTo(DEVICE_NAME) } @Test - fun sender_moveCloserToEndCast_serviceCallbackCalled() { - commandRegistry.onShellCommand(pw, getMoveCloserToEndCastCommand()) - - assertThat(context.isBound(mediaSenderServiceComponentName)).isTrue() + fun sender_almostCloseToEndCast_serviceCallbackCalled() { + commandRegistry.onShellCommand( + pw, getSenderCommand(AlmostCloseToEndCast::class.simpleName!!) + ) - val deviceInfoCaptor = argumentCaptor<DeviceInfo>() - verify(mediaSenderService).closeToReceiverToEndCast(any(), capture(deviceInfoCaptor)) - assertThat(deviceInfoCaptor.value!!.name).isEqualTo(DEVICE_NAME) + val routeInfoCaptor = argumentCaptor<MediaRoute2Info>() + verify(statusBarManager).updateMediaTapToTransferSenderDisplay( + eq(StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_ALMOST_CLOSE_TO_END_CAST), + capture(routeInfoCaptor), + nullable(), + nullable()) + assertThat(routeInfoCaptor.value!!.name).isEqualTo(DEVICE_NAME) } @Test fun sender_transferToReceiverTriggered_chipDisplayWithCorrectState() { - commandRegistry.onShellCommand(pw, getTransferToReceiverTriggeredCommand()) - - assertThat(context.isBound(mediaSenderServiceComponentName)).isTrue() + commandRegistry.onShellCommand( + pw, getSenderCommand(TransferToReceiverTriggered::class.simpleName!!) + ) - val deviceInfoCaptor = argumentCaptor<DeviceInfo>() - verify(mediaSenderService).transferToReceiverTriggered(any(), capture(deviceInfoCaptor)) - assertThat(deviceInfoCaptor.value!!.name).isEqualTo(DEVICE_NAME) + val routeInfoCaptor = argumentCaptor<MediaRoute2Info>() + verify(statusBarManager).updateMediaTapToTransferSenderDisplay( + eq(StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_RECEIVER_TRIGGERED), + capture(routeInfoCaptor), + nullable(), + nullable()) + assertThat(routeInfoCaptor.value!!.name).isEqualTo(DEVICE_NAME) } @Test fun sender_transferToThisDeviceTriggered_chipDisplayWithCorrectState() { - commandRegistry.onShellCommand(pw, getTransferToThisDeviceTriggeredCommand()) + commandRegistry.onShellCommand( + pw, getSenderCommand(TransferToThisDeviceTriggered::class.simpleName!!) + ) - assertThat(context.isBound(mediaSenderServiceComponentName)).isTrue() - verify(mediaSenderService).transferToThisDeviceTriggered(any(), any()) + verify(statusBarManager).updateMediaTapToTransferSenderDisplay( + eq(StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_THIS_DEVICE_TRIGGERED), + any(), + nullable(), + nullable()) } @Test fun sender_transferToReceiverSucceeded_chipDisplayWithCorrectState() { - commandRegistry.onShellCommand(pw, getTransferToReceiverSucceededCommand()) - - assertThat(context.isBound(mediaSenderServiceComponentName)).isTrue() + commandRegistry.onShellCommand( + pw, getSenderCommand(TransferToReceiverSucceeded::class.simpleName!!) + ) - val deviceInfoCaptor = argumentCaptor<DeviceInfo>() - verify(mediaSenderService) - .transferToReceiverSucceeded(any(), capture(deviceInfoCaptor), any()) - assertThat(deviceInfoCaptor.value!!.name).isEqualTo(DEVICE_NAME) + val routeInfoCaptor = argumentCaptor<MediaRoute2Info>() + verify(statusBarManager).updateMediaTapToTransferSenderDisplay( + eq(StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_RECEIVER_SUCCEEDED), + capture(routeInfoCaptor), + nullable(), + nullable()) + assertThat(routeInfoCaptor.value!!.name).isEqualTo(DEVICE_NAME) } @Test fun sender_transferToThisDeviceSucceeded_chipDisplayWithCorrectState() { - commandRegistry.onShellCommand(pw, getTransferToThisDeviceSucceededCommand()) - - assertThat(context.isBound(mediaSenderServiceComponentName)).isTrue() + commandRegistry.onShellCommand( + pw, getSenderCommand(TransferToThisDeviceSucceeded::class.simpleName!!) + ) - val deviceInfoCaptor = argumentCaptor<DeviceInfo>() - verify(mediaSenderService) - .transferToThisDeviceSucceeded(any(), capture(deviceInfoCaptor), any()) - assertThat(deviceInfoCaptor.value!!.name).isEqualTo(DEVICE_NAME) + val routeInfoCaptor = argumentCaptor<MediaRoute2Info>() + verify(statusBarManager).updateMediaTapToTransferSenderDisplay( + eq(StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_THIS_DEVICE_SUCCEEDED), + capture(routeInfoCaptor), + nullable(), + nullable()) + assertThat(routeInfoCaptor.value!!.name).isEqualTo(DEVICE_NAME) } @Test fun sender_transferFailed_serviceCallbackCalled() { - commandRegistry.onShellCommand(pw, getTransferFailedCommand()) + commandRegistry.onShellCommand(pw, getSenderCommand(TransferFailed::class.simpleName!!)) - assertThat(context.isBound(mediaSenderServiceComponentName)).isTrue() - verify(mediaSenderService).transferFailed(any(), any()) + verify(statusBarManager).updateMediaTapToTransferSenderDisplay( + eq(StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_RECEIVER_FAILED), + any(), + nullable(), + nullable()) } @Test - fun sender_noLongerCloseToReceiver_serviceCallbackCalledAndServiceUnbound() { - commandRegistry.onShellCommand(pw, getNoLongerCloseToReceiverCommand()) - - // Once we're no longer close to the receiver, we should unbind the service. - assertThat(context.isBound(mediaSenderServiceComponentName)).isFalse() - verify(mediaSenderService).noLongerCloseToReceiver(any(), any()) + fun sender_farFromReceiver_serviceCallbackCalled() { + commandRegistry.onShellCommand(pw, getSenderCommand(FAR_FROM_RECEIVER_STATE)) + + verify(statusBarManager).updateMediaTapToTransferSenderDisplay( + eq(StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_FAR_FROM_RECEIVER), + any(), + nullable(), + nullable()) } @Test @@ -196,61 +227,8 @@ class MediaTttCommandLineHelperTest : SysuiTestCase() { verify(mediaTttChipControllerReceiver).removeChip() } - private fun getMoveCloserToStartCastCommand(): Array<String> = - arrayOf( - SENDER_COMMAND, - DEVICE_NAME, - MOVE_CLOSER_TO_START_CAST_COMMAND_NAME - ) - - private fun getMoveCloserToEndCastCommand(): Array<String> = - arrayOf( - SENDER_COMMAND, - DEVICE_NAME, - MOVE_CLOSER_TO_END_CAST_COMMAND_NAME - ) - - private fun getTransferToReceiverTriggeredCommand(): Array<String> = - arrayOf( - SENDER_COMMAND, - DEVICE_NAME, - TRANSFER_TO_RECEIVER_TRIGGERED_COMMAND_NAME - ) - - private fun getTransferToThisDeviceTriggeredCommand(): Array<String> = - arrayOf( - SENDER_COMMAND, - DEVICE_NAME, - TRANSFER_TO_THIS_DEVICE_TRIGGERED_COMMAND_NAME - ) - - private fun getTransferToReceiverSucceededCommand(): Array<String> = - arrayOf( - SENDER_COMMAND, - DEVICE_NAME, - TRANSFER_TO_RECEIVER_SUCCEEDED_COMMAND_NAME - ) - - private fun getTransferToThisDeviceSucceededCommand(): Array<String> = - arrayOf( - SENDER_COMMAND, - DEVICE_NAME, - TRANSFER_TO_THIS_DEVICE_SUCCEEDED_COMMAND_NAME - ) - - private fun getTransferFailedCommand(): Array<String> = - arrayOf( - SENDER_COMMAND, - DEVICE_NAME, - TRANSFER_FAILED_COMMAND_NAME - ) - - private fun getNoLongerCloseToReceiverCommand(): Array<String> = - arrayOf( - SENDER_COMMAND, - DEVICE_NAME, - NO_LONGER_CLOSE_TO_RECEIVER_COMMAND_NAME - ) + private fun getSenderCommand(displayState: String): Array<String> = + arrayOf(SENDER_COMMAND, DEVICE_NAME, displayState) class EmptyCommand : Command { override fun execute(pw: PrintWriter, args: List<String>) { diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/sender/MediaTttChipControllerSenderTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/sender/MediaTttChipControllerSenderTest.kt index 6b4eebe680f9..c74ac64656ad 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/sender/MediaTttChipControllerSenderTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/sender/MediaTttChipControllerSenderTest.kt @@ -16,17 +16,20 @@ package com.android.systemui.media.taptotransfer.sender +import android.app.StatusBarManager import android.graphics.drawable.Drawable import android.graphics.drawable.Icon +import android.media.MediaRoute2Info import android.view.View import android.view.WindowManager import android.widget.ImageView import android.widget.LinearLayout import android.widget.TextView import androidx.test.filters.SmallTest +import com.android.internal.statusbar.IUndoMediaTransferCallback import com.android.systemui.R import com.android.systemui.SysuiTestCase -import com.android.systemui.shared.mediattt.IUndoTransferCallback +import com.android.systemui.statusbar.CommandQueue import com.android.systemui.util.mockito.any import com.google.common.truth.Truth.assertThat import org.junit.Before @@ -34,6 +37,7 @@ import org.junit.Ignore import org.junit.Test import org.mockito.ArgumentCaptor import org.mockito.Mock +import org.mockito.Mockito.never import org.mockito.Mockito.verify import org.mockito.MockitoAnnotations @@ -46,17 +50,150 @@ class MediaTttChipControllerSenderTest : SysuiTestCase() { @Mock private lateinit var windowManager: WindowManager + @Mock + private lateinit var commandQueue: CommandQueue + private lateinit var commandQueueCallback: CommandQueue.Callbacks @Before fun setUp() { MockitoAnnotations.initMocks(this) appIconDrawable = Icon.createWithResource(context, R.drawable.ic_cake).loadDrawable(context) - controllerSender = MediaTttChipControllerSender(context, windowManager) + controllerSender = MediaTttChipControllerSender(commandQueue, context, windowManager) + + val callbackCaptor = ArgumentCaptor.forClass(CommandQueue.Callbacks::class.java) + verify(commandQueue).addCallback(callbackCaptor.capture()) + commandQueueCallback = callbackCaptor.value!! + } + + @Test + fun commandQueueCallback_almostCloseToStartCast_triggersCorrectChip() { + commandQueueCallback.updateMediaTapToTransferSenderDisplay( + StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_ALMOST_CLOSE_TO_START_CAST, + routeInfo, + null + ) + + assertThat(getChipView().getChipText()) + .isEqualTo(almostCloseToStartCast().getChipTextString(context)) + } + + @Test + fun commandQueueCallback_almostCloseToEndCast_triggersCorrectChip() { + commandQueueCallback.updateMediaTapToTransferSenderDisplay( + StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_ALMOST_CLOSE_TO_END_CAST, + routeInfo, + null + ) + + assertThat(getChipView().getChipText()) + .isEqualTo(almostCloseToEndCast().getChipTextString(context)) + } + + @Test + fun commandQueueCallback_transferToReceiverTriggered_triggersCorrectChip() { + commandQueueCallback.updateMediaTapToTransferSenderDisplay( + StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_RECEIVER_TRIGGERED, + routeInfo, + null + ) + + assertThat(getChipView().getChipText()) + .isEqualTo(transferToReceiverTriggered().getChipTextString(context)) + } + + @Test + fun commandQueueCallback_transferToThisDeviceTriggered_triggersCorrectChip() { + commandQueueCallback.updateMediaTapToTransferSenderDisplay( + StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_THIS_DEVICE_TRIGGERED, + routeInfo, + null + ) + + assertThat(getChipView().getChipText()) + .isEqualTo(transferToThisDeviceTriggered().getChipTextString(context)) + } + + @Test + fun commandQueueCallback_transferToReceiverSucceeded_triggersCorrectChip() { + commandQueueCallback.updateMediaTapToTransferSenderDisplay( + StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_RECEIVER_SUCCEEDED, + routeInfo, + null + ) + + assertThat(getChipView().getChipText()) + .isEqualTo(transferToReceiverSucceeded().getChipTextString(context)) } @Test - fun moveCloserToStartCast_appIcon_deviceName_noLoadingIcon_noUndo_noFailureIcon() { - val state = moveCloserToStartCast() + fun commandQueueCallback_transferToThisDeviceSucceeded_triggersCorrectChip() { + commandQueueCallback.updateMediaTapToTransferSenderDisplay( + StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_THIS_DEVICE_SUCCEEDED, + routeInfo, + null + ) + + assertThat(getChipView().getChipText()) + .isEqualTo(transferToThisDeviceSucceeded().getChipTextString(context)) + } + + @Test + fun commandQueueCallback_transferToReceiverFailed_triggersCorrectChip() { + commandQueueCallback.updateMediaTapToTransferSenderDisplay( + StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_RECEIVER_FAILED, + routeInfo, + null + ) + + assertThat(getChipView().getChipText()) + .isEqualTo(transferFailed().getChipTextString(context)) + } + + @Test + fun commandQueueCallback_transferToThisDeviceFailed_triggersCorrectChip() { + commandQueueCallback.updateMediaTapToTransferSenderDisplay( + StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_THIS_DEVICE_FAILED, + routeInfo, + null + ) + + assertThat(getChipView().getChipText()) + .isEqualTo(transferFailed().getChipTextString(context)) + } + + @Test + fun commandQueueCallback_farFromReceiver_noChipShown() { + commandQueueCallback.updateMediaTapToTransferSenderDisplay( + StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_FAR_FROM_RECEIVER, + routeInfo, + null + ) + + verify(windowManager, never()).addView(any(), any()) + } + + @Test + fun commandQueueCallback_almostCloseThenFarFromReceiver_chipShownThenHidden() { + commandQueueCallback.updateMediaTapToTransferSenderDisplay( + StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_ALMOST_CLOSE_TO_START_CAST, + routeInfo, + null + ) + + commandQueueCallback.updateMediaTapToTransferSenderDisplay( + StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_FAR_FROM_RECEIVER, + routeInfo, + null + ) + + val viewCaptor = ArgumentCaptor.forClass(View::class.java) + verify(windowManager).addView(viewCaptor.capture(), any()) + verify(windowManager).removeView(viewCaptor.value) + } + + @Test + fun almostCloseToStartCast_appIcon_deviceName_noLoadingIcon_noUndo_noFailureIcon() { + val state = almostCloseToStartCast() controllerSender.displayChip(state) val chipView = getChipView() @@ -69,8 +206,8 @@ class MediaTttChipControllerSenderTest : SysuiTestCase() { } @Test - fun moveCloserToEndCast_appIcon_deviceName_noLoadingIcon_noUndo_noFailureIcon() { - val state = moveCloserToEndCast() + fun almostCloseToEndCast_appIcon_deviceName_noLoadingIcon_noUndo_noFailureIcon() { + val state = almostCloseToEndCast() controllerSender.displayChip(state) val chipView = getChipView() @@ -133,7 +270,7 @@ class MediaTttChipControllerSenderTest : SysuiTestCase() { @Test fun transferToReceiverSucceeded_withUndoRunnable_undoWithClick() { - val undoCallback = object : IUndoTransferCallback.Stub() { + val undoCallback = object : IUndoMediaTransferCallback.Stub() { override fun onUndoTriggered() {} } controllerSender.displayChip(transferToReceiverSucceeded(undoCallback)) @@ -146,7 +283,7 @@ class MediaTttChipControllerSenderTest : SysuiTestCase() { @Test fun transferToReceiverSucceeded_withUndoRunnable_undoButtonClickRunsRunnable() { var undoCallbackCalled = false - val undoCallback = object : IUndoTransferCallback.Stub() { + val undoCallback = object : IUndoMediaTransferCallback.Stub() { override fun onUndoTriggered() { undoCallbackCalled = true } @@ -160,7 +297,7 @@ class MediaTttChipControllerSenderTest : SysuiTestCase() { @Test fun transferToReceiverSucceeded_undoButtonClick_switchesToTransferToThisDeviceTriggered() { - val undoCallback = object : IUndoTransferCallback.Stub() { + val undoCallback = object : IUndoMediaTransferCallback.Stub() { override fun onUndoTriggered() {} } controllerSender.displayChip(transferToReceiverSucceeded(undoCallback)) @@ -194,7 +331,7 @@ class MediaTttChipControllerSenderTest : SysuiTestCase() { @Test fun transferToThisDeviceSucceeded_withUndoRunnable_undoWithClick() { - val undoCallback = object : IUndoTransferCallback.Stub() { + val undoCallback = object : IUndoMediaTransferCallback.Stub() { override fun onUndoTriggered() {} } controllerSender.displayChip(transferToThisDeviceSucceeded(undoCallback)) @@ -207,7 +344,7 @@ class MediaTttChipControllerSenderTest : SysuiTestCase() { @Test fun transferToThisDeviceSucceeded_withUndoRunnable_undoButtonClickRunsRunnable() { var undoCallbackCalled = false - val undoCallback = object : IUndoTransferCallback.Stub() { + val undoCallback = object : IUndoMediaTransferCallback.Stub() { override fun onUndoTriggered() { undoCallbackCalled = true } @@ -221,7 +358,7 @@ class MediaTttChipControllerSenderTest : SysuiTestCase() { @Test fun transferToThisDeviceSucceeded_undoButtonClick_switchesToTransferToReceiverTriggered() { - val undoCallback = object : IUndoTransferCallback.Stub() { + val undoCallback = object : IUndoMediaTransferCallback.Stub() { override fun onUndoTriggered() {} } controllerSender.displayChip(transferToThisDeviceSucceeded(undoCallback)) @@ -247,8 +384,8 @@ class MediaTttChipControllerSenderTest : SysuiTestCase() { } @Test - fun changeFromCloserToStartToTransferTriggered_loadingIconAppears() { - controllerSender.displayChip(moveCloserToStartCast()) + fun changeFromAlmostCloseToStartToTransferTriggered_loadingIconAppears() { + controllerSender.displayChip(almostCloseToStartCast()) controllerSender.displayChip(transferToReceiverTriggered()) assertThat(getChipView().getLoadingIconVisibility()).isEqualTo(View.VISIBLE) @@ -267,7 +404,7 @@ class MediaTttChipControllerSenderTest : SysuiTestCase() { controllerSender.displayChip(transferToReceiverTriggered()) controllerSender.displayChip( transferToReceiverSucceeded( - object : IUndoTransferCallback.Stub() { + object : IUndoMediaTransferCallback.Stub() { override fun onUndoTriggered() {} } ) @@ -277,9 +414,9 @@ class MediaTttChipControllerSenderTest : SysuiTestCase() { } @Test - fun changeFromTransferSucceededToMoveCloserToStart_undoButtonDisappears() { + fun changeFromTransferSucceededToAlmostCloseToStart_undoButtonDisappears() { controllerSender.displayChip(transferToReceiverSucceeded()) - controllerSender.displayChip(moveCloserToStartCast()) + controllerSender.displayChip(almostCloseToStartCast()) assertThat(getChipView().getUndoButton().visibility).isEqualTo(View.GONE) } @@ -311,12 +448,12 @@ class MediaTttChipControllerSenderTest : SysuiTestCase() { } /** Helper method providing default parameters to not clutter up the tests. */ - private fun moveCloserToStartCast() = - MoveCloserToStartCast(appIconDrawable, APP_ICON_CONTENT_DESC, DEVICE_NAME) + private fun almostCloseToStartCast() = + AlmostCloseToStartCast(appIconDrawable, APP_ICON_CONTENT_DESC, DEVICE_NAME) /** Helper method providing default parameters to not clutter up the tests. */ - private fun moveCloserToEndCast() = - MoveCloserToEndCast(appIconDrawable, APP_ICON_CONTENT_DESC, DEVICE_NAME) + private fun almostCloseToEndCast() = + AlmostCloseToEndCast(appIconDrawable, APP_ICON_CONTENT_DESC, DEVICE_NAME) /** Helper method providing default parameters to not clutter up the tests. */ private fun transferToReceiverTriggered() = @@ -327,13 +464,13 @@ class MediaTttChipControllerSenderTest : SysuiTestCase() { TransferToThisDeviceTriggered(appIconDrawable, APP_ICON_CONTENT_DESC) /** Helper method providing default parameters to not clutter up the tests. */ - private fun transferToReceiverSucceeded(undoCallback: IUndoTransferCallback? = null) = + private fun transferToReceiverSucceeded(undoCallback: IUndoMediaTransferCallback? = null) = TransferToReceiverSucceeded( appIconDrawable, APP_ICON_CONTENT_DESC, DEVICE_NAME, undoCallback ) /** Helper method providing default parameters to not clutter up the tests. */ - private fun transferToThisDeviceSucceeded(undoCallback: IUndoTransferCallback? = null) = + private fun transferToThisDeviceSucceeded(undoCallback: IUndoMediaTransferCallback? = null) = TransferToThisDeviceSucceeded( appIconDrawable, APP_ICON_CONTENT_DESC, DEVICE_NAME, undoCallback ) @@ -344,3 +481,7 @@ class MediaTttChipControllerSenderTest : SysuiTestCase() { private const val DEVICE_NAME = "My Tablet" private const val APP_ICON_CONTENT_DESC = "Content description" + +private val routeInfo = MediaRoute2Info.Builder("id", "Test Name") + .addFeature("feature") + .build() diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/sender/MediaTttSenderServiceTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/sender/MediaTttSenderServiceTest.kt deleted file mode 100644 index 64542cb2f647..000000000000 --- a/packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/sender/MediaTttSenderServiceTest.kt +++ /dev/null @@ -1,126 +0,0 @@ -package com.android.systemui.media.taptotransfer.sender - -import android.media.MediaRoute2Info -import androidx.test.filters.SmallTest -import com.android.systemui.SysuiTestCase -import com.android.systemui.shared.mediattt.DeviceInfo -import com.android.systemui.shared.mediattt.IDeviceSenderService -import com.android.systemui.shared.mediattt.IUndoTransferCallback -import com.android.systemui.util.mockito.any -import com.android.systemui.util.mockito.argumentCaptor -import com.android.systemui.util.mockito.capture -import com.google.common.truth.Truth.assertThat -import org.junit.Before -import org.junit.Ignore -import org.junit.Test -import org.mockito.Mock -import org.mockito.Mockito.verify -import org.mockito.MockitoAnnotations - -@SmallTest -@Ignore("b/216286227") -class MediaTttSenderServiceTest : SysuiTestCase() { - - private lateinit var service: IDeviceSenderService - - @Mock - private lateinit var controller: MediaTttChipControllerSender - - private val mediaInfo = MediaRoute2Info.Builder("id", "Test Name") - .addFeature("feature") - .build() - - @Before - fun setUp() { - MockitoAnnotations.initMocks(this) - val mediaTttSenderService = MediaTttSenderService(context, controller) - service = IDeviceSenderService.Stub.asInterface(mediaTttSenderService.onBind(null)) - } - - @Test - fun closeToReceiverToStartCast_controllerTriggeredWithCorrectState() { - val name = "Fake name" - service.closeToReceiverToStartCast(mediaInfo, DeviceInfo(name)) - - val chipStateCaptor = argumentCaptor<MoveCloserToStartCast>() - verify(controller).displayChip(capture(chipStateCaptor)) - - val chipState = chipStateCaptor.value!! - assertThat(chipState.getChipTextString(context)).contains(name) - } - - @Test - fun closeToReceiverToEndCast_controllerTriggeredWithCorrectState() { - val name = "Fake name" - service.closeToReceiverToEndCast(mediaInfo, DeviceInfo(name)) - - val chipStateCaptor = argumentCaptor<MoveCloserToEndCast>() - verify(controller).displayChip(capture(chipStateCaptor)) - - val chipState = chipStateCaptor.value!! - assertThat(chipState.getChipTextString(context)).contains(name) - } - - @Test - fun transferToThisDeviceTriggered_controllerTriggeredWithCorrectState() { - service.transferToThisDeviceTriggered(mediaInfo, DeviceInfo("Fake name")) - - verify(controller).displayChip(any<TransferToThisDeviceTriggered>()) - } - - @Test - fun transferToReceiverTriggered_controllerTriggeredWithCorrectState() { - val name = "Fake name" - service.transferToReceiverTriggered(mediaInfo, DeviceInfo(name)) - - val chipStateCaptor = argumentCaptor<TransferToReceiverTriggered>() - verify(controller).displayChip(capture(chipStateCaptor)) - - val chipState = chipStateCaptor.value!! - assertThat(chipState.getChipTextString(context)).contains(name) - } - - @Test - fun transferToReceiverSucceeded_controllerTriggeredWithCorrectState() { - val name = "Fake name" - val undoCallback = object : IUndoTransferCallback.Stub() { - override fun onUndoTriggered() {} - } - service.transferToReceiverSucceeded(mediaInfo, DeviceInfo(name), undoCallback) - - val chipStateCaptor = argumentCaptor<TransferToReceiverSucceeded>() - verify(controller).displayChip(capture(chipStateCaptor)) - - val chipState = chipStateCaptor.value!! - assertThat(chipState.getChipTextString(context)).contains(name) - assertThat(chipState.undoCallback).isEqualTo(undoCallback) - } - - @Test - fun transferToThisDeviceSucceeded_controllerTriggeredWithCorrectState() { - val undoCallback = object : IUndoTransferCallback.Stub() { - override fun onUndoTriggered() {} - } - service.transferToThisDeviceSucceeded(mediaInfo, DeviceInfo("name"), undoCallback) - - val chipStateCaptor = argumentCaptor<TransferToThisDeviceSucceeded>() - verify(controller).displayChip(capture(chipStateCaptor)) - - val chipState = chipStateCaptor.value!! - assertThat(chipState.undoCallback).isEqualTo(undoCallback) - } - - @Test - fun transferFailed_controllerTriggeredWithTransferFailedState() { - service.transferFailed(mediaInfo, DeviceInfo("Fake name")) - - verify(controller).displayChip(any<TransferFailed>()) - } - - @Test - fun noLongerCloseToReceiver_controllerRemoveChipTriggered() { - service.noLongerCloseToReceiver(mediaInfo, DeviceInfo("Fake name")) - - verify(controller).removeChip() - } -} diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/FooterActionsControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/qs/FooterActionsControllerTest.kt index 354bb5192251..f5fa0d030901 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/FooterActionsControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/FooterActionsControllerTest.kt @@ -15,9 +15,10 @@ import com.android.internal.logging.testing.FakeMetricsLogger import com.android.systemui.Dependency import com.android.systemui.R import com.android.systemui.classifier.FalsingManagerFake +import com.android.systemui.flags.FeatureFlags +import com.android.systemui.flags.Flags import com.android.systemui.globalactions.GlobalActionsDialogLite import com.android.systemui.plugins.ActivityStarter -import com.android.systemui.qs.FooterActionsController.ExpansionState import com.android.systemui.settings.UserTracker import com.android.systemui.statusbar.phone.MultiUserSwitchController import com.android.systemui.statusbar.policy.DeviceProvisionedController @@ -54,12 +55,16 @@ class FooterActionsControllerTest : LeakCheckedTest() { @Mock private lateinit var userInfoController: UserInfoController @Mock + private lateinit var multiUserSwitchControllerFactory: MultiUserSwitchController.Factory + @Mock private lateinit var multiUserSwitchController: MultiUserSwitchController @Mock private lateinit var globalActionsDialog: GlobalActionsDialogLite @Mock private lateinit var uiEventLogger: UiEventLogger @Mock + private lateinit var featureFlags: FeatureFlags + private lateinit var controller: FooterActionsController private val metricsLogger: MetricsLogger = FakeMetricsLogger() @@ -76,15 +81,18 @@ class FooterActionsControllerTest : LeakCheckedTest() { injectLeakCheckedDependencies(*LeakCheckedTest.ALL_SUPPORTED_CLASSES) val fakeTunerService = Dependency.get(TunerService::class.java) as FakeTunerService + whenever(multiUserSwitchControllerFactory.create(any())) + .thenReturn(multiUserSwitchController) + whenever(featureFlags.isEnabled(Flags.NEW_FOOTER)).thenReturn(false) + view = LayoutInflater.from(context) .inflate(R.layout.footer_actions, null) as FooterActionsView - controller = FooterActionsController(view, activityStarter, - userManager, userTracker, userInfoController, multiUserSwitchController, + controller = FooterActionsController(view, multiUserSwitchControllerFactory, + activityStarter, userManager, userTracker, userInfoController, deviceProvisionedController, falsingManager, metricsLogger, fakeTunerService, - globalActionsDialog, uiEventLogger, showPMLiteButton = true, - buttonsVisibleState = ExpansionState.EXPANDED, fakeSettings, - Handler(testableLooper.looper)) + globalActionsDialog, uiEventLogger, showPMLiteButton = true, fakeSettings, + Handler(testableLooper.looper), featureFlags) controller.init() ViewUtils.attachView(view) // View looper is the testable looper associated with the test @@ -98,7 +106,7 @@ class FooterActionsControllerTest : LeakCheckedTest() { @Test fun testLogPowerMenuClick() { - controller.expanded = true + controller.visible = true falsingManager.setFalseTap(false) view.findViewById<View>(R.id.pm_lite).performClick() diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/QSFooterViewControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/QSFooterViewControllerTest.java index f43e68f3e575..26aa37df0c0b 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/QSFooterViewControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/QSFooterViewControllerTest.java @@ -61,12 +61,8 @@ public class QSFooterViewControllerTest extends LeakCheckedTest { @Mock private ClipboardManager mClipboardManager; @Mock - private QuickQSPanelController mQuickQSPanelController; - @Mock private TextView mBuildText; @Mock - private FooterActionsController mFooterActionsController; - @Mock private FalsingManager mFalsingManager; @Mock private ActivityStarter mActivityStarter; @@ -93,8 +89,7 @@ public class QSFooterViewControllerTest extends LeakCheckedTest { when(mView.findViewById(android.R.id.edit)).thenReturn(mEditButton); mController = new QSFooterViewController(mView, mUserTracker, mFalsingManager, - mActivityStarter, mQSPanelController, mQuickQSPanelController, - mFooterActionsController); + mActivityStarter, mQSPanelController); mController.init(); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/QuickQSPanelControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/qs/QuickQSPanelControllerTest.kt index 59948d310b4f..09c6d9e86a44 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/QuickQSPanelControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/QuickQSPanelControllerTest.kt @@ -68,8 +68,6 @@ class QuickQSPanelControllerTest : SysuiTestCase() { private lateinit var tileView: QSTileView @Mock private lateinit var quickQsBrightnessController: QuickQSBrightnessController - @Mock - private lateinit var footerActionsController: FooterActionsController @Captor private lateinit var captor: ArgumentCaptor<QSPanel.OnConfigurationChangedListener> @@ -95,8 +93,7 @@ class QuickQSPanelControllerTest : SysuiTestCase() { uiEventLogger, qsLogger, dumpManager, - quickQsBrightnessController, - footerActionsController + quickQsBrightnessController ) controller.init() @@ -128,14 +125,12 @@ class QuickQSPanelControllerTest : SysuiTestCase() { } @Test - fun testBrightnessAndFooterVisibilityRefreshedWhenConfigurationChanged() { + fun testBrightnessRefreshedWhenConfigurationChanged() { // times(2) because both controller and base controller are registering their listeners verify(quickQSPanel, times(2)).addOnConfigurationChangedListener(captor.capture()) captor.allValues.forEach { it.onConfigurationChange(Configuration.EMPTY) } verify(quickQsBrightnessController).refreshVisibility(anyBoolean()) - // times(2) because footer visibility is also refreshed on controller init - verify(footerActionsController, times(2)).refreshVisibility(anyBoolean()) } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/shared/animation/UnfoldConstantTranslateAnimatorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/shared/animation/UnfoldConstantTranslateAnimatorTest.kt new file mode 100644 index 000000000000..32314159f865 --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/shared/animation/UnfoldConstantTranslateAnimatorTest.kt @@ -0,0 +1,117 @@ +package com.android.systemui.shared.animation + +import android.testing.AndroidTestingRunner +import android.view.View +import android.view.ViewGroup +import androidx.test.filters.SmallTest +import com.android.systemui.SysuiTestCase +import com.android.systemui.shared.animation.UnfoldConstantTranslateAnimator.Direction +import com.android.systemui.shared.animation.UnfoldConstantTranslateAnimator.ViewIdToTranslate +import com.android.systemui.unfold.UnfoldTransitionProgressProvider +import com.android.systemui.unfold.UnfoldTransitionProgressProvider.TransitionProgressListener +import org.junit.Assert.assertEquals +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.verify +import org.mockito.Mockito.`when` as whenever +import org.mockito.MockitoAnnotations + +@SmallTest +@RunWith(AndroidTestingRunner::class) +class UnfoldConstantTranslateAnimatorTest : SysuiTestCase() { + + @Mock private lateinit var progressProvider: UnfoldTransitionProgressProvider + + @Mock private lateinit var parent: ViewGroup + + @Captor private lateinit var progressListenerCaptor: ArgumentCaptor<TransitionProgressListener> + + private lateinit var animator: UnfoldConstantTranslateAnimator + private lateinit var progressListener: TransitionProgressListener + + private val viewsIdToRegister = + setOf( + ViewIdToTranslate(LEFT_VIEW_ID, Direction.LEFT), + ViewIdToTranslate(RIGHT_VIEW_ID, Direction.RIGHT)) + + @Before + fun setup() { + MockitoAnnotations.initMocks(this) + + animator = + UnfoldConstantTranslateAnimator(viewsIdToRegister, progressProvider) + + animator.init(parent, MAX_TRANSLATION) + + verify(progressProvider).addCallback(progressListenerCaptor.capture()) + progressListener = progressListenerCaptor.value + } + + @Test + fun onTransition_noMatchingIds() { + // GIVEN no views matching any ids + // WHEN the transition starts + progressListener.onTransitionStarted() + progressListener.onTransitionProgress(.1f) + + // THEN nothing... no exceptions + } + + @Test + fun onTransition_oneMovesLeft() { + // GIVEN one view with a matching id + val view = View(context) + whenever(parent.findViewById<View>(LEFT_VIEW_ID)).thenReturn(view) + + moveAndValidate(listOf(view to LEFT)) + } + + @Test + fun onTransition_oneMovesLeftAndOneMovesRightMultipleTimes() { + // GIVEN two views with a matching id + val leftView = View(context) + val rightView = View(context) + whenever(parent.findViewById<View>(LEFT_VIEW_ID)).thenReturn(leftView) + whenever(parent.findViewById<View>(RIGHT_VIEW_ID)).thenReturn(rightView) + + moveAndValidate(listOf(leftView to LEFT, rightView to RIGHT)) + moveAndValidate(listOf(leftView to LEFT, rightView to RIGHT)) + } + + private fun moveAndValidate(list: List<Pair<View, Int>>) { + // Compare values as ints because -0f != 0f + + // WHEN the transition starts + progressListener.onTransitionStarted() + progressListener.onTransitionProgress(0f) + + list.forEach { (view, direction) -> + assertEquals((-MAX_TRANSLATION * direction).toInt(), view.translationX.toInt()) + } + + // WHEN the transition progresses, translation is updated + progressListener.onTransitionProgress(.5f) + list.forEach { (view, direction) -> + assertEquals((-MAX_TRANSLATION / 2f * direction).toInt(), view.translationX.toInt()) + } + + // WHEN the transition ends, translation is completed + progressListener.onTransitionProgress(1f) + progressListener.onTransitionFinished() + list.forEach { (view, _) -> assertEquals(0, view.translationX.toInt()) } + } + + companion object { + private val LEFT = Direction.LEFT.multiplier.toInt() + private val RIGHT = Direction.RIGHT.multiplier.toInt() + + private const val MAX_TRANSLATION = 42f + + private const val LEFT_VIEW_ID = 1 + private const val RIGHT_VIEW_ID = 2 + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/LockscreenShadeTransitionControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/LockscreenShadeTransitionControllerTest.kt index d51d370eecb9..9076e1607be5 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/LockscreenShadeTransitionControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/LockscreenShadeTransitionControllerTest.kt @@ -169,8 +169,6 @@ class LockscreenShadeTransitionControllerTest : SysuiTestCase() { transitionController.goToLockedShade(null) whenever(statusbarStateController.state).thenReturn(StatusBarState.SHADE) transitionController.goToLockedShade(null) - whenever(statusbarStateController.state).thenReturn(StatusBarState.FULLSCREEN_USER_SWITCHER) - transitionController.goToLockedShade(null) verify(statusbarStateController, never()).setState(anyInt()) } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationViewHierarchyManagerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationViewHierarchyManagerTest.java index 83f1d87133c6..7fafb24317b7 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationViewHierarchyManagerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationViewHierarchyManagerTest.java @@ -35,6 +35,7 @@ import android.widget.LinearLayout; import androidx.test.filters.SmallTest; +import com.android.keyguard.KeyguardUpdateMonitor; import com.android.systemui.SysuiTestCase; import com.android.systemui.flags.FeatureFlags; import com.android.systemui.plugins.statusbar.NotificationSwipeActionHelper; @@ -56,6 +57,7 @@ import com.android.systemui.statusbar.notification.row.NotificationTestHelper; import com.android.systemui.statusbar.notification.stack.ForegroundServiceSectionController; import com.android.systemui.statusbar.notification.stack.NotificationListContainer; import com.android.systemui.statusbar.phone.KeyguardBypassController; +import com.android.systemui.statusbar.policy.KeyguardStateController; import com.android.wm.shell.bubbles.Bubbles; import com.google.android.collect.Lists; @@ -123,7 +125,9 @@ public class NotificationViewHierarchyManagerTest extends SysuiTestCase { mock(DynamicChildBindController.class), mock(LowPriorityInflationHelper.class), mock(AssistantFeedbackController.class), - mNotifPipelineFlags); + mNotifPipelineFlags, + mock(KeyguardUpdateMonitor.class), + mock(KeyguardStateController.class)); mViewHierarchyManager.setUpWithPresenter(mPresenter, mStackController, mListContainer); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/RunningFgsControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/RunningFgsControllerTest.java deleted file mode 100644 index 6059afe8a70b..000000000000 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/RunningFgsControllerTest.java +++ /dev/null @@ -1,340 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.systemui.statusbar; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.atLeastOnce; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -import android.app.IActivityManager; -import android.app.IForegroundServiceObserver; -import android.os.Binder; -import android.os.IBinder; -import android.os.RemoteException; -import android.testing.AndroidTestingRunner; -import android.util.Pair; - -import androidx.lifecycle.Lifecycle; -import androidx.lifecycle.LifecycleOwner; -import androidx.test.filters.MediumTest; - -import com.android.systemui.SysuiTestCase; -import com.android.systemui.statusbar.policy.RunningFgsController; -import com.android.systemui.statusbar.policy.RunningFgsController.UserPackageTime; -import com.android.systemui.statusbar.policy.RunningFgsControllerImpl; -import com.android.systemui.util.concurrency.FakeExecutor; -import com.android.systemui.util.time.FakeSystemClock; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.ArgumentCaptor; -import org.mockito.Mock; -import org.mockito.Mockito; -import org.mockito.MockitoAnnotations; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Objects; -import java.util.Random; -import java.util.function.Consumer; - -@MediumTest -@RunWith(AndroidTestingRunner.class) -public class RunningFgsControllerTest extends SysuiTestCase { - - private RunningFgsController mController; - - private FakeSystemClock mSystemClock = new FakeSystemClock(); - private FakeExecutor mExecutor = new FakeExecutor(mSystemClock); - private TestCallback mCallback = new TestCallback(); - - @Mock - private IActivityManager mActivityManager; - @Mock - private Lifecycle mLifecycle; - @Mock - private LifecycleOwner mLifecycleOwner; - - @Before - public void setUp() { - MockitoAnnotations.initMocks(this); - when(mLifecycleOwner.getLifecycle()).thenReturn(mLifecycle); - mController = new RunningFgsControllerImpl(mExecutor, mSystemClock, mActivityManager); - } - - @Test - public void testInitRegistersListenerInImpl() throws RemoteException { - ((RunningFgsControllerImpl) mController).init(); - verify(mActivityManager, times(1)).registerForegroundServiceObserver(any()); - } - - @Test - public void testAddCallbackCallsInitInImpl() { - verifyInitIsCalled(controller -> controller.addCallback(mCallback)); - } - - @Test - public void testRemoveCallbackCallsInitInImpl() { - verifyInitIsCalled(controller -> controller.removeCallback(mCallback)); - } - - @Test - public void testObserve1CallsInitInImpl() { - verifyInitIsCalled(controller -> controller.observe(mLifecycle, mCallback)); - } - - @Test - public void testObserve2CallsInitInImpl() { - verifyInitIsCalled(controller -> controller.observe(mLifecycleOwner, mCallback)); - } - - @Test - public void testGetPackagesWithFgsCallsInitInImpl() { - verifyInitIsCalled(controller -> controller.getPackagesWithFgs()); - } - - @Test - public void testStopFgsCallsInitInImpl() { - verifyInitIsCalled(controller -> controller.stopFgs(0, "")); - } - - /** - * Tests that callbacks can be added - */ - @Test - public void testAddCallback() throws RemoteException { - String testPackageName = "testPackageName"; - int testUserId = 0; - - IForegroundServiceObserver observer = prepareObserver(); - mController.addCallback(mCallback); - - observer.onForegroundStateChanged(new Binder(), testPackageName, testUserId, true); - - mExecutor.advanceClockToLast(); - mExecutor.runAllReady(); - - assertEquals("Callback should have been invoked exactly once.", - 1, mCallback.mInvocations.size()); - - List<UserPackageTime> userPackageTimes = mCallback.mInvocations.get(0); - assertEquals("There should have only been one package in callback. packages=" - + userPackageTimes, - 1, userPackageTimes.size()); - - UserPackageTime upt = userPackageTimes.get(0); - assertEquals(testPackageName, upt.getPackageName()); - assertEquals(testUserId, upt.getUserId()); - } - - /** - * Tests that callbacks can be removed. This test is only meaningful if - * {@link #testAddCallback()} can pass. - */ - @Test - public void testRemoveCallback() throws RemoteException { - String testPackageName = "testPackageName"; - int testUserId = 0; - - IForegroundServiceObserver observer = prepareObserver(); - mController.addCallback(mCallback); - mController.removeCallback(mCallback); - - observer.onForegroundStateChanged(new Binder(), testPackageName, testUserId, true); - - mExecutor.advanceClockToLast(); - mExecutor.runAllReady(); - - assertEquals("Callback should not have been invoked.", - 0, mCallback.mInvocations.size()); - } - - /** - * Tests packages are added when the controller receives a callback from activity manager for - * a foreground service start. - */ - @Test - public void testGetPackagesWithFgsAddingPackages() throws RemoteException { - int numPackages = 20; - int numUsers = 3; - - IForegroundServiceObserver observer = prepareObserver(); - - assertEquals("List should be empty", 0, mController.getPackagesWithFgs().size()); - - List<Pair<Integer, String>> addedPackages = new ArrayList<>(); - for (int pkgNumber = 0; pkgNumber < numPackages; pkgNumber++) { - for (int userId = 0; userId < numUsers; userId++) { - String packageName = "package.name." + pkgNumber; - addedPackages.add(new Pair(userId, packageName)); - - observer.onForegroundStateChanged(new Binder(), packageName, userId, true); - - containsAllAddedPackages(addedPackages, mController.getPackagesWithFgs()); - } - } - } - - /** - * Tests packages are removed when the controller receives a callback from activity manager for - * a foreground service ending. - */ - @Test - public void testGetPackagesWithFgsRemovingPackages() throws RemoteException { - int numPackages = 20; - int numUsers = 3; - int arrayLength = numPackages * numUsers; - - String[] packages = new String[arrayLength]; - int[] users = new int[arrayLength]; - IBinder[] tokens = new IBinder[arrayLength]; - for (int pkgNumber = 0; pkgNumber < numPackages; pkgNumber++) { - for (int userId = 0; userId < numUsers; userId++) { - int i = pkgNumber * numUsers + userId; - packages[i] = "package.name." + pkgNumber; - users[i] = userId; - tokens[i] = new Binder(); - } - } - - IForegroundServiceObserver observer = prepareObserver(); - - for (int i = 0; i < packages.length; i++) { - observer.onForegroundStateChanged(tokens[i], packages[i], users[i], true); - } - - assertEquals(packages.length, mController.getPackagesWithFgs().size()); - - List<Integer> removeOrder = new ArrayList<>(); - for (int i = 0; i < packages.length; i++) { - removeOrder.add(i); - } - Collections.shuffle(removeOrder, new Random(12345)); - - for (int idx : removeOrder) { - removePackageAndAssertRemovedFromList(observer, tokens[idx], packages[idx], users[idx]); - } - - assertEquals(0, mController.getPackagesWithFgs().size()); - } - - /** - * Tests a call on stopFgs forwards to activity manager. - */ - @Test - public void testStopFgs() throws RemoteException { - String pkgName = "package.name"; - mController.stopFgs(0, pkgName); - verify(mActivityManager).stopAppForUser(pkgName, 0); - } - - /** - * Tests a package which starts multiple services is only listed once and is only removed once - * all services are stopped. - */ - @Test - public void testSinglePackageWithMultipleServices() throws RemoteException { - String packageName = "package.name"; - int userId = 0; - IBinder serviceToken1 = new Binder(); - IBinder serviceToken2 = new Binder(); - - IForegroundServiceObserver observer = prepareObserver(); - - assertEquals(0, mController.getPackagesWithFgs().size()); - - observer.onForegroundStateChanged(serviceToken1, packageName, userId, true); - assertSinglePackage(packageName, userId); - - observer.onForegroundStateChanged(serviceToken2, packageName, userId, true); - assertSinglePackage(packageName, userId); - - observer.onForegroundStateChanged(serviceToken2, packageName, userId, false); - assertSinglePackage(packageName, userId); - - observer.onForegroundStateChanged(serviceToken1, packageName, userId, false); - assertEquals(0, mController.getPackagesWithFgs().size()); - } - - private IForegroundServiceObserver prepareObserver() - throws RemoteException { - mController.getPackagesWithFgs(); - - ArgumentCaptor<IForegroundServiceObserver> argumentCaptor = - ArgumentCaptor.forClass(IForegroundServiceObserver.class); - verify(mActivityManager).registerForegroundServiceObserver(argumentCaptor.capture()); - - return argumentCaptor.getValue(); - } - - private void verifyInitIsCalled(Consumer<RunningFgsControllerImpl> c) { - RunningFgsControllerImpl spiedController = Mockito.spy( - ((RunningFgsControllerImpl) mController)); - c.accept(spiedController); - verify(spiedController, atLeastOnce()).init(); - } - - private void containsAllAddedPackages(List<Pair<Integer, String>> addedPackages, - List<UserPackageTime> runningFgsPackages) { - for (Pair<Integer, String> userPkg : addedPackages) { - assertTrue(userPkg + " was not found in returned list", - runningFgsPackages.stream().anyMatch( - upt -> userPkg.first == upt.getUserId() - && Objects.equals(upt.getPackageName(), userPkg.second))); - } - for (UserPackageTime upt : runningFgsPackages) { - int userId = upt.getUserId(); - String packageName = upt.getPackageName(); - assertTrue("Unknown <user=" + userId + ", package=" + packageName + ">" - + " in returned list", - addedPackages.stream().anyMatch(userPkg -> userPkg.first == userId - && Objects.equals(packageName, userPkg.second))); - } - } - - private void removePackageAndAssertRemovedFromList(IForegroundServiceObserver observer, - IBinder token, String pkg, int userId) throws RemoteException { - observer.onForegroundStateChanged(token, pkg, userId, false); - List<UserPackageTime> packagesWithFgs = mController.getPackagesWithFgs(); - assertFalse("Package \"" + pkg + "\" was not removed", - packagesWithFgs.stream().anyMatch(upt -> - Objects.equals(upt.getPackageName(), pkg) && upt.getUserId() == userId)); - } - - private void assertSinglePackage(String packageName, int userId) { - assertEquals(1, mController.getPackagesWithFgs().size()); - assertEquals(packageName, mController.getPackagesWithFgs().get(0).getPackageName()); - assertEquals(userId, mController.getPackagesWithFgs().get(0).getUserId()); - } - - private static class TestCallback implements RunningFgsController.Callback { - - private List<List<UserPackageTime>> mInvocations = new ArrayList<>(); - - @Override - public void onFgsPackagesChanged(List<UserPackageTime> packages) { - mInvocations.add(packages); - } - } -} diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/StatusBarStateControllerImplTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/StatusBarStateControllerImplTest.kt index b736f389ad6c..a5ea897b6a6f 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/StatusBarStateControllerImplTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/StatusBarStateControllerImplTest.kt @@ -61,18 +61,16 @@ class StatusBarStateControllerImplTest : SysuiTestCase() { @Test fun testChangeState_logged() { TestableLooper.get(this).runWithLooper { - controller.state = StatusBarState.FULLSCREEN_USER_SWITCHER controller.state = StatusBarState.KEYGUARD controller.state = StatusBarState.SHADE controller.state = StatusBarState.SHADE_LOCKED } val logs = uiEventLogger.logs - assertEquals(4, logs.size) + assertEquals(3, logs.size) val ids = logs.map(UiEventLoggerFake.FakeUiEvent::eventId) - assertEquals(StatusBarStateEvent.STATUS_BAR_STATE_FULLSCREEN_USER_SWITCHER.id, ids[0]) - assertEquals(StatusBarStateEvent.STATUS_BAR_STATE_KEYGUARD.id, ids[1]) - assertEquals(StatusBarStateEvent.STATUS_BAR_STATE_SHADE.id, ids[2]) - assertEquals(StatusBarStateEvent.STATUS_BAR_STATE_SHADE_LOCKED.id, ids[3]) + assertEquals(StatusBarStateEvent.STATUS_BAR_STATE_KEYGUARD.id, ids[0]) + assertEquals(StatusBarStateEvent.STATUS_BAR_STATE_SHADE.id, ids[1]) + assertEquals(StatusBarStateEvent.STATUS_BAR_STATE_SHADE_LOCKED.id, ids[2]) } -}
\ No newline at end of file +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/StatusBarStateEventTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/StatusBarStateEventTest.kt index b5b2f1fc0484..79a2008e7542 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/StatusBarStateEventTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/StatusBarStateEventTest.kt @@ -33,18 +33,16 @@ class StatusBarStateEventTest : SysuiTestCase() { StatusBarStateEvent.STATUS_BAR_STATE_SHADE, StatusBarStateEvent.STATUS_BAR_STATE_SHADE_LOCKED, StatusBarStateEvent.STATUS_BAR_STATE_KEYGUARD, - StatusBarStateEvent.STATUS_BAR_STATE_FULLSCREEN_USER_SWITCHER, StatusBarStateEvent.STATUS_BAR_STATE_UNKNOWN ) val states = listOf( StatusBarState.SHADE, StatusBarState.SHADE_LOCKED, StatusBarState.KEYGUARD, - StatusBarState.FULLSCREEN_USER_SWITCHER, -1 ) events.zip(states).forEach { (event, state) -> assertEquals(event, StatusBarStateEvent.fromState(state)) } } -}
\ No newline at end of file +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/ShadeListBuilderTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/ShadeListBuilderTest.java index 8fb066bb4a39..cb248b05e4bd 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/ShadeListBuilderTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/ShadeListBuilderTest.java @@ -29,6 +29,7 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyList; import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.atLeast; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.clearInvocations; import static org.mockito.Mockito.inOrder; @@ -46,6 +47,7 @@ import android.testing.TestableLooper; import android.util.ArrayMap; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.test.filters.SmallTest; import com.android.systemui.SysuiTestCase; @@ -872,6 +874,73 @@ public class ShadeListBuilderTest extends SysuiTestCase { } @Test + public void testThatSectionComparatorsAreCalled() { + // GIVEN a section with a comparator that elevates some packages over others + NotifComparator comparator = spy(new HypeComparator(PACKAGE_2, PACKAGE_4)); + NotifSectioner sectioner = new PackageSectioner( + List.of(PACKAGE_1, PACKAGE_2, PACKAGE_4, PACKAGE_5), comparator); + mListBuilder.setSectioners(List.of(sectioner)); + + // WHEN the pipeline is kicked off on a bunch of notifications + addNotif(0, PACKAGE_0); + addNotif(1, PACKAGE_1); + addNotif(2, PACKAGE_2); + addNotif(3, PACKAGE_3); + addNotif(4, PACKAGE_4); + addNotif(5, PACKAGE_5); + dispatchBuild(); + + // THEN the notifs are sorted according to both sectioning and the section's comparator + verifyBuiltList( + notif(2), + notif(4), + notif(1), + notif(5), + notif(0), + notif(3) + ); + + // VERIFY that the comparator is invoked at least 3 times + verify(comparator, atLeast(3)).compare(any(), any()); + + // VERIFY that the comparator is never invoked with the entry from package 0 or 3. + final NotificationEntry package0Entry = mEntrySet.get(0); + verify(comparator, never()).compare(eq(package0Entry), any()); + verify(comparator, never()).compare(any(), eq(package0Entry)); + final NotificationEntry package3Entry = mEntrySet.get(3); + verify(comparator, never()).compare(eq(package3Entry), any()); + verify(comparator, never()).compare(any(), eq(package3Entry)); + } + + @Test + public void testThatSectionComparatorsAreNotCalledForSectionWithSingleEntry() { + // GIVEN a section with a comparator that will have only 1 element + NotifComparator comparator = spy(new HypeComparator(PACKAGE_3)); + NotifSectioner sectioner = new PackageSectioner(List.of(PACKAGE_3), comparator); + mListBuilder.setSectioners(List.of(sectioner)); + + // WHEN the pipeline is kicked off on a bunch of notifications + addNotif(0, PACKAGE_1); + addNotif(1, PACKAGE_2); + addNotif(2, PACKAGE_3); + addNotif(3, PACKAGE_4); + addNotif(4, PACKAGE_5); + dispatchBuild(); + + // THEN the notifs are sorted according to the sectioning + verifyBuiltList( + notif(2), + notif(0), + notif(1), + notif(3), + notif(4) + ); + + // VERIFY that the comparator is never invoked + verify(comparator, never()).compare(any(), any()); + } + + @Test public void testListenersAndPluggablesAreFiredInOrder() { // GIVEN a bunch of registered listeners and pluggables NotifFilter preGroupFilter = spy(new PackageFilter(PACKAGE_1)); @@ -934,7 +1003,8 @@ public class ShadeListBuilderTest extends SysuiTestCase { // GIVEN a variety of pluggables NotifFilter packageFilter = new PackageFilter(PACKAGE_1); NotifPromoter idPromoter = new IdPromoter(4); - NotifSectioner section = new PackageSectioner(PACKAGE_1); + NotifComparator sectionComparator = new HypeComparator(PACKAGE_1); + NotifSectioner section = new PackageSectioner(List.of(PACKAGE_1), sectionComparator); NotifComparator hypeComparator = new HypeComparator(PACKAGE_2); Invalidator preRenderInvalidator = new Invalidator("PreRenderInvalidator") {}; @@ -969,6 +1039,10 @@ public class ShadeListBuilderTest extends SysuiTestCase { verify(mOnRenderListListener).onRenderList(anyList()); clearInvocations(mOnRenderListListener); + sectionComparator.invalidateList(); + verify(mOnRenderListListener).onRenderList(anyList()); + + clearInvocations(mOnRenderListListener); preRenderInvalidator.invalidateList(); verify(mOnRenderListListener).onRenderList(anyList()); } @@ -2037,16 +2111,30 @@ public class ShadeListBuilderTest extends SysuiTestCase { /** Represents a section for the passed pkg */ private static class PackageSectioner extends NotifSectioner { - private final String mPackage; + private final List<String> mPackages; + private final NotifComparator mComparator; + + PackageSectioner(List<String> pkgs, NotifComparator comparator) { + super("PackageSection_" + pkgs, 0); + mPackages = pkgs; + mComparator = comparator; + } PackageSectioner(String pkg) { super("PackageSection_" + pkg, 0); - mPackage = pkg; + mPackages = List.of(pkg); + mComparator = null; + } + + @Nullable + @Override + public NotifComparator getComparator() { + return mComparator; } @Override public boolean isInSection(ListEntry entry) { - return entry.getRepresentativeEntry().getSbn().getPackageName().equals(mPackage); + return mPackages.contains(entry.getRepresentativeEntry().getSbn().getPackageName()); } } @@ -2157,6 +2245,7 @@ public class ShadeListBuilderTest extends SysuiTestCase { } } + private static final String PACKAGE_0 = "com.test0"; private static final String PACKAGE_1 = "com.test1"; private static final String PACKAGE_2 = "com.test2"; private static final String PACKAGE_3 = "org.test3"; diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/ConversationCoordinatorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/ConversationCoordinatorTest.kt index 8deac94214bd..7692a05eb5fc 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/ConversationCoordinatorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/ConversationCoordinatorTest.kt @@ -32,7 +32,6 @@ import com.android.systemui.statusbar.notification.collection.render.NodeControl import com.android.systemui.statusbar.notification.people.PeopleNotificationIdentifier import com.android.systemui.statusbar.notification.people.PeopleNotificationIdentifier.Companion.TYPE_IMPORTANT_PERSON import com.android.systemui.statusbar.notification.people.PeopleNotificationIdentifier.Companion.TYPE_PERSON -import com.android.systemui.util.mockito.any import com.android.systemui.util.mockito.withArgCaptor import com.google.common.truth.Truth.assertThat import org.junit.Assert.assertFalse @@ -41,7 +40,6 @@ import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.mockito.Mock -import org.mockito.Mockito.never import org.mockito.Mockito.verify import org.mockito.MockitoAnnotations import org.mockito.Mockito.`when` as whenever @@ -79,7 +77,7 @@ class ConversationCoordinatorTest : SysuiTestCase() { } peopleSectioner = coordinator.sectioner - peopleComparator = coordinator.comparator + peopleComparator = peopleSectioner.comparator!! entry = NotificationEntryBuilder().setChannel(channel).build() @@ -108,16 +106,6 @@ class ConversationCoordinatorTest : SysuiTestCase() { } @Test - fun testComparatorIgnoresFromOtherSection() { - val e1 = NotificationEntryBuilder().setId(1).setChannel(channel).build() - val e2 = NotificationEntryBuilder().setId(2).setChannel(channel).build() - - // wrong section -- never classify - assertThat(peopleComparator.compare(e1, e2)).isEqualTo(0) - verify(peopleNotificationIdentifier, never()).getPeopleNotificationType(any()) - } - - @Test fun testComparatorPutsImportantPeopleFirst() { whenever(peopleNotificationIdentifier.getPeopleNotificationType(entryA)) .thenReturn(TYPE_IMPORTANT_PERSON) diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/SensitiveContentCoordinatorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/SensitiveContentCoordinatorTest.kt index 5fd4174af164..3f84c161db20 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/SensitiveContentCoordinatorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/SensitiveContentCoordinatorTest.kt @@ -19,8 +19,11 @@ package com.android.systemui.statusbar.notification.collection.coordinator import android.os.UserHandle import android.service.notification.StatusBarNotification import androidx.test.filters.SmallTest +import com.android.keyguard.KeyguardUpdateMonitor import com.android.systemui.SysuiTestCase +import com.android.systemui.plugins.statusbar.StatusBarStateController import com.android.systemui.statusbar.NotificationLockscreenUserManager +import com.android.systemui.statusbar.StatusBarState import com.android.systemui.statusbar.notification.DynamicPrivacyController import com.android.systemui.statusbar.notification.collection.ListEntry import com.android.systemui.statusbar.notification.collection.NotifPipeline @@ -28,9 +31,12 @@ import com.android.systemui.statusbar.notification.collection.NotificationEntry import com.android.systemui.statusbar.notification.collection.listbuilder.OnBeforeRenderListListener import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.Invalidator import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.Pluggable +import com.android.systemui.statusbar.policy.KeyguardStateController import com.android.systemui.util.mockito.withArgCaptor +import com.android.systemui.util.mockito.any import com.android.systemui.util.mockito.mock import org.junit.Test +import org.mockito.Mockito.never import org.mockito.Mockito.verify import org.mockito.Mockito.`when` as whenever @@ -40,9 +46,13 @@ class SensitiveContentCoordinatorTest : SysuiTestCase() { val dynamicPrivacyController: DynamicPrivacyController = mock() val lockscreenUserManager: NotificationLockscreenUserManager = mock() val pipeline: NotifPipeline = mock() + val keyguardUpdateMonitor: KeyguardUpdateMonitor = mock() + val statusBarStateController: StatusBarStateController = mock() + val keyguardStateController: KeyguardStateController = mock() val coordinator: SensitiveContentCoordinator = SensitiveContentCoordinatorModule - .provideCoordinator(dynamicPrivacyController, lockscreenUserManager) + .provideCoordinator(dynamicPrivacyController, lockscreenUserManager, + keyguardUpdateMonitor, statusBarStateController, keyguardStateController) @Test fun onDynamicPrivacyChanged_invokeInvalidationListener() { @@ -190,6 +200,28 @@ class SensitiveContentCoordinatorTest : SysuiTestCase() { verify(entry.representativeEntry!!).setSensitive(true, true) } + @Test + fun onBeforeRenderList_deviceDynamicallyUnlocked_deviceBiometricBypassingLockScreen() { + coordinator.attach(pipeline) + val onBeforeRenderListListener = withArgCaptor<OnBeforeRenderListListener> { + verify(pipeline).addOnBeforeRenderListListener(capture()) + } + + whenever(lockscreenUserManager.currentUserId).thenReturn(1) + whenever(lockscreenUserManager.isLockscreenPublicMode(1)).thenReturn(true) + whenever(lockscreenUserManager.userAllowsPrivateNotificationsInPublic(1)).thenReturn(false) + whenever(dynamicPrivacyController.isDynamicallyUnlocked).thenReturn(true) + whenever(statusBarStateController.getState()).thenReturn(StatusBarState.KEYGUARD) + whenever(keyguardUpdateMonitor.getUserUnlockedWithBiometricAndIsBypassing(any())) + .thenReturn(true) + + val entry = fakeNotification(2, true) + + onBeforeRenderListListener.onBeforeRenderList(listOf(entry)) + + verify(entry.representativeEntry!!, never()).setSensitive(any(), any()) + } + private fun fakeNotification(notifUserId: Int, needsRedaction: Boolean): ListEntry { val mockUserHandle = mock<UserHandle>().apply { whenever(identifier).thenReturn(notifUserId) diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/render/ShadeViewDifferTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/render/ShadeViewDifferTest.java index 15ff5551703b..ab712649a90f 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/render/ShadeViewDifferTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/render/ShadeViewDifferTest.java @@ -17,6 +17,7 @@ package com.android.systemui.statusbar.notification.collection.render; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; import android.content.Context; import android.testing.AndroidTestingRunner; @@ -138,7 +139,7 @@ public class ShadeViewDifferTest extends SysuiTestCase { } @Test - public void testRemovedGroupsAreKeptTogether() { + public void testRemovedGroupsAreBrokenApart() { // GIVEN a preexisting tree with a group applySpecAndCheck( node(mController1), @@ -154,10 +155,10 @@ public class ShadeViewDifferTest extends SysuiTestCase { node(mController1) ); - // THEN the group children are still attached to their parent - assertEquals(mController2.getView(), mController3.getView().getParent()); - assertEquals(mController2.getView(), mController4.getView().getParent()); - assertEquals(mController2.getView(), mController5.getView().getParent()); + // THEN the group children are no longer attached to their parent + assertNull(mController3.getView().getParent()); + assertNull(mController4.getView().getParent()); + assertNull(mController5.getView().getParent()); } @Test diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutTest.java index bdcbbbc99ea3..4f731ed5f72c 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutTest.java @@ -16,7 +16,6 @@ package com.android.systemui.statusbar.notification.stack; -import static android.provider.Settings.Secure.NOTIFICATION_HISTORY_ENABLED; import static android.view.View.GONE; import static com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayout.ROWS_ALL; @@ -41,8 +40,6 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.os.UserHandle; -import android.provider.Settings; import android.testing.AndroidTestingRunner; import android.testing.TestableLooper; import android.util.MathUtils; @@ -112,10 +109,6 @@ public class NotificationStackScrollLayoutTest extends SysuiTestCase { public void setUp() throws Exception { allowTestableLooperAsMainThread(); - Settings.Secure.putIntForUser(mContext.getContentResolver(), NOTIFICATION_HISTORY_ENABLED, - 1, UserHandle.USER_CURRENT); - - // Interact with real instance of AmbientState. mAmbientState = new AmbientState(mContext, mNotificationSectionsManager, mBypassController); @@ -150,6 +143,7 @@ public class NotificationStackScrollLayoutTest extends SysuiTestCase { mStackScroller.setShelfController(notificationShelfController); mStackScroller.setStatusBar(mBar); mStackScroller.setEmptyShadeView(mEmptyShadeView); + when(mStackScrollLayoutController.isHistoryEnabled()).thenReturn(true); when(mStackScrollLayoutController.getNoticationRoundessManager()) .thenReturn(mNotificationRoundnessManager); mStackScroller.setController(mStackScrollLayoutController); @@ -404,6 +398,22 @@ public class NotificationStackScrollLayoutTest extends SysuiTestCase { } @Test + public void testUpdateFooter_withoutHistory() { + setBarStateForTest(StatusBarState.SHADE); + mStackScroller.setCurrentUserSetup(true); + + when(mStackScrollLayoutController.isHistoryEnabled()).thenReturn(false); + when(mStackScrollLayoutController.getVisibleNotificationCount()).thenReturn(1); + when(mStackScrollLayoutController.hasActiveClearableNotifications(eq(ROWS_ALL))) + .thenReturn(true); + + FooterView view = mock(FooterView.class); + mStackScroller.setFooterView(view); + mStackScroller.updateFooter(); + verify(mStackScroller).updateFooterView(true, true, false); + } + + @Test public void testUpdateFooter_oneClearableNotification_beforeUserSetup() { setBarStateForTest(StatusBarState.SHADE); mStackScroller.setCurrentUserSetup(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 ea681435132e..1da9bbcdb836 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 @@ -69,10 +69,9 @@ class StackScrollAlgorithmTest : SysuiTestCase() { stackScrollAlgorithm.resetViewStates(ambientState, /* speedBumpIndex= */ 0) - val closeHandleUnderlapHeight = - context.resources.getDimensionPixelSize(R.dimen.close_handle_underlap) - val fullHeight = - ambientState.layoutMaxHeight + closeHandleUnderlapHeight - ambientState.stackY + val marginBottom = + context.resources.getDimensionPixelSize(R.dimen.notification_panel_margin_bottom) + val fullHeight = ambientState.layoutMaxHeight + marginBottom - ambientState.stackY val centeredY = ambientState.stackY + fullHeight / 2f - emptyShadeView.height / 2f assertThat(emptyShadeView.viewState?.yTranslation).isEqualTo(centeredY) } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/BiometricsUnlockControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/BiometricsUnlockControllerTest.java index 8c7d22dde0b7..fb232ba3ac2c 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/BiometricsUnlockControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/BiometricsUnlockControllerTest.java @@ -38,6 +38,7 @@ import android.testing.TestableLooper.RunWithLooper; import android.testing.TestableResources; import com.android.internal.logging.MetricsLogger; +import com.android.internal.util.LatencyTracker; import com.android.keyguard.KeyguardUpdateMonitor; import com.android.systemui.SysuiTestCase; import com.android.systemui.biometrics.AuthController; @@ -110,6 +111,8 @@ public class BiometricsUnlockControllerTest extends SysuiTestCase { private KeyguardUnlockAnimationController mKeyguardUnlockAnimationController; @Mock private SessionTracker mSessionTracker; + @Mock + private LatencyTracker mLatencyTracker; private BiometricUnlockController mBiometricUnlockController; @Before @@ -133,7 +136,7 @@ public class BiometricsUnlockControllerTest extends SysuiTestCase { mMetricsLogger, mDumpManager, mPowerManager, mNotificationMediaManager, mWakefulnessLifecycle, mScreenLifecycle, mAuthController, mStatusBarStateController, mKeyguardUnlockAnimationController, - mSessionTracker); + mSessionTracker, mLatencyTracker); mBiometricUnlockController.setKeyguardViewController(mStatusBarKeyguardViewManager); mBiometricUnlockController.setBiometricModeListener(mBiometricModeListener); } 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 36a4c1e5ebfc..01e9822e0484 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 @@ -23,9 +23,13 @@ import static com.android.systemui.statusbar.StatusBarState.SHADE; import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.Mockito.clearInvocations; +import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import android.os.UserManager; import android.testing.AndroidTestingRunner; import android.testing.TestableLooper; import android.view.LayoutInflater; @@ -45,6 +49,7 @@ import com.android.systemui.statusbar.SysuiStatusBarStateController; import com.android.systemui.statusbar.events.SystemStatusAnimationScheduler; import com.android.systemui.statusbar.policy.BatteryController; import com.android.systemui.statusbar.policy.ConfigurationController; +import com.android.systemui.statusbar.policy.ConfigurationController.ConfigurationListener; import com.android.systemui.statusbar.policy.KeyguardStateController; import com.android.systemui.statusbar.policy.UserInfoController; @@ -52,6 +57,7 @@ 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.MockitoAnnotations; @@ -87,6 +93,12 @@ public class KeyguardStatusBarViewControllerTest extends SysuiTestCase { private SysuiStatusBarStateController mStatusBarStateController; @Mock private StatusBarContentInsetsProvider mStatusBarContentInsetsProvider; + @Mock + private UserManager mUserManager; + @Captor + private ArgumentCaptor<ConfigurationListener> mConfigurationListenerCaptor; + @Captor + private ArgumentCaptor<KeyguardUpdateMonitorCallback> mKeyguardCallbackCaptor; private TestNotificationPanelViewStateProvider mNotificationPanelViewStateProvider; private KeyguardStatusBarView mKeyguardStatusBarView; @@ -101,8 +113,8 @@ public class KeyguardStatusBarViewControllerTest extends SysuiTestCase { allowTestableLooperAsMainThread(); TestableLooper.get(this).runWithLooper(() -> { mKeyguardStatusBarView = - (KeyguardStatusBarView) LayoutInflater.from(mContext) - .inflate(R.layout.keyguard_status_bar, null); + spy((KeyguardStatusBarView) LayoutInflater.from(mContext) + .inflate(R.layout.keyguard_status_bar, null)); }); mController = new KeyguardStatusBarViewController( @@ -121,7 +133,8 @@ public class KeyguardStatusBarViewControllerTest extends SysuiTestCase { mKeyguardUpdateMonitor, mBiometricUnlockController, mStatusBarStateController, - mStatusBarContentInsetsProvider + mStatusBarContentInsetsProvider, + mUserManager ); } @@ -133,6 +146,31 @@ public class KeyguardStatusBarViewControllerTest extends SysuiTestCase { verify(mAnimationScheduler).addCallback(any()); verify(mUserInfoController).addCallback(any()); verify(mStatusBarIconController).addIconGroup(any()); + verify(mUserManager).isUserSwitcherEnabled(anyBoolean()); + } + + @Test + public void onConfigurationChanged_updatesUserSwitcherVisibility() { + mController.onViewAttached(); + verify(mConfigurationController).addCallback(mConfigurationListenerCaptor.capture()); + clearInvocations(mUserManager); + clearInvocations(mKeyguardStatusBarView); + + mConfigurationListenerCaptor.getValue().onConfigChanged(null); + verify(mUserManager).isUserSwitcherEnabled(anyBoolean()); + verify(mKeyguardStatusBarView).setUserSwitcherEnabled(anyBoolean()); + } + + @Test + public void onKeyguardVisibilityChanged_updatesUserSwitcherVisibility() { + mController.onViewAttached(); + verify(mKeyguardUpdateMonitor).registerCallback(mKeyguardCallbackCaptor.capture()); + clearInvocations(mUserManager); + clearInvocations(mKeyguardStatusBarView); + + mKeyguardCallbackCaptor.getValue().onKeyguardVisibilityChanged(true); + verify(mUserManager).isUserSwitcherEnabled(anyBoolean()); + verify(mKeyguardStatusBarView).setUserSwitcherEnabled(anyBoolean()); } @Test diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationGroupManagerLegacyTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationGroupManagerLegacyTest.java index 5d7b15424fec..d002cebe5cb1 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationGroupManagerLegacyTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationGroupManagerLegacyTest.java @@ -250,15 +250,17 @@ public class NotificationGroupManagerLegacyTest extends SysuiTestCase { @Notification.GroupAlertBehavior int priorityGroupAlert, @Notification.GroupAlertBehavior int siblingGroupAlert, boolean expectAlertOverride) { + long when = 10000; // Create entries in an order so that the priority entry can be deemed the newest child. NotificationEntry[] siblings = new NotificationEntry[numSiblings]; for (int i = 0; i < numSiblings; i++) { - siblings[i] = mGroupTestHelper.createChildNotification(siblingGroupAlert, i, "sibling"); + siblings[i] = mGroupTestHelper + .createChildNotification(siblingGroupAlert, i, "sibling", ++when); } NotificationEntry priorityEntry = - mGroupTestHelper.createChildNotification(priorityGroupAlert, 0, "priority"); + mGroupTestHelper.createChildNotification(priorityGroupAlert, 0, "priority", ++when); NotificationEntry summaryEntry = - mGroupTestHelper.createSummaryNotification(summaryGroupAlert, 0, "summary"); + mGroupTestHelper.createSummaryNotification(summaryGroupAlert, 0, "summary", ++when); // The priority entry is an important conversation. when(mPeopleNotificationIdentifier.getPeopleNotificationType(eq(priorityEntry))) @@ -322,17 +324,19 @@ public class NotificationGroupManagerLegacyTest extends SysuiTestCase { @Test public void testAlertOverrideWhenUpdatingSummaryAtEnd() { + long when = 10000; int numSiblings = 2; int groupAlert = Notification.GROUP_ALERT_SUMMARY; // Create entries in an order so that the priority entry can be deemed the newest child. NotificationEntry[] siblings = new NotificationEntry[numSiblings]; for (int i = 0; i < numSiblings; i++) { - siblings[i] = mGroupTestHelper.createChildNotification(groupAlert, i, "sibling"); + siblings[i] = + mGroupTestHelper.createChildNotification(groupAlert, i, "sibling", ++when); } NotificationEntry priorityEntry = - mGroupTestHelper.createChildNotification(groupAlert, 0, "priority"); + mGroupTestHelper.createChildNotification(groupAlert, 0, "priority", ++when); NotificationEntry summaryEntry = - mGroupTestHelper.createSummaryNotification(groupAlert, 0, "summary"); + mGroupTestHelper.createSummaryNotification(groupAlert, 0, "summary", ++when); // The priority entry is an important conversation. when(mPeopleNotificationIdentifier.getPeopleNotificationType(eq(priorityEntry))) diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationQSContainerControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationQSContainerControllerTest.kt index 337e64592750..bbb2346797b9 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationQSContainerControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationQSContainerControllerTest.kt @@ -6,6 +6,8 @@ import android.view.WindowInsets import android.view.WindowManagerPolicyConstants import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase +import com.android.systemui.flags.FeatureFlags +import com.android.systemui.flags.Flags import com.android.systemui.navigationbar.NavigationModeController import com.android.systemui.navigationbar.NavigationModeController.ModeChangedListener import com.android.systemui.recents.OverviewProxyService @@ -46,6 +48,8 @@ class NotificationQSContainerControllerTest : SysuiTestCase() { private lateinit var overviewProxyService: OverviewProxyService @Mock private lateinit var notificationsQSContainer: NotificationsQuickSettingsContainer + @Mock + private lateinit var featureFlags: FeatureFlags @Captor lateinit var navigationModeCaptor: ArgumentCaptor<ModeChangedListener> @Captor @@ -64,7 +68,8 @@ class NotificationQSContainerControllerTest : SysuiTestCase() { notificationsQSContainerController = NotificationsQSContainerController( notificationsQSContainer, navigationModeController, - overviewProxyService + overviewProxyService, + featureFlags ) whenever(notificationsQSContainer.defaultNotificationsMarginBottom) .thenReturn(NOTIFICATIONS_MARGIN) @@ -85,6 +90,26 @@ class NotificationQSContainerControllerTest : SysuiTestCase() { @Test fun testTaskbarVisibleInSplitShade() { notificationsQSContainerController.splitShadeEnabled = true + useNewFooter(false) + + given(taskbarVisible = true, + navigationMode = GESTURES_NAVIGATION, + insets = windowInsets().withStableBottom()) + then(expectedContainerPadding = 0, // taskbar should disappear when shade is expanded + expectedNotificationsMargin = NOTIFICATIONS_MARGIN) + + given(taskbarVisible = true, + navigationMode = BUTTONS_NAVIGATION, + insets = windowInsets().withStableBottom()) + then(expectedContainerPadding = STABLE_INSET_BOTTOM, + expectedNotificationsMargin = NOTIFICATIONS_MARGIN) + } + + @Test + fun testTaskbarVisibleInSplitShade_newFooter() { + notificationsQSContainerController.splitShadeEnabled = true + useNewFooter(true) + given(taskbarVisible = true, navigationMode = GESTURES_NAVIGATION, insets = windowInsets().withStableBottom()) @@ -102,6 +127,26 @@ class NotificationQSContainerControllerTest : SysuiTestCase() { fun testTaskbarNotVisibleInSplitShade() { // when taskbar is not visible, it means we're on the home screen notificationsQSContainerController.splitShadeEnabled = true + useNewFooter(false) + + given(taskbarVisible = false, + navigationMode = GESTURES_NAVIGATION, + insets = windowInsets().withStableBottom()) + then(expectedContainerPadding = 0) + + given(taskbarVisible = false, + navigationMode = BUTTONS_NAVIGATION, + insets = windowInsets().withStableBottom()) + then(expectedContainerPadding = 0, // qs goes full height as it's not obscuring nav buttons + expectedNotificationsMargin = STABLE_INSET_BOTTOM + NOTIFICATIONS_MARGIN) + } + + @Test + fun testTaskbarNotVisibleInSplitShade_newFooter() { + // when taskbar is not visible, it means we're on the home screen + notificationsQSContainerController.splitShadeEnabled = true + useNewFooter(true) + given(taskbarVisible = false, navigationMode = GESTURES_NAVIGATION, insets = windowInsets().withStableBottom()) @@ -117,6 +162,25 @@ class NotificationQSContainerControllerTest : SysuiTestCase() { @Test fun testTaskbarNotVisibleInSplitShadeWithCutout() { notificationsQSContainerController.splitShadeEnabled = true + useNewFooter(false) + + given(taskbarVisible = false, + navigationMode = GESTURES_NAVIGATION, + insets = windowInsets().withCutout()) + then(expectedContainerPadding = CUTOUT_HEIGHT) + + given(taskbarVisible = false, + navigationMode = BUTTONS_NAVIGATION, + insets = windowInsets().withCutout().withStableBottom()) + then(expectedContainerPadding = 0, + expectedNotificationsMargin = STABLE_INSET_BOTTOM + NOTIFICATIONS_MARGIN) + } + + @Test + fun testTaskbarNotVisibleInSplitShadeWithCutout_newFooter() { + notificationsQSContainerController.splitShadeEnabled = true + useNewFooter(true) + given(taskbarVisible = false, navigationMode = GESTURES_NAVIGATION, insets = windowInsets().withCutout()) @@ -132,6 +196,24 @@ class NotificationQSContainerControllerTest : SysuiTestCase() { @Test fun testTaskbarVisibleInSinglePaneShade() { notificationsQSContainerController.splitShadeEnabled = false + useNewFooter(false) + + given(taskbarVisible = true, + navigationMode = GESTURES_NAVIGATION, + insets = windowInsets().withStableBottom()) + then(expectedContainerPadding = 0) + + given(taskbarVisible = true, + navigationMode = BUTTONS_NAVIGATION, + insets = windowInsets().withStableBottom()) + then(expectedContainerPadding = STABLE_INSET_BOTTOM) + } + + @Test + fun testTaskbarVisibleInSinglePaneShade_newFooter() { + notificationsQSContainerController.splitShadeEnabled = false + useNewFooter(true) + given(taskbarVisible = true, navigationMode = GESTURES_NAVIGATION, insets = windowInsets().withStableBottom()) @@ -146,6 +228,8 @@ class NotificationQSContainerControllerTest : SysuiTestCase() { @Test fun testTaskbarNotVisibleInSinglePaneShade() { notificationsQSContainerController.splitShadeEnabled = false + useNewFooter(false) + given(taskbarVisible = false, navigationMode = GESTURES_NAVIGATION, insets = emptyInsets()) @@ -159,14 +243,56 @@ class NotificationQSContainerControllerTest : SysuiTestCase() { given(taskbarVisible = false, navigationMode = BUTTONS_NAVIGATION, insets = windowInsets().withStableBottom()) - then(expectedContainerPadding = 0, - expectedQsPadding = STABLE_INSET_BOTTOM) + then(expectedContainerPadding = 0, expectedQsPadding = STABLE_INSET_BOTTOM) + } + + @Test + fun testTaskbarNotVisibleInSinglePaneShade_newFooter() { + notificationsQSContainerController.splitShadeEnabled = false + useNewFooter(true) + + given(taskbarVisible = false, + navigationMode = GESTURES_NAVIGATION, + insets = emptyInsets()) + then(expectedContainerPadding = 0) + + given(taskbarVisible = false, + navigationMode = GESTURES_NAVIGATION, + insets = windowInsets().withCutout().withStableBottom()) + then(expectedContainerPadding = CUTOUT_HEIGHT) + + given(taskbarVisible = false, + navigationMode = BUTTONS_NAVIGATION, + insets = windowInsets().withStableBottom()) + then(expectedContainerPadding = 0, expectedQsPadding = STABLE_INSET_BOTTOM) } @Test fun testCustomizingInSinglePaneShade() { notificationsQSContainerController.splitShadeEnabled = false notificationsQSContainerController.setCustomizerShowing(true) + useNewFooter(false) + + // always sets spacings to 0 + given(taskbarVisible = false, + navigationMode = GESTURES_NAVIGATION, + insets = windowInsets().withStableBottom()) + then(expectedContainerPadding = 0, + expectedNotificationsMargin = 0) + + given(taskbarVisible = false, + navigationMode = BUTTONS_NAVIGATION, + insets = emptyInsets()) + then(expectedContainerPadding = 0, + expectedNotificationsMargin = 0) + } + + @Test + fun testCustomizingInSinglePaneShade_newFooter() { + notificationsQSContainerController.splitShadeEnabled = false + notificationsQSContainerController.setCustomizerShowing(true) + useNewFooter(true) + // always sets spacings to 0 given(taskbarVisible = false, navigationMode = GESTURES_NAVIGATION, @@ -185,6 +311,28 @@ class NotificationQSContainerControllerTest : SysuiTestCase() { fun testDetailShowingInSinglePaneShade() { notificationsQSContainerController.splitShadeEnabled = false notificationsQSContainerController.setDetailShowing(true) + useNewFooter(false) + + // always sets spacings to 0 + given(taskbarVisible = false, + navigationMode = GESTURES_NAVIGATION, + insets = windowInsets().withStableBottom()) + then(expectedContainerPadding = 0, + expectedNotificationsMargin = 0) + + given(taskbarVisible = false, + navigationMode = BUTTONS_NAVIGATION, + insets = emptyInsets()) + then(expectedContainerPadding = 0, + expectedNotificationsMargin = 0) + } + + @Test + fun testDetailShowingInSinglePaneShade_newFooter() { + notificationsQSContainerController.splitShadeEnabled = false + notificationsQSContainerController.setDetailShowing(true) + useNewFooter(true) + // always sets spacings to 0 given(taskbarVisible = false, navigationMode = GESTURES_NAVIGATION, @@ -202,6 +350,8 @@ class NotificationQSContainerControllerTest : SysuiTestCase() { @Test fun testDetailShowingInSplitShade() { notificationsQSContainerController.splitShadeEnabled = true + useNewFooter(false) + given(taskbarVisible = false, navigationMode = GESTURES_NAVIGATION, insets = windowInsets().withStableBottom()) @@ -215,6 +365,36 @@ class NotificationQSContainerControllerTest : SysuiTestCase() { then(expectedContainerPadding = 0) } + @Test + fun testDetailShowingInSplitShade_newFooter() { + notificationsQSContainerController.splitShadeEnabled = true + useNewFooter(true) + + given(taskbarVisible = false, + navigationMode = GESTURES_NAVIGATION, + insets = windowInsets().withStableBottom()) + then(expectedContainerPadding = 0) + + notificationsQSContainerController.setDetailShowing(true) + // should not influence spacing + given(taskbarVisible = false, + navigationMode = BUTTONS_NAVIGATION, + insets = emptyInsets()) + then(expectedContainerPadding = 0) + } + + @Test + fun testNotificationsMarginBottomIsUpdated() { + notificationsQSContainerController.splitShadeEnabled = true + verify(notificationsQSContainer).setNotificationsMarginBottom(NOTIFICATIONS_MARGIN) + + whenever(notificationsQSContainer.defaultNotificationsMarginBottom).thenReturn(100) + notificationsQSContainerController.updateMargins() + notificationsQSContainerController.splitShadeEnabled = false + + verify(notificationsQSContainer).setNotificationsMarginBottom(100) + } + private fun given( taskbarVisible: Boolean, navigationMode: Int, @@ -234,7 +414,13 @@ class NotificationQSContainerControllerTest : SysuiTestCase() { verify(notificationsQSContainer) .setPadding(anyInt(), anyInt(), anyInt(), eq(expectedContainerPadding)) verify(notificationsQSContainer).setNotificationsMarginBottom(expectedNotificationsMargin) - verify(notificationsQSContainer).setQSScrollPaddingBottom(expectedQsPadding) + val newFooter = featureFlags.isEnabled(Flags.NEW_FOOTER) + if (newFooter) { + verify(notificationsQSContainer) + .setQSContainerPaddingBottom(expectedNotificationsMargin) + } else { + verify(notificationsQSContainer).setQSScrollPaddingBottom(expectedQsPadding) + } Mockito.clearInvocations(notificationsQSContainer) } @@ -251,4 +437,8 @@ class NotificationQSContainerControllerTest : SysuiTestCase() { whenever(stableInsetBottom).thenReturn(STABLE_INSET_BOTTOM) return this } + + private fun useNewFooter(useNewFooter: Boolean) { + whenever(featureFlags.isEnabled(Flags.NEW_FOOTER)).thenReturn(useNewFooter) + } }
\ No newline at end of file diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java index bb79941b0e53..107ba8130349 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java @@ -36,6 +36,7 @@ import android.view.ViewGroup; import androidx.test.filters.SmallTest; +import com.android.internal.util.LatencyTracker; import com.android.internal.widget.LockPatternUtils; import com.android.keyguard.KeyguardMessageArea; import com.android.keyguard.KeyguardMessageAreaController; @@ -100,6 +101,8 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase { private ShadeController mShadeController; @Mock private DreamOverlayStateController mDreamOverlayStateController; + @Mock + private LatencyTracker mLatencyTracker; private StatusBarKeyguardViewManager mStatusBarKeyguardViewManager; @@ -127,7 +130,8 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase { mock(NotificationMediaManager.class), mKeyguardBouncerFactory, mKeyguardMessageAreaFactory, - () -> mShadeController); + () -> mShadeController, + mLatencyTracker); mStatusBarKeyguardViewManager.registerStatusBar( mStatusBar, mNotificationPanelView, @@ -171,17 +175,6 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase { } @Test - public void onPanelExpansionChanged_neverHidesFullscreenBouncer() { - // TODO: StatusBar should not be here, mBouncer.isFullscreenBouncer() should do the same. - when(mStatusBar.isFullScreenUserSwitcherState()).thenReturn(true); - mStatusBarKeyguardViewManager.onPanelExpansionChanged( - /* fraction= */ 0.5f, - /* expanded= */ false, - /* tracking= */ true); - verify(mBouncer).setExpansion(eq(KeyguardBouncer.EXPANSION_VISIBLE)); - } - - @Test public void onPanelExpansionChanged_neverHidesScrimmedBouncer() { when(mBouncer.isShowing()).thenReturn(true); when(mBouncer.isScrimmed()).thenReturn(true); diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java index 1564dfe8cd06..90b93e797410 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java @@ -885,15 +885,6 @@ public class StatusBarTest extends SysuiTestCase { } @Test - public void testSetState_changesIsFullScreenUserSwitcherState() { - mStatusBar.setBarStateForTest(StatusBarState.KEYGUARD); - assertFalse(mStatusBar.isFullScreenUserSwitcherState()); - - mStatusBar.setBarStateForTest(StatusBarState.FULLSCREEN_USER_SWITCHER); - assertTrue(mStatusBar.isFullScreenUserSwitcherState()); - } - - @Test public void testShowKeyguardImplementation_setsState() { when(mLockscreenUserManager.getCurrentProfiles()).thenReturn(new SparseArray<>()); @@ -903,12 +894,6 @@ public class StatusBarTest extends SysuiTestCase { mStatusBar.showKeyguardImpl(); verify(mStatusBarStateController).setState( eq(StatusBarState.KEYGUARD), eq(false) /* force */); - - // If useFullscreenUserSwitcher is true, state is set to FULLSCREEN_USER_SWITCHER. - when(mUserSwitcherController.useFullscreenUserSwitcher()).thenReturn(true); - mStatusBar.showKeyguardImpl(); - verify(mStatusBarStateController).setState( - eq(StatusBarState.FULLSCREEN_USER_SWITCHER), eq(false) /* force */); } @Test diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/HeadsUpManagerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/HeadsUpManagerTest.java index d3258408b33a..424a40058997 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/HeadsUpManagerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/HeadsUpManagerTest.java @@ -128,6 +128,28 @@ public class HeadsUpManagerTest extends AlertingNotificationManagerTest { } @Test + public void testCompareTo_withNullEntries() { + NotificationEntry alertEntry = new NotificationEntryBuilder().setTag("alert").build(); + mHeadsUpManager.showNotification(alertEntry); + + assertThat(mHeadsUpManager.compare(alertEntry, null)).isLessThan(0); + assertThat(mHeadsUpManager.compare(null, alertEntry)).isGreaterThan(0); + assertThat(mHeadsUpManager.compare(null, null)).isEqualTo(0); + } + + @Test + public void testCompareTo_withNonAlertEntries() { + NotificationEntry nonAlertEntry1 = new NotificationEntryBuilder().setTag("nae1").build(); + NotificationEntry nonAlertEntry2 = new NotificationEntryBuilder().setTag("nae2").build(); + NotificationEntry alertEntry = new NotificationEntryBuilder().setTag("alert").build(); + mHeadsUpManager.showNotification(alertEntry); + + assertThat(mHeadsUpManager.compare(alertEntry, nonAlertEntry1)).isLessThan(0); + assertThat(mHeadsUpManager.compare(nonAlertEntry1, alertEntry)).isGreaterThan(0); + assertThat(mHeadsUpManager.compare(nonAlertEntry1, nonAlertEntry2)).isEqualTo(0); + } + + @Test public void testAlertEntryCompareTo_ongoingCallLessThanActiveRemoteInput() { HeadsUpManager.HeadsUpEntry ongoingCall = mHeadsUpManager.new HeadsUpEntry(); ongoingCall.setEntry(new NotificationEntryBuilder() diff --git a/packages/SystemUI/tests/src/com/android/systemui/util/service/PackageObserverTest.java b/packages/SystemUI/tests/src/com/android/systemui/util/service/PackageObserverTest.java new file mode 100644 index 000000000000..a2fd288ef33e --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/util/service/PackageObserverTest.java @@ -0,0 +1,77 @@ +/* + * Copyright (C) 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.util.service; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.Mockito.verify; + +import android.content.BroadcastReceiver; +import android.content.ComponentName; +import android.content.Context; +import android.content.Intent; +import android.testing.AndroidTestingRunner; + +import androidx.test.filters.SmallTest; + +import com.android.systemui.SysuiTestCase; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.ArgumentCaptor; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; + +@SmallTest +@RunWith(AndroidTestingRunner.class) +public class PackageObserverTest extends SysuiTestCase { + @Mock + Context mContext; + + @Mock + Observer.Callback mCallback; + + @Before + public void setup() { + MockitoAnnotations.initMocks(this); + } + + @Test + public void testChange() { + final PackageObserver observer = new PackageObserver(mContext, + ComponentName.unflattenFromString("com.foo.bar/baz")); + final ArgumentCaptor<BroadcastReceiver> receiverCapture = + ArgumentCaptor.forClass(BroadcastReceiver.class); + + observer.addCallback(mCallback); + + // Verify broadcast receiver registered. + verify(mContext).registerReceiver(receiverCapture.capture(), any(), anyInt()); + + // Simulate package change. + receiverCapture.getValue().onReceive(mContext, new Intent()); + + // Check that callback was informed. + verify(mCallback).onSourceChanged(); + + observer.removeCallback(mCallback); + + // Make sure receiver is unregistered on last callback removal + verify(mContext).unregisterReceiver(receiverCapture.getValue()); + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/util/service/PersistentConnectionManagerTest.java b/packages/SystemUI/tests/src/com/android/systemui/util/service/PersistentConnectionManagerTest.java new file mode 100644 index 000000000000..53d4a96b0640 --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/util/service/PersistentConnectionManagerTest.java @@ -0,0 +1,138 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.util.service; + +import static org.mockito.Mockito.verify; + +import android.testing.AndroidTestingRunner; + +import androidx.test.filters.SmallTest; + +import com.android.systemui.SysuiTestCase; +import com.android.systemui.util.concurrency.FakeExecutor; +import com.android.systemui.util.time.FakeSystemClock; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.ArgumentCaptor; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.mockito.MockitoAnnotations; + +@SmallTest +@RunWith(AndroidTestingRunner.class) +public class PersistentConnectionManagerTest extends SysuiTestCase { + private static final int MAX_RETRIES = 5; + private static final int RETRY_DELAY_MS = 1000; + private static final int CONNECTION_MIN_DURATION_MS = 5000; + + private FakeSystemClock mFakeClock = new FakeSystemClock(); + private FakeExecutor mFakeExecutor = new FakeExecutor(mFakeClock); + + @Mock + private ObservableServiceConnection<Proxy> mConnection; + + @Mock + private Observer mObserver; + + private static class Proxy { + } + + private PersistentConnectionManager<Proxy> mConnectionManager; + + @Before + public void setup() { + MockitoAnnotations.initMocks(this); + + mConnectionManager = new PersistentConnectionManager<>( + mFakeClock, + mFakeExecutor, + mConnection, + MAX_RETRIES, + RETRY_DELAY_MS, + CONNECTION_MIN_DURATION_MS, + mObserver); + } + + private ObservableServiceConnection.Callback<Proxy> captureCallbackAndSend( + ObservableServiceConnection<Proxy> mConnection, Proxy proxy) { + ArgumentCaptor<ObservableServiceConnection.Callback<Proxy>> connectionCallbackCaptor = + ArgumentCaptor.forClass(ObservableServiceConnection.Callback.class); + + verify(mConnection).addCallback(connectionCallbackCaptor.capture()); + verify(mConnection).bind(); + Mockito.clearInvocations(mConnection); + + final ObservableServiceConnection.Callback callback = connectionCallbackCaptor.getValue(); + if (proxy != null) { + callback.onConnected(mConnection, proxy); + } else { + callback.onDisconnected(mConnection, 0); + } + + return callback; + } + + /** + * Validates initial connection. + */ + @Test + public void testConnect() { + mConnectionManager.start(); + captureCallbackAndSend(mConnection, Mockito.mock(Proxy.class)); + } + + /** + * Ensures reconnection on disconnect. + */ + @Test + public void testRetryOnBindFailure() { + mConnectionManager.start(); + ArgumentCaptor<ObservableServiceConnection.Callback<Proxy>> connectionCallbackCaptor = + ArgumentCaptor.forClass(ObservableServiceConnection.Callback.class); + + verify(mConnection).addCallback(connectionCallbackCaptor.capture()); + + // Verify attempts happen. Note that we account for the retries plus initial attempt, which + // is not scheduled. + for (int attemptCount = 0; attemptCount < MAX_RETRIES + 1; attemptCount++) { + verify(mConnection).bind(); + Mockito.clearInvocations(mConnection); + connectionCallbackCaptor.getValue().onDisconnected(mConnection, 0); + mFakeExecutor.advanceClockToNext(); + mFakeExecutor.runAllReady(); + } + } + + /** + * Ensures rebind on package change. + */ + @Test + public void testAttemptOnPackageChange() { + mConnectionManager.start(); + verify(mConnection).bind(); + ArgumentCaptor<Observer.Callback> callbackCaptor = + ArgumentCaptor.forClass(Observer.Callback.class); + captureCallbackAndSend(mConnection, Mockito.mock(Proxy.class)); + + verify(mObserver).addCallback(callbackCaptor.capture()); + + callbackCaptor.getValue().onSourceChanged(); + verify(mConnection).bind(); + } +} 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 9c49e98b9e36..ca37a40474e0 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/wmshell/BubblesTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/wmshell/BubblesTest.java @@ -1339,6 +1339,22 @@ public class BubblesTest extends SysuiTestCase { assertThat(mBubbleData.hasOverflowBubbleWithKey(entry.getKey())).isFalse(); } + @Test + public void testStackViewOnBackPressed_updatesBubbleDataExpandState() { + mBubbleController.updateBubble(mBubbleEntry); + + // Expand the stack + mBubbleData.setExpanded(true); + assertStackExpanded(); + + // Hit back + BubbleStackView stackView = mBubbleController.getStackView(); + stackView.onBackPressed(); + + // Make sure we're collapsed + assertStackCollapsed(); + } + /** Creates a bubble using the userId and package. */ private Bubble createBubble(int userId, String pkg) { final UserHandle userHandle = new UserHandle(userId); diff --git a/packages/SystemUI/tests/src/com/android/systemui/wmshell/NewNotifPipelineBubblesTest.java b/packages/SystemUI/tests/src/com/android/systemui/wmshell/NewNotifPipelineBubblesTest.java index e12a82a1c62b..d82671d6ecb8 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/wmshell/NewNotifPipelineBubblesTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/wmshell/NewNotifPipelineBubblesTest.java @@ -1158,6 +1158,22 @@ public class NewNotifPipelineBubblesTest extends SysuiTestCase { assertThat(mBubbleData.hasOverflowBubbleWithKey(entry.getKey())).isFalse(); } + @Test + public void testStackViewOnBackPressed_updatesBubbleDataExpandState() { + mBubbleController.updateBubble(mBubbleEntry); + + // Expand the stack + mBubbleData.setExpanded(true); + assertStackExpanded(); + + // Hit back + BubbleStackView stackView = mBubbleController.getStackView(); + stackView.onBackPressed(); + + // Make sure we're collapsed + assertStackCollapsed(); + } + /** * Sets the bubble metadata flags for this entry. These flags are normally set by * NotificationManagerService when the notification is sent, however, these tests do not diff --git a/services/Android.bp b/services/Android.bp index af70692a88e5..b0a5c66b53dd 100644 --- a/services/Android.bp +++ b/services/Android.bp @@ -102,6 +102,7 @@ filegroup { ":services.usage-sources", ":services.usb-sources", ":services.voiceinteraction-sources", + ":services.wallpapereffectsgeneration-sources", ":services.wifi-sources", ], visibility: ["//visibility:private"], @@ -158,6 +159,7 @@ java_library { "services.usage", "services.usb", "services.voiceinteraction", + "services.wallpapereffectsgeneration", "services.wifi", "service-blobstore", "service-jobscheduler", diff --git a/services/accessibility/java/com/android/server/accessibility/AbstractAccessibilityServiceConnection.java b/services/accessibility/java/com/android/server/accessibility/AbstractAccessibilityServiceConnection.java index e93ac47b1940..8b62a64f57d4 100644 --- a/services/accessibility/java/com/android/server/accessibility/AbstractAccessibilityServiceConnection.java +++ b/services/accessibility/java/com/android/server/accessibility/AbstractAccessibilityServiceConnection.java @@ -66,6 +66,7 @@ import android.os.RemoteCallback; import android.os.RemoteException; import android.os.ServiceManager; import android.os.SystemClock; +import android.provider.Settings; import android.util.Slog; import android.util.SparseArray; import android.view.Display; @@ -269,6 +270,7 @@ abstract class AbstractAccessibilityServiceConnection extends IAccessibilityServ void onDoubleTap(int displayId); void onDoubleTapAndHold(int displayId); + } public AbstractAccessibilityServiceConnection(Context context, ComponentName componentName, @@ -2164,4 +2166,23 @@ abstract class AbstractAccessibilityServiceConnection extends IAccessibilityServ public void onDoubleTapAndHold(int displayId) { mSystemSupport.onDoubleTapAndHold(displayId); } -} + + /** + * Sets the scaling factor for animations. + */ + public void setAnimationScale(float scale) { + final long identity = Binder.clearCallingIdentity(); + try { + Settings.Global.putFloat( + mContext.getContentResolver(), Settings.Global.WINDOW_ANIMATION_SCALE, scale); + Settings.Global.putFloat( + mContext.getContentResolver(), + Settings.Global.TRANSITION_ANIMATION_SCALE, + scale); + Settings.Global.putFloat( + mContext.getContentResolver(), Settings.Global.ANIMATOR_DURATION_SCALE, scale); + } finally { + Binder.restoreCallingIdentity(identity); + } + } +}
\ No newline at end of file diff --git a/services/accessibility/java/com/android/server/accessibility/SystemActionPerformer.java b/services/accessibility/java/com/android/server/accessibility/SystemActionPerformer.java index 6744ea8e26a5..803177b6c010 100644 --- a/services/accessibility/java/com/android/server/accessibility/SystemActionPerformer.java +++ b/services/accessibility/java/com/android/server/accessibility/SystemActionPerformer.java @@ -295,6 +295,21 @@ public class SystemActionPerformer { case AccessibilityService.GLOBAL_ACTION_KEYCODE_HEADSETHOOK : sendDownAndUpKeyEvents(KeyEvent.KEYCODE_HEADSETHOOK); return true; + case AccessibilityService.GLOBAL_ACTION_DPAD_UP: + sendDownAndUpKeyEvents(KeyEvent.KEYCODE_DPAD_UP); + return true; + case AccessibilityService.GLOBAL_ACTION_DPAD_DOWN: + sendDownAndUpKeyEvents(KeyEvent.KEYCODE_DPAD_DOWN); + return true; + case AccessibilityService.GLOBAL_ACTION_DPAD_LEFT: + sendDownAndUpKeyEvents(KeyEvent.KEYCODE_DPAD_LEFT); + return true; + case AccessibilityService.GLOBAL_ACTION_DPAD_RIGHT: + sendDownAndUpKeyEvents(KeyEvent.KEYCODE_DPAD_RIGHT); + return true; + case AccessibilityService.GLOBAL_ACTION_DPAD_CENTER: + sendDownAndUpKeyEvents(KeyEvent.KEYCODE_DPAD_CENTER); + return true; default: Slog.e(TAG, "Invalid action id: " + actionId); return false; diff --git a/services/api/current.txt b/services/api/current.txt index 50f00524676c..dcf7e64479da 100644 --- a/services/api/current.txt +++ b/services/api/current.txt @@ -39,6 +39,7 @@ package com.android.server.am { public interface ActivityManagerLocal { method public boolean canStartForegroundService(int, int, @NonNull String); + method public boolean startAndBindSupplementalProcessService(@NonNull android.content.Intent, @NonNull android.content.ServiceConnection, int) throws android.os.TransactionTooLargeException; } } diff --git a/services/companion/TEST_MAPPING b/services/companion/TEST_MAPPING index 63f54fa35158..4a37cb812981 100644 --- a/services/companion/TEST_MAPPING +++ b/services/companion/TEST_MAPPING @@ -1,6 +1,12 @@ { "presubmit": [ { + "name": "CtsCompanionDeviceManagerCoreTestCases" + }, + { + "name": "CtsCompanionDeviceManagerUiAutomationTestCases" + }, + { "name": "CtsOsTestCases", "options": [ { diff --git a/services/companion/java/com/android/server/companion/AssociationCleanUpService.java b/services/companion/java/com/android/server/companion/AssociationCleanUpService.java index f1d98f09aba3..0509e0cf5ccc 100644 --- a/services/companion/java/com/android/server/companion/AssociationCleanUpService.java +++ b/services/companion/java/com/android/server/companion/AssociationCleanUpService.java @@ -36,7 +36,6 @@ import com.android.server.LocalServices; * will be killed if association/role are revoked. */ public class AssociationCleanUpService extends JobService { - private static final String TAG = LOG_TAG + ".AssociationCleanUpService"; private static final int JOB_ID = AssociationCleanUpService.class.hashCode(); private static final long ONE_DAY_INTERVAL = 3 * 24 * 60 * 60 * 1000; // 1 Day private CompanionDeviceManagerServiceInternal mCdmServiceInternal = LocalServices.getService( @@ -56,7 +55,7 @@ public class AssociationCleanUpService extends JobService { @Override public boolean onStopJob(final JobParameters params) { - Slog.d(TAG, "Association cleanup job stopped; id=" + params.getJobId() + Slog.i(LOG_TAG, "Association cleanup job stopped; id=" + params.getJobId() + ", reason=" + JobParameters.getInternalReasonCodeDescription( params.getInternalStopReasonCode())); diff --git a/services/companion/java/com/android/server/companion/AssociationStoreImpl.java b/services/companion/java/com/android/server/companion/AssociationStoreImpl.java index 3ccabaaea2fa..21a677b8383c 100644 --- a/services/companion/java/com/android/server/companion/AssociationStoreImpl.java +++ b/services/companion/java/com/android/server/companion/AssociationStoreImpl.java @@ -18,6 +18,7 @@ package com.android.server.companion; import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.SuppressLint; import android.annotation.UserIdInt; import android.companion.AssociationInfo; import android.net.MacAddress; @@ -52,9 +53,10 @@ import java.util.StringJoiner; * Other system component (both inside and outside if the com.android.server.companion package) * should use public {@link AssociationStore} interface. */ +@SuppressLint("LongLogTag") class AssociationStoreImpl implements AssociationStore { private static final boolean DEBUG = false; - private static final String TAG = "AssociationStore"; + private static final String TAG = "CompanionDevice_AssociationStore"; private final Object mLock = new Object(); diff --git a/services/companion/java/com/android/server/companion/CompanionDeviceShellCommand.java b/services/companion/java/com/android/server/companion/CompanionDeviceShellCommand.java index f2e660779e9e..fd130852a43a 100644 --- a/services/companion/java/com/android/server/companion/CompanionDeviceShellCommand.java +++ b/services/companion/java/com/android/server/companion/CompanionDeviceShellCommand.java @@ -16,16 +16,17 @@ package com.android.server.companion; -import static com.android.server.companion.CompanionDeviceManagerService.LOG_TAG; - import android.companion.AssociationInfo; +import android.os.ShellCommand; import android.util.Log; import android.util.Slog; import java.io.PrintWriter; import java.util.List; -class CompanionDeviceShellCommand extends android.os.ShellCommand { +class CompanionDeviceShellCommand extends ShellCommand { + private static final String TAG = "CompanionDevice_ShellCommand"; + private final CompanionDeviceManagerService mService; private final AssociationStore mAssociationStore; @@ -84,7 +85,7 @@ class CompanionDeviceShellCommand extends android.os.ShellCommand { } return 0; } catch (Throwable t) { - Slog.e(LOG_TAG, "Error running a command: $ " + cmd, t); + Slog.e(TAG, "Error running a command: $ " + cmd, t); getErrPrintWriter().println(Log.getStackTraceString(t)); return 1; } diff --git a/services/companion/java/com/android/server/companion/DataStoreUtils.java b/services/companion/java/com/android/server/companion/DataStoreUtils.java index 6055a81c7ca7..8ac741a44ee5 100644 --- a/services/companion/java/com/android/server/companion/DataStoreUtils.java +++ b/services/companion/java/com/android/server/companion/DataStoreUtils.java @@ -25,7 +25,7 @@ import android.os.Environment; import android.util.AtomicFile; import android.util.Slog; -import com.android.internal.util.FunctionalUtils; +import com.android.internal.util.FunctionalUtils.ThrowingConsumer; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; @@ -34,8 +34,7 @@ import java.io.File; import java.io.FileOutputStream; final class DataStoreUtils { - - private static final String LOG_TAG = DataStoreUtils.class.getSimpleName(); + private static final String TAG = "CompanionDevice_DataStoreUtils"; static boolean isStartOfTag(@NonNull XmlPullParser parser, @NonNull String tag) throws XmlPullParserException { @@ -71,12 +70,12 @@ final class DataStoreUtils { * Writing to file could fail, for example, if the user has been recently removed and so was * their DE (/data/system_de/<user-id>/) directory. */ - static void writeToFileSafely(@NonNull AtomicFile file, - @NonNull FunctionalUtils.ThrowingConsumer<FileOutputStream> consumer) { + static void writeToFileSafely( + @NonNull AtomicFile file, @NonNull ThrowingConsumer<FileOutputStream> consumer) { try { file.write(consumer); } catch (Exception e) { - Slog.e(LOG_TAG, "Error while writing to file " + file, e); + Slog.e(TAG, "Error while writing to file " + file, e); } } diff --git a/services/companion/java/com/android/server/companion/PersistentDataStore.java b/services/companion/java/com/android/server/companion/PersistentDataStore.java index da33b4446840..d0cc12286b12 100644 --- a/services/companion/java/com/android/server/companion/PersistentDataStore.java +++ b/services/companion/java/com/android/server/companion/PersistentDataStore.java @@ -32,6 +32,7 @@ import static com.android.server.companion.DataStoreUtils.writeToFileSafely; import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.SuppressLint; import android.annotation.UserIdInt; import android.companion.AssociationInfo; import android.content.pm.UserInfo; @@ -39,6 +40,7 @@ import android.net.MacAddress; import android.os.Environment; import android.util.ArrayMap; import android.util.AtomicFile; +import android.util.Log; import android.util.Slog; import android.util.SparseArray; import android.util.TypedXmlPullParser; @@ -146,8 +148,9 @@ import java.util.concurrent.ConcurrentMap; * </state> * }</pre> */ +@SuppressLint("LongLogTag") final class PersistentDataStore { - private static final String LOG_TAG = CompanionDeviceManagerService.LOG_TAG + ".DataStore"; + private static final String TAG = "CompanionDevice_PersistentDataStore"; private static final boolean DEBUG = CompanionDeviceManagerService.DEBUG; private static final int CURRENT_PERSISTENCE_VERSION = 1; @@ -208,10 +211,9 @@ final class PersistentDataStore { void readStateForUser(@UserIdInt int userId, @NonNull Collection<AssociationInfo> associationsOut, @NonNull Map<String, Set<Integer>> previouslyUsedIdsPerPackageOut) { - Slog.i(LOG_TAG, "Reading associations for user " + userId + " from disk"); - + Slog.i(TAG, "Reading associations for user " + userId + " from disk"); final AtomicFile file = getStorageFileForUser(userId); - if (DEBUG) Slog.d(LOG_TAG, " > File=" + file.getBaseFile().getPath()); + if (DEBUG) Log.d(TAG, " > File=" + file.getBaseFile().getPath()); // getStorageFileForUser() ALWAYS returns the SAME OBJECT, which allows us to synchronize // accesses to the file on the file system using this AtomicFile object. @@ -220,12 +222,12 @@ final class PersistentDataStore { final AtomicFile readFrom; final String rootTag; if (!file.getBaseFile().exists()) { - if (DEBUG) Slog.d(LOG_TAG, " > File does not exist -> Try to read legacy file"); + if (DEBUG) Log.d(TAG, " > File does not exist -> Try to read legacy file"); legacyBaseFile = getBaseLegacyStorageFileForUser(userId); - if (DEBUG) Slog.d(LOG_TAG, " > Legacy file=" + legacyBaseFile.getPath()); + if (DEBUG) Log.d(TAG, " > Legacy file=" + legacyBaseFile.getPath()); if (!legacyBaseFile.exists()) { - if (DEBUG) Slog.d(LOG_TAG, " > Legacy file does not exist -> Abort"); + if (DEBUG) Log.d(TAG, " > Legacy file does not exist -> Abort"); return; } @@ -236,13 +238,13 @@ final class PersistentDataStore { rootTag = XML_TAG_STATE; } - if (DEBUG) Slog.d(LOG_TAG, " > Reading associations..."); + if (DEBUG) Log.d(TAG, " > Reading associations..."); final int version = readStateFromFileLocked(userId, readFrom, rootTag, associationsOut, previouslyUsedIdsPerPackageOut); if (DEBUG) { - Slog.d(LOG_TAG, " > Done reading: " + associationsOut); + Log.d(TAG, " > Done reading: " + associationsOut); if (version < CURRENT_PERSISTENCE_VERSION) { - Slog.d(LOG_TAG, " > File used old format: v." + version + " -> Re-write"); + Log.d(TAG, " > File used old format: v." + version + " -> Re-write"); } } @@ -250,13 +252,13 @@ final class PersistentDataStore { // The data is either in the legacy file or in the legacy format, or both. // Save the data to right file in using the current format. if (DEBUG) { - Slog.d(LOG_TAG, " > Writing the data to " + file.getBaseFile().getPath()); + Log.d(TAG, " > Writing the data to " + file.getBaseFile().getPath()); } persistStateToFileLocked(file, associationsOut, previouslyUsedIdsPerPackageOut); if (legacyBaseFile != null) { // We saved the data to the right file, can delete the old file now. - if (DEBUG) Slog.d(LOG_TAG, " > Deleting legacy file"); + if (DEBUG) Log.d(TAG, " > Deleting legacy file"); legacyBaseFile.delete(); } } @@ -273,11 +275,11 @@ final class PersistentDataStore { void persistStateForUser(@UserIdInt int userId, @NonNull Collection<AssociationInfo> associations, @NonNull Map<String, Set<Integer>> previouslyUsedIdsPerPackage) { - Slog.i(LOG_TAG, "Writing associations for user " + userId + " to disk"); - if (DEBUG) Slog.d(LOG_TAG, " > " + associations); + Slog.i(TAG, "Writing associations for user " + userId + " to disk"); + if (DEBUG) Slog.d(TAG, " > " + associations); final AtomicFile file = getStorageFileForUser(userId); - if (DEBUG) Slog.d(LOG_TAG, " > File=" + file.getBaseFile().getPath()); + if (DEBUG) Log.d(TAG, " > File=" + file.getBaseFile().getPath()); // getStorageFileForUser() ALWAYS returns the SAME OBJECT, which allows us to synchronize // accesses to the file on the file system using this AtomicFile object. synchronized (file) { @@ -312,7 +314,7 @@ final class PersistentDataStore { } return version; } catch (XmlPullParserException | IOException e) { - Slog.e(LOG_TAG, "Error while reading associations file", e); + Slog.e(TAG, "Error while reading associations file", e); return -1; } } @@ -528,7 +530,7 @@ final class PersistentDataStore { associationInfo = new AssociationInfo(associationId, userId, appPackage, macAddress, displayName, profile, selfManaged, notify, timeApproved, lastTimeConnected); } catch (Exception e) { - if (DEBUG) Slog.w(LOG_TAG, "Could not create AssociationInfo", e); + if (DEBUG) Log.w(TAG, "Could not create AssociationInfo", e); } return associationInfo; } diff --git a/services/companion/java/com/android/server/companion/RolesUtils.java b/services/companion/java/com/android/server/companion/RolesUtils.java index 76340fc1d6a8..904283f4e60e 100644 --- a/services/companion/java/com/android/server/companion/RolesUtils.java +++ b/services/companion/java/com/android/server/companion/RolesUtils.java @@ -19,20 +19,23 @@ package com.android.server.companion; import static android.app.role.RoleManager.MANAGE_HOLDERS_FLAG_DONT_KILL_APP; import static com.android.server.companion.CompanionDeviceManagerService.DEBUG; -import static com.android.server.companion.CompanionDeviceManagerService.LOG_TAG; import android.annotation.NonNull; +import android.annotation.SuppressLint; import android.annotation.UserIdInt; import android.app.role.RoleManager; import android.companion.AssociationInfo; import android.content.Context; import android.os.UserHandle; +import android.util.Log; import android.util.Slog; import java.util.List; /** Utility methods for accessing {@link RoleManager} APIs. */ +@SuppressLint("LongLogTag") final class RolesUtils { + private static final String TAG = CompanionDeviceManagerService.LOG_TAG; static boolean isRoleHolder(@NonNull Context context, @UserIdInt int userId, @NonNull String packageName, @NonNull String role) { @@ -45,7 +48,7 @@ final class RolesUtils { static void addRoleHolderForAssociation( @NonNull Context context, @NonNull AssociationInfo associationInfo) { if (DEBUG) { - Slog.d(LOG_TAG, "addRoleHolderForAssociation() associationInfo=" + associationInfo); + Log.d(TAG, "addRoleHolderForAssociation() associationInfo=" + associationInfo); } final String deviceProfile = associationInfo.getDeviceProfile(); @@ -61,7 +64,7 @@ final class RolesUtils { MANAGE_HOLDERS_FLAG_DONT_KILL_APP, userHandle, context.getMainExecutor(), success -> { if (!success) { - Slog.e(LOG_TAG, "Failed to add u" + userId + "\\" + packageName + Slog.e(TAG, "Failed to add u" + userId + "\\" + packageName + " to the list of " + deviceProfile + " holders."); } }); @@ -70,7 +73,7 @@ final class RolesUtils { static void removeRoleHolderForAssociation( @NonNull Context context, @NonNull AssociationInfo associationInfo) { if (DEBUG) { - Slog.d(LOG_TAG, "removeRoleHolderForAssociation() associationInfo=" + associationInfo); + Log.d(TAG, "removeRoleHolderForAssociation() associationInfo=" + associationInfo); } final String deviceProfile = associationInfo.getDeviceProfile(); @@ -86,7 +89,7 @@ final class RolesUtils { MANAGE_HOLDERS_FLAG_DONT_KILL_APP, userHandle, context.getMainExecutor(), success -> { if (!success) { - Slog.e(LOG_TAG, "Failed to remove u" + userId + "\\" + packageName + Slog.e(TAG, "Failed to remove u" + userId + "\\" + packageName + " from the list of " + deviceProfile + " holders."); } }); diff --git a/services/companion/java/com/android/server/companion/presence/BleCompanionDeviceScanner.java b/services/companion/java/com/android/server/companion/presence/BleCompanionDeviceScanner.java index 0eb6b8d24768..a771e7b1aa4a 100644 --- a/services/companion/java/com/android/server/companion/presence/BleCompanionDeviceScanner.java +++ b/services/companion/java/com/android/server/companion/presence/BleCompanionDeviceScanner.java @@ -21,8 +21,6 @@ import static android.bluetooth.BluetoothAdapter.ACTION_BLE_STATE_CHANGED; import static android.bluetooth.BluetoothAdapter.ACTION_STATE_CHANGED; import static android.bluetooth.BluetoothAdapter.EXTRA_PREVIOUS_STATE; import static android.bluetooth.BluetoothAdapter.EXTRA_STATE; -import static android.bluetooth.BluetoothAdapter.STATE_BLE_ON; -import static android.bluetooth.BluetoothAdapter.STATE_ON; import static android.bluetooth.BluetoothAdapter.nameForState; import static android.bluetooth.le.ScanCallback.SCAN_FAILED_ALREADY_STARTED; import static android.bluetooth.le.ScanCallback.SCAN_FAILED_APPLICATION_REGISTRATION_FAILED; @@ -35,6 +33,7 @@ import static android.bluetooth.le.ScanSettings.CALLBACK_TYPE_FIRST_MATCH; import static android.bluetooth.le.ScanSettings.CALLBACK_TYPE_MATCH_LOST; import static android.bluetooth.le.ScanSettings.SCAN_MODE_LOW_POWER; +import static com.android.server.companion.presence.CompanionDevicePresenceMonitor.DEBUG; import static com.android.server.companion.presence.Utils.btDeviceToString; import static java.util.Objects.requireNonNull; @@ -72,7 +71,6 @@ import java.util.Set; @SuppressLint("LongLogTag") class BleCompanionDeviceScanner implements AssociationStore.OnChangeListener { - private static final boolean DEBUG = false; private static final String TAG = "CompanionDevice_PresenceMonitor_BLE"; /** @@ -156,7 +154,7 @@ class BleCompanionDeviceScanner implements AssociationStore.OnChangeListener { private void checkBleState() { enforceInitialized(); - final boolean bleAvailable = isBleAvailable(); + final boolean bleAvailable = mBtAdapter.isLeEnabled(); if (DEBUG) { Log.i(TAG, "checkBleState() bleAvailable=" + bleAvailable); } @@ -183,16 +181,6 @@ class BleCompanionDeviceScanner implements AssociationStore.OnChangeListener { } } - /** - * A duplicate of {@code BluetoothAdapter.getLeAccess()} method which has the package-private - * access level, so it's not accessible from here. - */ - private boolean isBleAvailable() { - final int state = mBtAdapter.getLeState(); - if (DEBUG) Log.d(TAG, "getLeAccess() state=" + nameForBtState(state)); - return state == STATE_ON || state == STATE_BLE_ON; - } - @MainThread private void startScan() { enforceInitialized(); diff --git a/services/companion/java/com/android/server/companion/presence/BluetoothCompanionDeviceConnectionListener.java b/services/companion/java/com/android/server/companion/presence/BluetoothCompanionDeviceConnectionListener.java index 93cbe973b00e..1ba198ae26b0 100644 --- a/services/companion/java/com/android/server/companion/presence/BluetoothCompanionDeviceConnectionListener.java +++ b/services/companion/java/com/android/server/companion/presence/BluetoothCompanionDeviceConnectionListener.java @@ -16,6 +16,7 @@ package com.android.server.companion.presence; +import static com.android.server.companion.presence.CompanionDevicePresenceMonitor.DEBUG; import static com.android.server.companion.presence.Utils.btDeviceToString; import android.annotation.NonNull; @@ -39,7 +40,6 @@ import java.util.Map; class BluetoothCompanionDeviceConnectionListener extends BluetoothAdapter.BluetoothConnectionCallback implements AssociationStore.OnChangeListener { - private static final boolean DEBUG = false; private static final String TAG = "CompanionDevice_PresenceMonitor_BT"; interface Callback { diff --git a/services/companion/java/com/android/server/companion/presence/CompanionDevicePresenceMonitor.java b/services/companion/java/com/android/server/companion/presence/CompanionDevicePresenceMonitor.java new file mode 100644 index 000000000000..6371b25e6347 --- /dev/null +++ b/services/companion/java/com/android/server/companion/presence/CompanionDevicePresenceMonitor.java @@ -0,0 +1,228 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.companion.presence; + +import android.annotation.NonNull; +import android.annotation.SuppressLint; +import android.bluetooth.BluetoothAdapter; +import android.companion.AssociationInfo; +import android.content.Context; +import android.util.Log; + +import com.android.server.companion.AssociationStore; + +import java.util.HashSet; +import java.util.Set; + +/** + * Class responsible for monitoring companion devices' "presence" status (i.e. + * connected/disconnected for Bluetooth devices; nearby or not for BLE devices). + * + * <p> + * Should only be used by + * {@link com.android.server.companion.CompanionDeviceManagerService CompanionDeviceManagerService} + * to which it provides the following API: + * <ul> + * <li> {@link #onSelfManagedDeviceConnected(int)} + * <li> {@link #onSelfManagedDeviceDisconnected(int)} + * <li> {@link #isDevicePresent(int)} + * <li> {@link Callback#onDeviceAppeared(int) Callback.onDeviceAppeared(int)} + * <li> {@link Callback#onDeviceDisappeared(int) Callback.onDeviceDisappeared(int)} + * </ul> + */ +@SuppressLint("LongLogTag") +public class CompanionDevicePresenceMonitor implements AssociationStore.OnChangeListener, + BluetoothCompanionDeviceConnectionListener.Callback, BleCompanionDeviceScanner.Callback { + static final boolean DEBUG = false; + private static final String TAG = "CompanionDevice_PresenceMonitor"; + + /** Callback for notifying about changes to status of companion devices. */ + public interface Callback { + /** Invoked when companion device is found nearby or connects. */ + void onDeviceAppeared(int associationId); + + /** Invoked when a companion device no longer seen nearby or disconnects. */ + void onDeviceDisappeared(int associationId); + } + + private final @NonNull AssociationStore mAssociationStore; + private final @NonNull Callback mCallback; + private final @NonNull BluetoothCompanionDeviceConnectionListener mBtConnectionListener; + private final @NonNull BleCompanionDeviceScanner mBleScanner; + + // NOTE: Same association may appear in more than one of the following sets at the same time. + // (E.g. self-managed devices that have MAC addresses, could be reported as present by their + // companion applications, while at the same be connected via BT, or detected nearby by BLE + // scanner) + private final @NonNull Set<Integer> mConnectedBtDevices = new HashSet<>(); + private final @NonNull Set<Integer> mNearbyBleDevices = new HashSet<>(); + private final @NonNull Set<Integer> mReportedSelfManagedDevices = new HashSet<>(); + + public CompanionDevicePresenceMonitor(@NonNull AssociationStore associationStore, + @NonNull Callback callback) { + mAssociationStore = associationStore; + mCallback = callback; + + mBtConnectionListener = new BluetoothCompanionDeviceConnectionListener(associationStore, + /* BluetoothCompanionDeviceConnectionListener.Callback */ this); + mBleScanner = new BleCompanionDeviceScanner(associationStore, + /* BleCompanionDeviceScanner.Callback */ this); + } + + /** Initialize {@link CompanionDevicePresenceMonitor} */ + public void init(Context context) { + if (DEBUG) Log.i(TAG, "init()"); + + final BluetoothAdapter btAdapter = BluetoothAdapter.getDefaultAdapter(); + if (btAdapter != null) { + mBtConnectionListener.init(btAdapter); + mBleScanner.init(context, btAdapter); + } else { + Log.w(TAG, "BluetoothAdapter is NOT available."); + } + + mAssociationStore.registerListener(this); + } + + /** + * @return whether the associated companion devices is present. I.e. device is nearby (for BLE); + * or devices is connected (for Bluetooth); or reported (by the application) to be + * nearby (for "self-managed" associations). + */ + public boolean isDevicePresent(int associationId) { + return mReportedSelfManagedDevices.contains(associationId) + || mConnectedBtDevices.contains(associationId) + || mNearbyBleDevices.contains(associationId); + } + + /** + * Marks a "self-managed" device as connected. + * + * <p> + * Must ONLY be invoked by the + * {@link com.android.server.companion.CompanionDeviceManagerService CompanionDeviceManagerService} + * when an application invokes + * {@link android.companion.CompanionDeviceManager#notifyDeviceAppeared(int) notifyDeviceAppeared()} + */ + public void onSelfManagedDeviceConnected(int associationId) { + onDevicePresent(mReportedSelfManagedDevices, associationId, "application-reported"); + } + + /** + * Marks a "self-managed" device as disconnected. + * + * <p> + * Must ONLY be invoked by the + * {@link com.android.server.companion.CompanionDeviceManagerService CompanionDeviceManagerService} + * when an application invokes + * {@link android.companion.CompanionDeviceManager#notifyDeviceDisappeared(int) notifyDeviceDisappeared()} + */ + public void onSelfManagedDeviceDisconnected(int associationId) { + onDeviceGone(mReportedSelfManagedDevices, associationId, "application-reported"); + } + + @Override + public void onBluetoothCompanionDeviceConnected(int associationId) { + onDevicePresent(mConnectedBtDevices, associationId, /* sourceLoggingTag */ "bt"); + } + + @Override + public void onBluetoothCompanionDeviceDisconnected(int associationId) { + onDeviceGone(mConnectedBtDevices, associationId, /* sourceLoggingTag */ "bt"); + } + + @Override + public void onBleCompanionDeviceFound(int associationId) { + onDevicePresent(mNearbyBleDevices, associationId, /* sourceLoggingTag */ "ble"); + } + + @Override + public void onBleCompanionDeviceLost(int associationId) { + onDeviceGone(mNearbyBleDevices, associationId, /* sourceLoggingTag */ "ble"); + } + + private void onDevicePresent(@NonNull Set<Integer> presentDevicesForSource, + int newDeviceAssociationId, @NonNull String sourceLoggingTag) { + if (DEBUG) { + Log.i(TAG, "onDevice_Present() id=" + newDeviceAssociationId + + ", source=" + sourceLoggingTag); + Log.d(TAG, " > association=" + + mAssociationStore.getAssociationById(newDeviceAssociationId)); + } + + final boolean alreadyPresent = isDevicePresent(newDeviceAssociationId); + if (DEBUG && alreadyPresent) Log.i(TAG, "Device is already present."); + + final boolean added = presentDevicesForSource.add(newDeviceAssociationId); + if (DEBUG && !added) { + Log.w(TAG, "Association with id " + newDeviceAssociationId + " is ALREADY reported as " + + "present by this source (" + sourceLoggingTag + ")"); + } + + if (alreadyPresent) return; + + mCallback.onDeviceAppeared(newDeviceAssociationId); + } + + private void onDeviceGone(@NonNull Set<Integer> presentDevicesForSource, + int goneDeviceAssociationId, @NonNull String sourceLoggingTag) { + if (DEBUG) { + Log.i(TAG, "onDevice_Gone() id=" + goneDeviceAssociationId + + ", source=" + sourceLoggingTag); + Log.d(TAG, " > association=" + + mAssociationStore.getAssociationById(goneDeviceAssociationId)); + } + + final boolean removed = presentDevicesForSource.remove(goneDeviceAssociationId); + if (!removed) { + if (DEBUG) { + Log.w(TAG, "Association with id " + goneDeviceAssociationId + " was NOT reported " + + "as present by this source (" + sourceLoggingTag + ")"); + } + return; + } + + final boolean stillPresent = isDevicePresent(goneDeviceAssociationId); + if (stillPresent) { + if (DEBUG) Log.i(TAG, " Device is still present."); + return; + } + + mCallback.onDeviceDisappeared(goneDeviceAssociationId); + } + + /** + * Implements + * {@link AssociationStore.OnChangeListener#onAssociationRemoved(AssociationInfo)} + */ + @Override + public void onAssociationRemoved(@NonNull AssociationInfo association) { + final int id = association.getId(); + if (DEBUG) { + Log.i(TAG, "onAssociationRemoved() id=" + id); + Log.d(TAG, " > association=" + association); + } + + mConnectedBtDevices.remove(id); + mNearbyBleDevices.remove(id); + mReportedSelfManagedDevices.remove(id); + + // Do NOT call mCallback.onDeviceDisappeared()! + // CompanionDeviceManagerService will know that the association is removed, and will do + // what's needed. + } +} diff --git a/services/core/Android.bp b/services/core/Android.bp index 1106fe7270e6..561009fe2a71 100644 --- a/services/core/Android.bp +++ b/services/core/Android.bp @@ -134,6 +134,7 @@ java_library_static { "app-compat-annotations", "framework-tethering.stubs.module_lib", "service-permission.stubs.system_server", + "service-supplementalprocess.stubs.system_server", ], required: [ diff --git a/services/core/java/android/app/usage/UsageStatsManagerInternal.java b/services/core/java/android/app/usage/UsageStatsManagerInternal.java index 435d294a3e8e..a35aa7c74ee5 100644 --- a/services/core/java/android/app/usage/UsageStatsManagerInternal.java +++ b/services/core/java/android/app/usage/UsageStatsManagerInternal.java @@ -21,6 +21,7 @@ import android.annotation.ElapsedRealtimeLong; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.UserIdInt; +import android.app.ActivityManager.ProcessState; import android.app.usage.UsageStatsManager.StandbyBuckets; import android.content.ComponentName; import android.content.LocusId; @@ -375,10 +376,11 @@ public abstract class UsageStatsManagerInternal { * to this broadcast. * @param timestampMs time (in millis) when the broadcast was dispatched, in * {@link SystemClock#elapsedRealtime()} timebase. + * @param targetUidProcState process state of the uid that the broadcast is targeted to. */ public abstract void reportBroadcastDispatched(int sourceUid, @NonNull String targetPackage, @NonNull UserHandle targetUser, long idForResponseEvent, - @ElapsedRealtimeLong long timestampMs); + @ElapsedRealtimeLong long timestampMs, @ProcessState int targetUidProcState); /** * Reports a notification posted event to the UsageStatsManager. diff --git a/services/core/java/com/android/server/BinaryTransparencyService.java b/services/core/java/com/android/server/BinaryTransparencyService.java index db510cb6422a..7714dbc55aa9 100644 --- a/services/core/java/com/android/server/BinaryTransparencyService.java +++ b/services/core/java/com/android/server/BinaryTransparencyService.java @@ -33,6 +33,7 @@ import android.util.PackageUtils; import android.util.Slog; import com.android.internal.os.IBinaryTransparencyService; +import com.android.internal.util.FrameworkStatsLog; import java.io.File; import java.io.FileDescriptor; @@ -373,6 +374,7 @@ public class BinaryTransparencyService extends SystemService { private void getVBMetaDigestInformation() { mVbmetaDigest = SystemProperties.get(SYSPROP_NAME_VBETA_DIGEST, VBMETA_DIGEST_UNAVAILABLE); Slog.d(TAG, String.format("VBMeta Digest: %s", mVbmetaDigest)); + FrameworkStatsLog.write(FrameworkStatsLog.VBMETA_DIGEST_REPORTED, mVbmetaDigest); } @NonNull @@ -437,6 +439,13 @@ public class BinaryTransparencyService extends SystemService { } else { mBinaryHashes.put(packageName, sha256digest); } + + if (packageInfo.isApex) { + FrameworkStatsLog.write(FrameworkStatsLog.APEX_INFO_GATHERED, + packageInfo.packageName, + packageInfo.getLongVersionCode(), + mBinaryHashes.get(packageInfo.packageName)); + } } } catch (PackageManager.NameNotFoundException e) { Slog.e(TAG, "Could not find package with name " + packageName); @@ -466,6 +475,8 @@ public class BinaryTransparencyService extends SystemService { } else { mBinaryHashes.put(packageInfo.packageName, sha256digest); } + FrameworkStatsLog.write(FrameworkStatsLog.APEX_INFO_GATHERED, packageInfo.packageName, + packageInfo.getLongVersionCode(), mBinaryHashes.get(packageInfo.packageName)); Slog.d(TAG, String.format("Last update time for %s: %d", packageInfo.packageName, packageInfo.lastUpdateTime)); mBinaryLastUpdateTimes.put(packageInfo.packageName, packageInfo.lastUpdateTime); diff --git a/services/core/java/com/android/server/DockObserver.java b/services/core/java/com/android/server/DockObserver.java index e5a7b4e4ee23..8a6b54fd9769 100644 --- a/services/core/java/com/android/server/DockObserver.java +++ b/services/core/java/com/android/server/DockObserver.java @@ -19,7 +19,6 @@ package com.android.server; import android.content.ContentResolver; import android.content.Context; import android.content.Intent; -import android.content.pm.PackageManager; import android.media.AudioManager; import android.media.Ringtone; import android.media.RingtoneManager; @@ -32,15 +31,21 @@ import android.os.SystemClock; import android.os.UEventObserver; import android.os.UserHandle; import android.provider.Settings; -import android.util.Log; +import android.util.Pair; import android.util.Slog; +import com.android.internal.annotations.VisibleForTesting; import com.android.internal.util.DumpUtils; +import com.android.server.ExtconUEventObserver.ExtconInfo; import java.io.FileDescriptor; import java.io.FileNotFoundException; import java.io.FileReader; import java.io.PrintWriter; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * DockObserver monitors for a docking station. @@ -48,9 +53,6 @@ import java.io.PrintWriter; final class DockObserver extends SystemService { private static final String TAG = "DockObserver"; - private static final String DOCK_UEVENT_MATCH = "DEVPATH=/devices/virtual/switch/dock"; - private static final String DOCK_STATE_PATH = "/sys/class/switch/dock/state"; - private static final int MSG_DOCK_STATE_CHANGED = 0; private final PowerManager mPowerManager; @@ -69,6 +71,92 @@ final class DockObserver extends SystemService { private final boolean mAllowTheaterModeWakeFromDock; + private final List<ExtconStateConfig> mExtconStateConfigs; + + static final class ExtconStateProvider { + private final Map<String, String> mState; + + ExtconStateProvider(Map<String, String> state) { + mState = state; + } + + String getValue(String key) { + return mState.get(key); + } + + + static ExtconStateProvider fromString(String stateString) { + Map<String, String> states = new HashMap<>(); + String[] lines = stateString.split("\n"); + for (String line : lines) { + String[] fields = line.split("="); + if (fields.length == 2) { + states.put(fields[0], fields[1]); + } else { + Slog.e(TAG, "Invalid line: " + line); + } + } + return new ExtconStateProvider(states); + } + + static ExtconStateProvider fromFile(String stateFilePath) { + char[] buffer = new char[1024]; + try (FileReader file = new FileReader(stateFilePath)) { + int len = file.read(buffer, 0, 1024); + String stateString = (new String(buffer, 0, len)).trim(); + return ExtconStateProvider.fromString(stateString); + } catch (FileNotFoundException e) { + Slog.w(TAG, "No state file found at: " + stateFilePath); + return new ExtconStateProvider(new HashMap<>()); + } catch (Exception e) { + Slog.e(TAG, "" , e); + return new ExtconStateProvider(new HashMap<>()); + } + } + } + + /** + * Represents a mapping from extcon state to EXTRA_DOCK_STATE value. Each + * instance corresponds to an entry in config_dockExtconStateMapping. + */ + private static final class ExtconStateConfig { + + // The EXTRA_DOCK_STATE that will be used if the extcon key-value pairs match + public final int extraStateValue; + + // A list of key-value pairs that must be present in the extcon state for a match + // to be considered. An empty list is considered a matching wildcard. + public final List<Pair<String, String>> keyValuePairs = new ArrayList<>(); + + ExtconStateConfig(int extraStateValue) { + this.extraStateValue = extraStateValue; + } + } + + private static List<ExtconStateConfig> loadExtconStateConfigs(Context context) { + String[] rows = context.getResources().getStringArray( + com.android.internal.R.array.config_dockExtconStateMapping); + try { + ArrayList<ExtconStateConfig> configs = new ArrayList<>(); + for (String row : rows) { + String[] rowFields = row.split(","); + ExtconStateConfig config = new ExtconStateConfig(Integer.parseInt(rowFields[0])); + for (int i = 1; i < rowFields.length; i++) { + String[] keyValueFields = rowFields[i].split("="); + if (keyValueFields.length != 2) { + throw new IllegalArgumentException("Invalid key-value: " + rowFields[i]); + } + config.keyValuePairs.add(Pair.create(keyValueFields[0], keyValueFields[1])); + } + configs.add(config); + } + return configs; + } catch (IllegalArgumentException | ArrayIndexOutOfBoundsException e) { + Slog.e(TAG, "Could not parse extcon state config", e); + return new ArrayList<>(); + } + } + public DockObserver(Context context) { super(context); @@ -77,9 +165,25 @@ final class DockObserver extends SystemService { mAllowTheaterModeWakeFromDock = context.getResources().getBoolean( com.android.internal.R.bool.config_allowTheaterModeWakeFromDock); - init(); // set initial status + mExtconStateConfigs = loadExtconStateConfigs(context); + + List<ExtconInfo> infos = ExtconInfo.getExtconInfoForTypes(new String[] { + ExtconInfo.EXTCON_DOCK + }); - mObserver.startObserving(DOCK_UEVENT_MATCH); + if (!infos.isEmpty()) { + ExtconInfo info = infos.get(0); + Slog.i(TAG, "Found extcon info devPath: " + info.getDevicePath() + + ", statePath: " + info.getStatePath()); + + // set initial status + setDockStateFromProviderLocked(ExtconStateProvider.fromFile(info.getStatePath())); + mPreviousDockState = mActualDockState; + + mExtconUEventObserver.startObserving(info); + } else { + Slog.i(TAG, "No extcon dock device found in this kernel."); + } } @Override @@ -101,26 +205,6 @@ final class DockObserver extends SystemService { } } - private void init() { - synchronized (mLock) { - try { - char[] buffer = new char[1024]; - FileReader file = new FileReader(DOCK_STATE_PATH); - try { - int len = file.read(buffer, 0, 1024); - setActualDockStateLocked(Integer.parseInt((new String(buffer, 0, len)).trim())); - mPreviousDockState = mActualDockState; - } finally { - file.close(); - } - } catch (FileNotFoundException e) { - Slog.w(TAG, "This kernel does not have dock station support"); - } catch (Exception e) { - Slog.e(TAG, "" , e); - } - } - } - private void setActualDockStateLocked(int newState) { mActualDockState = newState; if (!mUpdatesStopped) { @@ -234,19 +318,50 @@ final class DockObserver extends SystemService { } }; - private final UEventObserver mObserver = new UEventObserver() { - @Override - public void onUEvent(UEventObserver.UEvent event) { - if (Log.isLoggable(TAG, Log.VERBOSE)) { - Slog.v(TAG, "Dock UEVENT: " + event.toString()); + private int getDockedStateExtraValue(ExtconStateProvider state) { + for (ExtconStateConfig config : mExtconStateConfigs) { + boolean match = true; + for (Pair<String, String> keyValue : config.keyValuePairs) { + String stateValue = state.getValue(keyValue.first); + match = match && keyValue.second.equals(stateValue); + if (!match) { + break; + } } - try { - synchronized (mLock) { - setActualDockStateLocked(Integer.parseInt(event.get("SWITCH_STATE"))); + if (match) { + return config.extraStateValue; + } + } + + return Intent.EXTRA_DOCK_STATE_DESK; + } + + @VisibleForTesting + void setDockStateFromProviderForTesting(ExtconStateProvider provider) { + synchronized (mLock) { + setDockStateFromProviderLocked(provider); + } + } + + private void setDockStateFromProviderLocked(ExtconStateProvider provider) { + int state = Intent.EXTRA_DOCK_STATE_UNDOCKED; + if ("1".equals(provider.getValue("DOCK"))) { + state = getDockedStateExtraValue(provider); + } + setActualDockStateLocked(state); + } + + private final ExtconUEventObserver mExtconUEventObserver = new ExtconUEventObserver() { + @Override + public void onUEvent(ExtconInfo extconInfo, UEventObserver.UEvent event) { + synchronized (mLock) { + String stateString = event.get("STATE"); + if (stateString != null) { + setDockStateFromProviderLocked(ExtconStateProvider.fromString(stateString)); + } else { + Slog.e(TAG, "Extcon event missing STATE: " + event); } - } catch (NumberFormatException e) { - Slog.e(TAG, "Could not parse switch state from event " + event); } } }; diff --git a/services/core/java/com/android/server/SystemServiceManager.java b/services/core/java/com/android/server/SystemServiceManager.java index 0bc3fcc83d47..d719d77ea1be 100644 --- a/services/core/java/com/android/server/SystemServiceManager.java +++ b/services/core/java/com/android/server/SystemServiceManager.java @@ -509,8 +509,7 @@ public final class SystemServiceManager implements Dumpable { throw new IllegalArgumentException(onWhat + " what?"); } } catch (Exception ex) { - Slog.wtf(TAG, "Failure reporting " + onWhat + " of user " + curUser - + " to service " + serviceName, ex); + logFailure(onWhat, curUser, serviceName, ex); } if (!submitToThreadPool) { warnIfTooLong(SystemClock.elapsedRealtime() - time, service, @@ -576,19 +575,19 @@ public final class SystemServiceManager implements Dumpable { return () -> { final TimingsTraceAndSlog t = new TimingsTraceAndSlog(oldTrace); final String serviceName = service.getClass().getName(); + final int curUserId = curUser.getUserIdentifier(); + t.traceBegin("ssm.on" + USER_STARTING + "User-" + curUserId + "_" + serviceName); try { - final int curUserId = curUser.getUserIdentifier(); - t.traceBegin("ssm.on" + USER_STARTING + "User-" + curUserId + "_" + serviceName); long time = SystemClock.elapsedRealtime(); service.onUserStarting(curUser); warnIfTooLong(SystemClock.elapsedRealtime() - time, service, "on" + USER_STARTING + "User-" + curUserId); - t.traceEnd(); } catch (Exception e) { - Slog.wtf(TAG, "Failure reporting " + USER_STARTING + " of user " + curUser - + " to service " + serviceName, e); + logFailure(USER_STARTING, curUser, serviceName, e); Slog.e(TAG, "Disabling thread pool - please capture a bug report."); sUseLifecycleThreadPool = false; + } finally { + t.traceEnd(); } }; } @@ -601,14 +600,26 @@ public final class SystemServiceManager implements Dumpable { final int curUserId = curUser.getUserIdentifier(); t.traceBegin("ssm.on" + USER_COMPLETED_EVENT + "User-" + curUserId + "_" + eventType + "_" + serviceName); - long time = SystemClock.elapsedRealtime(); - service.onUserCompletedEvent(curUser, eventType); - warnIfTooLong(SystemClock.elapsedRealtime() - time, service, - "on" + USER_COMPLETED_EVENT + "User-" + curUserId); - t.traceEnd(); + try { + long time = SystemClock.elapsedRealtime(); + service.onUserCompletedEvent(curUser, eventType); + warnIfTooLong(SystemClock.elapsedRealtime() - time, service, + "on" + USER_COMPLETED_EVENT + "User-" + curUserId); + } catch (Exception e) { + logFailure(USER_COMPLETED_EVENT, curUser, serviceName, e); + throw e; + } finally { + t.traceEnd(); + } }; } + /** Logs the failure. That's all. Tests may rely on parsing it, so only modify carefully. */ + private void logFailure(String onWhat, TargetUser curUser, String serviceName, Exception ex) { + Slog.wtf(TAG, "SystemService failure: Failure reporting " + onWhat + " of user " + + curUser + " to service " + serviceName, ex); + } + /** Sets the safe mode flag for services to query. */ void setSafeMode(boolean safeMode) { mSafeMode = safeMode; diff --git a/services/core/java/com/android/server/VcnManagementService.java b/services/core/java/com/android/server/VcnManagementService.java index 6a7afd90dc96..2d328d8b0949 100644 --- a/services/core/java/com/android/server/VcnManagementService.java +++ b/services/core/java/com/android/server/VcnManagementService.java @@ -539,7 +539,13 @@ public class VcnManagementService extends IVcnManagementService.Stub { @GuardedBy("mLock") private void notifyAllPolicyListenersLocked() { for (final PolicyListenerBinderDeath policyListener : mRegisteredPolicyListeners.values()) { - Binder.withCleanCallingIdentity(() -> policyListener.mListener.onPolicyChanged()); + Binder.withCleanCallingIdentity(() -> { + try { + policyListener.mListener.onPolicyChanged(); + } catch (RemoteException e) { + logDbg("VcnStatusCallback threw on VCN status change", e); + } + }); } } @@ -548,8 +554,13 @@ public class VcnManagementService extends IVcnManagementService.Stub { @NonNull ParcelUuid subGroup, @VcnStatusCode int statusCode) { for (final VcnStatusCallbackInfo cbInfo : mRegisteredStatusCallbacks.values()) { if (isCallbackPermissioned(cbInfo, subGroup)) { - Binder.withCleanCallingIdentity( - () -> cbInfo.mCallback.onVcnStatusChanged(statusCode)); + Binder.withCleanCallingIdentity(() -> { + try { + cbInfo.mCallback.onVcnStatusChanged(statusCode); + } catch (RemoteException e) { + logDbg("VcnStatusCallback threw on VCN status change", e); + } + }); } } } @@ -1222,13 +1233,17 @@ public class VcnManagementService extends IVcnManagementService.Stub { // Notify all registered StatusCallbacks for this subGroup for (VcnStatusCallbackInfo cbInfo : mRegisteredStatusCallbacks.values()) { if (isCallbackPermissioned(cbInfo, mSubGroup)) { - Binder.withCleanCallingIdentity( - () -> - cbInfo.mCallback.onGatewayConnectionError( - gatewayConnectionName, - errorCode, - exceptionClass, - exceptionMessage)); + Binder.withCleanCallingIdentity(() -> { + try { + cbInfo.mCallback.onGatewayConnectionError( + gatewayConnectionName, + errorCode, + exceptionClass, + exceptionMessage); + } catch (RemoteException e) { + logDbg("VcnStatusCallback threw on VCN status change", e); + } + }); } } } diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java index b5c0a67be20f..9353dd832bba 100644 --- a/services/core/java/com/android/server/am/ActiveServices.java +++ b/services/core/java/com/android/server/am/ActiveServices.java @@ -2721,7 +2721,8 @@ public final class ActiveServices { int bindServiceLocked(IApplicationThread caller, IBinder token, Intent service, String resolvedType, final IServiceConnection connection, int flags, - String instanceName, String callingPackage, final int userId) + String instanceName, boolean isSupplementalProcessService, String callingPackage, + final int userId) throws TransactionTooLargeException { if (DEBUG_SERVICE) Slog.v(TAG_SERVICE, "bindService: " + service + " type=" + resolvedType + " conn=" + connection.asBinder() @@ -2805,10 +2806,9 @@ public final class ActiveServices { final boolean isBindExternal = (flags & Context.BIND_EXTERNAL_SERVICE) != 0; final boolean allowInstant = (flags & Context.BIND_ALLOW_INSTANT) != 0; - ServiceLookupResult res = - retrieveServiceLocked(service, instanceName, resolvedType, callingPackage, - callingPid, callingUid, userId, true, - callerFg, isBindExternal, allowInstant); + ServiceLookupResult res = retrieveServiceLocked(service, instanceName, + isSupplementalProcessService, resolvedType, callingPackage, callingPid, callingUid, + userId, true, callerFg, isBindExternal, allowInstant); if (res == null) { return 0; } @@ -3228,6 +3228,20 @@ public final class ActiveServices { int callingPid, int callingUid, int userId, boolean createIfNeeded, boolean callingFromFg, boolean isBindExternal, boolean allowInstant) { + return retrieveServiceLocked(service, instanceName, false, resolvedType, callingPackage, + callingPid, callingUid, userId, createIfNeeded, callingFromFg, isBindExternal, + allowInstant); + } + + private ServiceLookupResult retrieveServiceLocked(Intent service, + String instanceName, boolean isSupplementalProcessService, String resolvedType, + String callingPackage, int callingPid, int callingUid, int userId, + boolean createIfNeeded, boolean callingFromFg, boolean isBindExternal, + boolean allowInstant) { + if (isSupplementalProcessService && instanceName == null) { + throw new IllegalArgumentException("No instanceName provided for supplemental process"); + } + ServiceRecord r = null; if (DEBUG_SERVICE) Slog.v(TAG_SERVICE, "retrieveServiceLocked: " + service + " type=" + resolvedType + " callingUid=" + callingUid); @@ -3249,7 +3263,6 @@ public final class ActiveServices { if (instanceName == null) { comp = service.getComponent(); } else { - // This is for isolated services final ComponentName realComp = service.getComponent(); if (realComp == null) { throw new IllegalArgumentException("Can't use custom instance name '" + instanceName @@ -3304,12 +3317,19 @@ public final class ActiveServices { return null; } if (instanceName != null - && (sInfo.flags & ServiceInfo.FLAG_ISOLATED_PROCESS) == 0) { + && (sInfo.flags & ServiceInfo.FLAG_ISOLATED_PROCESS) == 0 + && !isSupplementalProcessService) { throw new IllegalArgumentException("Can't use instance name '" + instanceName - + "' with non-isolated service '" + sInfo.name + "'"); + + "' with non-isolated non-supplemental service '" + sInfo.name + "'"); } - ComponentName className = new ComponentName( - sInfo.applicationInfo.packageName, sInfo.name); + if (isSupplementalProcessService + && (sInfo.flags & ServiceInfo.FLAG_ISOLATED_PROCESS) != 0) { + throw new IllegalArgumentException("Service cannot be both supplemental and " + + "isolated"); + } + + ComponentName className = new ComponentName(sInfo.applicationInfo.packageName, + sInfo.name); ComponentName name = comp != null ? comp : className; if (!mAm.validateAssociationAllowedLocked(callingPackage, callingUid, name.getPackageName(), sInfo.applicationInfo.uid)) { @@ -3392,7 +3412,8 @@ public final class ActiveServices { = new Intent.FilterComparison(service.cloneFilter()); final ServiceRestarter res = new ServiceRestarter(); r = new ServiceRecord(mAm, className, name, definingPackageName, - definingUid, filter, sInfo, callingFromFg, res); + definingUid, filter, sInfo, callingFromFg, res, + isSupplementalProcessService); res.setService(r); smap.mServicesByInstanceName.put(name, r); smap.mServicesByIntent.put(filter, r); diff --git a/services/core/java/com/android/server/am/ActivityManagerLocal.java b/services/core/java/com/android/server/am/ActivityManagerLocal.java index 9a1bfddcec07..d9ee7d974864 100644 --- a/services/core/java/com/android/server/am/ActivityManagerLocal.java +++ b/services/core/java/com/android/server/am/ActivityManagerLocal.java @@ -18,6 +18,9 @@ package com.android.server.am; import android.annotation.NonNull; import android.annotation.SystemApi; +import android.content.Intent; +import android.content.ServiceConnection; +import android.os.TransactionTooLargeException; /** * Interface for in-process calls into @@ -58,4 +61,24 @@ public interface ActivityManagerLocal { * @hide */ void tempAllowWhileInUsePermissionInFgs(int uid, long durationMs); + + /** + * Starts a supplemental process service and binds to it. You can through the arguments here + * have the system bring up multiple concurrent processes hosting their own instance of that + * service. The <var>userAppUid</var> you provide here identifies the different instances - each + * unique uid is attributed to a supplemental process. + * + * @param service Identifies the supplemental process service to connect to. The Intent must + * specify an explicit component name. This value cannot be null. + * @param conn Receives information as the service is started and stopped. + * This must be a valid ServiceConnection object; it must not be null. + * @param userAppUid Uid of the app for which the supplemental process needs to be spawned. + * @return {@code true} if the system is in the process of bringing up a + * service that your client has permission to bind to; {@code false} + * if the system couldn't find the service or if your client doesn't + * have permission to bind to it. + */ + boolean startAndBindSupplementalProcessService(@NonNull Intent service, + @NonNull ServiceConnection conn, int userAppUid) throws TransactionTooLargeException; + } diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 512697593708..e2204e2efaca 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -218,6 +218,7 @@ import android.content.IIntentSender; import android.content.Intent; import android.content.IntentFilter; import android.content.LocusId; +import android.content.ServiceConnection; import android.content.pm.ActivityInfo; import android.content.pm.ActivityPresentationInfo; import android.content.pm.ApplicationInfo; @@ -2900,16 +2901,31 @@ public class ActivityManagerService extends IActivityManager.Stub mActivityTaskManager.setPackageScreenCompatMode(packageName, mode); } - private boolean hasUsageStatsPermission(String callingPackage) { + private boolean hasUsageStatsPermission(String callingPackage, int callingUid, int callingPid) { final int mode = mAppOpsService.noteOperation(AppOpsManager.OP_GET_USAGE_STATS, - Binder.getCallingUid(), callingPackage, null, false, "", false).getOpMode(); + callingUid, callingPackage, null, false, "", false).getOpMode(); if (mode == AppOpsManager.MODE_DEFAULT) { - return checkCallingPermission(Manifest.permission.PACKAGE_USAGE_STATS) + return checkPermission(Manifest.permission.PACKAGE_USAGE_STATS, callingPid, callingUid) == PackageManager.PERMISSION_GRANTED; } return mode == AppOpsManager.MODE_ALLOWED; } + private boolean hasUsageStatsPermission(String callingPackage) { + return hasUsageStatsPermission(callingPackage, + Binder.getCallingUid(), Binder.getCallingPid()); + } + + private void enforceUsageStatsPermission(String callingPackage, + int callingUid, int callingPid, String operation) { + if (!hasUsageStatsPermission(callingPackage, callingUid, callingPid)) { + final String errorMsg = "Permission denial for <" + operation + "> from pid=" + + Binder.getCallingPid() + ", uid=" + Binder.getCallingUid() + + " which requires PACKAGE_USAGE_STATS permission"; + throw new SecurityException(errorMsg); + } + } + @Override public int getPackageProcessState(String packageName, String callingPackage) { if (!hasUsageStatsPermission(callingPackage)) { @@ -12315,13 +12331,25 @@ public class ActivityManagerService extends IActivityManager.Stub public int bindService(IApplicationThread caller, IBinder token, Intent service, String resolvedType, IServiceConnection connection, int flags, String callingPackage, int userId) throws TransactionTooLargeException { - return bindIsolatedService(caller, token, service, resolvedType, connection, flags, + return bindServiceInstance(caller, token, service, resolvedType, connection, flags, null, callingPackage, userId); } - public int bindIsolatedService(IApplicationThread caller, IBinder token, Intent service, + /** + * Binds to a service with a given instanceName, creating it if it does not already exist. + * If the instanceName field is not supplied, binding to the service occurs as usual. + */ + public int bindServiceInstance(IApplicationThread caller, IBinder token, Intent service, String resolvedType, IServiceConnection connection, int flags, String instanceName, String callingPackage, int userId) throws TransactionTooLargeException { + return bindServiceInstance(caller, token, service, resolvedType, connection, flags, + instanceName, false, callingPackage, userId); + } + + private int bindServiceInstance(IApplicationThread caller, IBinder token, Intent service, + String resolvedType, IServiceConnection connection, int flags, String instanceName, + boolean isSupplementalProcessService, String callingPackage, int userId) + throws TransactionTooLargeException { enforceNotIsolatedCaller("bindService"); // Refuse possible leaked file descriptors @@ -12333,6 +12361,10 @@ public class ActivityManagerService extends IActivityManager.Stub throw new IllegalArgumentException("callingPackage cannot be null"); } + if (isSupplementalProcessService && instanceName == null) { + throw new IllegalArgumentException("No instance name provided for isolated process"); + } + // Ensure that instanceName, which is caller provided, does not contain // unusual characters. if (instanceName != null) { @@ -12346,8 +12378,8 @@ public class ActivityManagerService extends IActivityManager.Stub } synchronized(this) { - return mServices.bindServiceLocked(caller, token, service, - resolvedType, connection, flags, instanceName, callingPackage, userId); + return mServices.bindServiceLocked(caller, token, service, resolvedType, connection, + flags, instanceName, isSupplementalProcessService, callingPackage, userId); } } @@ -12766,7 +12798,7 @@ public class ActivityManagerService extends IActivityManager.Stub noAction.add(null); actions = noAction.iterator(); } - boolean onlyProtectedBroadcasts = actions.hasNext(); + boolean onlyProtectedBroadcasts = true; // Collect stickies of users and check if broadcast is only registered for protected // broadcasts @@ -12840,6 +12872,8 @@ public class ActivityManagerService extends IActivityManager.Stub // Change is not enabled, thus not targeting T+. Assume exported. flags |= Context.RECEIVER_EXPORTED; } + } else if ((flags & Context.RECEIVER_NOT_EXPORTED) == 0) { + flags |= Context.RECEIVER_EXPORTED; } } @@ -13332,6 +13366,13 @@ public class ActivityManagerService extends IActivityManager.Stub backgroundActivityStartsToken = null; } } + + // TODO (206518114): We need to use the "real" package name which sent the broadcast, + // in case the broadcast is sent via PendingIntent. + if (brOptions.getIdForResponseEvent() > 0) { + enforceUsageStatsPermission(callerPackage, realCallingUid, realCallingPid, + "recordResponseEventWhileInBackground()"); + } } // Verify that protected broadcasts are only being sent by system code, @@ -15880,6 +15921,34 @@ public class ActivityManagerService extends IActivityManager.Stub } @Override + public boolean startAndBindSupplementalProcessService(Intent service, + ServiceConnection conn, int userAppUid) throws TransactionTooLargeException { + if (service == null) { + throw new IllegalArgumentException("intent is null"); + } + if (conn == null) { + throw new IllegalArgumentException("connection is null"); + } + if (service.getComponent() == null) { + throw new IllegalArgumentException("service must specify explicit component"); + } + if (!UserHandle.isApp(userAppUid)) { + throw new IllegalArgumentException("uid is not within application range"); + } + + Handler handler = mContext.getMainThreadHandler(); + int flags = Context.BIND_AUTO_CREATE; + + final IServiceConnection sd = mContext.getServiceDispatcher(conn, handler, flags); + service.prepareToLeaveProcess(mContext); + return ActivityManagerService.this.bindServiceInstance( + mContext.getIApplicationThread(), mContext.getActivityToken(), service, + service.resolveTypeIfNeeded(mContext.getContentResolver()), sd, flags, + Integer.toString(userAppUid), /*isSupplementalProcessService*/ true, + mContext.getOpPackageName(), UserHandle.getUserId(userAppUid)) != 0; + } + + @Override public void onUserRemoved(@UserIdInt int userId) { // Clean up any ActivityTaskManager state (by telling it the user is stopped) mAtmInternal.onUserStopped(userId); @@ -16020,6 +16089,23 @@ public class ActivityManagerService extends IActivityManager.Stub } /** + * Returns package name by pid. + */ + @Override + @Nullable + public String getPackageNameByPid(int pid) { + synchronized (mPidsSelfLocked) { + final ProcessRecord app = mPidsSelfLocked.get(pid); + + if (app != null && app.info != null) { + return app.info.packageName; + } + + return null; + } + } + + /** * Sets if the given pid has an overlay UI or not. * * @param pid The pid we are setting overlay UI for. @@ -17819,6 +17905,11 @@ public class ActivityManagerService extends IActivityManager.Stub } } + @Override + public boolean isAppFreezerEnabled() { + return mOomAdjuster.mCachedAppOptimizer.useFreezer(); + } + /** * Resets the state of the {@link com.android.server.am.AppErrors} instance. * This is intended for testing within the CTS only and is protected by diff --git a/services/core/java/com/android/server/am/AppRestrictionController.java b/services/core/java/com/android/server/am/AppRestrictionController.java index 1315293abaa4..465623f800c5 100644 --- a/services/core/java/com/android/server/am/AppRestrictionController.java +++ b/services/core/java/com/android/server/am/AppRestrictionController.java @@ -54,6 +54,7 @@ import static android.content.pm.PackageManager.MATCH_DIRECT_BOOT_AWARE; import static android.content.pm.PackageManager.MATCH_DIRECT_BOOT_UNAWARE; import static android.content.pm.PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS; import static android.os.PowerExemptionManager.REASON_ALLOWLISTED_PACKAGE; +import static android.os.PowerExemptionManager.REASON_CARRIER_PRIVILEGED_APP; import static android.os.PowerExemptionManager.REASON_COMPANION_DEVICE_MANAGER; import static android.os.PowerExemptionManager.REASON_DENIED; import static android.os.PowerExemptionManager.REASON_DEVICE_DEMO_MODE; @@ -65,6 +66,7 @@ import static android.os.PowerExemptionManager.REASON_PROC_STATE_PERSISTENT_UI; import static android.os.PowerExemptionManager.REASON_PROFILE_OWNER; import static android.os.PowerExemptionManager.REASON_ROLE_DIALER; import static android.os.PowerExemptionManager.REASON_ROLE_EMERGENCY; +import static android.os.PowerExemptionManager.REASON_SYSTEM_ALLOW_LISTED; import static android.os.PowerExemptionManager.REASON_SYSTEM_MODULE; import static android.os.PowerExemptionManager.REASON_SYSTEM_UID; import static android.os.Process.SYSTEM_UID; @@ -125,6 +127,7 @@ import android.provider.DeviceConfig.OnPropertiesChangedListener; import android.provider.DeviceConfig.Properties; import android.provider.Settings; import android.provider.Settings.Global; +import android.telephony.TelephonyManager; import android.util.ArraySet; import android.util.Slog; import android.util.SparseArray; @@ -138,6 +141,7 @@ import com.android.internal.util.ArrayUtils; import com.android.internal.util.function.TriConsumer; import com.android.server.AppStateTracker; import com.android.server.LocalServices; +import com.android.server.SystemConfig; import com.android.server.apphibernation.AppHibernationManagerInternal; import com.android.server.pm.UserManagerInternal; import com.android.server.usage.AppStandbyInternal; @@ -229,6 +233,24 @@ public final class AppRestrictionController { @GuardedBy("mLock") private final HashMap<String, Boolean> mSystemModulesCache = new HashMap<>(); + /** + * The pre-config packages that are exempted from the background restrictions. + */ + private ArraySet<String> mBgRestrictionExemptioFromSysConfig; + + /** + * Lock specifically for bookkeeping around the carrier-privileged app set. + * Do not acquire any other locks while holding this one. Methods that + * require this lock to be held are named with a "CPL" suffix. + */ + private final Object mCarrierPrivilegedLock = new Object(); + + /** + * List of carrier-privileged apps that should be excluded from standby. + */ + @GuardedBy("mCarrierPrivilegedLock") + private List<String> mCarrierPrivilegedApps; + final ActivityManagerService mActivityManagerService; /** @@ -690,6 +712,7 @@ public final class AppRestrictionController { DeviceConfig.addOnPropertiesChangedListener(DeviceConfig.NAMESPACE_ACTIVITY_MANAGER, ActivityThread.currentApplication().getMainExecutor(), mConstantsObserver); mConstantsObserver.start(); + initBgRestrictionExemptioFromSysConfig(); initRestrictionStates(); initSystemModuleNames(); registerForUidObservers(); @@ -711,6 +734,22 @@ public final class AppRestrictionController { initRestrictionStates(); } + private void initBgRestrictionExemptioFromSysConfig() { + mBgRestrictionExemptioFromSysConfig = + SystemConfig.getInstance().getBgRestrictionExemption(); + if (DEBUG_BG_RESTRICTION_CONTROLLER) { + final ArraySet<String> exemptedPkgs = mBgRestrictionExemptioFromSysConfig; + for (int i = exemptedPkgs.size() - 1; i >= 0; i--) { + Slog.i(TAG, "bg-restriction-exemption: " + exemptedPkgs.valueAt(i)); + } + } + } + + private boolean isExemptedFromSysConfig(String packageName) { + return mBgRestrictionExemptioFromSysConfig != null + && mBgRestrictionExemptioFromSysConfig.contains(packageName); + } + private void initRestrictionStates() { final int[] allUsers = mInjector.getUserManagerInternal().getUserIds(); for (int userId : allUsers) { @@ -1542,14 +1581,11 @@ public final class AppRestrictionController { } } - boolean isOnDeviceIdleAllowlist(int uid, boolean allowExceptIdle) { + boolean isOnDeviceIdleAllowlist(int uid) { final int appId = UserHandle.getAppId(uid); - final int[] allowlist = allowExceptIdle - ? mDeviceIdleExceptIdleAllowlist - : mDeviceIdleAllowlist; - - return Arrays.binarySearch(allowlist, appId) >= 0; + return Arrays.binarySearch(mDeviceIdleAllowlist, appId) >= 0 + || Arrays.binarySearch(mDeviceIdleExceptIdleAllowlist, appId) >= 0; } void setDeviceIdleAllowlist(int[] allAppids, int[] exceptIdleAppids) { @@ -1570,7 +1606,7 @@ public final class AppRestrictionController { if (UserHandle.isCore(uid)) { return REASON_SYSTEM_UID; } - if (isOnDeviceIdleAllowlist(uid, false)) { + if (isOnDeviceIdleAllowlist(uid)) { return REASON_ALLOWLISTED_PACKAGE; } final ActivityManagerInternal am = mInjector.getActivityManagerInternal(); @@ -1604,6 +1640,10 @@ public final class AppRestrictionController { return REASON_OP_ACTIVATE_PLATFORM_VPN; } else if (isSystemModule(pkg)) { return REASON_SYSTEM_MODULE; + } else if (isCarrierApp(pkg)) { + return REASON_CARRIER_PRIVILEGED_APP; + } else if (isExemptedFromSysConfig(pkg)) { + return REASON_SYSTEM_ALLOW_LISTED; } } } @@ -1616,6 +1656,37 @@ public final class AppRestrictionController { return REASON_DENIED; } + private boolean isCarrierApp(String packageName) { + synchronized (mCarrierPrivilegedLock) { + if (mCarrierPrivilegedApps == null) { + fetchCarrierPrivilegedAppsCPL(); + } + if (mCarrierPrivilegedApps != null) { + return mCarrierPrivilegedApps.contains(packageName); + } + return false; + } + } + + private void clearCarrierPrivilegedApps() { + if (DEBUG_BG_RESTRICTION_CONTROLLER) { + Slog.i(TAG, "Clearing carrier privileged apps list"); + } + synchronized (mCarrierPrivilegedLock) { + mCarrierPrivilegedApps = null; // Need to be refetched. + } + } + + @GuardedBy("mCarrierPrivilegedLock") + private void fetchCarrierPrivilegedAppsCPL() { + final TelephonyManager telephonyManager = mInjector.getTelephonyManager(); + mCarrierPrivilegedApps = + telephonyManager.getCarrierPrivilegedPackagesForAllActiveSubscriptions(); + if (DEBUG_BG_RESTRICTION_CONTROLLER) { + Slog.d(TAG, "apps with carrier privilege " + mCarrierPrivilegedApps); + } + } + private boolean isRoleHeldByUid(@NonNull String roleName, int uid) { synchronized (mLock) { final ArrayList<String> roles = mUidRolesMapping.get(uid); @@ -1791,6 +1862,7 @@ public final class AppRestrictionController { private AppBatteryExemptionTracker mAppBatteryExemptionTracker; private AppFGSTracker mAppFGSTracker; private AppMediaSessionTracker mAppMediaSessionTracker; + private TelephonyManager mTelephonyManager; Injector(Context context) { mContext = context; @@ -1890,6 +1962,13 @@ public final class AppRestrictionController { return mRoleManager; } + TelephonyManager getTelephonyManager() { + if (mTelephonyManager == null) { + mTelephonyManager = getContext().getSystemService(TelephonyManager.class); + } + return mTelephonyManager; + } + AppFGSTracker getAppFGSTracker() { return mAppFGSTracker; } @@ -1939,6 +2018,19 @@ public final class AppRestrictionController { onUidAdded(uid); } } + } + // fall through. + case Intent.ACTION_PACKAGE_CHANGED: { + final String pkgName = intent.getData().getSchemeSpecificPart(); + final String[] cmpList = intent.getStringArrayExtra( + Intent.EXTRA_CHANGED_COMPONENT_NAME_LIST); + // If this is PACKAGE_ADDED (cmpList == null), or if it's a whole-package + // enable/disable event (cmpList is just the package name itself), drop + // our carrier privileged app & system-app caches and let them refresh + if (cmpList == null + || (cmpList.length == 1 && pkgName.equals(cmpList[0]))) { + clearCarrierPrivilegedApps(); + } } break; case Intent.ACTION_PACKAGE_FULLY_REMOVED: { final int uid = intent.getIntExtra(Intent.EXTRA_UID, -1); @@ -1986,6 +2078,7 @@ public final class AppRestrictionController { }; final IntentFilter packageFilter = new IntentFilter(); packageFilter.addAction(Intent.ACTION_PACKAGE_ADDED); + packageFilter.addAction(Intent.ACTION_PACKAGE_CHANGED); packageFilter.addAction(Intent.ACTION_PACKAGE_FULLY_REMOVED); packageFilter.addDataScheme("package"); mContext.registerReceiverForAllUsers(broadcastReceiver, packageFilter, null, mBgHandler); diff --git a/services/core/java/com/android/server/am/BatteryExternalStatsWorker.java b/services/core/java/com/android/server/am/BatteryExternalStatsWorker.java index 8561b61c2172..1131fa8a32b8 100644 --- a/services/core/java/com/android/server/am/BatteryExternalStatsWorker.java +++ b/services/core/java/com/android/server/am/BatteryExternalStatsWorker.java @@ -451,7 +451,7 @@ class BatteryExternalStatsWorker implements BatteryStatsImpl.ExternalStatsSync { mUidsToRemove.clear(); mCurrentFuture = null; mUseLatestStates = true; - if (updateFlags == UPDATE_ALL) { + if ((updateFlags & UPDATE_ALL) == UPDATE_ALL) { cancelSyncDueToBatteryLevelChangeLocked(); } if ((updateFlags & UPDATE_CPU) != 0) { @@ -496,7 +496,11 @@ class BatteryExternalStatsWorker implements BatteryStatsImpl.ExternalStatsSync { Slog.wtf(TAG, "Error updating external stats: ", e); } - if ((updateFlags & UPDATE_ALL) == UPDATE_ALL) { + if ((updateFlags & RESET) != 0) { + synchronized (BatteryExternalStatsWorker.this) { + mLastCollectionTimeStamp = 0; + } + } else if ((updateFlags & UPDATE_ALL) == UPDATE_ALL) { synchronized (BatteryExternalStatsWorker.this) { mLastCollectionTimeStamp = SystemClock.elapsedRealtime(); } @@ -658,7 +662,7 @@ class BatteryExternalStatsWorker implements BatteryStatsImpl.ExternalStatsSync { mStats.updateCpuTimeLocked(onBattery, onBatteryScreenOff, cpuClusterChargeUC); } - if (updateFlags == UPDATE_ALL) { + if ((updateFlags & UPDATE_ALL) == UPDATE_ALL) { mStats.updateKernelWakelocksLocked(elapsedRealtimeUs); mStats.updateKernelMemoryBandwidthLocked(elapsedRealtimeUs); } @@ -731,7 +735,7 @@ class BatteryExternalStatsWorker implements BatteryStatsImpl.ExternalStatsSync { uptime, networkStatsManager); } - if (updateFlags == UPDATE_ALL) { + if ((updateFlags & UPDATE_ALL) == UPDATE_ALL) { // This helps mStats deal with ignoring data from prior to resets. mStats.informThatAllExternalStatsAreFlushed(); } diff --git a/services/core/java/com/android/server/am/BatteryStatsService.java b/services/core/java/com/android/server/am/BatteryStatsService.java index 5da461d8e392..2f7249ea5d84 100644 --- a/services/core/java/com/android/server/am/BatteryStatsService.java +++ b/services/core/java/com/android/server/am/BatteryStatsService.java @@ -797,12 +797,19 @@ public final class BatteryStatsService extends IBatteryStats.Stub final BatteryUsageStats bus; switch (atomTag) { case FrameworkStatsLog.BATTERY_USAGE_STATS_SINCE_RESET: - bus = getBatteryUsageStats(List.of(BatteryUsageStatsQuery.DEFAULT)).get(0); + final BatteryUsageStatsQuery querySinceReset = + new BatteryUsageStatsQuery.Builder() + .includeProcessStateData() + .build(); + bus = getBatteryUsageStats(List.of(querySinceReset)).get(0); break; case FrameworkStatsLog.BATTERY_USAGE_STATS_SINCE_RESET_USING_POWER_PROFILE_MODEL: - final BatteryUsageStatsQuery powerProfileQuery = - new BatteryUsageStatsQuery.Builder().powerProfileModeledOnly().build(); - bus = getBatteryUsageStats(List.of(powerProfileQuery)).get(0); + final BatteryUsageStatsQuery queryPowerProfile = + new BatteryUsageStatsQuery.Builder() + .includeProcessStateData() + .powerProfileModeledOnly() + .build(); + bus = getBatteryUsageStats(List.of(queryPowerProfile)).get(0); break; case FrameworkStatsLog.BATTERY_USAGE_STATS_BEFORE_RESET: if (!BATTERY_USAGE_STORE_ENABLED) { @@ -812,10 +819,12 @@ public final class BatteryStatsService extends IBatteryStats.Stub final long sessionStart = mBatteryUsageStatsStore .getLastBatteryUsageStatsBeforeResetAtomPullTimestamp(); final long sessionEnd = mStats.getStartClockTime(); - final BatteryUsageStatsQuery query = new BatteryUsageStatsQuery.Builder() - .aggregateSnapshots(sessionStart, sessionEnd) - .build(); - bus = getBatteryUsageStats(List.of(query)).get(0); + final BatteryUsageStatsQuery queryBeforeReset = + new BatteryUsageStatsQuery.Builder() + .includeProcessStateData() + .aggregateSnapshots(sessionStart, sessionEnd) + .build(); + bus = getBatteryUsageStats(List.of(queryBeforeReset)).get(0); mBatteryUsageStatsStore .setLastBatteryUsageStatsBeforeResetAtomPullTimestamp(sessionEnd); break; diff --git a/services/core/java/com/android/server/am/BroadcastQueue.java b/services/core/java/com/android/server/am/BroadcastQueue.java index 0c383ebbbcd7..a83fdd0e74cd 100644 --- a/services/core/java/com/android/server/am/BroadcastQueue.java +++ b/services/core/java/com/android/server/am/BroadcastQueue.java @@ -56,6 +56,7 @@ import android.os.Handler; import android.os.IBinder; import android.os.Looper; import android.os.Message; +import android.os.PowerExemptionManager; import android.os.PowerExemptionManager.ReasonCode; import android.os.PowerExemptionManager.TempAllowListType; import android.os.Process; @@ -334,7 +335,7 @@ public final class BroadcastQueue { mService.updateOomAdjPendingTargetsLocked(OomAdjuster.OOM_ADJ_REASON_START_RECEIVER); // Tell the application to launch this receiver. - maybeReportBroadcastDispatchedEventLocked(r); + maybeReportBroadcastDispatchedEventLocked(r, r.curReceiver.applicationInfo.uid); r.intent.setComponent(r.curComponent); boolean started = false; @@ -870,7 +871,7 @@ public final class BroadcastQueue { + " due to receiver " + filter.receiverList.app + " (uid " + filter.receiverList.uid + ")" + " not specifying RECEIVER_EXPORTED"); - // skip = true; + skip = true; } if (skip) { @@ -927,7 +928,7 @@ public final class BroadcastQueue { r.receiverTime = SystemClock.uptimeMillis(); maybeAddAllowBackgroundActivityStartsToken(filter.receiverList.app, r); maybeScheduleTempAllowlistLocked(filter.owningUid, r, r.options); - maybeReportBroadcastDispatchedEventLocked(r); + maybeReportBroadcastDispatchedEventLocked(r, filter.owningUid); performReceiveLocked(filter.receiverList.app, filter.receiverList.receiver, new Intent(r.intent), r.resultCode, r.resultData, r.resultExtras, r.ordered, r.initialSticky, r.userId); @@ -1856,22 +1857,35 @@ public final class BroadcastQueue { return null; } - private void maybeReportBroadcastDispatchedEventLocked(BroadcastRecord r) { - final String targetPackage = getTargetPackage(r); - // Ignore non-explicit broadcasts - if (targetPackage == null) { - return; - } + private void maybeReportBroadcastDispatchedEventLocked(BroadcastRecord r, int targetUid) { // TODO (206518114): Only allow apps with ACCESS_PACKAGE_USAGE_STATS to set // getIdForResponseEvent. + // TODO (217251579): Temporarily use temp-allowlist reason to identify + // push messages and record response events. + useTemporaryAllowlistReasonAsSignal(r); if (r.options == null || r.options.getIdForResponseEvent() <= 0) { return; } - // TODO (206518114): Only report this event when the broadcast is dispatched while the app - // is in the background state. + final String targetPackage = getTargetPackage(r); + // Ignore non-explicit broadcasts + if (targetPackage == null) { + return; + } getUsageStatsManagerInternal().reportBroadcastDispatched( r.callingUid, targetPackage, UserHandle.of(r.userId), - r.options.getIdForResponseEvent(), SystemClock.elapsedRealtime()); + r.options.getIdForResponseEvent(), SystemClock.elapsedRealtime(), + mService.getUidStateLocked(targetUid)); + } + + private void useTemporaryAllowlistReasonAsSignal(BroadcastRecord r) { + if (r.options == null || r.options.getIdForResponseEvent() > 0) { + return; + } + final int reasonCode = r.options.getTemporaryAppAllowlistReasonCode(); + if (reasonCode == PowerExemptionManager.REASON_PUSH_MESSAGING + || reasonCode == PowerExemptionManager.REASON_PUSH_MESSAGING_OVER_QUOTA) { + r.options.recordResponseEventWhileInBackground(reasonCode); + } } @NonNull diff --git a/services/core/java/com/android/server/am/CachedAppOptimizer.java b/services/core/java/com/android/server/am/CachedAppOptimizer.java index 6f22c61d2b2a..7af73ebda0c0 100644 --- a/services/core/java/com/android/server/am/CachedAppOptimizer.java +++ b/services/core/java/com/android/server/am/CachedAppOptimizer.java @@ -977,7 +977,7 @@ public final class CachedAppOptimizer { Slog.d(TAG_AM, "pid " + pid + " " + app.processName + " received sync transactions while frozen, killing"); app.killLocked("Sync transaction while in frozen state", - ApplicationExitInfo.REASON_OTHER, + ApplicationExitInfo.REASON_FREEZER, ApplicationExitInfo.SUBREASON_FREEZER_BINDER_TRANSACTION, true); processKilled = true; } @@ -990,7 +990,7 @@ public final class CachedAppOptimizer { Slog.d(TAG_AM, "Unable to query binder frozen info for pid " + pid + " " + app.processName + ". Killing it. Exception: " + e); app.killLocked("Unable to query binder frozen stats", - ApplicationExitInfo.REASON_OTHER, + ApplicationExitInfo.REASON_FREEZER, ApplicationExitInfo.SUBREASON_FREEZER_BINDER_IOCTL, true); processKilled = true; } @@ -1007,7 +1007,7 @@ public final class CachedAppOptimizer { Slog.e(TAG_AM, "Unable to unfreeze binder for " + pid + " " + app.processName + ". Killing it"); app.killLocked("Unable to unfreeze", - ApplicationExitInfo.REASON_OTHER, + ApplicationExitInfo.REASON_FREEZER, ApplicationExitInfo.SUBREASON_FREEZER_BINDER_IOCTL, true); return; } @@ -1423,7 +1423,7 @@ public final class CachedAppOptimizer { mFreezeHandler.post(() -> { synchronized (mAm) { proc.killLocked("Unable to freeze binder interface", - ApplicationExitInfo.REASON_OTHER, + ApplicationExitInfo.REASON_FREEZER, ApplicationExitInfo.SUBREASON_FREEZER_BINDER_IOCTL, true); } }); @@ -1477,7 +1477,7 @@ public final class CachedAppOptimizer { mFreezeHandler.post(() -> { synchronized (mAm) { proc.killLocked("Unable to freeze binder interface", - ApplicationExitInfo.REASON_OTHER, + ApplicationExitInfo.REASON_FREEZER, ApplicationExitInfo.SUBREASON_FREEZER_BINDER_IOCTL, true); } }); diff --git a/services/core/java/com/android/server/am/ServiceRecord.java b/services/core/java/com/android/server/am/ServiceRecord.java index 24e7ba4a32b9..da78e2d7504e 100644 --- a/services/core/java/com/android/server/am/ServiceRecord.java +++ b/services/core/java/com/android/server/am/ServiceRecord.java @@ -570,6 +570,14 @@ final class ServiceRecord extends Binder implements ComponentName.WithComponentN ComponentName instanceName, String definingPackageName, int definingUid, Intent.FilterComparison intent, ServiceInfo sInfo, boolean callerIsFg, Runnable restarter) { + this(ams, name, instanceName, definingPackageName, definingUid, intent, sInfo, callerIsFg, + restarter, false); + } + + ServiceRecord(ActivityManagerService ams, ComponentName name, + ComponentName instanceName, String definingPackageName, int definingUid, + Intent.FilterComparison intent, ServiceInfo sInfo, boolean callerIsFg, + Runnable restarter, boolean isSupplementalProcessService) { this.ams = ams; this.name = name; this.instanceName = instanceName; @@ -580,7 +588,8 @@ final class ServiceRecord extends Binder implements ComponentName.WithComponentN serviceInfo = sInfo; appInfo = sInfo.applicationInfo; packageName = sInfo.applicationInfo.packageName; - if ((sInfo.flags & ServiceInfo.FLAG_ISOLATED_PROCESS) != 0) { + if ((sInfo.flags & ServiceInfo.FLAG_ISOLATED_PROCESS) != 0 + || isSupplementalProcessService) { processName = sInfo.processName + ":" + instanceName.getClassName(); } else { processName = sInfo.processName; diff --git a/services/core/java/com/android/server/app/GameManagerService.java b/services/core/java/com/android/server/app/GameManagerService.java index 3c9d29d77bbe..551773e3e834 100644 --- a/services/core/java/com/android/server/app/GameManagerService.java +++ b/services/core/java/com/android/server/app/GameManagerService.java @@ -20,6 +20,11 @@ import static android.content.Intent.ACTION_PACKAGE_ADDED; import static android.content.Intent.ACTION_PACKAGE_CHANGED; import static android.content.Intent.ACTION_PACKAGE_REMOVED; +import static com.android.internal.R.styleable.GameModeConfig_allowGameAngleDriver; +import static com.android.internal.R.styleable.GameModeConfig_allowGameDownscaling; +import static com.android.internal.R.styleable.GameModeConfig_allowGameFpsOverride; +import static com.android.internal.R.styleable.GameModeConfig_supportsBatteryGameMode; +import static com.android.internal.R.styleable.GameModeConfig_supportsPerformanceGameMode; import static com.android.server.wm.CompatModePackages.DOWNSCALED; import static com.android.server.wm.CompatModePackages.DOWNSCALE_30; import static com.android.server.wm.CompatModePackages.DOWNSCALE_35; @@ -54,6 +59,10 @@ import android.content.IntentFilter; import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; +import android.content.pm.PackageManager.NameNotFoundException; +import android.content.res.Resources; +import android.content.res.TypedArray; +import android.content.res.XmlResourceParser; import android.hardware.power.Mode; import android.net.Uri; import android.os.Binder; @@ -71,8 +80,10 @@ import android.os.ShellCallback; import android.provider.DeviceConfig; import android.provider.DeviceConfig.Properties; import android.util.ArrayMap; +import android.util.AttributeSet; import android.util.KeyValueListParser; import android.util.Slog; +import android.util.Xml; import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; @@ -84,7 +95,11 @@ import com.android.server.ServiceThread; import com.android.server.SystemService; import com.android.server.SystemService.TargetUser; +import org.xmlpull.v1.XmlPullParser; +import org.xmlpull.v1.XmlPullParserException; + import java.io.FileDescriptor; +import java.io.IOException; import java.io.PrintWriter; import java.util.List; @@ -425,12 +440,20 @@ public final class GameManagerService extends IGameManagerService.Stub { public static final String METADATA_BATTERY_MODE_ENABLE = "com.android.app.gamemode.battery.enabled"; + /** + * Metadata that allows a game to specify all intervention information with an XML file in + * the application field. + */ + public static final String METADATA_GAME_MODE_CONFIG = "android.game_mode_config"; + + private static final String GAME_MODE_CONFIG_NODE_NAME = "game-mode-config"; private final String mPackageName; private final ArrayMap<Integer, GameModeConfiguration> mModeConfigs; private boolean mPerfModeOptedIn; private boolean mBatteryModeOptedIn; private boolean mAllowDownscale; private boolean mAllowAngle; + private boolean mAllowFpsOverride; GamePackageConfiguration(String packageName, int userId) { mPackageName = packageName; @@ -438,18 +461,21 @@ public final class GameManagerService extends IGameManagerService.Stub { try { final ApplicationInfo ai = mPackageManager.getApplicationInfoAsUser(packageName, PackageManager.GET_META_DATA, userId); - if (ai.metaData != null) { - mPerfModeOptedIn = ai.metaData.getBoolean(METADATA_PERFORMANCE_MODE_ENABLE); - mBatteryModeOptedIn = ai.metaData.getBoolean(METADATA_BATTERY_MODE_ENABLE); - mAllowDownscale = ai.metaData.getBoolean(METADATA_WM_ALLOW_DOWNSCALE, true); - mAllowAngle = ai.metaData.getBoolean(METADATA_ANGLE_ALLOW_ANGLE, true); - } else { - mPerfModeOptedIn = false; - mBatteryModeOptedIn = false; - mAllowDownscale = true; - mAllowAngle = true; + if (!parseInterventionFromXml(ai, packageName)) { + if (ai.metaData != null) { + mPerfModeOptedIn = ai.metaData.getBoolean(METADATA_PERFORMANCE_MODE_ENABLE); + mBatteryModeOptedIn = ai.metaData.getBoolean(METADATA_BATTERY_MODE_ENABLE); + mAllowDownscale = ai.metaData.getBoolean(METADATA_WM_ALLOW_DOWNSCALE, true); + mAllowAngle = ai.metaData.getBoolean(METADATA_ANGLE_ALLOW_ANGLE, true); + } else { + mPerfModeOptedIn = false; + mBatteryModeOptedIn = false; + mAllowDownscale = true; + mAllowAngle = true; + mAllowFpsOverride = true; + } } - } catch (PackageManager.NameNotFoundException e) { + } catch (NameNotFoundException e) { // Not all packages are installed, hence ignore those that are not installed yet. Slog.v(TAG, "Failed to get package metadata"); } @@ -469,6 +495,53 @@ public final class GameManagerService extends IGameManagerService.Stub { } } + private boolean parseInterventionFromXml(ApplicationInfo ai, String packageName) { + boolean xmlFound = false; + try (XmlResourceParser parser = ai.loadXmlMetaData(mPackageManager, + METADATA_GAME_MODE_CONFIG)) { + if (parser == null) { + Slog.v(TAG, "No " + METADATA_GAME_MODE_CONFIG + + " meta-data found for package " + mPackageName); + } else { + xmlFound = true; + final Resources resources = mPackageManager.getResourcesForApplication( + packageName); + final AttributeSet attributeSet = Xml.asAttributeSet(parser); + int type; + while ((type = parser.next()) != XmlPullParser.END_DOCUMENT + && type != XmlPullParser.START_TAG) { + // Do nothing + } + + boolean isStartingTagGameModeConfig = + GAME_MODE_CONFIG_NODE_NAME.equals(parser.getName()); + if (!isStartingTagGameModeConfig) { + Slog.w(TAG, "Meta-data does not start with " + + GAME_MODE_CONFIG_NODE_NAME + + " tag"); + } else { + final TypedArray array = resources.obtainAttributes(attributeSet, + com.android.internal.R.styleable.GameModeConfig); + mPerfModeOptedIn = array.getBoolean( + GameModeConfig_supportsPerformanceGameMode, false); + mBatteryModeOptedIn = array.getBoolean( + GameModeConfig_supportsBatteryGameMode, + false); + mAllowDownscale = array.getBoolean(GameModeConfig_allowGameDownscaling, + true); + mAllowAngle = array.getBoolean(GameModeConfig_allowGameAngleDriver, true); + mAllowFpsOverride = array.getBoolean(GameModeConfig_allowGameFpsOverride, + true); + array.recycle(); + } + } + } catch (NameNotFoundException | XmlPullParserException | IOException ex) { + Slog.e(TAG, "Error while parsing XML meta-data for " + + METADATA_GAME_MODE_CONFIG); + } + return xmlFound; + } + /** * GameModeConfiguration contains all the values for all the interventions associated with * a game mode. @@ -497,7 +570,8 @@ public final class GameManagerService extends IGameManagerService.Stub { mScaling = !mAllowDownscale || willGamePerformOptimizations(mGameMode) ? DEFAULT_SCALING : parser.getString(SCALING_KEY, DEFAULT_SCALING); - mFps = parser.getString(FPS_KEY, DEFAULT_FPS); + mFps = mAllowFpsOverride && !willGamePerformOptimizations(mGameMode) + ? parser.getString(FPS_KEY, DEFAULT_FPS) : DEFAULT_FPS; // We only want to use ANGLE if: // - We're allowed to use ANGLE (the app hasn't opted out via the manifest) AND // - The app has not opted in to performing the work itself AND @@ -691,7 +765,7 @@ public final class GameManagerService extends IGameManagerService.Stub { try { return mPackageManager.getPackageUidAsUser(packageName, userId) == Binder.getCallingUid(); - } catch (PackageManager.NameNotFoundException e) { + } catch (NameNotFoundException e) { return false; } } @@ -855,7 +929,7 @@ public final class GameManagerService extends IGameManagerService.Stub { */ @Override @RequiresPermission(Manifest.permission.MANAGE_GAME_MODE) - public @GameMode boolean getAngleEnabled(String packageName, int userId) + public @GameMode boolean isAngleEnabled(String packageName, int userId) throws SecurityException { final int gameMode = getGameMode(packageName, userId); if (gameMode == GameManager.GAME_MODE_UNSUPPORTED) { @@ -1413,7 +1487,7 @@ public final class GameManagerService extends IGameManagerService.Stub { if (applicationInfo.category != ApplicationInfo.CATEGORY_GAME) { return; } - } catch (PackageManager.NameNotFoundException e) { + } catch (NameNotFoundException e) { // Ignore the exception. } switch (intent.getAction()) { diff --git a/services/core/java/com/android/server/app/GameServiceProviderInstanceImpl.java b/services/core/java/com/android/server/app/GameServiceProviderInstanceImpl.java index ec37134acd01..145a298af95e 100644 --- a/services/core/java/com/android/server/app/GameServiceProviderInstanceImpl.java +++ b/services/core/java/com/android/server/app/GameServiceProviderInstanceImpl.java @@ -43,6 +43,7 @@ import android.service.games.IGameSession; import android.service.games.IGameSessionController; import android.service.games.IGameSessionService; import android.util.Slog; +import android.view.SurfaceControl; import android.view.SurfaceControlViewHost.SurfacePackage; import com.android.internal.annotations.GuardedBy; @@ -50,6 +51,7 @@ import com.android.internal.annotations.VisibleForTesting; import com.android.internal.infra.AndroidFuture; import com.android.internal.infra.ServiceConnector; import com.android.server.wm.WindowManagerInternal; +import com.android.server.wm.WindowManagerInternal.TaskSystemBarsListener; import com.android.server.wm.WindowManagerService; import java.util.List; @@ -62,6 +64,18 @@ final class GameServiceProviderInstanceImpl implements GameServiceProviderInstan private static final int CREATE_GAME_SESSION_TIMEOUT_MS = 10_000; private static final boolean DEBUG = false; + private final TaskSystemBarsListener mTaskSystemBarsVisibilityListener = + new TaskSystemBarsListener() { + @Override + public void onTransientSystemBarsVisibilityChanged( + int taskId, + boolean visible, + boolean wereRevealedFromSwipeOnSystemBar) { + GameServiceProviderInstanceImpl.this.onTransientSystemBarsVisibilityChanged( + taskId, visible, wereRevealedFromSwipeOnSystemBar); + } + }; + private final TaskStackListener mTaskStackListener = new TaskStackListener() { @Override public void onTaskCreated(int taskId, ComponentName componentName) throws RemoteException { @@ -98,7 +112,10 @@ final class GameServiceProviderInstanceImpl implements GameServiceProviderInstan private final IGameServiceController mGameServiceController = new IGameServiceController.Stub() { @Override + @RequiresPermission(Manifest.permission.MANAGE_GAME_ACTIVITY) public void createGameSession(int taskId) { + mContext.enforceCallingPermission(Manifest.permission.MANAGE_GAME_ACTIVITY, + "createGameSession()"); mBackgroundExecutor.execute(() -> { GameServiceProviderInstanceImpl.this.createGameSession(taskId); }); @@ -200,6 +217,8 @@ final class GameServiceProviderInstanceImpl implements GameServiceProviderInstan } catch (RemoteException e) { Slog.w(TAG, "Failed to register task stack listener", e); } + + mWindowManagerInternal.registerTaskSystemBarsListener(mTaskSystemBarsVisibilityListener); } @GuardedBy("mLock") @@ -215,8 +234,11 @@ final class GameServiceProviderInstanceImpl implements GameServiceProviderInstan Slog.w(TAG, "Failed to unregister task stack listener", e); } + mWindowManagerInternal.unregisterTaskSystemBarsListener( + mTaskSystemBarsVisibilityListener); + for (GameSessionRecord gameSessionRecord : mGameSessions.values()) { - destroyGameSessionFromRecord(gameSessionRecord); + destroyGameSessionFromRecordLocked(gameSessionRecord); } mGameSessions.clear(); @@ -304,6 +326,37 @@ final class GameServiceProviderInstanceImpl implements GameServiceProviderInstan } } + private void onTransientSystemBarsVisibilityChanged( + int taskId, + boolean visible, + boolean wereRevealedFromSwipeOnSystemBar) { + if (visible && !wereRevealedFromSwipeOnSystemBar) { + return; + } + + GameSessionRecord gameSessionRecord; + synchronized (mLock) { + gameSessionRecord = mGameSessions.get(taskId); + } + + if (gameSessionRecord == null) { + return; + } + + IGameSession gameSession = gameSessionRecord.getGameSession(); + if (gameSession == null) { + return; + } + + try { + gameSession.onTransientSystemBarVisibilityFromRevealGestureChanged(visible); + } catch (RemoteException ex) { + Slog.w(TAG, + "Failed to send transient system bars visibility from reveal gesture for task: " + + taskId); + } + } + private void createGameSession(int taskId) { synchronized (mLock) { createGameSessionLocked(taskId); @@ -458,10 +511,11 @@ final class GameServiceProviderInstanceImpl implements GameServiceProviderInstan } return; } - destroyGameSessionFromRecord(gameSessionRecord); + destroyGameSessionFromRecordLocked(gameSessionRecord); } - private void destroyGameSessionFromRecord(@NonNull GameSessionRecord gameSessionRecord) { + @GuardedBy("mLock") + private void destroyGameSessionFromRecordLocked(@NonNull GameSessionRecord gameSessionRecord) { SurfacePackage surfacePackage = gameSessionRecord.getSurfacePackage(); if (surfacePackage != null) { try { @@ -534,17 +588,29 @@ final class GameServiceProviderInstanceImpl implements GameServiceProviderInstan @VisibleForTesting void takeScreenshot(int taskId, @NonNull AndroidFuture callback) { + GameSessionRecord gameSessionRecord; synchronized (mLock) { - boolean isTaskAssociatedWithGameSession = mGameSessions.containsKey(taskId); - if (!isTaskAssociatedWithGameSession) { + gameSessionRecord = mGameSessions.get(taskId); + if (gameSessionRecord == null) { Slog.w(TAG, "No game session found for id: " + taskId); callback.complete(GameScreenshotResult.createInternalErrorResult()); return; } } + final SurfacePackage overlaySurfacePackage = gameSessionRecord.getSurfacePackage(); + final SurfaceControl overlaySurfaceControl = + overlaySurfacePackage != null ? overlaySurfacePackage.getSurfaceControl() : null; mBackgroundExecutor.execute(() -> { - final Bitmap bitmap = mWindowManagerService.captureTaskBitmap(taskId); + final SurfaceControl.LayerCaptureArgs.Builder layerCaptureArgsBuilder = + new SurfaceControl.LayerCaptureArgs.Builder(/* layer */ null); + if (overlaySurfaceControl != null) { + SurfaceControl[] excludeLayers = new SurfaceControl[1]; + excludeLayers[0] = overlaySurfaceControl; + layerCaptureArgsBuilder.setExcludeLayers(excludeLayers); + } + final Bitmap bitmap = mWindowManagerService.captureTaskBitmap(taskId, + layerCaptureArgsBuilder); if (bitmap == null) { Slog.w(TAG, "Could not get bitmap for id: " + taskId); callback.complete(GameScreenshotResult.createInternalErrorResult()); diff --git a/services/core/java/com/android/server/attention/AttentionManagerService.java b/services/core/java/com/android/server/attention/AttentionManagerService.java index a1395890fd3c..d2fa386ad6ba 100644 --- a/services/core/java/com/android/server/attention/AttentionManagerService.java +++ b/services/core/java/com/android/server/attention/AttentionManagerService.java @@ -22,6 +22,7 @@ import static android.content.Context.BIND_INCLUDE_CAPABILITIES; import static android.provider.DeviceConfig.NAMESPACE_ATTENTION_MANAGER_SERVICE; import static android.service.attention.AttentionService.ATTENTION_FAILURE_CANCELLED; import static android.service.attention.AttentionService.ATTENTION_FAILURE_UNKNOWN; +import static android.service.attention.AttentionService.PROXIMITY_UNKNOWN; import android.Manifest; import android.annotation.NonNull; @@ -29,6 +30,7 @@ import android.annotation.Nullable; import android.app.ActivityThread; import android.attention.AttentionManagerInternal; import android.attention.AttentionManagerInternal.AttentionCallbackInternal; +import android.attention.AttentionManagerInternal.ProximityCallbackInternal; import android.content.BroadcastReceiver; import android.content.ComponentName; import android.content.Context; @@ -57,6 +59,7 @@ import android.service.attention.AttentionService.AttentionFailureCodes; import android.service.attention.AttentionService.AttentionSuccessCodes; import android.service.attention.IAttentionCallback; import android.service.attention.IAttentionService; +import android.service.attention.IProximityCallback; import android.text.TextUtils; import android.util.Slog; @@ -134,6 +137,15 @@ public class AttentionManagerService extends SystemService { @GuardedBy("mLock") AttentionCheck mCurrentAttentionCheck; + /** + * A proxy for relaying proximity information between the Attention Service and the client. + * The proxy will be initialized when the client calls onStartProximityUpdates and will be + * disabled only when the client calls onStopProximityUpdates. + */ + @VisibleForTesting + @GuardedBy("mLock") + ProximityUpdate mCurrentProximityUpdate; + public AttentionManagerService(Context context) { this(context, (PowerManager) context.getSystemService(Context.POWER_SERVICE), new Object(), null); @@ -315,6 +327,77 @@ public class AttentionManagerService extends SystemService { } } + /** + * Requests the continuous updates of proximity signal via the provided callback, + * until the given callback is stopped. + * + * Calling this multiple times for duplicate requests will be no-ops, returning true. + * + * @return {@code true} if the framework was able to dispatch the request + */ + @VisibleForTesting + boolean onStartProximityUpdates(ProximityCallbackInternal callbackInternal) { + Objects.requireNonNull(callbackInternal); + if (!mIsServiceEnabled) { + Slog.w(LOG_TAG, "Trying to call onProximityUpdate() on an unsupported device."); + return false; + } + + if (!isServiceAvailable()) { + Slog.w(LOG_TAG, "Service is not available at this moment."); + return false; + } + + // don't allow proximity request in screen off state. + // This behavior might change in the future. + if (!mPowerManager.isInteractive()) { + Slog.w(LOG_TAG, "Proximity Service is unavailable during screen off at this moment."); + return false; + } + + synchronized (mLock) { + // schedule shutting down the connection if no one resets this timer + freeIfInactiveLocked(); + + // lazily start the service, which should be very lightweight to start + bindLocked(); + + /* + Prevent spamming with multiple requests, only one at a time is allowed. + If there are use-cases for keeping track of multiple requests, we + can refactor ProximityUpdate object to keep track of multiple internal callbacks. + */ + if (mCurrentProximityUpdate != null && mCurrentProximityUpdate.mStartedUpdates) { + if (mCurrentProximityUpdate.mCallbackInternal == callbackInternal) { + Slog.w(LOG_TAG, "Provided callback is already registered. Skipping."); + return true; + } else { + // reject the new request since the old request is still alive. + Slog.w(LOG_TAG, "New proximity update cannot be processed because there is " + + "already an ongoing update"); + return false; + } + } + mCurrentProximityUpdate = new ProximityUpdate(callbackInternal); + return mCurrentProximityUpdate.startUpdates(); + } + } + + /** Cancels the specified proximity registration. */ + @VisibleForTesting + void onStopProximityUpdates(ProximityCallbackInternal callbackInternal) { + synchronized (mLock) { + if (mCurrentProximityUpdate == null + || !mCurrentProximityUpdate.mCallbackInternal.equals(callbackInternal) + || !mCurrentProximityUpdate.mStartedUpdates) { + Slog.w(LOG_TAG, "Cannot stop a non-current callback"); + return; + } + mCurrentProximityUpdate.cancelUpdates(); + mCurrentProximityUpdate = null; + } + } + @GuardedBy("mLock") @VisibleForTesting protected void freeIfInactiveLocked() { @@ -390,15 +473,18 @@ public class AttentionManagerService extends SystemService { ipw.println("Class=" + mComponentName.getClassName()); ipw.decreaseIndent(); } - ipw.println("binding=" + mBinding); - ipw.println("current attention check:"); synchronized (mLock) { + ipw.println("binding=" + mBinding); + ipw.println("current attention check:"); if (mCurrentAttentionCheck != null) { mCurrentAttentionCheck.dump(ipw); } if (mAttentionCheckCacheBuffer != null) { mAttentionCheckCacheBuffer.dump(ipw); } + if (mCurrentProximityUpdate != null) { + mCurrentProximityUpdate.dump(ipw); + } } } @@ -417,6 +503,17 @@ public class AttentionManagerService extends SystemService { public void cancelAttentionCheck(AttentionCallbackInternal callbackInternal) { AttentionManagerService.this.cancelAttentionCheck(callbackInternal); } + + @Override + public boolean onStartProximityUpdates( + ProximityCallbackInternal callback) { + return AttentionManagerService.this.onStartProximityUpdates(callback); + } + + @Override + public void onStopProximityUpdates(ProximityCallbackInternal callback) { + AttentionManagerService.this.onStopProximityUpdates(callback); + } } @VisibleForTesting @@ -536,6 +633,71 @@ public class AttentionManagerService extends SystemService { } } + @VisibleForTesting + final class ProximityUpdate { + private final ProximityCallbackInternal mCallbackInternal; + private final IProximityCallback mIProximityCallback; + private boolean mStartedUpdates; + + ProximityUpdate(ProximityCallbackInternal callbackInternal) { + mCallbackInternal = callbackInternal; + mIProximityCallback = new IProximityCallback.Stub() { + @Override + public void onProximityUpdate(double distance) { + synchronized (mLock) { + mCallbackInternal.onProximityUpdate(distance); + freeIfInactiveLocked(); + } + } + }; + } + + boolean startUpdates() { + synchronized (mLock) { + if (mStartedUpdates) { + Slog.w(LOG_TAG, "Already registered to a proximity service."); + return false; + } + if (mService == null) { + Slog.w(LOG_TAG, + "There is no service bound. Proximity update request rejected."); + return false; + } + try { + mService.onStartProximityUpdates(mIProximityCallback); + mStartedUpdates = true; + } catch (RemoteException e) { + Slog.e(LOG_TAG, "Cannot call into the AttentionService", e); + return false; + } + } + return true; + } + + void cancelUpdates() { + synchronized (mLock) { + if (mStartedUpdates) { + if (mService == null) { + mStartedUpdates = false; + return; + } + try { + mService.onStopProximityUpdates(); + mStartedUpdates = false; + } catch (RemoteException e) { + Slog.e(LOG_TAG, "Cannot call into the AttentionService", e); + } + } + } + } + + void dump(IndentingPrintWriter ipw) { + ipw.increaseIndent(); + ipw.println("is StartedUpdates=" + mStartedUpdates); + ipw.decreaseIndent(); + } + } + private void appendResultToAttentionCacheBuffer(AttentionCheckCache cache) { synchronized (mLock) { if (mAttentionCheckCacheBuffer == null) { @@ -593,6 +755,18 @@ public class AttentionManagerService extends SystemService { mCurrentAttentionCheck.mCallbackInternal.onFailure(ATTENTION_FAILURE_UNKNOWN); } } + if (mCurrentProximityUpdate != null && mCurrentProximityUpdate.mStartedUpdates) { + if (mService != null) { + try { + mService.onStartProximityUpdates(mCurrentProximityUpdate.mIProximityCallback); + } catch (RemoteException e) { + Slog.e(LOG_TAG, "Cannot call into the AttentionService", e); + } + } else { + mCurrentProximityUpdate.cancelUpdates(); + mCurrentProximityUpdate = null; + } + } } @VisibleForTesting @@ -609,7 +783,9 @@ public class AttentionManagerService extends SystemService { switch (msg.what) { // Do not occupy resources when not in use - unbind proactively. case CHECK_CONNECTION_EXPIRATION: { - cancelAndUnbindLocked(); + synchronized (mLock) { + cancelAndUnbindLocked(); + } } break; @@ -653,10 +829,15 @@ public class AttentionManagerService extends SystemService { @GuardedBy("mLock") private void cancelAndUnbindLocked() { synchronized (mLock) { - if (mCurrentAttentionCheck == null) { + if (mCurrentAttentionCheck == null && mCurrentProximityUpdate == null) { return; } - cancel(); + if (mCurrentAttentionCheck != null) { + cancel(); + } + if (mCurrentProximityUpdate != null) { + mCurrentProximityUpdate.cancelUpdates(); + } if (mService == null) { return; } @@ -702,7 +883,9 @@ public class AttentionManagerService extends SystemService { @Override public void onReceive(Context context, Intent intent) { if (Intent.ACTION_SCREEN_OFF.equals(intent.getAction())) { - cancelAndUnbindLocked(); + synchronized (mLock) { + cancelAndUnbindLocked(); + } } } } @@ -730,8 +913,27 @@ public class AttentionManagerService extends SystemService { } } + class TestableProximityCallbackInternal extends ProximityCallbackInternal { + private double mLastCallbackCode = PROXIMITY_UNKNOWN; + + @Override + public void onProximityUpdate(double distance) { + mLastCallbackCode = distance; + } + + public void reset() { + mLastCallbackCode = PROXIMITY_UNKNOWN; + } + + public double getLastCallbackCode() { + return mLastCallbackCode; + } + } + final TestableAttentionCallbackInternal mTestableAttentionCallback = new TestableAttentionCallbackInternal(); + final TestableProximityCallbackInternal mTestableProximityCallback = + new TestableProximityCallbackInternal(); @Override public int onCommand(@Nullable final String cmd) { @@ -749,6 +951,10 @@ public class AttentionManagerService extends SystemService { return cmdCallCheckAttention(); case "cancelCheckAttention": return cmdCallCancelAttention(); + case "onStartProximityUpdates": + return cmdCallOnStartProximityUpdates(); + case "onStopProximityUpdates": + return cmdCallOnStopProximityUpdates(); default: throw new IllegalArgumentException("Invalid argument"); } @@ -758,6 +964,8 @@ public class AttentionManagerService extends SystemService { return cmdClearTestableAttentionService(); case "getLastTestCallbackCode": return cmdGetLastTestCallbackCode(); + case "getLastTestProximityCallbackCode": + return cmdGetLastTestProximityCallbackCode(); default: return handleDefaultCommands(cmd); } @@ -782,6 +990,7 @@ public class AttentionManagerService extends SystemService { private int cmdClearTestableAttentionService() { sTestAttentionServicePackage = ""; mTestableAttentionCallback.reset(); + mTestableProximityCallback.reset(); resetStates(); return 0; } @@ -800,6 +1009,20 @@ public class AttentionManagerService extends SystemService { return 0; } + private int cmdCallOnStartProximityUpdates() { + final PrintWriter out = getOutPrintWriter(); + boolean calledSuccessfully = onStartProximityUpdates(mTestableProximityCallback); + out.println(calledSuccessfully ? "true" : "false"); + return 0; + } + + private int cmdCallOnStopProximityUpdates() { + final PrintWriter out = getOutPrintWriter(); + onStopProximityUpdates(mTestableProximityCallback); + out.println("true"); + return 0; + } + private int cmdResolveAttentionServiceComponent() { final PrintWriter out = getOutPrintWriter(); ComponentName resolvedComponent = resolveAttentionService(mContext); @@ -813,7 +1036,16 @@ public class AttentionManagerService extends SystemService { return 0; } + private int cmdGetLastTestProximityCallbackCode() { + final PrintWriter out = getOutPrintWriter(); + out.println(mTestableProximityCallback.getLastCallbackCode()); + return 0; + } + private void resetStates() { + synchronized (mLock) { + mCurrentProximityUpdate = null; + } mComponentName = resolveAttentionService(mContext); } @@ -844,11 +1076,24 @@ public class AttentionManagerService extends SystemService { + " (to see the result, call getLastTestCallbackCode)"); out.println(" := false, otherwise"); out.println(" call cancelCheckAttention: Cancels check attention"); + out.println(" call onStartProximityUpdates: Calls onStartProximityUpdates"); + out.println(" ---returns:"); + out.println( + " := true, if the request was successfully dispatched to the service " + + "implementation." + + " (to see the result, call getLastTestProximityCallbackCode)"); + out.println(" := false, otherwise"); + out.println(" call onStopProximityUpdates: Cancels proximity updates"); out.println(" getLastTestCallbackCode"); out.println(" ---returns:"); out.println( " := An integer, representing the last callback code received from the " + "bounded implementation. If none, it will return -1"); + out.println(" getLastTestProximityCallbackCode"); + out.println(" ---returns:"); + out.println( + " := A double, representing the last proximity value received from the " + + "bounded implementation. If none, it will return -1.0"); } } diff --git a/services/core/java/com/android/server/audio/AudioDeviceBroker.java b/services/core/java/com/android/server/audio/AudioDeviceBroker.java index 65be5f06d08f..5330845907ca 100644 --- a/services/core/java/com/android/server/audio/AudioDeviceBroker.java +++ b/services/core/java/com/android/server/audio/AudioDeviceBroker.java @@ -29,7 +29,7 @@ import android.media.AudioDeviceInfo; import android.media.AudioManager; import android.media.AudioRoutesInfo; import android.media.AudioSystem; -import android.media.BtProfileConnectionInfo; +import android.media.BluetoothProfileConnectionInfo; import android.media.IAudioRoutesObserver; import android.media.ICapturePresetDevicesRoleDispatcher; import android.media.ICommunicationDeviceDispatcher; @@ -531,12 +531,12 @@ import java.util.concurrent.atomic.AtomicBoolean; /*package*/ static final class BtDeviceChangedData { final @Nullable BluetoothDevice mNewDevice; final @Nullable BluetoothDevice mPreviousDevice; - final @NonNull BtProfileConnectionInfo mInfo; + final @NonNull BluetoothProfileConnectionInfo mInfo; final @NonNull String mEventSource; BtDeviceChangedData(@Nullable BluetoothDevice newDevice, @Nullable BluetoothDevice previousDevice, - @NonNull BtProfileConnectionInfo info, @NonNull String eventSource) { + @NonNull BluetoothProfileConnectionInfo info, @NonNull String eventSource) { mNewDevice = newDevice; mPreviousDevice = previousDevice; mInfo = info; @@ -568,9 +568,9 @@ import java.util.concurrent.atomic.AtomicBoolean; mDevice = device; mState = state; mProfile = d.mInfo.getProfile(); - mSupprNoisy = d.mInfo.getSuppressNoisyIntent(); + mSupprNoisy = d.mInfo.isSuppressNoisyIntent(); mVolume = d.mInfo.getVolume(); - mIsLeOutput = d.mInfo.getIsLeOutput(); + mIsLeOutput = d.mInfo.isLeOutput(); mEventSource = d.mEventSource; mAudioSystemDevice = audioDevice; mMusicDevice = AudioSystem.DEVICE_NONE; @@ -641,7 +641,7 @@ import java.util.concurrent.atomic.AtomicBoolean; audioDevice = AudioSystem.DEVICE_OUT_HEARING_AID; break; case BluetoothProfile.LE_AUDIO: - if (d.mInfo.getIsLeOutput()) { + if (d.mInfo.isLeOutput()) { audioDevice = AudioSystem.DEVICE_OUT_BLE_HEADSET; } else { audioDevice = AudioSystem.DEVICE_IN_BLE_HEADSET; diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java index 407d42ea510d..4494d963418e 100644 --- a/services/core/java/com/android/server/audio/AudioService.java +++ b/services/core/java/com/android/server/audio/AudioService.java @@ -85,7 +85,7 @@ import android.media.AudioPlaybackConfiguration; import android.media.AudioRecordingConfiguration; import android.media.AudioRoutesInfo; import android.media.AudioSystem; -import android.media.BtProfileConnectionInfo; +import android.media.BluetoothProfileConnectionInfo; import android.media.IAudioFocusDispatcher; import android.media.IAudioModeDispatcher; import android.media.IAudioRoutesObserver; @@ -6434,14 +6434,14 @@ public class AudioService extends IAudioService.Stub * See AudioManager.handleBluetoothActiveDeviceChanged(...) */ public void handleBluetoothActiveDeviceChanged(BluetoothDevice newDevice, - BluetoothDevice previousDevice, @NonNull BtProfileConnectionInfo info) { + BluetoothDevice previousDevice, @NonNull BluetoothProfileConnectionInfo info) { if (mContext.checkCallingOrSelfPermission(android.Manifest.permission.BLUETOOTH_STACK) != PackageManager.PERMISSION_GRANTED) { throw new SecurityException("Bluetooth is the only caller allowed"); } if (info == null) { - throw new IllegalArgumentException("Illegal null BtProfileConnectionInfo for device " - + previousDevice + " -> " + newDevice); + throw new IllegalArgumentException("Illegal null BluetoothProfileConnectionInfo for" + + " device " + previousDevice + " -> " + newDevice); } final int profile = info.getProfile(); if (profile != BluetoothProfile.A2DP && profile != BluetoothProfile.A2DP_SINK diff --git a/services/core/java/com/android/server/audio/BtHelper.java b/services/core/java/com/android/server/audio/BtHelper.java index 47f31d505867..a006b91c9eb6 100644 --- a/services/core/java/com/android/server/audio/BtHelper.java +++ b/services/core/java/com/android/server/audio/BtHelper.java @@ -31,7 +31,7 @@ import android.content.Intent; import android.media.AudioDeviceAttributes; import android.media.AudioManager; import android.media.AudioSystem; -import android.media.BtProfileConnectionInfo; +import android.media.BluetoothProfileConnectionInfo; import android.os.Binder; import android.os.UserHandle; import android.provider.Settings; @@ -40,6 +40,7 @@ import android.util.Log; import com.android.internal.annotations.GuardedBy; import java.io.PrintWriter; +import java.util.Collections; import java.util.List; import java.util.Objects; @@ -489,11 +490,13 @@ public class BtHelper { if (proxy.getConnectionState(btDevice) == BluetoothProfile.STATE_CONNECTED) { mDeviceBroker.queueOnBluetoothActiveDeviceChanged( new AudioDeviceBroker.BtDeviceChangedData(btDevice, null, - new BtProfileConnectionInfo(profile), "mBluetoothProfileServiceListener")); + new BluetoothProfileConnectionInfo(profile), + "mBluetoothProfileServiceListener")); } else { mDeviceBroker.queueOnBluetoothActiveDeviceChanged( new AudioDeviceBroker.BtDeviceChangedData(null, btDevice, - new BtProfileConnectionInfo(profile), "mBluetoothProfileServiceListener")); + new BluetoothProfileConnectionInfo(profile), + "mBluetoothProfileServiceListener")); } } @@ -503,7 +506,12 @@ public class BtHelper { // Discard timeout message mDeviceBroker.handleCancelFailureToConnectToBtHeadsetService(); mBluetoothHeadset = headset; - setBtScoActiveDevice(headset != null ? headset.getActiveDevice() : null); + BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter(); + List<BluetoothDevice> activeDevices = Collections.emptyList(); + if (adapter != null) { + activeDevices = adapter.getActiveDevices(BluetoothProfile.HEADSET); + } + setBtScoActiveDevice((activeDevices.size() > 0) ? activeDevices.get(0) : null); // Refresh SCO audio state checkScoAudioState(); if (mScoAudioState != SCO_STATE_ACTIVATE_REQ diff --git a/services/core/java/com/android/server/clipboard/ClipboardService.java b/services/core/java/com/android/server/clipboard/ClipboardService.java index 28508f46bfe6..53fe4509b1cc 100644 --- a/services/core/java/com/android/server/clipboard/ClipboardService.java +++ b/services/core/java/com/android/server/clipboard/ClipboardService.java @@ -1090,6 +1090,10 @@ public class ClipboardService extends SystemService { && mAutofillInternal.isAugmentedAutofillServiceForUser(uid, userId)) { return; } + if (mPm.checkPermission(Manifest.permission.SUPPRESS_CLIPBOARD_ACCESS_NOTIFICATION, + callingPackage) == PackageManager.PERMISSION_GRANTED) { + return; + } // Don't notify if already notified for this uid and clip. if (clipboard.mNotifiedUids.get(uid)) { return; diff --git a/services/core/java/com/android/server/display/AutomaticBrightnessController.java b/services/core/java/com/android/server/display/AutomaticBrightnessController.java index 1b552577308d..162eb0e188b9 100644 --- a/services/core/java/com/android/server/display/AutomaticBrightnessController.java +++ b/services/core/java/com/android/server/display/AutomaticBrightnessController.java @@ -201,6 +201,10 @@ class AutomaticBrightnessController { // Controls High Brightness Mode. private HighBrightnessModeController mHbmController; + // Throttles (caps) maximum allowed brightness + private BrightnessThrottler mBrightnessThrottler; + private boolean mIsBrightnessThrottled; + // Context-sensitive brightness configurations require keeping track of the foreground app's // package name and category, which is done by registering a TaskStackListener to call back to // us onTaskStackChanged, and then using the ActivityTaskManager to get the foreground app's @@ -226,7 +230,7 @@ class AutomaticBrightnessController { long brighteningLightDebounceConfig, long darkeningLightDebounceConfig, boolean resetAmbientLuxAfterWarmUpConfig, HysteresisLevels ambientBrightnessThresholds, HysteresisLevels screenBrightnessThresholds, Context context, - HighBrightnessModeController hbmController, + HighBrightnessModeController hbmController, BrightnessThrottler brightnessThrottler, BrightnessMappingStrategy idleModeBrightnessMapper, int ambientLightHorizonShort, int ambientLightHorizonLong) { this(new Injector(), callbacks, looper, sensorManager, lightSensor, @@ -235,8 +239,8 @@ class AutomaticBrightnessController { lightSensorRate, initialLightSensorRate, brighteningLightDebounceConfig, darkeningLightDebounceConfig, resetAmbientLuxAfterWarmUpConfig, ambientBrightnessThresholds, screenBrightnessThresholds, context, - hbmController, idleModeBrightnessMapper, ambientLightHorizonShort, - ambientLightHorizonLong + hbmController, brightnessThrottler, idleModeBrightnessMapper, + ambientLightHorizonShort, ambientLightHorizonLong ); } @@ -249,7 +253,7 @@ class AutomaticBrightnessController { long brighteningLightDebounceConfig, long darkeningLightDebounceConfig, boolean resetAmbientLuxAfterWarmUpConfig, HysteresisLevels ambientBrightnessThresholds, HysteresisLevels screenBrightnessThresholds, Context context, - HighBrightnessModeController hbmController, + HighBrightnessModeController hbmController, BrightnessThrottler brightnessThrottler, BrightnessMappingStrategy idleModeBrightnessMapper, int ambientLightHorizonShort, int ambientLightHorizonLong) { mInjector = injector; @@ -291,6 +295,7 @@ class AutomaticBrightnessController { mForegroundAppCategory = ApplicationInfo.CATEGORY_UNDEFINED; mPendingForegroundAppCategory = ApplicationInfo.CATEGORY_UNDEFINED; mHbmController = hbmController; + mBrightnessThrottler = brightnessThrottler; mInteractiveModeBrightnessMapper = interactiveModeBrightnessMapper; mIdleModeBrightnessMapper = idleModeBrightnessMapper; // Initialize to active (normal) screen brightness mode @@ -365,6 +370,13 @@ class AutomaticBrightnessController { prepareBrightnessAdjustmentSample(); } changed |= setLightSensorEnabled(enable && !dozing); + + if (mIsBrightnessThrottled != mBrightnessThrottler.isThrottled()) { + // Maximum brightness has changed, so recalculate display brightness. + mIsBrightnessThrottled = mBrightnessThrottler.isThrottled(); + changed = true; + } + if (changed) { updateAutoBrightness(false /*sendUpdate*/, userInitiatedChange); } @@ -855,8 +867,11 @@ class AutomaticBrightnessController { // Clamps values with float range [0.0-1.0] private float clampScreenBrightness(float value) { - return MathUtils.constrain(value, - mHbmController.getCurrentBrightnessMin(), mHbmController.getCurrentBrightnessMax()); + final float minBrightness = Math.min(mHbmController.getCurrentBrightnessMin(), + mBrightnessThrottler.getBrightnessCap()); + final float maxBrightness = Math.min(mHbmController.getCurrentBrightnessMax(), + mBrightnessThrottler.getBrightnessCap()); + return MathUtils.constrain(value, minBrightness, maxBrightness); } private void prepareBrightnessAdjustmentSample() { diff --git a/services/core/java/com/android/server/display/BrightnessMappingStrategy.java b/services/core/java/com/android/server/display/BrightnessMappingStrategy.java index a1d722b6df9d..c46ae851b752 100644 --- a/services/core/java/com/android/server/display/BrightnessMappingStrategy.java +++ b/services/core/java/com/android/server/display/BrightnessMappingStrategy.java @@ -69,8 +69,10 @@ public abstract class BrightnessMappingStrategy { */ @Nullable public static BrightnessMappingStrategy create(Resources resources, - DisplayDeviceConfig displayDeviceConfig) { - return create(resources, displayDeviceConfig, /* isForIdleMode= */ false, null); + DisplayDeviceConfig displayDeviceConfig, + DisplayWhiteBalanceController displayWhiteBalanceController) { + return create(resources, displayDeviceConfig, /* isForIdleMode= */ false, + displayWhiteBalanceController); } /** @@ -845,7 +847,7 @@ public abstract class BrightnessMappingStrategy { float nits = mBrightnessSpline.interpolate(lux); // Adjust nits to compensate for display white balance colour strength. - if (mDisplayWhiteBalanceController != null && isForIdleMode()) { + if (mDisplayWhiteBalanceController != null) { nits = mDisplayWhiteBalanceController.calculateAdjustedBrightnessNits(nits); } diff --git a/services/core/java/com/android/server/display/DisplayDevice.java b/services/core/java/com/android/server/display/DisplayDevice.java index d0ce9ef47c35..5de162ce711c 100644 --- a/services/core/java/com/android/server/display/DisplayDevice.java +++ b/services/core/java/com/android/server/display/DisplayDevice.java @@ -222,6 +222,22 @@ abstract class DisplayDevice { } /** + * Returns the system preferred display mode. + */ + public Display.Mode getSystemPreferredDisplayModeLocked() { + return EMPTY_DISPLAY_MODE; + } + + /** + * Returns the display mode that was being used when this display was first found by + * display manager. + * @hide + */ + public Display.Mode getActiveDisplayModeAtStartLocked() { + return EMPTY_DISPLAY_MODE; + } + + /** * Sets the requested color mode. */ public void setRequestedColorModeLocked(int colorMode) { diff --git a/services/core/java/com/android/server/display/DisplayDeviceConfig.java b/services/core/java/com/android/server/display/DisplayDeviceConfig.java index a4a6eb4312cc..6866137e294e 100644 --- a/services/core/java/com/android/server/display/DisplayDeviceConfig.java +++ b/services/core/java/com/android/server/display/DisplayDeviceConfig.java @@ -30,6 +30,8 @@ import android.util.Slog; import android.util.Spline; import android.view.DisplayAddress; +import com.android.internal.annotations.VisibleForTesting; + import com.android.internal.R; import com.android.internal.display.BrightnessSynchronizer; import com.android.server.display.config.BrightnessThresholds; @@ -40,9 +42,12 @@ import com.android.server.display.config.DisplayConfiguration; import com.android.server.display.config.DisplayQuirks; import com.android.server.display.config.HbmTiming; import com.android.server.display.config.HighBrightnessMode; +import com.android.server.display.config.Interpolation; import com.android.server.display.config.NitsMap; import com.android.server.display.config.Point; import com.android.server.display.config.RefreshRateRange; +import com.android.server.display.config.SdrHdrRatioMap; +import com.android.server.display.config.SdrHdrRatioPoint; import com.android.server.display.config.SensorDetails; import com.android.server.display.config.ThermalStatus; import com.android.server.display.config.ThermalThrottling; @@ -66,10 +71,126 @@ import java.util.List; import javax.xml.datatype.DatatypeConfigurationException; /** - * Reads and stores display-specific configurations. + * Reads and stores display-specific configurations. + * File format: + * <pre> + * {@code + * <displayConfiguration> + * <densityMap> + * <density> + * <height>480</height> + * <width>720</width> + * <density>120</density> + * </density> + * <density> + * <height>720</height> + * <width>1280</width> + * <density>213</density> + * </density> + * <density> + * <height>1080</height> + * <width>1920</width> + * <density>320</density> + * </density> + * <density> + * <height>2160</height> + * <width>3840</width> + * <density>640</density> + * </density> + * </densityMap> + * + * <screenBrightnessMap> + * <point> + * <value>0.0</value> + * <nits>2.0</nits> + * </point> + * <point> + * <value>0.62</value> + * <nits>500.0</nits> + * </point> + * <point> + * <value>1.0</value> + * <nits>800.0</nits> + * </point> + * </screenBrightnessMap> + * + * <screenBrightnessDefault>0.65</screenBrightnessDefault> + * + * <thermalThrottling> + * <brightnessThrottlingMap> + * <brightnessThrottlingPoint> + * <thermalStatus>severe</thermalStatus> + * <brightness>0.1</brightness> + * </brightnessThrottlingPoint> + * <brightnessThrottlingPoint> + * <thermalStatus>critical</thermalStatus> + * <brightness>0.01</brightness> + * </brightnessThrottlingPoint> + * </brightnessThrottlingMap> + * </thermalThrottling> + * + * <highBrightnessMode enabled="true"> + * <transitionPoint>0.62</transitionPoint> + * <minimumLux>10000</minimumLux> + * <timing> + * <timeWindowSecs>1800</timeWindowSecs> // Window in which we restrict HBM. + * <timeMaxSecs>300</timeMaxSecs> // Maximum time of HBM allowed in that window. + * <timeMinSecs>60</timeMinSecs> // Minimum time remaining required to switch + * </timing> // HBM on for. + * <refreshRate> + * <minimum>120</minimum> + * <maximum>120</maximum> + * </refreshRate> + * <thermalStatusLimit>light</thermalStatusLimit> + * <allowInLowPowerMode>false</allowInLowPowerMode> + * </highBrightnessMode> + * + * <quirks> + * <quirk>canSetBrightnessViaHwc</quirk> + * </quirks> + * + * <screenBrightnessRampFastDecrease>0.01</screenBrightnessRampFastDecrease> + * <screenBrightnessRampFastIncrease>0.02</screenBrightnessRampFastIncrease> + * <screenBrightnessRampSlowDecrease>0.03</screenBrightnessRampSlowDecrease> + * <screenBrightnessRampSlowIncrease>0.04</screenBrightnessRampSlowIncrease> + * + * <lightSensor> + * <type>android.sensor.light</type> + * <name>1234 Ambient Light Sensor</name> + * </lightSensor> + * <proxSensor> + * <type>android.sensor.proximity</type> + * <name>1234 Proximity Sensor</name> + * </proxSensor> + * + * <ambientLightHorizonLong>10001</ambientLightHorizonLong> + * <ambientLightHorizonShort>2001</ambientLightHorizonShort> + * + * <displayBrightnessChangeThresholds> + * <brighteningThresholds> + * <minimum>0.001</minimum> // Minimum change needed in screen brightness to brighten. + * </brighteningThresholds> + * <darkeningThresholds> + * <minimum>0.002</minimum> // Minimum change needed in screen brightness to darken. + * </darkeningThresholds> + * </displayBrightnessChangeThresholds> + * + * <ambientBrightnessChangeThresholds> + * <brighteningThresholds> + * <minimum>0.003</minimum> // Minimum change needed in ambient brightness to brighten. + * </brighteningThresholds> + * <darkeningThresholds> + * <minimum>0.004</minimum> // Minimum change needed in ambient brightness to darken. + * </darkeningThresholds> + * </ambientBrightnessChangeThresholds> + * + * </displayConfiguration> + * } + * </pre> */ public class DisplayDeviceConfig { private static final String TAG = "DisplayDeviceConfig"; + private static final boolean DEBUG = false; public static final float HIGH_BRIGHTNESS_MODE_UNSUPPORTED = Float.NaN; @@ -86,6 +207,9 @@ public class DisplayDeviceConfig { private static final String NO_SUFFIX_FORMAT = "%d"; private static final long STABLE_FLAG = 1L << 62; + private static final int INTERPOLATION_DEFAULT = 0; + private static final int INTERPOLATION_LINEAR = 1; + // Float.NaN (used as invalid for brightness) cannot be stored in config.xml // so -2 is used instead private static final float INVALID_BRIGHTNESS_IN_CONFIG = -2f; @@ -99,6 +223,9 @@ public class DisplayDeviceConfig { // Length of the ambient light horizon used to calculate short-term estimate of ambient light. private static final int AMBIENT_LIGHT_SHORT_HORIZON_MILLIS = 2000; + @VisibleForTesting + static final float HDR_PERCENT_OF_SCREEN_REQUIRED_DEFAULT = 0.5f; + private final Context mContext; // The details of the ambient light sensor associated with this display. @@ -114,6 +241,7 @@ public class DisplayDeviceConfig { // config.xml. These are the raw values and just used for the dumpsys private float[] mRawNits; private float[] mRawBacklight; + private int mInterpolationType; // These arrays are calculated from the raw arrays, but clamped to contain values equal to and // between mBacklightMinimum and mBacklightMaximum. These three arrays should all be the same @@ -142,6 +270,7 @@ public class DisplayDeviceConfig { private Spline mBrightnessToBacklightSpline; private Spline mBacklightToBrightnessSpline; private Spline mBacklightToNitsSpline; + private Spline mNitsToBacklightSpline; private List<String> mQuirks; private boolean mIsHighBrightnessModeEnabled = false; private HighBrightnessModeData mHbmData; @@ -149,6 +278,7 @@ public class DisplayDeviceConfig { private String mLoadedFrom = null; private BrightnessThrottlingData mBrightnessThrottlingData; + private Spline mSdrToHdrRatioSpline; private DisplayDeviceConfig(Context context) { mContext = context; @@ -333,6 +463,45 @@ public class DisplayDeviceConfig { } /** + * Calculate the HDR brightness for the specified SDR brightenss. + * + * @return the HDR brightness or BRIGHTNESS_INVALID when no mapping exists. + */ + public float getHdrBrightnessFromSdr(float brightness) { + if (mSdrToHdrRatioSpline == null) { + return PowerManager.BRIGHTNESS_INVALID; + } + + float backlight = getBacklightFromBrightness(brightness); + float nits = getNitsFromBacklight(backlight); + if (nits == NITS_INVALID) { + return PowerManager.BRIGHTNESS_INVALID; + } + + float ratio = mSdrToHdrRatioSpline.interpolate(nits); + float hdrNits = nits * ratio; + if (mNitsToBacklightSpline == null) { + return PowerManager.BRIGHTNESS_INVALID; + } + + float hdrBacklight = mNitsToBacklightSpline.interpolate(hdrNits); + hdrBacklight = Math.max(mBacklightMinimum, Math.min(mBacklightMaximum, hdrBacklight)); + float hdrBrightness = mBacklightToBrightnessSpline.interpolate(hdrBacklight); + + if (DEBUG) { + Slog.d(TAG, "getHdrBrightnessFromSdr: sdr brightness " + brightness + + " backlight " + backlight + + " nits " + nits + + " ratio " + ratio + + " hdrNits " + hdrNits + + " hdrBacklight " + hdrBacklight + + " hdrBrightness " + hdrBrightness + ); + } + return hdrBrightness; + } + + /** * Return an array of equal length to backlight and nits, that covers the entire system * brightness range of 0.0-1.0. * @@ -444,15 +613,18 @@ public class DisplayDeviceConfig { + ", mNits=" + Arrays.toString(mNits) + ", mRawBacklight=" + Arrays.toString(mRawBacklight) + ", mRawNits=" + Arrays.toString(mRawNits) + + ", mInterpolationType=" + mInterpolationType + ", mBrightness=" + Arrays.toString(mBrightness) + ", mBrightnessToBacklightSpline=" + mBrightnessToBacklightSpline + ", mBacklightToBrightnessSpline=" + mBacklightToBrightnessSpline + + ", mNitsToBacklightSpline=" + mNitsToBacklightSpline + ", mBacklightMinimum=" + mBacklightMinimum + ", mBacklightMaximum=" + mBacklightMaximum + ", mBrightnessDefault=" + mBrightnessDefault + ", mQuirks=" + mQuirks + ", isHbmEnabled=" + mIsHighBrightnessModeEnabled + ", mHbmData=" + mHbmData + + ", mSdrToHdrRatioSpline=" + mSdrToHdrRatioSpline + ", mBrightnessThrottlingData=" + mBrightnessThrottlingData + ", mBrightnessRampFastDecrease=" + mBrightnessRampFastDecrease + ", mBrightnessRampFastIncrease=" + mBrightnessRampFastIncrease @@ -653,6 +825,7 @@ public class DisplayDeviceConfig { float[] nits = new float[size]; float[] backlight = new float[size]; + mInterpolationType = convertInterpolationType(map.getInterpolation()); int i = 0; for (Point point : points) { nits[i] = point.getNits().floatValue(); @@ -678,6 +851,40 @@ public class DisplayDeviceConfig { constrainNitsAndBacklightArrays(); } + private Spline loadSdrHdrRatioMap(HighBrightnessMode hbmConfig) { + final SdrHdrRatioMap sdrHdrRatioMap = hbmConfig.getSdrHdrRatioMap_all(); + + if (sdrHdrRatioMap == null) { + return null; + } + + final List<SdrHdrRatioPoint> points = sdrHdrRatioMap.getPoint(); + final int size = points.size(); + if (size <= 0) { + return null; + } + + float[] nits = new float[size]; + float[] ratios = new float[size]; + + int i = 0; + for (SdrHdrRatioPoint point : points) { + nits[i] = point.getSdrNits().floatValue(); + if (i > 0) { + if (nits[i] < nits[i - 1]) { + Slog.e(TAG, "sdrHdrRatioMap must be non-decreasing, ignoring rest " + + " of configuration. nits: " + nits[i] + " < " + + nits[i - 1]); + return null; + } + } + ratios[i] = point.getHdrRatio().floatValue(); + ++i; + } + + return Spline.createSpline(nits, ratios); + } + private void loadBrightnessThrottlingMap(DisplayConfiguration config) { final ThermalThrottling throttlingConfig = config.getThermalThrottling(); if (throttlingConfig == null) { @@ -823,9 +1030,18 @@ public class DisplayDeviceConfig { mBacklight[mBacklight.length - 1], PowerManager.BRIGHTNESS_MIN, PowerManager.BRIGHTNESS_MAX, mBacklight[i]); } - mBrightnessToBacklightSpline = Spline.createSpline(mBrightness, mBacklight); - mBacklightToBrightnessSpline = Spline.createSpline(mBacklight, mBrightness); - mBacklightToNitsSpline = Spline.createSpline(mBacklight, mNits); + mBrightnessToBacklightSpline = mInterpolationType == INTERPOLATION_LINEAR + ? Spline.createLinearSpline(mBrightness, mBacklight) + : Spline.createSpline(mBrightness, mBacklight); + mBacklightToBrightnessSpline = mInterpolationType == INTERPOLATION_LINEAR + ? Spline.createLinearSpline(mBacklight, mBrightness) + : Spline.createSpline(mBacklight, mBrightness); + mBacklightToNitsSpline = mInterpolationType == INTERPOLATION_LINEAR + ? Spline.createLinearSpline(mBacklight, mNits) + : Spline.createSpline(mBacklight, mNits); + mNitsToBacklightSpline = mInterpolationType == INTERPOLATION_LINEAR + ? Spline.createLinearSpline(mNits, mBacklight) + : Spline.createSpline(mNits, mBacklight); } private void loadQuirks(DisplayConfiguration config) { @@ -862,6 +1078,20 @@ public class DisplayDeviceConfig { mRefreshRateLimitations.add(new RefreshRateLimitation( DisplayManagerInternal.REFRESH_RATE_LIMIT_HIGH_BRIGHTNESS_MODE, min, max)); } + BigDecimal minHdrPctOfScreen = hbm.getMinimumHdrPercentOfScreen_all(); + if (minHdrPctOfScreen != null) { + mHbmData.minimumHdrPercentOfScreen = minHdrPctOfScreen.floatValue(); + if (mHbmData.minimumHdrPercentOfScreen > 1 + || mHbmData.minimumHdrPercentOfScreen < 0) { + Slog.w(TAG, "Invalid minimum HDR percent of screen: " + + String.valueOf(mHbmData.minimumHdrPercentOfScreen)); + mHbmData.minimumHdrPercentOfScreen = HDR_PERCENT_OF_SCREEN_REQUIRED_DEFAULT; + } + } else { + mHbmData.minimumHdrPercentOfScreen = HDR_PERCENT_OF_SCREEN_REQUIRED_DEFAULT; + } + + mSdrToHdrRatioSpline = loadSdrHdrRatioMap(hbm); } } @@ -1024,6 +1254,21 @@ public class DisplayDeviceConfig { } } + private int convertInterpolationType(Interpolation value) { + if (value == null) { + return INTERPOLATION_DEFAULT; + } + switch (value) { + case _default: + return INTERPOLATION_DEFAULT; + case linear: + return INTERPOLATION_LINEAR; + default: + Slog.wtf(TAG, "Unexpected Interpolation Type: " + value); + return INTERPOLATION_DEFAULT; + } + } + private void loadAmbientHorizonFromDdc(DisplayConfiguration config) { final BigInteger configLongHorizon = config.getAmbientLightHorizonLong(); if (configLongHorizon != null) { @@ -1088,11 +1333,15 @@ public class DisplayDeviceConfig { /** Minimum time that HBM can be on before being enabled. */ public long timeMinMillis; + /** Minimum HDR video size to enter high brightness mode */ + public float minimumHdrPercentOfScreen; + HighBrightnessModeData() {} HighBrightnessModeData(float minimumLux, float transitionPoint, long timeWindowMillis, long timeMaxMillis, long timeMinMillis, - @PowerManager.ThermalStatus int thermalStatusLimit, boolean allowInLowPowerMode) { + @PowerManager.ThermalStatus int thermalStatusLimit, boolean allowInLowPowerMode, + float minimumHdrPercentOfScreen) { this.minimumLux = minimumLux; this.transitionPoint = transitionPoint; this.timeWindowMillis = timeWindowMillis; @@ -1100,6 +1349,7 @@ public class DisplayDeviceConfig { this.timeMinMillis = timeMinMillis; this.thermalStatusLimit = thermalStatusLimit; this.allowInLowPowerMode = allowInLowPowerMode; + this.minimumHdrPercentOfScreen = minimumHdrPercentOfScreen; } /** @@ -1114,6 +1364,7 @@ public class DisplayDeviceConfig { other.transitionPoint = transitionPoint; other.thermalStatusLimit = thermalStatusLimit; other.allowInLowPowerMode = allowInLowPowerMode; + other.minimumHdrPercentOfScreen = minimumHdrPercentOfScreen; } @Override @@ -1126,6 +1377,7 @@ public class DisplayDeviceConfig { + ", timeMin: " + timeMinMillis + "ms" + ", thermalStatusLimit: " + thermalStatusLimit + ", allowInLowPowerMode: " + allowInLowPowerMode + + ", minimumHdrPercentOfScreen: " + minimumHdrPercentOfScreen + "} "; } } diff --git a/services/core/java/com/android/server/display/DisplayManagerService.java b/services/core/java/com/android/server/display/DisplayManagerService.java index 4e88acd11fac..7f1482e6dde1 100644 --- a/services/core/java/com/android/server/display/DisplayManagerService.java +++ b/services/core/java/com/android/server/display/DisplayManagerService.java @@ -1833,6 +1833,16 @@ public final class DisplayManagerService extends SystemService { } } + Display.Mode getSystemPreferredDisplayModeInternal(int displayId) { + synchronized (mSyncRoot) { + final DisplayDevice device = getDeviceForDisplayLocked(displayId); + if (device == null) { + return null; + } + return device.getSystemPreferredDisplayModeLocked(); + } + } + void setShouldAlwaysRespectAppRequestedModeInternal(boolean enabled) { mDisplayModeDirector.setShouldAlwaysRespectAppRequestedMode(enabled); } @@ -2183,6 +2193,16 @@ public final class DisplayManagerService extends SystemService { } } + Display.Mode getActiveDisplayModeAtStart(int displayId) { + synchronized (mSyncRoot) { + final DisplayDevice device = getDeviceForDisplayLocked(displayId); + if (device == null) { + return null; + } + return device.getActiveDisplayModeAtStartLocked(); + } + } + void setAmbientColorTemperatureOverride(float cct) { synchronized (mSyncRoot) { final DisplayPowerController displayPowerController = mDisplayPowerControllers.get( @@ -3471,6 +3491,16 @@ public final class DisplayManagerService extends SystemService { } @Override // Binder call + public Display.Mode getSystemPreferredDisplayMode(int displayId) { + final long token = Binder.clearCallingIdentity(); + try { + return getSystemPreferredDisplayModeInternal(displayId); + } finally { + Binder.restoreCallingIdentity(token); + } + } + + @Override // Binder call public void setShouldAlwaysRespectAppRequestedMode(boolean enabled) { mContext.enforceCallingOrSelfPermission( Manifest.permission.OVERRIDE_DISPLAY_MODE_REQUESTS, diff --git a/services/core/java/com/android/server/display/DisplayManagerShellCommand.java b/services/core/java/com/android/server/display/DisplayManagerShellCommand.java index a9875c873bbb..bfdac5781b75 100644 --- a/services/core/java/com/android/server/display/DisplayManagerShellCommand.java +++ b/services/core/java/com/android/server/display/DisplayManagerShellCommand.java @@ -68,6 +68,8 @@ class DisplayManagerShellCommand extends ShellCommand { return clearUserPreferredDisplayMode(); case "get-user-preferred-display-mode": return getUserPreferredDisplayMode(); + case "get-active-display-mode-at-start": + return getActiveDisplayModeAtStart(); case "set-match-content-frame-rate-pref": return setMatchContentFrameRateUserPreference(); case "get-match-content-frame-rate-pref": @@ -125,6 +127,9 @@ class DisplayManagerShellCommand extends ShellCommand { pw.println(" Returns the user preferred display mode or null if no mode is set by user." + "If DISPLAY_ID is passed, the mode for display with id = DISPLAY_ID is " + "returned, else global display mode is returned."); + pw.println(" get-active-display-mode-at-start DISPLAY_ID"); + pw.println(" Returns the display mode which was found at boot time of display with " + + "id = DISPLAY_ID"); pw.println(" set-match-content-frame-rate-pref PREFERENCE"); pw.println(" Sets the match content frame rate preference as PREFERENCE "); pw.println(" get-match-content-frame-rate-pref"); @@ -298,6 +303,30 @@ class DisplayManagerShellCommand extends ShellCommand { return 0; } + private int getActiveDisplayModeAtStart() { + final String displayIdText = getNextArg(); + if (displayIdText == null) { + getErrPrintWriter().println("Error: no displayId specified"); + return 1; + } + final int displayId; + try { + displayId = Integer.parseInt(displayIdText); + } catch (NumberFormatException e) { + getErrPrintWriter().println("Error: invalid displayId"); + return 1; + } + + Display.Mode mode = mService.getActiveDisplayModeAtStart(displayId); + if (mode == null) { + getOutPrintWriter().println("Boot display mode: null"); + return 0; + } + getOutPrintWriter().println("Boot display mode: " + mode.getPhysicalWidth() + " " + + mode.getPhysicalHeight() + " " + mode.getRefreshRate()); + return 0; + } + private int setMatchContentFrameRateUserPreference() { final String matchContentFrameRatePrefText = getNextArg(); if (matchContentFrameRatePrefText == null) { diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java index 3494342a66fb..d71e07ab573f 100644 --- a/services/core/java/com/android/server/display/DisplayPowerController.java +++ b/services/core/java/com/android/server/display/DisplayPowerController.java @@ -546,28 +546,6 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call // Seed the cached brightness saveBrightnessInfo(getScreenBrightnessSetting()); - setUpAutoBrightness(resources, handler); - - mColorFadeEnabled = !ActivityManager.isLowRamDeviceStatic(); - mColorFadeFadesConfig = resources.getBoolean( - com.android.internal.R.bool.config_animateScreenLights); - - mDisplayBlanksAfterDozeConfig = resources.getBoolean( - com.android.internal.R.bool.config_displayBlanksAfterDoze); - - mBrightnessBucketsInDozeConfig = resources.getBoolean( - com.android.internal.R.bool.config_displayBrightnessBucketsInDoze); - - loadProximitySensor(); - - mCurrentScreenBrightnessSetting = getScreenBrightnessSetting(); - mScreenBrightnessForVr = getScreenBrightnessForVrSetting(); - mAutoBrightnessAdjustment = getAutoBrightnessAdjustmentSetting(); - mTemporaryScreenBrightness = PowerManager.BRIGHTNESS_INVALID_FLOAT; - mPendingScreenBrightnessSetting = PowerManager.BRIGHTNESS_INVALID_FLOAT; - mTemporaryAutoBrightnessAdjustment = PowerManager.BRIGHTNESS_INVALID_FLOAT; - mPendingAutoBrightnessAdjustment = PowerManager.BRIGHTNESS_INVALID_FLOAT; - DisplayWhiteBalanceSettings displayWhiteBalanceSettings = null; DisplayWhiteBalanceController displayWhiteBalanceController = null; if (mDisplayId == Display.DEFAULT_DISPLAY) { @@ -610,6 +588,29 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call } else { mCdsi = null; } + + setUpAutoBrightness(resources, handler); + + mColorFadeEnabled = !ActivityManager.isLowRamDeviceStatic(); + mColorFadeFadesConfig = resources.getBoolean( + com.android.internal.R.bool.config_animateScreenLights); + + mDisplayBlanksAfterDozeConfig = resources.getBoolean( + com.android.internal.R.bool.config_displayBlanksAfterDoze); + + mBrightnessBucketsInDozeConfig = resources.getBoolean( + com.android.internal.R.bool.config_displayBrightnessBucketsInDoze); + + loadProximitySensor(); + + mCurrentScreenBrightnessSetting = getScreenBrightnessSetting(); + mScreenBrightnessForVr = getScreenBrightnessForVrSetting(); + mAutoBrightnessAdjustment = getAutoBrightnessAdjustmentSetting(); + mTemporaryScreenBrightness = PowerManager.BRIGHTNESS_INVALID_FLOAT; + mPendingScreenBrightnessSetting = PowerManager.BRIGHTNESS_INVALID_FLOAT; + mTemporaryAutoBrightnessAdjustment = PowerManager.BRIGHTNESS_INVALID_FLOAT; + mPendingAutoBrightnessAdjustment = PowerManager.BRIGHTNESS_INVALID_FLOAT; + } private void applyReduceBrightColorsSplineAdjustment( @@ -831,7 +832,13 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call setUpAutoBrightness(mContext.getResources(), mHandler); reloadReduceBrightColours(); mHbmController.resetHbmData(info.width, info.height, token, info.uniqueId, - mDisplayDeviceConfig.getHighBrightnessModeData()); + mDisplayDeviceConfig.getHighBrightnessModeData(), + new HighBrightnessModeController.HdrBrightnessDeviceConfig() { + @Override + public float getHdrBrightnessFromSdr(float sdrBrightness) { + return mDisplayDeviceConfig.getHdrBrightnessFromSdr(sdrBrightness); + } + }); mBrightnessThrottler.resetThrottlingData( mDisplayDeviceConfig.getBrightnessThrottlingData()); } @@ -901,7 +908,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call final boolean isIdleScreenBrightnessEnabled = resources.getBoolean( R.bool.config_enableIdleScreenBrightnessMode); mInteractiveModeBrightnessMapper = BrightnessMappingStrategy.create(resources, - mDisplayDeviceConfig); + mDisplayDeviceConfig, mDisplayWhiteBalanceController); if (isIdleScreenBrightnessEnabled) { mIdleModeBrightnessMapper = BrightnessMappingStrategy.createForIdleMode(resources, mDisplayDeviceConfig, mDisplayWhiteBalanceController); @@ -974,7 +981,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call lightSensorRate, initialLightSensorRate, brighteningLightDebounce, darkeningLightDebounce, autoBrightnessResetAmbientLuxAfterWarmUp, ambientBrightnessThresholds, screenBrightnessThresholds, mContext, - mHbmController, mIdleModeBrightnessMapper, + mHbmController, mBrightnessThrottler, mIdleModeBrightnessMapper, mDisplayDeviceConfig.getAmbientHorizonShort(), mDisplayDeviceConfig.getAmbientHorizonLong()); } else { @@ -1347,6 +1354,29 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call mBrightnessReasonTemp.setReason(BrightnessReason.REASON_MANUAL); } + // Now that a desired brightness has been calculated, apply brightness throttling. The + // dimming and low power transformations that follow can only dim brightness further. + // + // We didn't do this earlier through brightness clamping because we need to know both + // unthrottled (unclamped/ideal) and throttled brightness levels for subsequent operations. + // Note throttling effectively changes the allowed brightness range, so, similarly to HBM, + // we broadcast this change through setting. + final float unthrottledBrightnessState = brightnessState; + if (mBrightnessThrottler.isThrottled()) { + brightnessState = Math.min(brightnessState, mBrightnessThrottler.getBrightnessCap()); + mBrightnessReasonTemp.addModifier(BrightnessReason.MODIFIER_THROTTLED); + if (!mAppliedThrottling) { + // Brightness throttling is needed, so do so quickly. + // Later, when throttling is removed, we let other mechanisms decide on speed. + slowChange = false; + updateScreenBrightnessSetting = true; + } + mAppliedThrottling = true; + } else if (mAppliedThrottling) { + mAppliedThrottling = false; + updateScreenBrightnessSetting = true; + } + if (updateScreenBrightnessSetting) { // Tell the rest of the system about the new brightness in case we had to change it // for things like auto-brightness or high-brightness-mode. Note that we do this @@ -1393,20 +1423,6 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call mAppliedLowPower = false; } - // Apply brightness throttling after applying all other transforms - final float unthrottledBrightnessState = brightnessState; - if (mBrightnessThrottler.isThrottled()) { - brightnessState = Math.min(brightnessState, mBrightnessThrottler.getBrightnessCap()); - mBrightnessReasonTemp.addModifier(BrightnessReason.MODIFIER_THROTTLED); - if (!mAppliedThrottling) { - slowChange = false; - } - mAppliedThrottling = true; - } else if (mAppliedThrottling) { - slowChange = false; - mAppliedThrottling = false; - } - // The current brightness to use has been calculated at this point, and HbmController should // be notified so that it can accurately calculate HDR or HBM levels. We specifically do it // here instead of having HbmController listen to the brightness setting because certain @@ -1656,6 +1672,10 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call private boolean saveBrightnessInfo(float brightness, float adjustedBrightness) { synchronized (mCachedBrightnessInfo) { + final float minBrightness = Math.min(mHbmController.getCurrentBrightnessMin(), + mBrightnessThrottler.getBrightnessCap()); + final float maxBrightness = Math.min(mHbmController.getCurrentBrightnessMax(), + mBrightnessThrottler.getBrightnessCap()); boolean changed = false; changed |= @@ -1666,10 +1686,10 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call adjustedBrightness); changed |= mCachedBrightnessInfo.checkAndSetFloat(mCachedBrightnessInfo.brightnessMin, - mHbmController.getCurrentBrightnessMin()); + minBrightness); changed |= mCachedBrightnessInfo.checkAndSetFloat(mCachedBrightnessInfo.brightnessMax, - mHbmController.getCurrentBrightnessMax()); + maxBrightness); changed |= mCachedBrightnessInfo.checkAndSetInt(mCachedBrightnessInfo.hbmMode, mHbmController.getHighBrightnessMode()); @@ -1700,6 +1720,12 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call final DisplayDeviceInfo info = device.getDisplayDeviceInfoLocked(); return new HighBrightnessModeController(mHandler, info.width, info.height, displayToken, displayUniqueId, PowerManager.BRIGHTNESS_MIN, PowerManager.BRIGHTNESS_MAX, hbmData, + new HighBrightnessModeController.HdrBrightnessDeviceConfig() { + @Override + public float getHdrBrightnessFromSdr(float sdrBrightness) { + return mDisplayDeviceConfig.getHdrBrightnessFromSdr(sdrBrightness); + } + }, () -> { sendUpdatePowerStateLocked(); postBrightnessChangeRunnable(); diff --git a/services/core/java/com/android/server/display/HighBrightnessModeController.java b/services/core/java/com/android/server/display/HighBrightnessModeController.java index 23c17f5af10d..0b9d4debd16f 100644 --- a/services/core/java/com/android/server/display/HighBrightnessModeController.java +++ b/services/core/java/com/android/server/display/HighBrightnessModeController.java @@ -58,11 +58,13 @@ class HighBrightnessModeController { private static final boolean DEBUG = false; - private static final float HDR_PERCENT_OF_SCREEN_REQUIRED = 0.50f; - @VisibleForTesting static final float HBM_TRANSITION_POINT_INVALID = Float.POSITIVE_INFINITY; + public interface HdrBrightnessDeviceConfig { + float getHdrBrightnessFromSdr(float sdrBrightness); + } + private final float mBrightnessMin; private final float mBrightnessMax; private final Handler mHandler; @@ -76,6 +78,7 @@ class HighBrightnessModeController { private HdrListener mHdrListener; private HighBrightnessModeData mHbmData; + private HdrBrightnessDeviceConfig mHdrBrightnessCfg; private IBinder mRegisteredDisplayToken; private boolean mIsInAllowedAmbientRange = false; @@ -115,16 +118,17 @@ class HighBrightnessModeController { HighBrightnessModeController(Handler handler, int width, int height, IBinder displayToken, String displayUniqueId, float brightnessMin, float brightnessMax, - HighBrightnessModeData hbmData, Runnable hbmChangeCallback, Context context) { + HighBrightnessModeData hbmData, HdrBrightnessDeviceConfig hdrBrightnessCfg, + Runnable hbmChangeCallback, Context context) { this(new Injector(), handler, width, height, displayToken, displayUniqueId, brightnessMin, - brightnessMax, hbmData, hbmChangeCallback, context); + brightnessMax, hbmData, hdrBrightnessCfg, hbmChangeCallback, context); } @VisibleForTesting HighBrightnessModeController(Injector injector, Handler handler, int width, int height, IBinder displayToken, String displayUniqueId, float brightnessMin, float brightnessMax, - HighBrightnessModeData hbmData, Runnable hbmChangeCallback, - Context context) { + HighBrightnessModeData hbmData, HdrBrightnessDeviceConfig hdrBrightnessCfg, + Runnable hbmChangeCallback, Context context) { mInjector = injector; mContext = context; mClock = injector.getClock(); @@ -138,7 +142,7 @@ class HighBrightnessModeController { mRecalcRunnable = this::recalculateTimeAllowance; mHdrListener = new HdrListener(); - resetHbmData(width, height, displayToken, displayUniqueId, hbmData); + resetHbmData(width, height, displayToken, displayUniqueId, hbmData, hdrBrightnessCfg); } void setAutoBrightnessEnabled(int state) { @@ -178,6 +182,13 @@ class HighBrightnessModeController { } float getHdrBrightnessValue() { + if (mHdrBrightnessCfg != null) { + float hdrBrightness = mHdrBrightnessCfg.getHdrBrightnessFromSdr(mBrightness); + if (hdrBrightness != PowerManager.BRIGHTNESS_INVALID) { + return hdrBrightness; + } + } + // For HDR brightness, we take the current brightness and scale it to the max. The reason // we do this is because we want brightness to go to HBM max when it would normally go // to normal max, meaning it should not wait to go to 10000 lux (or whatever the transition @@ -250,10 +261,11 @@ class HighBrightnessModeController { } void resetHbmData(int width, int height, IBinder displayToken, String displayUniqueId, - HighBrightnessModeData hbmData) { + HighBrightnessModeData hbmData, HdrBrightnessDeviceConfig hdrBrightnessCfg) { mWidth = width; mHeight = height; mHbmData = hbmData; + mHdrBrightnessCfg = hdrBrightnessCfg; mDisplayStatsId = displayUniqueId.hashCode(); unregisterHdrListener(); @@ -602,8 +614,8 @@ class HighBrightnessModeController { int maxW, int maxH, int flags) { mHandler.post(() -> { mIsHdrLayerPresent = numberOfHdrLayers > 0 - && (float) (maxW * maxH) - >= ((float) (mWidth * mHeight) * HDR_PERCENT_OF_SCREEN_REQUIRED); + && (float) (maxW * maxH) >= ((float) (mWidth * mHeight) + * mHbmData.minimumHdrPercentOfScreen); // Calling the brightness update so that we can recalculate // brightness with HDR in mind. onBrightnessChanged(mBrightness, mUnthrottledBrightness, mThrottlingReason); diff --git a/services/core/java/com/android/server/display/LocalDisplayAdapter.java b/services/core/java/com/android/server/display/LocalDisplayAdapter.java index 3a9ef0a83f6b..a31c2314bd1f 100644 --- a/services/core/java/com/android/server/display/LocalDisplayAdapter.java +++ b/services/core/java/com/android/server/display/LocalDisplayAdapter.java @@ -192,8 +192,12 @@ final class LocalDisplayAdapter extends DisplayAdapter { private float mBrightnessState = PowerManager.BRIGHTNESS_INVALID_FLOAT; private float mSdrBrightnessState = PowerManager.BRIGHTNESS_INVALID_FLOAT; private int mDefaultModeId = INVALID_MODE_ID; + private int mSystemPreferredModeId = INVALID_MODE_ID; private int mDefaultModeGroup; private int mUserPreferredModeId = INVALID_MODE_ID; + // This is used only for the purpose of testing, to verify if the mode was correct when the + // device started or booted. + private int mActiveDisplayModeAtStartId = INVALID_MODE_ID; private Display.Mode mUserPreferredMode; private int mActiveModeId = INVALID_MODE_ID; private DisplayModeDirector.DesiredDisplayModeSpecs mDisplayModeSpecs = @@ -208,7 +212,7 @@ final class LocalDisplayAdapter extends DisplayAdapter { private boolean mSidekickActive; private SidekickInternal mSidekickInternal; private SurfaceControl.StaticDisplayInfo mStaticDisplayInfo; - // The supported display modes according in SurfaceFlinger + // The supported display modes according to SurfaceFlinger private SurfaceControl.DisplayMode[] mSfDisplayModes; // The active display mode in SurfaceFlinger private SurfaceControl.DisplayMode mActiveSfDisplayMode; @@ -230,6 +234,7 @@ final class LocalDisplayAdapter extends DisplayAdapter { mBacklightAdapter = new BacklightAdapter(displayToken, isDefaultDisplay, mSurfaceControlProxy); mDisplayDeviceConfig = null; + mActiveDisplayModeAtStartId = dynamicInfo.activeDisplayModeId; } @Override @@ -238,12 +243,23 @@ final class LocalDisplayAdapter extends DisplayAdapter { } /** + * Returns the boot display mode of this display. + * @hide + */ + @Override + public Display.Mode getActiveDisplayModeAtStartLocked() { + return findMode(mActiveDisplayModeAtStartId); + } + + /** * Returns true if there is a change. **/ public boolean updateDisplayPropertiesLocked(SurfaceControl.StaticDisplayInfo staticInfo, SurfaceControl.DynamicDisplayInfo dynamicInfo, SurfaceControl.DesiredDisplayModeSpecs modeSpecs) { - boolean changed = updateDisplayModesLocked( + boolean changed = + updateSystemPreferredDisplayMode(dynamicInfo.preferredBootDisplayMode); + changed |= updateDisplayModesLocked( dynamicInfo.supportedDisplayModes, dynamicInfo.activeDisplayModeId, modeSpecs); changed |= updateStaticInfo(staticInfo); changed |= updateColorModesLocked(dynamicInfo.supportedColorModes, @@ -369,8 +385,11 @@ final class LocalDisplayAdapter extends DisplayAdapter { // For a new display, we need to initialize the default mode ID. if (mDefaultModeId == INVALID_MODE_ID) { - mDefaultModeId = activeRecord.mMode.getModeId(); - mDefaultModeGroup = mActiveSfDisplayMode.group; + mDefaultModeId = mSystemPreferredModeId != INVALID_MODE_ID + ? mSystemPreferredModeId : activeRecord.mMode.getModeId(); + mDefaultModeGroup = mSystemPreferredModeId != INVALID_MODE_ID + ? getModeById(mSfDisplayModes, mSystemPreferredModeId).group + : mActiveSfDisplayMode.group; } else if (modesAdded && activeModeChanged) { Slog.d(TAG, "New display modes are added and the active mode has changed, " + "use active mode as default mode."); @@ -531,6 +550,15 @@ final class LocalDisplayAdapter extends DisplayAdapter { return true; } + private boolean updateSystemPreferredDisplayMode(int modeId) { + if (!mSurfaceControlProxy.getBootDisplayModeSupport() + || mSystemPreferredModeId == modeId) { + return false; + } + mSystemPreferredModeId = modeId; + return true; + } + private SurfaceControl.DisplayMode getModeById(SurfaceControl.DisplayMode[] supportedModes, int modeId) { for (SurfaceControl.DisplayMode mode : supportedModes) { @@ -857,6 +885,16 @@ final class LocalDisplayAdapter extends DisplayAdapter { if (oldModeId != getPreferredModeId()) { updateDeviceInfoLocked(); } + + if (!mSurfaceControlProxy.getBootDisplayModeSupport()) { + return; + } + if (mUserPreferredMode == null) { + mSurfaceControlProxy.clearBootDisplayMode(getDisplayTokenLocked()); + } else { + mSurfaceControlProxy.setBootDisplayMode(getDisplayTokenLocked(), + mUserPreferredMode.getModeId()); + } } @Override @@ -865,6 +903,11 @@ final class LocalDisplayAdapter extends DisplayAdapter { } @Override + public Display.Mode getSystemPreferredDisplayModeLocked() { + return findMode(mSystemPreferredModeId); + } + + @Override public void setRequestedColorModeLocked(int colorMode) { requestColorModeLocked(colorMode); } @@ -1072,6 +1115,17 @@ final class LocalDisplayAdapter extends DisplayAdapter { return matchingModeId; } + // Returns a mode with id = modeId. + private Display.Mode findMode(int modeId) { + for (int i = 0; i < mSupportedModes.size(); i++) { + Display.Mode supportedMode = mSupportedModes.valueAt(i).mMode; + if (supportedMode.getModeId() == modeId) { + return supportedMode; + } + } + return null; + } + // Returns a mode with resolution (width, height) and/or refreshRate. If any one of the // resolution or refresh-rate is valid, a mode having the valid parameters is returned. private Display.Mode findMode(int width, int height, float refreshRate) { @@ -1318,6 +1372,18 @@ final class LocalDisplayAdapter extends DisplayAdapter { return SurfaceControl.setActiveColorMode(displayToken, colorMode); } + public boolean getBootDisplayModeSupport() { + return SurfaceControl.getBootDisplayModeSupport(); + } + + public void setBootDisplayMode(IBinder displayToken, int modeId) { + SurfaceControl.setBootDisplayMode(displayToken, modeId); + } + + public void clearBootDisplayMode(IBinder displayToken) { + SurfaceControl.clearBootDisplayMode(displayToken); + } + public void setAutoLowLatencyMode(IBinder displayToken, boolean on) { SurfaceControl.setAutoLowLatencyMode(displayToken, on); @@ -1340,7 +1406,6 @@ final class LocalDisplayAdapter extends DisplayAdapter { return SurfaceControl.setDisplayBrightness(displayToken, sdrBacklight, sdrNits, displayBacklight, displayNits); } - } static class BacklightAdapter { diff --git a/services/core/java/com/android/server/display/RampAnimator.java b/services/core/java/com/android/server/display/RampAnimator.java index 1ebd1f5a535c..d8672fc07619 100644 --- a/services/core/java/com/android/server/display/RampAnimator.java +++ b/services/core/java/com/android/server/display/RampAnimator.java @@ -70,7 +70,7 @@ class RampAnimator<T> { mRate = 0; mTargetValue = target; mCurrentValue = target; - mProperty.setValue(mObject, target); + setPropertyValue(target); if (mAnimating) { mAnimating = false; cancelAnimationCallback(); @@ -125,6 +125,15 @@ class RampAnimator<T> { mListener = listener; } + /** + * Sets the brightness property by converting the given value from HLG space + * into linear space. + */ + private void setPropertyValue(float val) { + final float linearVal = BrightnessUtils.convertGammaToLinear(val); + mProperty.setValue(mObject, linearVal); + } + private void postAnimationCallback() { mChoreographer.postCallback(Choreographer.CALLBACK_ANIMATION, mAnimationCallback, null); } @@ -160,9 +169,7 @@ class RampAnimator<T> { final float oldCurrentValue = mCurrentValue; mCurrentValue = mAnimatedValue; if (oldCurrentValue != mCurrentValue) { - // Convert value from HLG into linear space for the property. - final float linearCurrentVal = BrightnessUtils.convertGammaToLinear(mCurrentValue); - mProperty.setValue(mObject, linearCurrentVal); + setPropertyValue(mCurrentValue); } if (mTargetValue != mCurrentValue) { postAnimationCallback(); diff --git a/services/core/java/com/android/server/hdmi/HdmiCecConfig.java b/services/core/java/com/android/server/hdmi/HdmiCecConfig.java index 65ec1c07c4a1..79820a222dc0 100644 --- a/services/core/java/com/android/server/hdmi/HdmiCecConfig.java +++ b/services/core/java/com/android/server/hdmi/HdmiCecConfig.java @@ -29,6 +29,7 @@ import android.os.Environment; import android.os.SystemProperties; import android.provider.Settings.Global; import android.util.ArrayMap; +import android.util.Slog; import com.android.internal.R; import com.android.internal.annotations.GuardedBy; @@ -246,9 +247,11 @@ public class HdmiCecConfig { mAllowedValues.add(value); if (mContext.getResources().getBoolean(defaultResId)) { if (mDefaultValue != null) { - throw new VerificationException("Invalid CEC setup for '" - + this.getName() + "' setting. " - + "Setting already has a default value."); + Slog.e(TAG, + "Failed to set '" + value + "' as a default for '" + this.getName() + + "': Setting already has a default ('" + mDefaultValue + + "')."); + return; } mDefaultValue = value; } @@ -277,6 +280,11 @@ public class HdmiCecConfig { mContext = context; mStorageAdapter = storageAdapter; + // IMPORTANT: when adding a config value for a particular setting, register that value AFTER + // the existing values for that setting. That way, defaults set in the RRO are forward + // compatible even if the RRO doesn't include that new value yet + // (e.g. because it's ported from a previous release). + Setting hdmiCecEnabled = registerSetting( HdmiControlManager.CEC_SETTING_NAME_HDMI_CEC_ENABLED, R.bool.config_cecHdmiCecEnabled_userConfigurable); @@ -313,15 +321,15 @@ public class HdmiCecConfig { powerControlMode.registerValue(HdmiControlManager.POWER_CONTROL_MODE_TV, R.bool.config_cecPowerControlModeTv_allowed, R.bool.config_cecPowerControlModeTv_default); - powerControlMode.registerValue(HdmiControlManager.POWER_CONTROL_MODE_TV_AND_AUDIO_SYSTEM, - R.bool.config_cecPowerControlModeTvAndAudioSystem_allowed, - R.bool.config_cecPowerControlModeTvAndAudioSystem_default); powerControlMode.registerValue(HdmiControlManager.POWER_CONTROL_MODE_BROADCAST, R.bool.config_cecPowerControlModeBroadcast_allowed, R.bool.config_cecPowerControlModeBroadcast_default); powerControlMode.registerValue(HdmiControlManager.POWER_CONTROL_MODE_NONE, R.bool.config_cecPowerControlModeNone_allowed, R.bool.config_cecPowerControlModeNone_default); + powerControlMode.registerValue(HdmiControlManager.POWER_CONTROL_MODE_TV_AND_AUDIO_SYSTEM, + R.bool.config_cecPowerControlModeTvAndAudioSystem_allowed, + R.bool.config_cecPowerControlModeTvAndAudioSystem_default); Setting powerStateChangeOnActiveSourceLost = registerSetting( HdmiControlManager.CEC_SETTING_NAME_POWER_STATE_CHANGE_ON_ACTIVE_SOURCE_LOST, @@ -385,6 +393,16 @@ public class HdmiCecConfig { R.bool.config_cecTvSendStandbyOnSleepDisabled_allowed, R.bool.config_cecTvSendStandbyOnSleepDisabled_default); + Setting setMenuLanguage = registerSetting( + HdmiControlManager.CEC_SETTING_NAME_SET_MENU_LANGUAGE, + R.bool.config_cecSetMenuLanguage_userConfigurable); + setMenuLanguage.registerValue(HdmiControlManager.SET_MENU_LANGUAGE_ENABLED, + R.bool.config_cecSetMenuLanguageEnabled_allowed, + R.bool.config_cecSetMenuLanguageEnabled_default); + setMenuLanguage.registerValue(HdmiControlManager.SET_MENU_LANGUAGE_DISABLED, + R.bool.config_cecSetMenuLanguageDisabled_allowed, + R.bool.config_cecSetMenuLanguageDisabled_default); + Setting rcProfileTv = registerSetting( HdmiControlManager.CEC_SETTING_NAME_RC_PROFILE_TV, R.bool.config_cecRcProfileTv_userConfigurable); @@ -697,6 +715,8 @@ public class HdmiCecConfig { return STORAGE_SHARED_PREFS; case HdmiControlManager.CEC_SETTING_NAME_TV_SEND_STANDBY_ON_SLEEP: return STORAGE_SHARED_PREFS; + case HdmiControlManager.CEC_SETTING_NAME_SET_MENU_LANGUAGE: + return STORAGE_SHARED_PREFS; case HdmiControlManager.CEC_SETTING_NAME_RC_PROFILE_TV: return STORAGE_SHARED_PREFS; case HdmiControlManager.CEC_SETTING_NAME_RC_PROFILE_SOURCE_HANDLES_ROOT_MENU: @@ -768,6 +788,8 @@ public class HdmiCecConfig { return setting.getName(); case HdmiControlManager.CEC_SETTING_NAME_TV_SEND_STANDBY_ON_SLEEP: return setting.getName(); + case HdmiControlManager.CEC_SETTING_NAME_SET_MENU_LANGUAGE: + return setting.getName(); case HdmiControlManager.CEC_SETTING_NAME_RC_PROFILE_TV: return setting.getName(); case HdmiControlManager.CEC_SETTING_NAME_RC_PROFILE_SOURCE_HANDLES_ROOT_MENU: diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDevice.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDevice.java index c674ffebfe92..454a76ac04f4 100755 --- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDevice.java +++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDevice.java @@ -901,17 +901,12 @@ abstract class HdmiCecLocalDevice { protected int handleVendorCommandWithId(HdmiCecMessage message) { byte[] params = message.getParams(); int vendorId = HdmiUtils.threeBytesToInt(params); - if (vendorId == mService.getVendorId()) { - if (!mService.invokeVendorCommandListenersOnReceived( - mDeviceType, message.getSource(), message.getDestination(), params, true)) { - return Constants.ABORT_REFUSED; - } - } else if (message.getDestination() != Constants.ADDR_BROADCAST - && message.getSource() != Constants.ADDR_UNREGISTERED) { - Slog.v(TAG, "Wrong direct vendor command. Replying with <Feature Abort>"); - return Constants.ABORT_UNRECOGNIZED_OPCODE; - } else { + if (message.getDestination() == Constants.ADDR_BROADCAST + || message.getSource() == Constants.ADDR_UNREGISTERED) { Slog.v(TAG, "Wrong broadcast vendor command. Ignoring"); + } else if (!mService.invokeVendorCommandListenersOnReceived( + mDeviceType, message.getSource(), message.getDestination(), params, true)) { + return Constants.ABORT_REFUSED; } return Constants.HANDLED; } diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java index b23395f36e63..0edcea548055 100644 --- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java +++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java @@ -17,10 +17,15 @@ package com.android.server.hdmi; import android.annotation.CallSuper; +import android.content.ActivityNotFoundException; +import android.content.ComponentName; +import android.content.Context; +import android.content.Intent; import android.hardware.hdmi.HdmiControlManager; import android.hardware.hdmi.HdmiDeviceInfo; import android.hardware.hdmi.IHdmiControlCallback; import android.hardware.tv.cec.V1_0.SendMessageResult; +import android.os.Binder; import android.os.Handler; import android.os.PowerManager; import android.os.PowerManager.WakeLock; @@ -45,9 +50,6 @@ import java.util.Locale; public class HdmiCecLocalDevicePlayback extends HdmiCecLocalDeviceSource { private static final String TAG = "HdmiCecLocalDevicePlayback"; - private static final boolean SET_MENU_LANGUAGE = - HdmiProperties.set_menu_language_enabled().orElse(false); - // How long to wait after hotplug out before possibly going to Standby. @VisibleForTesting static final long STANDBY_AFTER_HOTPLUG_OUT_DELAY_MS = 30_000; @@ -383,7 +385,9 @@ public class HdmiCecLocalDevicePlayback extends HdmiCecLocalDeviceSource { @Constants.HandleMessageResult protected int handleSetMenuLanguage(HdmiCecMessage message) { assertRunOnServiceThread(); - if (!SET_MENU_LANGUAGE) { + if (mService.getHdmiCecConfig().getIntValue( + HdmiControlManager.CEC_SETTING_NAME_SET_MENU_LANGUAGE) + == HdmiControlManager.SET_MENU_LANGUAGE_DISABLED) { return Constants.ABORT_UNRECOGNIZED_OPCODE; } @@ -408,7 +412,7 @@ public class HdmiCecLocalDevicePlayback extends HdmiCecLocalDeviceSource { // locale from being chosen. 'eng' in the CEC command, for instance, // will always be mapped to en-AU among other variants like en-US, en-GB, // an en-IN, which may not be the expected one. - LocalePicker.updateLocale(localeInfo.getLocale()); + startSetMenuLanguageActivity(localeInfo.getLocale()); return Constants.HANDLED; } } @@ -420,6 +424,24 @@ public class HdmiCecLocalDevicePlayback extends HdmiCecLocalDeviceSource { } } + private void startSetMenuLanguageActivity(Locale locale) { + final long identity = Binder.clearCallingIdentity(); + try { + Context context = mService.getContext(); + Intent intent = new Intent(); + intent.putExtra(HdmiControlManager.EXTRA_LOCALE, locale.toLanguageTag()); + intent.setComponent( + ComponentName.unflattenFromString(context.getResources().getString( + com.android.internal.R.string.config_hdmiCecSetMenuLanguageActivity))); + intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + context.startActivityAsUser(intent, context.getUser()); + } catch (ActivityNotFoundException e) { + Slog.e(TAG, "unable to start HdmiCecSetMenuLanguageActivity"); + } finally { + Binder.restoreCallingIdentity(identity); + } + } + @Override @Constants.HandleMessageResult protected int handleSetSystemAudioMode(HdmiCecMessage message) { diff --git a/services/core/java/com/android/server/hdmi/HdmiCecStandbyModeHandler.java b/services/core/java/com/android/server/hdmi/HdmiCecStandbyModeHandler.java index 6f7473d60121..57fe9e6a4acc 100644 --- a/services/core/java/com/android/server/hdmi/HdmiCecStandbyModeHandler.java +++ b/services/core/java/com/android/server/hdmi/HdmiCecStandbyModeHandler.java @@ -133,6 +133,7 @@ public final class HdmiCecStandbyModeHandler { addHandler(Constants.MESSAGE_SET_OSD_NAME, mBypasser); addHandler(Constants.MESSAGE_DEVICE_VENDOR_ID, mBypasser); addHandler(Constants.MESSAGE_REPORT_POWER_STATUS, mBypasser); + addHandler(Constants.MESSAGE_GIVE_FEATURES, mBypasser); addHandler(Constants.MESSAGE_USER_CONTROL_PRESSED, mUserControlProcessedHandler); diff --git a/services/core/java/com/android/server/hdmi/HdmiControlService.java b/services/core/java/com/android/server/hdmi/HdmiControlService.java index 8391e0b4e19a..8ac233114b48 100644 --- a/services/core/java/com/android/server/hdmi/HdmiControlService.java +++ b/services/core/java/com/android/server/hdmi/HdmiControlService.java @@ -1701,11 +1701,11 @@ public class HdmiControlService extends SystemService { class VendorCommandListenerRecord implements IBinder.DeathRecipient { private final IHdmiVendorCommandListener mListener; - private final int mDeviceType; + private final int mVendorId; - public VendorCommandListenerRecord(IHdmiVendorCommandListener listener, int deviceType) { + VendorCommandListenerRecord(IHdmiVendorCommandListener listener, int vendorId) { mListener = listener; - mDeviceType = deviceType; + mVendorId = vendorId; } @Override @@ -2191,10 +2191,10 @@ public class HdmiControlService extends SystemService { } @Override - public void addVendorCommandListener(final IHdmiVendorCommandListener listener, - final int deviceType) { + public void addVendorCommandListener( + final IHdmiVendorCommandListener listener, final int vendorId) { initBinderCall(); - HdmiControlService.this.addVendorCommandListener(listener, deviceType); + HdmiControlService.this.addVendorCommandListener(listener, vendorId); } @Override @@ -3354,8 +3354,9 @@ public class HdmiControlService extends SystemService { mStandbyMessageReceived = false; } - private void addVendorCommandListener(IHdmiVendorCommandListener listener, int deviceType) { - VendorCommandListenerRecord record = new VendorCommandListenerRecord(listener, deviceType); + @VisibleForTesting + void addVendorCommandListener(IHdmiVendorCommandListener listener, int vendorId) { + VendorCommandListenerRecord record = new VendorCommandListenerRecord(listener, vendorId); try { listener.asBinder().linkToDeath(record, 0); } catch (RemoteException e) { @@ -3374,8 +3375,14 @@ public class HdmiControlService extends SystemService { return false; } for (VendorCommandListenerRecord record : mVendorCommandListenerRecords) { - if (record.mDeviceType != deviceType) { - continue; + if (hasVendorId) { + int vendorId = + ((params[0] & 0xFF) << 16) + + ((params[1] & 0xFF) << 8) + + (params[2] & 0xFF); + if (record.mVendorId != vendorId) { + continue; + } } try { record.mListener.onReceived(srcAddress, destAddress, params, hasVendorId); diff --git a/services/core/java/com/android/server/input/GestureMonitorSpyWindow.java b/services/core/java/com/android/server/input/GestureMonitorSpyWindow.java new file mode 100644 index 000000000000..dbd3f3529208 --- /dev/null +++ b/services/core/java/com/android/server/input/GestureMonitorSpyWindow.java @@ -0,0 +1,95 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.input; + +import static android.os.InputConstants.DEFAULT_DISPATCHING_TIMEOUT_MILLIS; + +import android.os.IBinder; +import android.view.InputApplicationHandle; +import android.view.InputChannel; +import android.view.InputMonitor; +import android.view.InputWindowHandle; +import android.view.SurfaceControl; +import android.view.WindowManager; + +/** + * An internal implementation of an {@link InputMonitor} that uses a spy window. + * + * This spy window is a layer container in the SurfaceFlinger hierarchy that does not have any + * graphical buffer, but can still receive input. It is parented to the DisplayContent so + * that it can spy on any pointer events that start in the DisplayContent bounds. When the + * object is constructed, it will add itself to SurfaceFlinger. + */ +class GestureMonitorSpyWindow { + final InputApplicationHandle mApplicationHandle; + final InputWindowHandle mWindowHandle; + + // The token, InputChannel, and SurfaceControl are owned by this object. + final IBinder mMonitorToken; + final InputChannel mClientChannel; + final SurfaceControl mInputSurface; + + GestureMonitorSpyWindow(IBinder token, String name, int displayId, int pid, int uid, + SurfaceControl sc, InputChannel inputChannel) { + mMonitorToken = token; + mClientChannel = inputChannel; + mInputSurface = sc; + + mApplicationHandle = new InputApplicationHandle(null, name, + DEFAULT_DISPATCHING_TIMEOUT_MILLIS); + mWindowHandle = new InputWindowHandle(mApplicationHandle, displayId); + + mWindowHandle.name = name; + mWindowHandle.token = mClientChannel.getToken(); + mWindowHandle.layoutParamsType = WindowManager.LayoutParams.TYPE_SECURE_SYSTEM_OVERLAY; + mWindowHandle.layoutParamsFlags = WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL; + mWindowHandle.dispatchingTimeoutMillis = DEFAULT_DISPATCHING_TIMEOUT_MILLIS; + mWindowHandle.visible = true; + mWindowHandle.focusable = false; + mWindowHandle.hasWallpaper = false; + mWindowHandle.paused = false; + mWindowHandle.ownerPid = pid; + mWindowHandle.ownerUid = uid; + mWindowHandle.inputFeatures = WindowManager.LayoutParams.INPUT_FEATURE_SPY; + mWindowHandle.scaleFactor = 1.0f; + mWindowHandle.trustedOverlay = true; + mWindowHandle.replaceTouchableRegionWithCrop(null /* use this surface's bounds */); + + final SurfaceControl.Transaction t = new SurfaceControl.Transaction(); + t.setInputWindowInfo(mInputSurface, mWindowHandle); + t.setLayer(mInputSurface, Integer.MAX_VALUE); + t.setPosition(mInputSurface, 0, 0); + t.setCrop(mInputSurface, null /* crop to parent surface */); + t.show(mInputSurface); + + t.apply(); + } + + void remove() { + final SurfaceControl.Transaction t = new SurfaceControl.Transaction(); + t.hide(mInputSurface); + t.remove(mInputSurface); + t.apply(); + + mClientChannel.dispose(); + } + + String dump() { + return "name='" + mWindowHandle.name + "', inputChannelToken=" + + mClientChannel.getToken() + " displayId=" + mWindowHandle.displayId; + } +} diff --git a/services/core/java/com/android/server/input/InputManagerService.java b/services/core/java/com/android/server/input/InputManagerService.java index 783a88ca29bf..bfaa7b37fa33 100644 --- a/services/core/java/com/android/server/input/InputManagerService.java +++ b/services/core/java/com/android/server/input/InputManagerService.java @@ -150,6 +150,8 @@ public class InputManagerService extends IInputManager.Stub static final String TAG = "InputManager"; static final boolean DEBUG = false; + private static final boolean USE_SPY_WINDOW_GESTURE_MONITORS = true; + private static final String EXCLUDED_DEVICES_PATH = "etc/excluded-input-devices.xml"; private static final String PORT_ASSOCIATIONS_PATH = "etc/input-port-associations.xml"; @@ -277,6 +279,12 @@ public class InputManagerService extends IInputManager.Stub @GuardedBy("mPointerDisplayIdLock") private int mOverriddenPointerDisplayId = Display.INVALID_DISPLAY; + + // Holds all the registered gesture monitors that are implemented as spy windows. The spy + // windows are mapped by their InputChannel tokens. + @GuardedBy("mInputMonitors") + final Map<IBinder, GestureMonitorSpyWindow> mInputMonitors = new HashMap<>(); + private static native long nativeInit(InputManagerService service, Context context, MessageQueue messageQueue); private static native void nativeStart(long ptr); @@ -716,33 +724,77 @@ public class InputManagerService extends IInputManager.Stub inputChannelName, Binder.getCallingPid()); } + @NonNull + private InputChannel createSpyWindowGestureMonitor(IBinder monitorToken, String name, + int displayId, int pid, int uid) { + final SurfaceControl sc = mWindowManagerCallbacks.createSurfaceForGestureMonitor(name, + displayId); + if (sc == null) { + throw new IllegalArgumentException( + "Could not create gesture monitor surface on display: " + displayId); + } + final InputChannel channel = createInputChannel(name); + + try { + monitorToken.linkToDeath(() -> removeSpyWindowGestureMonitor(channel.getToken()), 0); + } catch (RemoteException e) { + Slog.i(TAG, "Client died before '" + name + "' could be created."); + return null; + } + synchronized (mInputMonitors) { + mInputMonitors.put(channel.getToken(), + new GestureMonitorSpyWindow(monitorToken, name, displayId, pid, uid, sc, + channel)); + } + + final InputChannel outInputChannel = new InputChannel(); + channel.copyTo(outInputChannel); + return outInputChannel; + } + + private void removeSpyWindowGestureMonitor(IBinder inputChannelToken) { + final GestureMonitorSpyWindow monitor; + synchronized (mInputMonitors) { + monitor = mInputMonitors.remove(inputChannelToken); + } + removeInputChannel(inputChannelToken); + if (monitor == null) return; + monitor.remove(); + } + /** * Creates an input monitor that will receive pointer events for the purposes of system-wide * gesture interpretation. * - * @param inputChannelName The input channel name. + * @param requestedName The input channel name. * @param displayId Target display id. * @return The input channel. */ @Override // Binder call - public InputMonitor monitorGestureInput(String inputChannelName, int displayId) { + public InputMonitor monitorGestureInput(IBinder monitorToken, @NonNull String requestedName, + int displayId) { if (!checkCallingPermission(android.Manifest.permission.MONITOR_INPUT, - "monitorInputRegion()")) { + "monitorGestureInput()")) { throw new SecurityException("Requires MONITOR_INPUT permission"); } - Objects.requireNonNull(inputChannelName, "inputChannelName must not be null."); + Objects.requireNonNull(requestedName, "name must not be null."); + Objects.requireNonNull(monitorToken, "token must not be null."); if (displayId < Display.DEFAULT_DISPLAY) { throw new IllegalArgumentException("displayId must >= 0."); } + final String name = "[Gesture Monitor] " + requestedName; final int pid = Binder.getCallingPid(); + final int uid = Binder.getCallingUid(); final long ident = Binder.clearCallingIdentity(); try { - InputChannel inputChannel = nativeCreateInputMonitor( - mPtr, displayId, true /*isGestureMonitor*/, inputChannelName, pid); - InputMonitorHost host = new InputMonitorHost(inputChannel.getToken()); - return new InputMonitor(inputChannel, host); + final InputChannel inputChannel = + USE_SPY_WINDOW_GESTURE_MONITORS + ? createSpyWindowGestureMonitor(monitorToken, name, displayId, pid, uid) + : nativeCreateInputMonitor(mPtr, displayId, true /*isGestureMonitor*/, + requestedName, pid); + return new InputMonitor(inputChannel, new InputMonitorHost(inputChannel.getToken())); } finally { Binder.restoreCallingIdentity(ident); } @@ -2563,37 +2615,51 @@ public class InputManagerService extends IInputManager.Stub String dumpStr = nativeDump(mPtr); if (dumpStr != null) { pw.println(dumpStr); - dumpAssociations(pw); } + + pw.println("Input Manager Service (Java) State:"); + dumpAssociations(pw, " " /*prefix*/); + dumpSpyWindowGestureMonitors(pw, " " /*prefix*/); } - private void dumpAssociations(PrintWriter pw) { + private void dumpAssociations(PrintWriter pw, String prefix) { if (!mStaticAssociations.isEmpty()) { - pw.println("Static Associations:"); + pw.println(prefix + "Static Associations:"); mStaticAssociations.forEach((k, v) -> { - pw.print(" port: " + k); + pw.print(prefix + " port: " + k); pw.println(" display: " + v); }); } synchronized (mAssociationsLock) { if (!mRuntimeAssociations.isEmpty()) { - pw.println("Runtime Associations:"); + pw.println(prefix + "Runtime Associations:"); mRuntimeAssociations.forEach((k, v) -> { - pw.print(" port: " + k); + pw.print(prefix + " port: " + k); pw.println(" display: " + v); }); } if (!mUniqueIdAssociations.isEmpty()) { - pw.println("Unique Id Associations:"); + pw.println(prefix + "Unique Id Associations:"); mUniqueIdAssociations.forEach((k, v) -> { - pw.print(" port: " + k); + pw.print(prefix + " port: " + k); pw.println(" uniqueId: " + v); }); } } } + private void dumpSpyWindowGestureMonitors(PrintWriter pw, String prefix) { + synchronized (mInputMonitors) { + if (mInputMonitors.isEmpty()) return; + pw.println(prefix + "Gesture Monitors (implemented as spy windows):"); + int i = 0; + for (final GestureMonitorSpyWindow monitor : mInputMonitors.values()) { + pw.append(prefix + " " + i++ + ": ").println(monitor.dump()); + } + } + } + private boolean checkCallingPermission(String permission, String func) { // Quick check: if the calling permission is me, it's all okay. if (Binder.getCallingPid() == Process.myPid()) { @@ -2618,6 +2684,7 @@ public class InputManagerService extends IInputManager.Stub synchronized (mAssociationsLock) { /* Test if blocked by associations lock. */} synchronized (mLidSwitchLock) { /* Test if blocked by lid switch lock. */ } synchronized (mPointerDisplayIdLock) { /* Test if blocked by pointer display id lock */ } + synchronized (mInputMonitors) { /* Test if blocked by input monitor lock. */ } nativeMonitor(mPtr); } @@ -2686,6 +2753,11 @@ public class InputManagerService extends IInputManager.Stub // Native callback. private void notifyInputChannelBroken(IBinder token) { + synchronized (mInputMonitors) { + if (mInputMonitors.containsKey(token)) { + removeSpyWindowGestureMonitor(token); + } + } mWindowManagerCallbacks.notifyInputChannelBroken(token); } @@ -2721,6 +2793,17 @@ public class InputManagerService extends IInputManager.Stub // Native callback private void notifyWindowUnresponsive(IBinder token, String reason) { + int gestureMonitorPid = -1; + synchronized (mInputMonitors) { + final GestureMonitorSpyWindow gestureMonitor = mInputMonitors.get(token); + if (gestureMonitor != null) { + gestureMonitorPid = gestureMonitor.mWindowHandle.ownerPid; + } + } + if (gestureMonitorPid != -1) { + mWindowManagerCallbacks.notifyGestureMonitorUnresponsive(gestureMonitorPid, reason); + return; + } mWindowManagerCallbacks.notifyWindowUnresponsive(token, reason); } @@ -2731,6 +2814,17 @@ public class InputManagerService extends IInputManager.Stub // Native callback private void notifyWindowResponsive(IBinder token) { + int gestureMonitorPid = -1; + synchronized (mInputMonitors) { + final GestureMonitorSpyWindow gestureMonitor = mInputMonitors.get(token); + if (gestureMonitor != null) { + gestureMonitorPid = gestureMonitor.mWindowHandle.ownerPid; + } + } + if (gestureMonitorPid != -1) { + mWindowManagerCallbacks.notifyGestureMonitorResponsive(gestureMonitorPid); + return; + } mWindowManagerCallbacks.notifyWindowResponsive(token); } @@ -3184,6 +3278,16 @@ public class InputManagerService extends IInputManager.Stub * pointers such as the mouse cursor and touch spots for the given display. */ SurfaceControl getParentSurfaceForPointers(int displayId); + + /** + * Create a {@link SurfaceControl} that can be configured to receive input over the entire + * display to implement a gesture monitor. The surface will not have a graphical buffer. + * @param name the name of the gesture monitor + * @param displayId the display to create the window in + * @return the SurfaceControl of the new layer container surface + */ + @Nullable + SurfaceControl createSurfaceForGestureMonitor(String name, int displayId); } /** @@ -3258,20 +3362,24 @@ public class InputManagerService extends IInputManager.Stub * Interface for the system to handle request from InputMonitors. */ private final class InputMonitorHost extends IInputMonitorHost.Stub { - private final IBinder mToken; + private final IBinder mInputChannelToken; - InputMonitorHost(IBinder token) { - mToken = token; + InputMonitorHost(IBinder inputChannelToken) { + mInputChannelToken = inputChannelToken; } @Override public void pilferPointers() { - nativePilferPointers(mPtr, mToken); + nativePilferPointers(mPtr, mInputChannelToken); } @Override public void dispose() { - nativeRemoveInputChannel(mPtr, mToken); + if (USE_SPY_WINDOW_GESTURE_MONITORS) { + removeSpyWindowGestureMonitor(mInputChannelToken); + return; + } + nativeRemoveInputChannel(mPtr, mInputChannelToken); } } diff --git a/services/core/java/com/android/server/inputmethod/HandwritingEventReceiverSurface.java b/services/core/java/com/android/server/inputmethod/HandwritingEventReceiverSurface.java index 4c2616667a02..9846a2ba48a4 100644 --- a/services/core/java/com/android/server/inputmethod/HandwritingEventReceiverSurface.java +++ b/services/core/java/com/android/server/inputmethod/HandwritingEventReceiverSurface.java @@ -19,7 +19,6 @@ package com.android.server.inputmethod; import static android.os.InputConstants.DEFAULT_DISPATCHING_TIMEOUT_MILLIS; import android.annotation.NonNull; -import android.graphics.Rect; import android.os.Process; import android.view.InputApplicationHandle; import android.view.InputChannel; @@ -33,8 +32,11 @@ final class HandwritingEventReceiverSurface { public static final String TAG = HandwritingEventReceiverSurface.class.getSimpleName(); static final boolean DEBUG = HandwritingModeController.DEBUG; - private final int mClientPid; - private final int mClientUid; + // Place the layer below the highest layer to place it under gesture monitors. If the surface + // is above gesture monitors, then edge-back and swipe-up gestures won't work when this surface + // is intercepting. + // TODO(b/217538817): Specify the ordering in WM by usage. + private static final int HANDWRITING_SURFACE_LAYER = Integer.MAX_VALUE - 1; private final InputApplicationHandle mApplicationHandle; private final InputWindowHandle mWindowHandle; @@ -44,9 +46,6 @@ final class HandwritingEventReceiverSurface { HandwritingEventReceiverSurface(String name, int displayId, @NonNull SurfaceControl sc, @NonNull InputChannel inputChannel) { - // Initialized the window as being owned by the system. - mClientPid = Process.myPid(); - mClientUid = Process.myUid(); mApplicationHandle = new InputApplicationHandle(null, name, DEFAULT_DISPATCHING_TIMEOUT_MILLIS); @@ -57,29 +56,26 @@ final class HandwritingEventReceiverSurface { mWindowHandle.name = name; mWindowHandle.token = mClientChannel.getToken(); mWindowHandle.layoutParamsType = WindowManager.LayoutParams.TYPE_SECURE_SYSTEM_OVERLAY; - mWindowHandle.layoutParamsFlags = WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL; + mWindowHandle.layoutParamsFlags = WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL + | WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE; mWindowHandle.dispatchingTimeoutMillis = DEFAULT_DISPATCHING_TIMEOUT_MILLIS; mWindowHandle.visible = true; mWindowHandle.focusable = false; mWindowHandle.hasWallpaper = false; mWindowHandle.paused = false; - mWindowHandle.ownerPid = mClientPid; - mWindowHandle.ownerUid = mClientUid; + mWindowHandle.ownerPid = Process.myPid(); + mWindowHandle.ownerUid = Process.myUid(); mWindowHandle.inputFeatures = WindowManager.LayoutParams.INPUT_FEATURE_SPY | WindowManager.LayoutParams.INPUT_FEATURE_INTERCEPTS_STYLUS; mWindowHandle.scaleFactor = 1.0f; mWindowHandle.trustedOverlay = true; - mWindowHandle.replaceTouchableRegionWithCrop(null /* use this surface as crop */); + mWindowHandle.replaceTouchableRegionWithCrop(null /* use this surface's bounds */); final SurfaceControl.Transaction t = new SurfaceControl.Transaction(); t.setInputWindowInfo(mInputSurface, mWindowHandle); - t.setLayer(mInputSurface, Integer.MAX_VALUE); + t.setLayer(mInputSurface, HANDWRITING_SURFACE_LAYER); t.setPosition(mInputSurface, 0, 0); - // Use an arbitrarily large crop that is positioned at the origin. The crop determines the - // bounds and the coordinate space of the input events, so it must start at the origin to - // receive input in display space. - // TODO(b/210039666): fix this in SurfaceFlinger and avoid the hack. - t.setCrop(mInputSurface, new Rect(0, 0, 10000, 10000)); + t.setCrop(mInputSurface, null /* crop to parent surface */); t.show(mInputSurface); t.apply(); diff --git a/services/core/java/com/android/server/locales/LocaleManagerBackupHelper.java b/services/core/java/com/android/server/locales/LocaleManagerBackupHelper.java index 134fb967cac5..01aee7bc1942 100644 --- a/services/core/java/com/android/server/locales/LocaleManagerBackupHelper.java +++ b/services/core/java/com/android/server/locales/LocaleManagerBackupHelper.java @@ -31,13 +31,11 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.PackageManagerInternal; -import android.os.BestClock; import android.os.Binder; import android.os.HandlerThread; import android.os.LocaleList; import android.os.Process; import android.os.RemoteException; -import android.os.SystemClock; import android.os.UserHandle; import android.text.TextUtils; import android.util.Slog; @@ -61,7 +59,6 @@ import java.io.UnsupportedEncodingException; import java.nio.charset.StandardCharsets; import java.time.Clock; import java.time.Duration; -import java.time.ZoneOffset; import java.util.HashMap; /** @@ -97,15 +94,10 @@ class LocaleManagerBackupHelper { LocaleManagerBackupHelper(LocaleManagerService localeManagerService, PackageManagerInternal pmInternal) { - this(localeManagerService.mContext, localeManagerService, pmInternal, getDefaultClock(), + this(localeManagerService.mContext, localeManagerService, pmInternal, Clock.systemUTC(), new SparseArray<>()); } - private static @NonNull Clock getDefaultClock() { - return new BestClock(ZoneOffset.UTC, SystemClock.currentNetworkTimeClock(), - Clock.systemUTC()); - } - @VisibleForTesting LocaleManagerBackupHelper(Context context, LocaleManagerService localeManagerService, PackageManagerInternal pmInternal, Clock clock, SparseArray<StagedData> stagedData) { diff --git a/services/core/java/com/android/server/location/contexthub/IContextHubWrapper.java b/services/core/java/com/android/server/location/contexthub/IContextHubWrapper.java index 21ea1f600b71..a1ee46b4c943 100644 --- a/services/core/java/com/android/server/location/contexthub/IContextHubWrapper.java +++ b/services/core/java/com/android/server/location/contexthub/IContextHubWrapper.java @@ -465,7 +465,7 @@ public abstract class IContextHubWrapper { try { mHub.onHostEndpointConnected(info); } catch (RemoteException | ServiceSpecificException e) { - Log.e(TAG, "RemoteException in onHostEndpointConnected"); + Log.e(TAG, "Exception in onHostEndpointConnected" + e.getMessage()); } } @@ -474,7 +474,7 @@ public abstract class IContextHubWrapper { try { mHub.onHostEndpointDisconnected((char) hostEndpointId); } catch (RemoteException | ServiceSpecificException e) { - Log.e(TAG, "RemoteException in onHostEndpointDisconnected"); + Log.e(TAG, "Exception in onHostEndpointDisconnected" + e.getMessage()); } } @@ -488,6 +488,8 @@ public abstract class IContextHubWrapper { return ContextHubTransaction.RESULT_SUCCESS; } catch (RemoteException | ServiceSpecificException e) { return ContextHubTransaction.RESULT_FAILED_UNKNOWN; + } catch (IllegalArgumentException e) { + return ContextHubTransaction.RESULT_FAILED_BAD_PARAMS; } } @@ -499,8 +501,10 @@ public abstract class IContextHubWrapper { try { mHub.loadNanoapp(contextHubId, aidlNanoAppBinary, transactionId); return ContextHubTransaction.RESULT_SUCCESS; - } catch (RemoteException | ServiceSpecificException e) { + } catch (RemoteException | ServiceSpecificException | UnsupportedOperationException e) { return ContextHubTransaction.RESULT_FAILED_UNKNOWN; + } catch (IllegalArgumentException e) { + return ContextHubTransaction.RESULT_FAILED_BAD_PARAMS; } } @@ -510,8 +514,10 @@ public abstract class IContextHubWrapper { try { mHub.unloadNanoapp(contextHubId, nanoappId, transactionId); return ContextHubTransaction.RESULT_SUCCESS; - } catch (RemoteException | ServiceSpecificException e) { + } catch (RemoteException | ServiceSpecificException | UnsupportedOperationException e) { return ContextHubTransaction.RESULT_FAILED_UNKNOWN; + } catch (IllegalArgumentException e) { + return ContextHubTransaction.RESULT_FAILED_BAD_PARAMS; } } @@ -521,8 +527,10 @@ public abstract class IContextHubWrapper { try { mHub.enableNanoapp(contextHubId, nanoappId, transactionId); return ContextHubTransaction.RESULT_SUCCESS; - } catch (RemoteException | ServiceSpecificException e) { + } catch (RemoteException | ServiceSpecificException | UnsupportedOperationException e) { return ContextHubTransaction.RESULT_FAILED_UNKNOWN; + } catch (IllegalArgumentException e) { + return ContextHubTransaction.RESULT_FAILED_BAD_PARAMS; } } @@ -532,8 +540,10 @@ public abstract class IContextHubWrapper { try { mHub.disableNanoapp(contextHubId, nanoappId, transactionId); return ContextHubTransaction.RESULT_SUCCESS; - } catch (RemoteException | ServiceSpecificException e) { + } catch (RemoteException | ServiceSpecificException | UnsupportedOperationException e) { return ContextHubTransaction.RESULT_FAILED_UNKNOWN; + } catch (IllegalArgumentException e) { + return ContextHubTransaction.RESULT_FAILED_BAD_PARAMS; } } @@ -542,8 +552,10 @@ public abstract class IContextHubWrapper { try { mHub.queryNanoapps(contextHubId); return ContextHubTransaction.RESULT_SUCCESS; - } catch (RemoteException | ServiceSpecificException e) { + } catch (RemoteException | ServiceSpecificException | UnsupportedOperationException e) { return ContextHubTransaction.RESULT_FAILED_UNKNOWN; + } catch (IllegalArgumentException e) { + return ContextHubTransaction.RESULT_FAILED_BAD_PARAMS; } } @@ -551,7 +563,7 @@ public abstract class IContextHubWrapper { mAidlCallbackMap.put(contextHubId, new ContextHubAidlCallback(contextHubId, callback)); try { mHub.registerCallback(contextHubId, mAidlCallbackMap.get(contextHubId)); - } catch (RemoteException | ServiceSpecificException e) { + } catch (RemoteException | ServiceSpecificException | IllegalArgumentException e) { Log.e(TAG, "Exception while registering callback: " + e.getMessage()); } } diff --git a/services/core/java/com/android/server/location/gnss/GnssNmeaProvider.java b/services/core/java/com/android/server/location/gnss/GnssNmeaProvider.java index 5036a6e7edf5..bfef97856838 100644 --- a/services/core/java/com/android/server/location/gnss/GnssNmeaProvider.java +++ b/services/core/java/com/android/server/location/gnss/GnssNmeaProvider.java @@ -63,16 +63,25 @@ class GnssNmeaProvider extends GnssListenerMultiplexer<Void, IGnssNmeaListener, @Override protected boolean registerWithService(Void ignored, Collection<GnssListenerRegistration> registrations) { - if (D) { - Log.d(TAG, "starting gnss nmea messages"); + if (mGnssNative.startNmeaMessageCollection()) { + if (D) { + Log.d(TAG, "starting gnss nmea messages collection"); + } + return true; + } else { + Log.e(TAG, "error starting gnss nmea messages collection"); + return false; } - return true; } @Override protected void unregisterWithService() { - if (D) { - Log.d(TAG, "stopping gnss nmea messages"); + if (mGnssNative.stopNmeaMessageCollection()) { + if (D) { + Log.d(TAG, "stopping gnss nmea messages collection"); + } + } else { + Log.e(TAG, "error stopping gnss nmea messages collection"); } } diff --git a/services/core/java/com/android/server/location/gnss/GnssStatusProvider.java b/services/core/java/com/android/server/location/gnss/GnssStatusProvider.java index 936283deda8e..0ce36d6a8276 100644 --- a/services/core/java/com/android/server/location/gnss/GnssStatusProvider.java +++ b/services/core/java/com/android/server/location/gnss/GnssStatusProvider.java @@ -43,6 +43,7 @@ public class GnssStatusProvider extends private final AppOpsHelper mAppOpsHelper; private final LocationUsageLogger mLogger; + private final GnssNative mGnssNative; private boolean mIsNavigating = false; @@ -50,6 +51,7 @@ public class GnssStatusProvider extends super(injector); mAppOpsHelper = injector.getAppOpsHelper(); mLogger = injector.getLocationUsageLogger(); + mGnssNative = gnssNative; gnssNative.addBaseCallbacks(this); gnssNative.addStatusCallbacks(this); @@ -64,16 +66,25 @@ public class GnssStatusProvider extends @Override protected boolean registerWithService(Void ignored, Collection<GnssListenerRegistration> registrations) { - if (D) { - Log.d(TAG, "starting gnss status"); + if (mGnssNative.startSvStatusCollection()) { + if (D) { + Log.d(TAG, "starting gnss sv status"); + } + return true; + } else { + Log.e(TAG, "error starting gnss sv status"); + return false; } - return true; } @Override protected void unregisterWithService() { - if (D) { - Log.d(TAG, "stopping gnss status"); + if (mGnssNative.stopSvStatusCollection()) { + if (D) { + Log.d(TAG, "stopping gnss sv status"); + } + } else { + Log.e(TAG, "error stopping gnss sv status"); } } diff --git a/services/core/java/com/android/server/location/gnss/hal/GnssNative.java b/services/core/java/com/android/server/location/gnss/hal/GnssNative.java index e072bf7dc1f7..af87677ecb66 100644 --- a/services/core/java/com/android/server/location/gnss/hal/GnssNative.java +++ b/services/core/java/com/android/server/location/gnss/hal/GnssNative.java @@ -783,6 +783,38 @@ public class GnssNative { } /** + * Starts sv status collection. + */ + public boolean startSvStatusCollection() { + Preconditions.checkState(mRegistered); + return mGnssHal.startSvStatusCollection(); + } + + /** + * Stops sv status collection. + */ + public boolean stopSvStatusCollection() { + Preconditions.checkState(mRegistered); + return mGnssHal.stopSvStatusCollection(); + } + + /** + * Starts NMEA message collection. + */ + public boolean startNmeaMessageCollection() { + Preconditions.checkState(mRegistered); + return mGnssHal.startNmeaMessageCollection(); + } + + /** + * Stops NMEA message collection. + */ + public boolean stopNmeaMessageCollection() { + Preconditions.checkState(mRegistered); + return mGnssHal.stopNmeaMessageCollection(); + } + + /** * Returns true if measurement corrections are supported. */ public boolean isMeasurementCorrectionsSupported() { @@ -1369,6 +1401,22 @@ public class GnssNative { return native_inject_measurement_corrections(corrections); } + protected boolean startSvStatusCollection() { + return native_start_sv_status_collection(); + } + + protected boolean stopSvStatusCollection() { + return native_stop_sv_status_collection(); + } + + protected boolean startNmeaMessageCollection() { + return native_start_nmea_message_collection(); + } + + protected boolean stopNmeaMessageCollection() { + return native_stop_nmea_message_collection(); + } + protected int getBatchSize() { return native_get_batch_size(); } @@ -1478,6 +1526,10 @@ public class GnssNative { private static native int native_read_nmea(byte[] buffer, int bufferSize); + private static native boolean native_start_nmea_message_collection(); + + private static native boolean native_stop_nmea_message_collection(); + // location injection APIs private static native void native_inject_location( @@ -1501,6 +1553,11 @@ public class GnssNative { private static native void native_inject_time(long time, long timeReference, int uncertainty); + // sv status APIs + private static native boolean native_start_sv_status_collection(); + + private static native boolean native_stop_sv_status_collection(); + // navigation message APIs private static native boolean native_is_navigation_message_supported(); diff --git a/services/core/java/com/android/server/logcat/LogAccessConfirmationActivity.java b/services/core/java/com/android/server/logcat/LogAccessConfirmationActivity.java new file mode 100644 index 000000000000..6b442a6a395e --- /dev/null +++ b/services/core/java/com/android/server/logcat/LogAccessConfirmationActivity.java @@ -0,0 +1,130 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.logcat; + +import android.content.Context; +import android.content.DialogInterface; +import android.content.Intent; +import android.content.IntentSender; +import android.os.Bundle; +import android.os.ServiceManager; +import android.os.logcat.ILogcatManagerService; +import android.util.Slog; +import android.view.View; +import android.widget.TextView; + +import com.android.internal.R; +import com.android.internal.app.AlertActivity; +import com.android.internal.app.AlertController; + + +/** + * This dialog is shown to the user before an activity in a harmful app is launched. + * + * See {@code PackageManager.setLogcatAppInfo} for more info. + */ +public class LogAccessConfirmationActivity extends AlertActivity implements + DialogInterface.OnClickListener { + private static final String TAG = LogAccessConfirmationActivity.class.getSimpleName(); + + private String mPackageName; + private IntentSender mTarget; + private final ILogcatManagerService mLogcatManagerService = + ILogcatManagerService.Stub.asInterface(ServiceManager.getService("logcat")); + + private int mUid; + private int mGid; + private int mPid; + private int mFd; + + private static final String EXTRA_UID = "uid"; + private static final String EXTRA_GID = "gid"; + private static final String EXTRA_PID = "pid"; + private static final String EXTRA_FD = "fd"; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + final Intent intent = getIntent(); + mPackageName = intent.getStringExtra(Intent.EXTRA_PACKAGE_NAME); + mUid = intent.getIntExtra("uid", 0); + mGid = intent.getIntExtra("gid", 0); + mPid = intent.getIntExtra("pid", 0); + mFd = intent.getIntExtra("fd", 0); + + final AlertController.AlertParams p = mAlertParams; + p.mTitle = getString(R.string.log_access_confirmation_title); + p.mView = createView(); + + p.mPositiveButtonText = getString(R.string.log_access_confirmation_allow); + p.mPositiveButtonListener = this; + p.mNegativeButtonText = getString(R.string.log_access_confirmation_deny); + p.mNegativeButtonListener = this; + + mAlert.installContent(mAlertParams); + } + + private View createView() { + final View view = getLayoutInflater().inflate(R.layout.harmful_app_warning_dialog, + null /*root*/); + ((TextView) view.findViewById(R.id.app_name_text)) + .setText(mPackageName); + ((TextView) view.findViewById(R.id.message)) + .setText(getIntent().getExtras().getString("body")); + return view; + } + + @Override + public void onClick(DialogInterface dialog, int which) { + switch (which) { + case DialogInterface.BUTTON_POSITIVE: + try { + mLogcatManagerService.approve(mUid, mGid, mPid, mFd); + } catch (Throwable t) { + Slog.e(TAG, "Could not start the LogcatManagerService.", t); + } + finish(); + break; + case DialogInterface.BUTTON_NEGATIVE: + try { + mLogcatManagerService.decline(mUid, mGid, mPid, mFd); + } catch (Throwable t) { + Slog.e(TAG, "Could not start the LogcatManagerService.", t); + } + finish(); + break; + } + } + + /** + * Create the Intent for a LogAccessConfirmationActivity. + */ + public static Intent createIntent(Context context, String targetPackageName, + IntentSender target, int uid, int gid, int pid, int fd) { + final Intent intent = new Intent(); + intent.setClass(context, LogAccessConfirmationActivity.class); + intent.putExtra(Intent.EXTRA_PACKAGE_NAME, targetPackageName); + intent.putExtra(EXTRA_UID, uid); + intent.putExtra(EXTRA_GID, gid); + intent.putExtra(EXTRA_PID, pid); + intent.putExtra(EXTRA_FD, fd); + + return intent; + } + +} diff --git a/services/core/java/com/android/server/logcat/LogcatManagerService.java b/services/core/java/com/android/server/logcat/LogcatManagerService.java index ff6372aec3bd..140c6d48b57b 100644 --- a/services/core/java/com/android/server/logcat/LogcatManagerService.java +++ b/services/core/java/com/android/server/logcat/LogcatManagerService.java @@ -16,20 +16,36 @@ package com.android.server.logcat; +import android.annotation.NonNull; +import android.app.ActivityManager; +import android.app.ActivityManager.RunningAppProcessInfo; +import android.app.ActivityManagerInternal; +import android.app.Notification; +import android.app.NotificationManager; +import android.app.PendingIntent; import android.content.Context; +import android.content.Intent; +import android.content.pm.PackageManager; +import android.content.pm.PackageManager.NameNotFoundException; import android.os.ILogd; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.os.logcat.ILogcatManagerService; import android.util.Slog; +import com.android.internal.R; +import com.android.internal.notification.SystemNotificationChannels; +import com.android.internal.util.ArrayUtils; +import com.android.server.LocalServices; import com.android.server.SystemService; +import java.util.Arrays; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; /** - * Service responsible for manage the access to Logcat. + * Service responsible for managing the access to Logcat. */ public final class LogcatManagerService extends SystemService { @@ -38,6 +54,43 @@ public final class LogcatManagerService extends SystemService { private final BinderService mBinderService; private final ExecutorService mThreadExecutor; private ILogd mLogdService; + private NotificationManager mNotificationManager; + private @NonNull ActivityManager mActivityManager; + private ActivityManagerInternal mActivityManagerInternal; + private static final int MAX_UID_IMPORTANCE_COUNT_LISTENER = 2; + private static int sUidImportanceListenerCount = 0; + private static final int AID_SHELL_UID = 2000; + + // TODO This allowlist is just a temporary workaround for the tests: + // FrameworksServicesTests + // PlatformRuleTests + // After adapting the test suites, the allowlist will be removed in + // the upcoming bug fix patches. + private static final String[] ALLOWABLE_TESTING_PACKAGES = { + "android.platform.test.rule.tests", + "com.android.frameworks.servicestests" + }; + + // TODO Same as the above ALLOWABLE_TESTING_PACKAGES. + private boolean isAllowableTestingPackage(int uid) { + PackageManager pm = mContext.getPackageManager(); + + String[] packageNames = pm.getPackagesForUid(uid); + + if (ArrayUtils.isEmpty(packageNames)) { + return false; + } + + for (String name : packageNames) { + Slog.e(TAG, "isAllowableTestingPackage: " + name); + + if (Arrays.asList(ALLOWABLE_TESTING_PACKAGES).contains(name)) { + return true; + } + } + + return false; + }; private final class BinderService extends ILogcatManagerService.Stub { @Override @@ -51,6 +104,197 @@ public final class LogcatManagerService extends SystemService { // the logd data access is finished. mThreadExecutor.execute(new LogdMonitor(uid, gid, pid, fd, false)); } + + @Override + public void approve(int uid, int gid, int pid, int fd) { + try { + getLogdService().approve(uid, gid, pid, fd); + } catch (RemoteException e) { + e.printStackTrace(); + } + } + + @Override + public void decline(int uid, int gid, int pid, int fd) { + try { + getLogdService().decline(uid, gid, pid, fd); + } catch (RemoteException e) { + e.printStackTrace(); + } + } + } + + private ILogd getLogdService() { + synchronized (LogcatManagerService.this) { + if (mLogdService == null) { + LogcatManagerService.this.addLogdService(); + } + return mLogdService; + } + } + + private String getBodyString(Context context, String callingPackage, int uid) { + PackageManager pm = context.getPackageManager(); + try { + return context.getString( + com.android.internal.R.string.log_access_confirmation_body, + pm.getApplicationInfoAsUser(callingPackage, PackageManager.MATCH_DIRECT_BOOT_AUTO, + UserHandle.getUserId(uid)).loadLabel(pm)); + } catch (NameNotFoundException e) { + // App name is unknown. + return null; + } + } + + private void sendNotification(int notificationId, String clientInfo, int uid, int gid, int pid, + int fd) { + + final ActivityManagerInternal activityManagerInternal = + LocalServices.getService(ActivityManagerInternal.class); + + PackageManager pm = mContext.getPackageManager(); + String packageName = activityManagerInternal.getPackageNameByPid(pid); + if (packageName != null) { + String notificationBody = getBodyString(mContext, packageName, uid); + + final Intent mIntent = LogAccessConfirmationActivity.createIntent(mContext, + packageName, null, uid, gid, pid, fd); + + if (notificationBody == null) { + // Decline the logd access if the nofitication body is unknown + Slog.e(TAG, "Unknown notification body, declining the logd access"); + declineLogdAccess(uid, gid, pid, fd); + return; + } + + // TODO Next version will replace notification with dialogue + // per UX guidance. + generateNotificationWithBodyContent(notificationId, clientInfo, notificationBody, + mIntent); + return; + + } + + String[] packageNames = pm.getPackagesForUid(uid); + + if (ArrayUtils.isEmpty(packageNames)) { + // Decline the logd access if the app name is unknown + Slog.e(TAG, "Unknown calling package name, declining the logd access"); + declineLogdAccess(uid, gid, pid, fd); + return; + } + + String firstPackageName = packageNames[0]; + + if (firstPackageName == null || firstPackageName.length() == 0) { + // Decline the logd access if the package name from uid is unknown + Slog.e(TAG, "Unknown calling package name, declining the logd access"); + declineLogdAccess(uid, gid, pid, fd); + return; + } + + String notificationBody = getBodyString(mContext, firstPackageName, uid); + + final Intent mIntent = LogAccessConfirmationActivity.createIntent(mContext, + firstPackageName, null, uid, gid, pid, fd); + + if (notificationBody == null) { + Slog.e(TAG, "Unknown notification body, declining the logd access"); + declineLogdAccess(uid, gid, pid, fd); + return; + } + + // TODO Next version will replace notification with dialogue + // per UX guidance. + generateNotificationWithBodyContent(notificationId, clientInfo, + notificationBody, mIntent); + } + + private void declineLogdAccess(int uid, int gid, int pid, int fd) { + try { + getLogdService().decline(uid, gid, pid, fd); + } catch (RemoteException ex) { + Slog.e(TAG, "Fails to call remote functions ", ex); + } + } + + private void generateNotificationWithBodyContent(int notificationId, String clientInfo, + String notificationBody, Intent intent) { + final Notification.Builder notificationBuilder = new Notification.Builder( + mContext, + SystemNotificationChannels.ACCESSIBILITY_SECURITY_POLICY); + intent.setFlags( + Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); + intent.setIdentifier(String.valueOf(notificationId) + clientInfo); + intent.putExtra("body", notificationBody); + + notificationBuilder + .setSmallIcon(R.drawable.ic_info) + .setContentTitle( + mContext.getString(R.string.log_access_confirmation_title)) + .setContentText(notificationBody) + .setContentIntent( + PendingIntent.getActivity(mContext, 0, intent, + PendingIntent.FLAG_IMMUTABLE)) + .setTicker(mContext.getString(R.string.log_access_confirmation_title)) + .setOnlyAlertOnce(true) + .setAutoCancel(true); + mNotificationManager.notify(notificationId, notificationBuilder.build()); + } + + /** + * A class which watches an uid for background access and notifies the logdMonitor when + * the package status becomes foreground (importance change) + */ + private class UidImportanceListener implements ActivityManager.OnUidImportanceListener { + private final int mExpectedUid; + private final int mExpectedGid; + private final int mExpectedPid; + private final int mExpectedFd; + private int mExpectedImportance; + private int mCurrentImportance = RunningAppProcessInfo.IMPORTANCE_GONE; + + UidImportanceListener(int uid, int gid, int pid, int fd, int importance) { + mExpectedUid = uid; + mExpectedGid = gid; + mExpectedPid = pid; + mExpectedFd = fd; + mExpectedImportance = importance; + } + + @Override + public void onUidImportance(int uid, int importance) { + if (uid == mExpectedUid) { + mCurrentImportance = importance; + + /** + * 1) If the process status changes to foreground, send a notification + * for user consent. + * 2) If the process status remains background, we decline logd access request. + **/ + if (importance <= RunningAppProcessInfo.IMPORTANCE_FOREGROUND_SERVICE) { + String clientInfo = getClientInfo(uid, mExpectedGid, mExpectedPid, mExpectedFd); + sendNotification(0, clientInfo, uid, mExpectedGid, mExpectedPid, + mExpectedFd); + mActivityManager.removeOnUidImportanceListener(this); + + synchronized (LogcatManagerService.this) { + sUidImportanceListenerCount--; + } + } else { + try { + getLogdService().decline(uid, mExpectedGid, mExpectedPid, mExpectedFd); + } catch (RemoteException ex) { + Slog.e(TAG, "Fails to call remote functions ", ex); + } + } + } + } + } + + private static String getClientInfo(int uid, int gid, int pid, int fd) { + return "UID=" + Integer.toString(uid) + " GID=" + Integer.toString(gid) + " PID=" + + Integer.toString(pid) + " FD=" + Integer.toString(fd); } private class LogdMonitor implements Runnable { @@ -74,9 +318,7 @@ public final class LogcatManagerService extends SystemService { } /** - * The current version grant the permission by default. - * And track the logd access. - * The next version will generate a prompt for users. + * LogdMonitor generates a prompt for users. * The users decide whether the logd access is allowed. */ @Override @@ -86,10 +328,61 @@ public final class LogcatManagerService extends SystemService { } if (mStart) { - try { - mLogdService.approve(mUid, mGid, mPid, mFd); - } catch (RemoteException ex) { - Slog.e(TAG, "Fails to call remote functions ", ex); + + // TODO See the comments of ALLOWABLE_TESTING_PACKAGES. + if (isAllowableTestingPackage(mUid)) { + try { + getLogdService().approve(mUid, mGid, mPid, mFd); + } catch (RemoteException e) { + e.printStackTrace(); + } + return; + } + + // If the access request is coming from adb shell, approve the logd access + if (mUid == AID_SHELL_UID) { + try { + getLogdService().approve(mUid, mGid, mPid, mFd); + } catch (RemoteException e) { + e.printStackTrace(); + } + return; + } + + final int procState = LocalServices.getService(ActivityManagerInternal.class) + .getUidProcessState(mUid); + // If the process is foreground, send a notification for user consent + if (procState <= ActivityManager.PROCESS_STATE_FOREGROUND_SERVICE) { + String clientInfo = getClientInfo(mUid, mGid, mPid, mFd); + sendNotification(0, clientInfo, mUid, mGid, mPid, mFd); + } else { + /** + * If the process is background, add a background process change listener and + * monitor if the process status changes. + * To avoid clients registering multiple listeners, we limit the number of + * maximum listeners to MAX_UID_IMPORTANCE_COUNT_LISTENER. + **/ + if (mActivityManager == null) { + return; + } + + synchronized (LogcatManagerService.this) { + if (sUidImportanceListenerCount < MAX_UID_IMPORTANCE_COUNT_LISTENER) { + // Trigger addOnUidImportanceListener when there is an update from + // the importance of the process + mActivityManager.addOnUidImportanceListener(new UidImportanceListener( + mUid, mGid, mPid, mFd, + RunningAppProcessInfo.IMPORTANCE_FOREGROUND_SERVICE), + RunningAppProcessInfo.IMPORTANCE_FOREGROUND_SERVICE); + sUidImportanceListenerCount++; + } else { + try { + getLogdService().decline(mUid, mGid, mPid, mFd); + } catch (RemoteException e) { + e.printStackTrace(); + } + } + } } } } @@ -100,6 +393,8 @@ public final class LogcatManagerService extends SystemService { mContext = context; mBinderService = new BinderService(); mThreadExecutor = Executors.newCachedThreadPool(); + mActivityManager = context.getSystemService(ActivityManager.class); + mNotificationManager = mContext.getSystemService(NotificationManager.class); } @Override @@ -114,5 +409,4 @@ public final class LogcatManagerService extends SystemService { private void addLogdService() { mLogdService = ILogd.Stub.asInterface(ServiceManager.getService("logd")); } - } diff --git a/services/core/java/com/android/server/media/BluetoothRouteProvider.java b/services/core/java/com/android/server/media/BluetoothRouteProvider.java index 91de9e559e13..728782ccee0b 100644 --- a/services/core/java/com/android/server/media/BluetoothRouteProvider.java +++ b/services/core/java/com/android/server/media/BluetoothRouteProvider.java @@ -45,7 +45,6 @@ import android.util.SparseIntArray; import com.android.internal.R; import java.util.ArrayList; -import java.util.Collections; import java.util.HashMap; import java.util.Iterator; import java.util.List; @@ -448,15 +447,16 @@ class BluetoothRouteProvider { case BluetoothProfile.A2DP: mA2dpProfile = (BluetoothA2dp) proxy; // It may contain null. - activeDevices = Collections.singletonList(mA2dpProfile.getActiveDevice()); + activeDevices = mBluetoothAdapter.getActiveDevices(BluetoothProfile.A2DP); break; case BluetoothProfile.HEARING_AID: mHearingAidProfile = (BluetoothHearingAid) proxy; - activeDevices = mHearingAidProfile.getActiveDevices(); + activeDevices = mBluetoothAdapter.getActiveDevices( + BluetoothProfile.HEARING_AID); break; case BluetoothProfile.LE_AUDIO: mLeAudioProfile = (BluetoothLeAudio) proxy; - activeDevices = mLeAudioProfile.getActiveDevices(); + activeDevices = mBluetoothAdapter.getActiveDevices(BluetoothProfile.LE_AUDIO); break; default: return; diff --git a/services/core/java/com/android/server/notification/NotificationRecord.java b/services/core/java/com/android/server/notification/NotificationRecord.java index 96d7521439cd..70e968fa8bdc 100644 --- a/services/core/java/com/android/server/notification/NotificationRecord.java +++ b/services/core/java/com/android/server/notification/NotificationRecord.java @@ -201,6 +201,10 @@ public final class NotificationRecord { private boolean mIsAppImportanceLocked; private ArraySet<Uri> mGrantableUris; + // Storage for phone numbers that were found to be associated with + // contacts in this notification. + private ArraySet<String> mPhoneNumbers; + // Whether this notification record should have an update logged the next time notifications // are sorted. private boolean mPendingLogUpdate = false; @@ -1547,6 +1551,26 @@ public final class NotificationRecord { return mPendingLogUpdate; } + /** + * Merge the given set of phone numbers into the list of phone numbers that + * are cached on this notification record. + */ + public void mergePhoneNumbers(ArraySet<String> phoneNumbers) { + // if the given phone numbers are null or empty then don't do anything + if (phoneNumbers == null || phoneNumbers.size() == 0) { + return; + } + // initialize if not already + if (mPhoneNumbers == null) { + mPhoneNumbers = new ArraySet<>(); + } + mPhoneNumbers.addAll(phoneNumbers); + } + + public ArraySet<String> getPhoneNumbers() { + return mPhoneNumbers; + } + @VisibleForTesting static final class Light { public final int color; diff --git a/services/core/java/com/android/server/notification/ValidateNotificationPeople.java b/services/core/java/com/android/server/notification/ValidateNotificationPeople.java index d7bc3bb8af28..dc4d04feab72 100644 --- a/services/core/java/com/android/server/notification/ValidateNotificationPeople.java +++ b/services/core/java/com/android/server/notification/ValidateNotificationPeople.java @@ -68,7 +68,10 @@ public class ValidateNotificationPeople implements NotificationSignalExtractor { private static final boolean ENABLE_PEOPLE_VALIDATOR = true; private static final String SETTING_ENABLE_PEOPLE_VALIDATOR = "validate_notification_people_enabled"; - private static final String[] LOOKUP_PROJECTION = { Contacts._ID, Contacts.STARRED }; + private static final String[] LOOKUP_PROJECTION = { Contacts._ID, Contacts.LOOKUP_KEY, + Contacts.STARRED, Contacts.HAS_PHONE_NUMBER }; + private static final String[] PHONE_LOOKUP_PROJECTION = + { ContactsContract.CommonDataKinds.Phone.NORMALIZED_NUMBER }; private static final int MAX_PEOPLE = 10; private static final int PEOPLE_CACHE_SIZE = 200; @@ -409,6 +412,35 @@ public class ValidateNotificationPeople implements NotificationSignalExtractor { return lookupResult; } + @VisibleForTesting + // Performs a contacts search using searchContacts, and then follows up by looking up + // any phone numbers associated with the resulting contact information and merge those + // into the lookup result as well. Will have no additional effect if the contact does + // not have any phone numbers. + LookupResult searchContactsAndLookupNumbers(Context context, Uri lookupUri) { + LookupResult lookupResult = searchContacts(context, lookupUri); + String phoneLookupKey = lookupResult.getPhoneLookupKey(); + if (phoneLookupKey != null) { + String selection = Contacts.LOOKUP_KEY + " = ?"; + String[] selectionArgs = new String[] { phoneLookupKey }; + try (Cursor cursor = context.getContentResolver().query( + ContactsContract.CommonDataKinds.Phone.CONTENT_URI, PHONE_LOOKUP_PROJECTION, + selection, selectionArgs, /* sortOrder= */ null)) { + if (cursor == null) { + Slog.w(TAG, "Cursor is null when querying contact phone number."); + return lookupResult; + } + + while (cursor.moveToNext()) { + lookupResult.mergePhoneNumber(cursor); + } + } catch (Throwable t) { + Slog.w(TAG, "Problem getting content resolver or querying phone numbers.", t); + } + } + return lookupResult; + } + private void addWorkContacts(LookupResult lookupResult, Context context, Uri corpLookupUri) { final int workUserId = findWorkUserId(context); if (workUserId == -1) { @@ -454,6 +486,9 @@ public class ValidateNotificationPeople implements NotificationSignalExtractor { private final long mExpireMillis; private float mAffinity = NONE; + private boolean mHasPhone = false; + private String mPhoneLookupKey = null; + private ArraySet<String> mPhoneNumbers = new ArraySet<>(); public LookupResult() { mExpireMillis = System.currentTimeMillis() + CONTACT_REFRESH_MILLIS; @@ -473,6 +508,15 @@ public class ValidateNotificationPeople implements NotificationSignalExtractor { Slog.i(TAG, "invalid cursor: no _ID"); } + // Lookup key for potentially looking up contact phone number later + final int lookupKeyIdx = cursor.getColumnIndex(Contacts.LOOKUP_KEY); + if (lookupKeyIdx >= 0) { + mPhoneLookupKey = cursor.getString(lookupKeyIdx); + if (DEBUG) Slog.d(TAG, "contact LOOKUP_KEY is: " + mPhoneLookupKey); + } else { + if (DEBUG) Slog.d(TAG, "invalid cursor: no LOOKUP_KEY"); + } + // Starred final int starIdx = cursor.getColumnIndex(Contacts.STARRED); if (starIdx >= 0) { @@ -484,6 +528,39 @@ public class ValidateNotificationPeople implements NotificationSignalExtractor { } else { if (DEBUG) Slog.d(TAG, "invalid cursor: no STARRED"); } + + // whether a phone number is present + final int hasPhoneIdx = cursor.getColumnIndex(Contacts.HAS_PHONE_NUMBER); + if (hasPhoneIdx >= 0) { + mHasPhone = cursor.getInt(hasPhoneIdx) != 0; + if (DEBUG) Slog.d(TAG, "contact HAS_PHONE_NUMBER is: " + mHasPhone); + } else { + if (DEBUG) Slog.d(TAG, "invalid cursor: no HAS_PHONE_NUMBER"); + } + } + + // Returns the phone lookup key that is cached in this result, or null + // if the contact has no known phone info. + public String getPhoneLookupKey() { + if (!mHasPhone) { + return null; + } + return mPhoneLookupKey; + } + + // Merge phone number found in this lookup and store it in mPhoneNumbers. + public void mergePhoneNumber(Cursor cursor) { + final int phoneNumIdx = cursor.getColumnIndex( + ContactsContract.CommonDataKinds.Phone.NORMALIZED_NUMBER); + if (phoneNumIdx >= 0) { + mPhoneNumbers.add(cursor.getString(phoneNumIdx)); + } else { + if (DEBUG) Slog.d(TAG, "invalid cursor: no NORMALIZED_NUMBER"); + } + } + + public ArraySet<String> getPhoneNumbers() { + return mPhoneNumbers; } private boolean isExpired() { @@ -509,6 +586,7 @@ public class ValidateNotificationPeople implements NotificationSignalExtractor { // Amount of time to wait for a result from the contacts db before rechecking affinity. private static final long LOOKUP_TIME = 1000; private float mContactAffinity = NONE; + private ArraySet<String> mPhoneNumbers = null; private NotificationRecord mRecord; private PeopleRankingReconsideration(Context context, String key, @@ -543,7 +621,9 @@ public class ValidateNotificationPeople implements NotificationSignalExtractor { lookupResult = resolveEmailContact(mContext, uri.getSchemeSpecificPart()); } else if (handle.startsWith(Contacts.CONTENT_LOOKUP_URI.toString())) { if (DEBUG) Slog.d(TAG, "checking lookup URI: " + handle); - lookupResult = searchContacts(mContext, uri); + // only look up phone number if this is a contact lookup uri and thus isn't + // already directly a phone number. + lookupResult = searchContactsAndLookupNumbers(mContext, uri); } else { lookupResult = new LookupResult(); // invalid person for the cache if (!"name".equals(uri.getScheme())) { @@ -561,6 +641,13 @@ public class ValidateNotificationPeople implements NotificationSignalExtractor { Slog.d(TAG, "lookup contactAffinity is " + lookupResult.getAffinity()); } mContactAffinity = Math.max(mContactAffinity, lookupResult.getAffinity()); + // merge any phone numbers found in this lookup result + if (lookupResult.getPhoneNumbers() != null) { + if (mPhoneNumbers == null) { + mPhoneNumbers = new ArraySet<>(); + } + mPhoneNumbers.addAll(lookupResult.getPhoneNumbers()); + } } else { if (DEBUG) Slog.d(TAG, "lookupResult is null"); } @@ -581,6 +668,7 @@ public class ValidateNotificationPeople implements NotificationSignalExtractor { float affinityBound = operand.getContactAffinity(); operand.setContactAffinity(Math.max(mContactAffinity, affinityBound)); if (VERBOSE) Slog.i(TAG, "final affinity: " + operand.getContactAffinity()); + operand.mergePhoneNumbers(mPhoneNumbers); } public float getContactAffinity() { diff --git a/services/core/java/com/android/server/notification/ZenModeFiltering.java b/services/core/java/com/android/server/notification/ZenModeFiltering.java index 29aad63a1f4b..d04b3315fcec 100644 --- a/services/core/java/com/android/server/notification/ZenModeFiltering.java +++ b/services/core/java/com/android/server/notification/ZenModeFiltering.java @@ -33,6 +33,7 @@ import android.telecom.TelecomManager; import android.telephony.PhoneNumberUtils; import android.telephony.TelephonyManager; import android.util.ArrayMap; +import android.util.ArraySet; import android.util.Slog; import com.android.internal.messages.nano.SystemMessageProto; @@ -140,7 +141,7 @@ public class ZenModeFiltering { } protected void recordCall(NotificationRecord record) { - REPEAT_CALLERS.recordCall(mContext, extras(record)); + REPEAT_CALLERS.recordCall(mContext, extras(record), record.getPhoneNumbers()); } /** @@ -351,7 +352,8 @@ public class ZenModeFiltering { private final ArrayMap<String, Long> mOtherCalls = new ArrayMap<>(); private int mThresholdMinutes; - private synchronized void recordCall(Context context, Bundle extras) { + private synchronized void recordCall(Context context, Bundle extras, + ArraySet<String> phoneNumbers) { setThresholdMinutes(context); if (mThresholdMinutes <= 0 || extras == null) return; final String[] extraPeople = ValidateNotificationPeople.getExtraPeople(extras); @@ -359,7 +361,7 @@ public class ZenModeFiltering { final long now = System.currentTimeMillis(); cleanUp(mTelCalls, now); cleanUp(mOtherCalls, now); - recordCallers(extraPeople, now); + recordCallers(extraPeople, phoneNumbers, now); } private synchronized boolean isRepeat(Context context, Bundle extras) { @@ -407,7 +409,8 @@ public class ZenModeFiltering { } } - private synchronized void recordCallers(String[] people, long now) { + private synchronized void recordCallers(String[] people, ArraySet<String> phoneNumbers, + long now) { for (int i = 0; i < people.length; i++) { String person = people[i]; if (person == null) continue; @@ -428,6 +431,14 @@ public class ZenModeFiltering { mOtherCalls.put(person, now); } } + + // record any additional numbers from the notification record if + // provided; these are in the format of just a phone number string + if (phoneNumbers != null) { + for (String num : phoneNumbers) { + mTelCalls.put(num, now); + } + } } private synchronized boolean checkCallers(Context context, String[] people) { diff --git a/services/core/java/com/android/server/pm/ApexManager.java b/services/core/java/com/android/server/pm/ApexManager.java index 2e9ad50f23f6..2d870997bed7 100644 --- a/services/core/java/com/android/server/pm/ApexManager.java +++ b/services/core/java/com/android/server/pm/ApexManager.java @@ -32,9 +32,6 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageInstaller; import android.content.pm.PackageManager; import android.content.pm.SigningDetails; -import com.android.server.pm.pkg.parsing.PackageInfoWithoutStateUtils; -import com.android.server.pm.pkg.parsing.ParsingPackageUtils; -import com.android.server.pm.pkg.component.ParsedApexSystemService; import android.content.pm.parsing.result.ParseResult; import android.content.pm.parsing.result.ParseTypeImpl; import android.os.Binder; @@ -59,6 +56,9 @@ import com.android.modules.utils.build.UnboundedSdkLevel; import com.android.server.pm.parsing.PackageParser2; import com.android.server.pm.parsing.pkg.AndroidPackage; import com.android.server.pm.parsing.pkg.ParsedPackage; +import com.android.server.pm.pkg.component.ParsedApexSystemService; +import com.android.server.pm.pkg.parsing.PackageInfoWithoutStateUtils; +import com.android.server.pm.pkg.parsing.ParsingPackageUtils; import com.android.server.utils.TimingsTraceAndSlog; import com.google.android.collect.Lists; @@ -414,9 +414,11 @@ public abstract class ApexManager { throws PackageManagerException; /** - * Get a map of system services defined in an apex mapped to the jar files they reside in. + * Get a list of apex system services implemented in an apex. + * + * <p>The list is sorted by initOrder for consistency. */ - public abstract Map<String, String> getApexSystemServices(); + public abstract List<ApexSystemServiceInfo> getApexSystemServices(); /** * Dumps various state information to the provided {@link PrintWriter} object. @@ -449,7 +451,7 @@ public abstract class ApexManager { * Map of all apex system services to the jar files they are contained in. */ @GuardedBy("mLock") - private Map<String, String> mApexSystemServices = new ArrayMap<>(); + private List<ApexSystemServiceInfo> mApexSystemServices = new ArrayList<>(); /** * Contains the list of {@code packageName}s of apks-in-apex for given @@ -605,14 +607,19 @@ public abstract class ApexManager { } String name = service.getName(); - if (mApexSystemServices.containsKey(name)) { - throw new IllegalStateException(String.format( - "Duplicate apex-system-service %s from %s, %s", - name, mApexSystemServices.get(name), service.getJarPath())); + for (ApexSystemServiceInfo info : mApexSystemServices) { + if (info.getName().equals(name)) { + throw new IllegalStateException(String.format( + "Duplicate apex-system-service %s from %s, %s", + name, info.mJarPath, service.getJarPath())); + } } - mApexSystemServices.put(name, service.getJarPath()); + ApexSystemServiceInfo info = new ApexSystemServiceInfo( + service.getName(), service.getJarPath(), service.getInitOrder()); + mApexSystemServices.add(info); } + Collections.sort(mApexSystemServices); mPackageNameToApexModuleName.put(packageInfo.packageName, ai.moduleName); if (ai.isActive) { if (activePackagesSet.contains(packageInfo.packageName)) { @@ -1133,7 +1140,7 @@ public abstract class ApexManager { } @Override - public Map<String, String> getApexSystemServices() { + public List<ApexSystemServiceInfo> getApexSystemServices() { synchronized (mLock) { Preconditions.checkState(mApexSystemServices != null, "APEX packages have not been scanned"); @@ -1423,10 +1430,10 @@ public abstract class ApexManager { } @Override - public Map<String, String> getApexSystemServices() { + public List<ApexSystemServiceInfo> getApexSystemServices() { // TODO(satayev): we can't really support flattened apex use case, and need to migrate // the manifest entries into system's manifest asap. - return Collections.emptyMap(); + return Collections.emptyList(); } @Override diff --git a/services/core/java/com/android/server/pm/ApexSystemServiceInfo.java b/services/core/java/com/android/server/pm/ApexSystemServiceInfo.java new file mode 100644 index 000000000000..f75ba6d165c9 --- /dev/null +++ b/services/core/java/com/android/server/pm/ApexSystemServiceInfo.java @@ -0,0 +1,58 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.pm; + +import android.annotation.Nullable; + +/** + * A helper class that contains information about apex-system-service to be used within system + * server process. + */ +public final class ApexSystemServiceInfo implements Comparable<ApexSystemServiceInfo> { + + final String mName; + @Nullable + final String mJarPath; + final int mInitOrder; + + public ApexSystemServiceInfo(String name, String jarPath, int initOrder) { + this.mName = name; + this.mJarPath = jarPath; + this.mInitOrder = initOrder; + } + + public String getName() { + return mName; + } + + public String getJarPath() { + return mJarPath; + } + + public int getInitOrder() { + return mInitOrder; + } + + @Override + public int compareTo(ApexSystemServiceInfo other) { + if (mInitOrder == other.mInitOrder) { + return mName.compareTo(other.mName); + } + // higher initOrder values take precedence + return -Integer.compare(mInitOrder, other.mInitOrder); + } +} diff --git a/services/core/java/com/android/server/pm/DexOptHelper.java b/services/core/java/com/android/server/pm/DexOptHelper.java index ba89916e6dfa..53eb9cf7d9fe 100644 --- a/services/core/java/com/android/server/pm/DexOptHelper.java +++ b/services/core/java/com/android/server/pm/DexOptHelper.java @@ -293,7 +293,8 @@ final class DexOptHelper { public ArraySet<String> getOptimizablePackages() { ArraySet<String> pkgs = new ArraySet<>(); mPm.forEachPackageState(packageState -> { - if (mPm.mPackageDexOptimizer.canOptimizePackage(packageState.getPkg())) { + final AndroidPackage pkg = packageState.getPkg(); + if (pkg != null && mPm.mPackageDexOptimizer.canOptimizePackage(pkg)) { pkgs.add(packageState.getPackageName()); } }); diff --git a/services/core/java/com/android/server/pm/InitAppsHelper.java b/services/core/java/com/android/server/pm/InitAndSystemPackageHelper.java index 2fda02db63e5..06405ae32fcf 100644 --- a/services/core/java/com/android/server/pm/InitAppsHelper.java +++ b/services/core/java/com/android/server/pm/InitAndSystemPackageHelper.java @@ -32,7 +32,6 @@ import static com.android.server.pm.PackageManagerService.SYSTEM_PARTITIONS; import static com.android.server.pm.PackageManagerService.TAG; import static com.android.server.pm.pkg.parsing.ParsingPackageUtils.PARSE_FRAMEWORK_RES_SPLITS; -import android.annotation.NonNull; import android.annotation.Nullable; import android.content.pm.parsing.ApkLiteParseUtils; import android.os.Environment; @@ -62,25 +61,14 @@ import java.util.concurrent.ExecutorService; * further cleanup and eventually all the installation/scanning related logic will go to another * class. */ -final class InitAppsHelper { +final class InitAndSystemPackageHelper { private final PackageManagerService mPm; + private final List<ScanPartition> mDirsToScanAsSystem; private final int mScanFlags; private final int mSystemParseFlags; private final int mSystemScanFlags; private final InstallPackageHelper mInstallPackageHelper; - private final ApexManager mApexManager; - private final PackageParser2 mPackageParser; - private final ExecutorService mExecutorService; - /* Tracks how long system scan took */ - private long mSystemScanTime; - /* Track of the number of cached system apps */ - private int mCachedSystemApps; - /* Track of the number of system apps */ - private int mSystemPackagesCount; - private final boolean mIsDeviceUpgrading; - private final boolean mIsOnlyCoreApps; - private final List<ScanPartition> mSystemPartitions; /** * Tracks new system packages [received in an OTA] that we expect to @@ -88,34 +76,21 @@ final class InitAppsHelper { * are package location. */ private final ArrayMap<String, File> mExpectingBetter = new ArrayMap<>(); - /* Tracks of any system packages that no longer exist that needs to be pruned. */ - private final List<String> mPossiblyDeletedUpdatedSystemApps = new ArrayList<>(); - // Tracks of stub packages that must either be replaced with full versions in the /data - // partition or be disabled. - private final List<String> mStubSystemApps = new ArrayList<>(); // TODO(b/198166813): remove PMS dependency - InitAppsHelper(PackageManagerService pm, ApexManager apexManager, - InstallPackageHelper installPackageHelper, PackageParser2 packageParser, - List<ScanPartition> systemPartitions) { + InitAndSystemPackageHelper(PackageManagerService pm) { mPm = pm; - mApexManager = apexManager; - mInstallPackageHelper = installPackageHelper; - mPackageParser = packageParser; - mSystemPartitions = systemPartitions; + mInstallPackageHelper = new InstallPackageHelper(pm); mDirsToScanAsSystem = getSystemScanPartitions(); - mIsDeviceUpgrading = mPm.isDeviceUpgrading(); - mIsOnlyCoreApps = mPm.isOnlyCoreApps(); // Set flag to monitor and not change apk file paths when scanning install directories. int scanFlags = SCAN_BOOTING | SCAN_INITIAL; - if (mIsDeviceUpgrading || mPm.isFirstBoot()) { + if (mPm.isDeviceUpgrading() || mPm.isFirstBoot()) { mScanFlags = scanFlags | SCAN_FIRST_BOOT_OR_UPGRADE; } else { mScanFlags = scanFlags; } mSystemParseFlags = mPm.getDefParseFlags() | ParsingPackageUtils.PARSE_IS_SYSTEM_DIR; mSystemScanFlags = scanFlags | SCAN_AS_SYSTEM; - mExecutorService = ParallelPackageParser.makeExecutorService(); } private List<File> getFrameworkResApkSplitFiles() { @@ -143,7 +118,7 @@ final class InitAppsHelper { private List<ScanPartition> getSystemScanPartitions() { final List<ScanPartition> scanPartitions = new ArrayList<>(); - scanPartitions.addAll(mSystemPartitions); + scanPartitions.addAll(mPm.mInjector.getSystemPartitions()); scanPartitions.addAll(getApexScanPartitions()); Slog.d(TAG, "Directories scanned as system partitions: " + scanPartitions); return scanPartitions; @@ -151,7 +126,8 @@ final class InitAppsHelper { private List<ScanPartition> getApexScanPartitions() { final List<ScanPartition> scanPartitions = new ArrayList<>(); - final List<ApexManager.ActiveApexInfo> activeApexInfos = mApexManager.getActiveApexInfos(); + final List<ApexManager.ActiveApexInfo> activeApexInfos = + mPm.mApexManager.getActiveApexInfos(); for (int i = 0; i < activeApexInfos.size(); i++) { final ScanPartition scanPartition = resolveApexToScanPartition(activeApexInfos.get(i)); if (scanPartition != null) { @@ -168,133 +144,117 @@ final class InitAppsHelper { if (apexInfo.preInstalledApexPath.getAbsolutePath().equals( sp.getFolder().getAbsolutePath()) || apexInfo.preInstalledApexPath.getAbsolutePath().startsWith( - sp.getFolder().getAbsolutePath() + File.separator)) { + sp.getFolder().getAbsolutePath() + File.separator)) { return new ScanPartition(apexInfo.apexDirectory, sp, SCAN_AS_APK_IN_APEX); } } return null; } - /** - * Install apps from system dirs. - */ - @GuardedBy({"mPm.mInstallLock", "mPm.mLock"}) - public OverlayConfig initSystemApps(WatchedArrayMap<String, PackageSetting> packageSettings, - int[] userIds, long startTime) { + public OverlayConfig initPackages( + WatchedArrayMap<String, PackageSetting> packageSettings, int[] userIds, + long startTime) { + PackageParser2 packageParser = mPm.mInjector.getScanningCachingPackageParser(); + + ExecutorService executorService = ParallelPackageParser.makeExecutorService(); // Prepare apex package info before scanning APKs, this information is needed when // scanning apk in apex. - mApexManager.scanApexPackagesTraced(mPackageParser, mExecutorService); + mPm.mApexManager.scanApexPackagesTraced(packageParser, executorService); - scanSystemDirs(mPackageParser, mExecutorService); + scanSystemDirs(packageParser, executorService); // Parse overlay configuration files to set default enable state, mutability, and // priority of system overlays. final ArrayMap<String, File> apkInApexPreInstalledPaths = new ArrayMap<>(); - for (ApexManager.ActiveApexInfo apexInfo : mApexManager.getActiveApexInfos()) { - for (String packageName : mApexManager.getApksInApex(apexInfo.apexModuleName)) { + for (ApexManager.ActiveApexInfo apexInfo : mPm.mApexManager.getActiveApexInfos()) { + for (String packageName : mPm.mApexManager.getApksInApex(apexInfo.apexModuleName)) { apkInApexPreInstalledPaths.put(packageName, apexInfo.preInstalledApexPath); } } - final OverlayConfig overlayConfig = OverlayConfig.initializeSystemInstance( + OverlayConfig overlayConfig = OverlayConfig.initializeSystemInstance( consumer -> mPm.forEachPackage( pkg -> consumer.accept(pkg, pkg.isSystem(), - apkInApexPreInstalledPaths.get(pkg.getPackageName())))); - - if (!mIsOnlyCoreApps) { + apkInApexPreInstalledPaths.get(pkg.getPackageName())))); + // Prune any system packages that no longer exist. + final List<String> possiblyDeletedUpdatedSystemApps = new ArrayList<>(); + // Stub packages must either be replaced with full versions in the /data + // partition or be disabled. + final List<String> stubSystemApps = new ArrayList<>(); + + if (!mPm.isOnlyCoreApps()) { // do this first before mucking with mPackages for the "expecting better" case - updateStubSystemAppsList(mStubSystemApps); + updateStubSystemAppsList(stubSystemApps); mInstallPackageHelper.prepareSystemPackageCleanUp(packageSettings, - mPossiblyDeletedUpdatedSystemApps, mExpectingBetter, userIds); + possiblyDeletedUpdatedSystemApps, mExpectingBetter, userIds); } - logSystemAppsScanningTime(startTime); - return overlayConfig; - } - - @GuardedBy({"mPm.mInstallLock", "mPm.mLock"}) - private void logSystemAppsScanningTime(long startTime) { - mCachedSystemApps = PackageCacher.sCachedPackageReadCount.get(); + final int cachedSystemApps = PackageCacher.sCachedPackageReadCount.get(); // Remove any shared userIDs that have no associated packages mPm.mSettings.pruneSharedUsersLPw(); - mSystemScanTime = SystemClock.uptimeMillis() - startTime; - mSystemPackagesCount = mPm.mPackages.size(); - Slog.i(TAG, "Finished scanning system apps. Time: " + mSystemScanTime - + " ms, packageCount: " + mSystemPackagesCount + final long systemScanTime = SystemClock.uptimeMillis() - startTime; + final int systemPackagesCount = mPm.mPackages.size(); + Slog.i(TAG, "Finished scanning system apps. Time: " + systemScanTime + + " ms, packageCount: " + systemPackagesCount + " , timePerPackage: " - + (mSystemPackagesCount == 0 ? 0 : mSystemScanTime / mSystemPackagesCount) - + " , cached: " + mCachedSystemApps); - if (mIsDeviceUpgrading && mSystemPackagesCount > 0) { + + (systemPackagesCount == 0 ? 0 : systemScanTime / systemPackagesCount) + + " , cached: " + cachedSystemApps); + if (mPm.isDeviceUpgrading() && systemPackagesCount > 0) { //CHECKSTYLE:OFF IndentationCheck FrameworkStatsLog.write(FrameworkStatsLog.BOOT_TIME_EVENT_DURATION_REPORTED, BOOT_TIME_EVENT_DURATION__EVENT__OTA_PACKAGE_MANAGER_SYSTEM_APP_AVG_SCAN_TIME, - mSystemScanTime / mSystemPackagesCount); + systemScanTime / systemPackagesCount); //CHECKSTYLE:ON IndentationCheck } - } - /** - * Install apps/updates from data dir and fix system apps that are affected. - */ - @GuardedBy({"mPm.mInstallLock", "mPm.mLock"}) - public void initNonSystemApps(@NonNull int[] userIds, long startTime) { - if (!mIsOnlyCoreApps) { + if (!mPm.isOnlyCoreApps()) { EventLog.writeEvent(EventLogTags.BOOT_PROGRESS_PMS_DATA_SCAN_START, SystemClock.uptimeMillis()); scanDirTracedLI(mPm.getAppInstallDir(), /* frameworkSplits= */ null, 0, - mScanFlags | SCAN_REQUIRE_KNOWN, - mPackageParser, mExecutorService); + mScanFlags | SCAN_REQUIRE_KNOWN, 0, + packageParser, executorService); + } - List<Runnable> unfinishedTasks = mExecutorService.shutdownNow(); + List<Runnable> unfinishedTasks = executorService.shutdownNow(); if (!unfinishedTasks.isEmpty()) { throw new IllegalStateException("Not all tasks finished before calling close: " + unfinishedTasks); } - if (!mIsOnlyCoreApps) { - fixSystemPackages(userIds); - logNonSystemAppScanningTime(startTime); + + if (!mPm.isOnlyCoreApps()) { + mInstallPackageHelper.cleanupDisabledPackageSettings(possiblyDeletedUpdatedSystemApps, + userIds, mScanFlags); + mInstallPackageHelper.checkExistingBetterPackages(mExpectingBetter, + stubSystemApps, mSystemScanFlags, mSystemParseFlags); + + // Uncompress and install any stubbed system applications. + // This must be done last to ensure all stubs are replaced or disabled. + mInstallPackageHelper.installSystemStubPackages(stubSystemApps, mScanFlags); + + final int cachedNonSystemApps = PackageCacher.sCachedPackageReadCount.get() + - cachedSystemApps; + + final long dataScanTime = SystemClock.uptimeMillis() - systemScanTime - startTime; + final int dataPackagesCount = mPm.mPackages.size() - systemPackagesCount; + Slog.i(TAG, "Finished scanning non-system apps. Time: " + dataScanTime + + " ms, packageCount: " + dataPackagesCount + + " , timePerPackage: " + + (dataPackagesCount == 0 ? 0 : dataScanTime / dataPackagesCount) + + " , cached: " + cachedNonSystemApps); + if (mPm.isDeviceUpgrading() && dataPackagesCount > 0) { + //CHECKSTYLE:OFF IndentationCheck + FrameworkStatsLog.write( + FrameworkStatsLog.BOOT_TIME_EVENT_DURATION_REPORTED, + BOOT_TIME_EVENT_DURATION__EVENT__OTA_PACKAGE_MANAGER_DATA_APP_AVG_SCAN_TIME, + dataScanTime / dataPackagesCount); + //CHECKSTYLE:OFF IndentationCheck + } } mExpectingBetter.clear(); - mPm.mSettings.pruneRenamedPackagesLPw(); - mPackageParser.close(); - } - - /** - * Clean up system packages now that some system package updates have been installed from - * the data dir. Also install system stub packages as the last step. - */ - @GuardedBy({"mPm.mInstallLock", "mPm.mLock"}) - private void fixSystemPackages(@NonNull int[] userIds) { - mInstallPackageHelper.cleanupDisabledPackageSettings(mPossiblyDeletedUpdatedSystemApps, - userIds, mScanFlags); - mInstallPackageHelper.checkExistingBetterPackages(mExpectingBetter, - mStubSystemApps, mSystemScanFlags, mSystemParseFlags); - - // Uncompress and install any stubbed system applications. - // This must be done last to ensure all stubs are replaced or disabled. - mInstallPackageHelper.installSystemStubPackages(mStubSystemApps, mScanFlags); - } - @GuardedBy({"mPm.mInstallLock", "mPm.mLock"}) - private void logNonSystemAppScanningTime(long startTime) { - final int cachedNonSystemApps = PackageCacher.sCachedPackageReadCount.get() - - mCachedSystemApps; - - final long dataScanTime = SystemClock.uptimeMillis() - mSystemScanTime - startTime; - final int dataPackagesCount = mPm.mPackages.size() - mSystemPackagesCount; - Slog.i(TAG, "Finished scanning non-system apps. Time: " + dataScanTime - + " ms, packageCount: " + dataPackagesCount - + " , timePerPackage: " - + (dataPackagesCount == 0 ? 0 : dataScanTime / dataPackagesCount) - + " , cached: " + cachedNonSystemApps); - if (mIsDeviceUpgrading && dataPackagesCount > 0) { - //CHECKSTYLE:OFF IndentationCheck - FrameworkStatsLog.write( - FrameworkStatsLog.BOOT_TIME_EVENT_DURATION_REPORTED, - BOOT_TIME_EVENT_DURATION__EVENT__OTA_PACKAGE_MANAGER_DATA_APP_AVG_SCAN_TIME, - dataScanTime / dataPackagesCount); - //CHECKSTYLE:OFF IndentationCheck - } + mPm.mSettings.pruneRenamedPackagesLPw(); + packageParser.close(); + return overlayConfig; } /** @@ -314,14 +274,14 @@ final class InitAppsHelper { continue; } scanDirTracedLI(partition.getOverlayFolder(), /* frameworkSplits= */ null, - mSystemParseFlags, mSystemScanFlags | partition.scanFlag, + mSystemParseFlags, mSystemScanFlags | partition.scanFlag, 0, packageParser, executorService); } List<File> frameworkSplits = getFrameworkResApkSplitFiles(); scanDirTracedLI(frameworkDir, frameworkSplits, mSystemParseFlags | PARSE_FRAMEWORK_RES_SPLITS, - mSystemScanFlags | SCAN_NO_DEX | SCAN_AS_PRIVILEGED, + mSystemScanFlags | SCAN_NO_DEX | SCAN_AS_PRIVILEGED, 0, packageParser, executorService); if (!mPm.mPackages.containsKey("android")) { throw new IllegalStateException( @@ -333,11 +293,11 @@ final class InitAppsHelper { if (partition.getPrivAppFolder() != null) { scanDirTracedLI(partition.getPrivAppFolder(), /* frameworkSplits= */ null, mSystemParseFlags, - mSystemScanFlags | SCAN_AS_PRIVILEGED | partition.scanFlag, + mSystemScanFlags | SCAN_AS_PRIVILEGED | partition.scanFlag, 0, packageParser, executorService); } scanDirTracedLI(partition.getAppFolder(), /* frameworkSplits= */ null, - mSystemParseFlags, mSystemScanFlags | partition.scanFlag, + mSystemParseFlags, mSystemScanFlags | partition.scanFlag, 0, packageParser, executorService); } } @@ -356,11 +316,11 @@ final class InitAppsHelper { @GuardedBy({"mPm.mInstallLock", "mPm.mLock"}) private void scanDirTracedLI(File scanDir, List<File> frameworkSplits, final int parseFlags, int scanFlags, - PackageParser2 packageParser, ExecutorService executorService) { + long currentTime, PackageParser2 packageParser, ExecutorService executorService) { Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "scanDir [" + scanDir.getAbsolutePath() + "]"); try { mInstallPackageHelper.installPackagesFromDir(scanDir, frameworkSplits, parseFlags, - scanFlags, packageParser, executorService); + scanFlags, currentTime, packageParser, executorService); } finally { Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER); } diff --git a/services/core/java/com/android/server/pm/InstallPackageHelper.java b/services/core/java/com/android/server/pm/InstallPackageHelper.java index 83c84728cb5a..336da2acca67 100644 --- a/services/core/java/com/android/server/pm/InstallPackageHelper.java +++ b/services/core/java/com/android/server/pm/InstallPackageHelper.java @@ -3030,7 +3030,7 @@ final class InstallPackageHelper { final RemovePackageHelper removePackageHelper = new RemovePackageHelper(mPm); removePackageHelper.removePackageLI(stubPkg, true /*chatty*/); try { - return scanSystemPackageTracedLI(scanFile, parseFlags, scanFlags, null); + return scanSystemPackageTracedLI(scanFile, parseFlags, scanFlags, 0, null); } catch (PackageManagerException e) { Slog.w(TAG, "Failed to install compressed system package:" + stubPkg.getPackageName(), e); @@ -3163,7 +3163,7 @@ final class InstallPackageHelper { | ParsingPackageUtils.PARSE_IS_SYSTEM_DIR; @PackageManagerService.ScanFlags int scanFlags = mPm.getSystemPackageScanFlags(codePath); final AndroidPackage pkg = scanSystemPackageTracedLI( - codePath, parseFlags, scanFlags, null); + codePath, parseFlags, scanFlags, 0 /*currentTime*/, null); PackageSetting pkgSetting = mPm.mSettings.getPackageLPr(pkg.getPackageName()); @@ -3338,7 +3338,7 @@ final class InstallPackageHelper { mRemovePackageHelper.removePackageLI(pkg, true); try { final File codePath = new File(pkg.getPath()); - scanSystemPackageTracedLI(codePath, 0, scanFlags, null); + scanSystemPackageTracedLI(codePath, 0, scanFlags, 0, null); } catch (PackageManagerException e) { Slog.e(TAG, "Failed to parse updated, ex-system package: " + e.getMessage()); @@ -3359,7 +3359,7 @@ final class InstallPackageHelper { @GuardedBy({"mPm.mInstallLock", "mPm.mLock"}) public void installPackagesFromDir(File scanDir, List<File> frameworkSplits, int parseFlags, - int scanFlags, PackageParser2 packageParser, + int scanFlags, long currentTime, PackageParser2 packageParser, ExecutorService executorService) { final File[] files = scanDir.listFiles(); if (ArrayUtils.isEmpty(files)) { @@ -3402,7 +3402,7 @@ final class InstallPackageHelper { parseResult.parsedPackage); } try { - addForInitLI(parseResult.parsedPackage, parseFlags, scanFlags, + addForInitLI(parseResult.parsedPackage, parseFlags, scanFlags, currentTime, null); } catch (PackageManagerException e) { errorCode = e.error; @@ -3465,7 +3465,7 @@ final class InstallPackageHelper { try { final AndroidPackage newPkg = scanSystemPackageTracedLI( - scanFile, reparseFlags, rescanFlags, null); + scanFile, reparseFlags, rescanFlags, 0, null); // We rescanned a stub, add it to the list of stubbed system packages if (newPkg.isStub()) { stubSystemApps.add(packageName); @@ -3479,14 +3479,14 @@ final class InstallPackageHelper { /** * Traces a package scan. - * @see #scanSystemPackageLI(File, int, int, UserHandle) + * @see #scanSystemPackageLI(File, int, int, long, UserHandle) */ @GuardedBy({"mPm.mInstallLock", "mPm.mLock"}) public AndroidPackage scanSystemPackageTracedLI(File scanFile, final int parseFlags, - int scanFlags, UserHandle user) throws PackageManagerException { + int scanFlags, long currentTime, UserHandle user) throws PackageManagerException { Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "scanPackage [" + scanFile.toString() + "]"); try { - return scanSystemPackageLI(scanFile, parseFlags, scanFlags, user); + return scanSystemPackageLI(scanFile, parseFlags, scanFlags, currentTime, user); } finally { Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER); } @@ -3498,7 +3498,7 @@ final class InstallPackageHelper { */ @GuardedBy({"mPm.mInstallLock", "mPm.mLock"}) private AndroidPackage scanSystemPackageLI(File scanFile, int parseFlags, int scanFlags, - UserHandle user) throws PackageManagerException { + long currentTime, UserHandle user) throws PackageManagerException { if (DEBUG_INSTALL) Slog.d(TAG, "Parsing: " + scanFile); Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "parsePackage"); @@ -3514,7 +3514,7 @@ final class InstallPackageHelper { PackageManagerService.renameStaticSharedLibraryPackage(parsedPackage); } - return addForInitLI(parsedPackage, parseFlags, scanFlags, user); + return addForInitLI(parsedPackage, parseFlags, scanFlags, currentTime, user); } /** @@ -3533,11 +3533,11 @@ final class InstallPackageHelper { @GuardedBy({"mPm.mLock", "mPm.mInstallLock"}) private AndroidPackage addForInitLI(ParsedPackage parsedPackage, @ParsingPackageUtils.ParseFlags int parseFlags, - @PackageManagerService.ScanFlags int scanFlags, + @PackageManagerService.ScanFlags int scanFlags, long currentTime, @Nullable UserHandle user) throws PackageManagerException { final Pair<ScanResult, Boolean> scanResultPair = scanSystemPackageLI( - parsedPackage, parseFlags, scanFlags, user); + parsedPackage, parseFlags, scanFlags, currentTime, user); final ScanResult scanResult = scanResultPair.first; boolean shouldHideSystemApp = scanResultPair.second; if (scanResult.mSuccess) { @@ -3715,7 +3715,7 @@ final class InstallPackageHelper { private Pair<ScanResult, Boolean> scanSystemPackageLI(ParsedPackage parsedPackage, @ParsingPackageUtils.ParseFlags int parseFlags, - @PackageManagerService.ScanFlags int scanFlags, + @PackageManagerService.ScanFlags int scanFlags, long currentTime, @Nullable UserHandle user) throws PackageManagerException { final boolean scanSystemPartition = (parseFlags & ParsingPackageUtils.PARSE_IS_SYSTEM_DIR) != 0; @@ -3902,7 +3902,7 @@ final class InstallPackageHelper { } final ScanResult scanResult = scanPackageNewLI(parsedPackage, parseFlags, - scanFlags | SCAN_UPDATE_SIGNATURE, 0 /* currentTime */, user, null); + scanFlags | SCAN_UPDATE_SIGNATURE, currentTime, user, null); return new Pair<>(scanResult, shouldHideSystemApp); } diff --git a/services/core/java/com/android/server/pm/PackageDexOptimizer.java b/services/core/java/com/android/server/pm/PackageDexOptimizer.java index a5b42f03b6df..69d498794e64 100644 --- a/services/core/java/com/android/server/pm/PackageDexOptimizer.java +++ b/services/core/java/com/android/server/pm/PackageDexOptimizer.java @@ -182,7 +182,7 @@ public class PackageDexOptimizer { mInjector = injector; } - boolean canOptimizePackage(AndroidPackage pkg) { + boolean canOptimizePackage(@NonNull AndroidPackage pkg) { // We do not dexopt a package with no code. // Note that the system package is marked as having no code, however we can // still optimize it via dexoptSystemServerPath. diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 9d95ead3a311..ee5c6385429a 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -247,6 +247,7 @@ import com.android.server.pm.verify.domain.DomainVerificationService; import com.android.server.pm.verify.domain.proxy.DomainVerificationProxy; import com.android.server.pm.verify.domain.proxy.DomainVerificationProxyV1; import com.android.server.storage.DeviceStorageMonitorInternal; +import com.android.server.supplementalprocess.SupplementalProcessManagerLocal; import com.android.server.utils.SnapshotCache; import com.android.server.utils.TimingsTraceAndSlog; import com.android.server.utils.Watchable; @@ -934,6 +935,7 @@ public class PackageManagerService extends IPackageManager.Stub final @Nullable String mOverlayConfigSignaturePackage; final @Nullable String mRecentsPackage; final @Nullable String mAmbientContextDetectionPackage; + private final @NonNull String mRequiredSupplementalProcessPackage; @GuardedBy("mLock") private final PackageUsage mPackageUsage = new PackageUsage(); @@ -944,7 +946,7 @@ public class PackageManagerService extends IPackageManager.Stub private final BroadcastHelper mBroadcastHelper; private final RemovePackageHelper mRemovePackageHelper; private final DeletePackageHelper mDeletePackageHelper; - private final InitAppsHelper mInitAppsHelper; + private final InitAndSystemPackageHelper mInitAndSystemPackageHelper; private final AppDataHelper mAppDataHelper; private final InstallPackageHelper mInstallPackageHelper; private final PreferredActivityHelper mPreferredActivityHelper; @@ -1671,6 +1673,7 @@ public class PackageManagerService extends IPackageManager.Stub mSharedSystemSharedLibraryPackageName = testParams.sharedSystemSharedLibraryPackageName; mOverlayConfigSignaturePackage = testParams.overlayConfigSignaturePackage; mResolveComponentName = testParams.resolveComponentName; + mRequiredSupplementalProcessPackage = testParams.requiredSupplementalProcessPackage; mLiveComputer = createLiveComputer(); mSnapshotComputer = null; @@ -1689,12 +1692,13 @@ public class PackageManagerService extends IPackageManager.Stub mAppDataHelper = testParams.appDataHelper; mInstallPackageHelper = testParams.installPackageHelper; mRemovePackageHelper = testParams.removePackageHelper; - mInitAppsHelper = testParams.initAndSystemPackageHelper; + mInitAndSystemPackageHelper = testParams.initAndSystemPackageHelper; mDeletePackageHelper = testParams.deletePackageHelper; mPreferredActivityHelper = testParams.preferredActivityHelper; mResolveIntentHelper = testParams.resolveIntentHelper; mDexOptHelper = testParams.dexOptHelper; mSuspendPackageHelper = testParams.suspendPackageHelper; + mSharedLibraries.setDeletePackageHelper(mDeletePackageHelper); registerObservers(false); @@ -1836,8 +1840,7 @@ public class PackageManagerService extends IPackageManager.Stub mAppDataHelper = new AppDataHelper(this); mInstallPackageHelper = new InstallPackageHelper(this, mAppDataHelper); mRemovePackageHelper = new RemovePackageHelper(this, mAppDataHelper); - mInitAppsHelper = new InitAppsHelper(this, mApexManager, mInstallPackageHelper, - mInjector.getScanningCachingPackageParser(), mInjector.getSystemPartitions()); + mInitAndSystemPackageHelper = new InitAndSystemPackageHelper(this); mDeletePackageHelper = new DeletePackageHelper(this, mRemovePackageHelper, mAppDataHelper); mSharedLibraries.setDeletePackageHelper(mDeletePackageHelper); @@ -1967,8 +1970,8 @@ public class PackageManagerService extends IPackageManager.Stub mIsEngBuild, mIsUserDebugBuild, mIncrementalVersion); final int[] userIds = mUserManager.getUserIds(); - mOverlayConfig = mInitAppsHelper.initSystemApps(packageSettings, userIds, startTime); - mInitAppsHelper.initNonSystemApps(userIds, startTime); + mOverlayConfig = mInitAndSystemPackageHelper.initPackages(packageSettings, + userIds, startTime); // Resolve the storage manager. mStorageManagerPackage = getStorageManagerPackageName(); @@ -2139,6 +2142,9 @@ public class PackageManagerService extends IPackageManager.Stub getPackageInfo(mRequiredPermissionControllerPackage, 0, UserHandle.USER_SYSTEM).getLongVersionCode()); + // Resolve the supplemental process + mRequiredSupplementalProcessPackage = getRequiredSupplementalProcessPackageName(); + // Initialize InstantAppRegistry's Instant App list for all users. for (AndroidPackage pkg : mPackages.values()) { if (pkg.isSystem()) { @@ -3154,6 +3160,11 @@ public class PackageManagerService extends IPackageManager.Stub throw new IllegalStateException("PermissionController is not found"); } + @Override + public String getSupplementalProcessPackageName() { + return mRequiredSupplementalProcessPackage; + } + String getPackageInstallerPackageName() { return mRequiredInstallerPackage; } @@ -5519,6 +5530,24 @@ public class PackageManagerService extends IPackageManager.Stub } } + private @NonNull String getRequiredSupplementalProcessPackageName() { + final Intent intent = new Intent(SupplementalProcessManagerLocal.SERVICE_INTERFACE); + + final List<ResolveInfo> matches = queryIntentServicesInternal( + intent, + /* resolvedType= */ null, + MATCH_SYSTEM_ONLY | MATCH_DIRECT_BOOT_AWARE | MATCH_DIRECT_BOOT_UNAWARE, + UserHandle.USER_SYSTEM, + /* callingUid= */ Process.myUid(), + /* includeInstantApps= */ false); + if (matches.size() == 1) { + return matches.get(0).getComponentInfo().packageName; + } else { + throw new RuntimeException("There should exactly one supplemental process; found " + + matches.size() + ": matches=" + matches); + } + } + @Override public String getDefaultTextClassifierPackageName() { return ensureSystemPackageName( @@ -8677,7 +8706,7 @@ public class PackageManagerService extends IPackageManager.Stub } boolean isExpectingBetter(String packageName) { - return mInitAppsHelper.isExpectingBetter(packageName); + return mInitAndSystemPackageHelper.isExpectingBetter(packageName); } int getDefParseFlags() { @@ -8780,12 +8809,13 @@ public class PackageManagerService extends IPackageManager.Stub } boolean isOverlayMutable(String packageName) { - return mOverlayConfig.isMutable(packageName); + return (mOverlayConfig != null ? mOverlayConfig + : OverlayConfig.getSystemInstance()).isMutable(packageName); } @ScanFlags int getSystemPackageScanFlags(File codePath) { List<ScanPartition> dirsToScanAsSystem = - mInitAppsHelper.getDirsToScanAsSystem(); + mInitAndSystemPackageHelper.getDirsToScanAsSystem(); @PackageManagerService.ScanFlags int scanFlags = SCAN_AS_SYSTEM; for (int i = dirsToScanAsSystem.size() - 1; i >= 0; i--) { ScanPartition partition = dirsToScanAsSystem.get(i); @@ -8803,7 +8833,7 @@ public class PackageManagerService extends IPackageManager.Stub Pair<Integer, Integer> getSystemPackageRescanFlagsAndReparseFlags(File scanFile, int systemScanFlags, int systemParseFlags) { List<ScanPartition> dirsToScanAsSystem = - mInitAppsHelper.getDirsToScanAsSystem(); + mInitAndSystemPackageHelper.getDirsToScanAsSystem(); @ParsingPackageUtils.ParseFlags int reparseFlags = 0; @PackageManagerService.ScanFlags int rescanFlags = 0; for (int i1 = dirsToScanAsSystem.size() - 1; i1 >= 0; i1--) { diff --git a/services/core/java/com/android/server/pm/PackageManagerServiceTestParams.java b/services/core/java/com/android/server/pm/PackageManagerServiceTestParams.java index 00ca4ae8b734..d12c826b8d40 100644 --- a/services/core/java/com/android/server/pm/PackageManagerServiceTestParams.java +++ b/services/core/java/com/android/server/pm/PackageManagerServiceTestParams.java @@ -89,6 +89,7 @@ public final class PackageManagerServiceTestParams { public @Nullable String defaultTextClassifierPackage; public @Nullable String systemTextClassifierPackage; public @Nullable String overlayConfigSignaturePackage; + public @NonNull String requiredSupplementalProcessPackage; public ViewCompiler viewCompiler; public @Nullable String retailDemoPackage; public @Nullable String recentsPackage; @@ -108,7 +109,7 @@ public final class PackageManagerServiceTestParams { public AppDataHelper appDataHelper; public InstallPackageHelper installPackageHelper; public RemovePackageHelper removePackageHelper; - public InitAppsHelper initAndSystemPackageHelper; + public InitAndSystemPackageHelper initAndSystemPackageHelper; public DeletePackageHelper deletePackageHelper; public PreferredActivityHelper preferredActivityHelper; public ResolveIntentHelper resolveIntentHelper; diff --git a/services/core/java/com/android/server/pm/StorageEventHelper.java b/services/core/java/com/android/server/pm/StorageEventHelper.java index 137209850736..bb7e55a4bf40 100644 --- a/services/core/java/com/android/server/pm/StorageEventHelper.java +++ b/services/core/java/com/android/server/pm/StorageEventHelper.java @@ -32,6 +32,7 @@ import android.content.pm.PackageManager; import android.content.pm.PackagePartitions; import android.content.pm.UserInfo; import android.content.pm.VersionedPackage; +import com.android.server.pm.pkg.parsing.ParsingPackageUtils; import android.os.Environment; import android.os.FileUtils; import android.os.UserHandle; @@ -47,7 +48,6 @@ import android.util.Slog; import com.android.internal.policy.AttributeCache; import com.android.server.pm.parsing.pkg.AndroidPackage; import com.android.server.pm.pkg.PackageStateInternal; -import com.android.server.pm.pkg.parsing.ParsingPackageUtils; import java.io.File; import java.util.ArrayList; @@ -150,7 +150,7 @@ public final class StorageEventHelper extends StorageEventListener { final AndroidPackage pkg; try { pkg = installPackageHelper.scanSystemPackageTracedLI( - ps.getPath(), parseFlags, SCAN_INITIAL, null); + ps.getPath(), parseFlags, SCAN_INITIAL, 0, null); loaded.add(pkg); } catch (PackageManagerException e) { diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java index 79c5ea2efefe..edc0e3d64c42 100644 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java @@ -51,6 +51,7 @@ import android.content.pm.PermissionGroupInfo; import android.content.pm.PermissionInfo; import android.content.pm.permission.SplitPermissionInfoParcelable; import android.os.Binder; +import android.os.Build; import android.os.IBinder; import android.os.Process; import android.os.RemoteException; @@ -613,11 +614,12 @@ public class PermissionManagerService extends IPermissionManager.Stub { int granted = PermissionManagerService.this.checkUidPermission(uid, POST_NOTIFICATIONS); AndroidPackage pkg = mPackageManagerInt.getPackage(uid); - if (granted != PermissionManager.PERMISSION_GRANTED) { + if (granted != PackageManager.PERMISSION_GRANTED + && pkg.getTargetSdkVersion() >= Build.VERSION_CODES.M) { int flags = PermissionManagerService.this.getPermissionFlags(pkg.getPackageName(), POST_NOTIFICATIONS, UserHandle.getUserId(uid)); if ((flags & PackageManager.FLAG_PERMISSION_REVIEW_REQUIRED) != 0) { - return PermissionManager.PERMISSION_GRANTED; + return PackageManager.PERMISSION_GRANTED; } } return granted; diff --git a/services/core/java/com/android/server/pm/pkg/component/ParsedApexSystemService.java b/services/core/java/com/android/server/pm/pkg/component/ParsedApexSystemService.java index 586d2c48d27d..cf478b1da2e4 100644 --- a/services/core/java/com/android/server/pm/pkg/component/ParsedApexSystemService.java +++ b/services/core/java/com/android/server/pm/pkg/component/ParsedApexSystemService.java @@ -34,4 +34,7 @@ public interface ParsedApexSystemService { @Nullable String getMaxSdkVersion(); + + int getInitOrder(); + } diff --git a/services/core/java/com/android/server/pm/pkg/component/ParsedApexSystemServiceImpl.java b/services/core/java/com/android/server/pm/pkg/component/ParsedApexSystemServiceImpl.java index 1e427d015cc1..167aba301f35 100644 --- a/services/core/java/com/android/server/pm/pkg/component/ParsedApexSystemServiceImpl.java +++ b/services/core/java/com/android/server/pm/pkg/component/ParsedApexSystemServiceImpl.java @@ -48,18 +48,18 @@ public class ParsedApexSystemServiceImpl implements ParsedApexSystemService, Par @Nullable private String maxSdkVersion; + private int initOrder; + public ParsedApexSystemServiceImpl() { } - - // 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/content/pm/parsing/component/ParsedApexSystemServiceImpl.java + // $ codegen $ANDROID_BUILD_TOP/frameworks/base/services/core/java/com/android/server/pm/pkg/component/ParsedApexSystemServiceImpl.java // // To exclude the generated code from IntelliJ auto-formatting enable (one-time): // Settings > Editor > Code Style > Formatter Control @@ -71,13 +71,15 @@ public class ParsedApexSystemServiceImpl implements ParsedApexSystemService, Par @NonNull String name, @Nullable String jarPath, @Nullable String minSdkVersion, - @Nullable String maxSdkVersion) { + @Nullable String maxSdkVersion, + int initOrder) { this.name = name; com.android.internal.util.AnnotationValidations.validate( NonNull.class, null, name); this.jarPath = jarPath; this.minSdkVersion = minSdkVersion; this.maxSdkVersion = maxSdkVersion; + this.initOrder = initOrder; // onConstructed(); // You can define this method to get a callback } @@ -103,6 +105,11 @@ public class ParsedApexSystemServiceImpl implements ParsedApexSystemService, Par } @DataClass.Generated.Member + public int getInitOrder() { + return initOrder; + } + + @DataClass.Generated.Member public @NonNull ParsedApexSystemServiceImpl setName(@NonNull String value) { name = value; com.android.internal.util.AnnotationValidations.validate( @@ -129,6 +136,12 @@ public class ParsedApexSystemServiceImpl implements ParsedApexSystemService, Par } @DataClass.Generated.Member + public @NonNull ParsedApexSystemServiceImpl setInitOrder( int value) { + initOrder = value; + return this; + } + + @DataClass.Generated.Member static Parcelling<String> sParcellingForName = Parcelling.Cache.get( Parcelling.BuiltIn.ForInternedString.class); @@ -187,6 +200,7 @@ public class ParsedApexSystemServiceImpl implements ParsedApexSystemService, Par sParcellingForJarPath.parcel(jarPath, dest, flags); sParcellingForMinSdkVersion.parcel(minSdkVersion, dest, flags); sParcellingForMaxSdkVersion.parcel(maxSdkVersion, dest, flags); + dest.writeInt(initOrder); } @Override @@ -205,6 +219,7 @@ public class ParsedApexSystemServiceImpl implements ParsedApexSystemService, Par String _jarPath = sParcellingForJarPath.unparcel(in); String _minSdkVersion = sParcellingForMinSdkVersion.unparcel(in); String _maxSdkVersion = sParcellingForMaxSdkVersion.unparcel(in); + int _initOrder = in.readInt(); this.name = _name; com.android.internal.util.AnnotationValidations.validate( @@ -212,6 +227,7 @@ public class ParsedApexSystemServiceImpl implements ParsedApexSystemService, Par this.jarPath = _jarPath; this.minSdkVersion = _minSdkVersion; this.maxSdkVersion = _maxSdkVersion; + this.initOrder = _initOrder; // onConstructed(); // You can define this method to get a callback } @@ -231,10 +247,10 @@ public class ParsedApexSystemServiceImpl implements ParsedApexSystemService, Par }; @DataClass.Generated( - time = 1641431950080L, + time = 1643723578605L, codegenVersion = "1.0.23", - sourceFile = "frameworks/base/core/java/android/content/pm/parsing/component/ParsedApexSystemServiceImpl.java", - inputSignatures = "private @com.android.internal.util.DataClass.ParcelWith(com.android.internal.util.Parcelling.BuiltIn.ForInternedString.class) @android.annotation.NonNull java.lang.String name\nprivate @com.android.internal.util.DataClass.ParcelWith(com.android.internal.util.Parcelling.BuiltIn.ForInternedString.class) @android.annotation.Nullable java.lang.String jarPath\nprivate @com.android.internal.util.DataClass.ParcelWith(com.android.internal.util.Parcelling.BuiltIn.ForInternedString.class) @android.annotation.Nullable java.lang.String minSdkVersion\nprivate @com.android.internal.util.DataClass.ParcelWith(com.android.internal.util.Parcelling.BuiltIn.ForInternedString.class) @android.annotation.Nullable java.lang.String maxSdkVersion\nclass ParsedApexSystemServiceImpl extends java.lang.Object implements [android.content.pm.parsing.component.ParsedApexSystemService, android.os.Parcelable]\n@com.android.internal.util.DataClass(genGetters=true, genAidl=false, genSetters=true, genParcelable=true)") + sourceFile = "frameworks/base/services/core/java/com/android/server/pm/pkg/component/ParsedApexSystemServiceImpl.java", + inputSignatures = "private @com.android.internal.util.DataClass.ParcelWith(com.android.internal.util.Parcelling.BuiltIn.ForInternedString.class) @android.annotation.NonNull java.lang.String name\nprivate @com.android.internal.util.DataClass.ParcelWith(com.android.internal.util.Parcelling.BuiltIn.ForInternedString.class) @android.annotation.Nullable java.lang.String jarPath\nprivate @com.android.internal.util.DataClass.ParcelWith(com.android.internal.util.Parcelling.BuiltIn.ForInternedString.class) @android.annotation.Nullable java.lang.String minSdkVersion\nprivate @com.android.internal.util.DataClass.ParcelWith(com.android.internal.util.Parcelling.BuiltIn.ForInternedString.class) @android.annotation.Nullable java.lang.String maxSdkVersion\nprivate int initOrder\nclass ParsedApexSystemServiceImpl extends java.lang.Object implements [com.android.server.pm.pkg.component.ParsedApexSystemService, android.os.Parcelable]\n@com.android.internal.util.DataClass(genGetters=true, genAidl=false, genSetters=true, genParcelable=true)") @Deprecated private void __metadata() {} diff --git a/services/core/java/com/android/server/pm/pkg/component/ParsedApexSystemServiceUtils.java b/services/core/java/com/android/server/pm/pkg/component/ParsedApexSystemServiceUtils.java index 38a6f5a356e7..ed9aa2e6860a 100644 --- a/services/core/java/com/android/server/pm/pkg/component/ParsedApexSystemServiceUtils.java +++ b/services/core/java/com/android/server/pm/pkg/component/ParsedApexSystemServiceUtils.java @@ -53,10 +53,13 @@ public class ParsedApexSystemServiceUtils { R.styleable.AndroidManifestApexSystemService_minSdkVersion); String maxSdkVersion = sa.getString( R.styleable.AndroidManifestApexSystemService_maxSdkVersion); + int initOrder = sa.getInt(R.styleable.AndroidManifestApexSystemService_initOrder, 0); systemService.setName(className) .setMinSdkVersion(minSdkVersion) - .setMaxSdkVersion(maxSdkVersion); + .setMaxSdkVersion(maxSdkVersion) + .setInitOrder(initOrder); + if (!TextUtils.isEmpty(jarPath)) { systemService.setJarPath(jarPath); } diff --git a/services/core/java/com/android/server/security/AttestationVerificationManagerService.java b/services/core/java/com/android/server/security/AttestationVerificationManagerService.java index f519ceda1e50..243efb5e58ce 100644 --- a/services/core/java/com/android/server/security/AttestationVerificationManagerService.java +++ b/services/core/java/com/android/server/security/AttestationVerificationManagerService.java @@ -16,6 +16,8 @@ package com.android.server.security; +import static android.security.attestationverification.AttestationVerificationManager.PROFILE_SELF_TRUSTED; +import static android.security.attestationverification.AttestationVerificationManager.RESULT_FAILURE; import static android.security.attestationverification.AttestationVerificationManager.RESULT_UNKNOWN; import android.content.Context; @@ -76,10 +78,24 @@ public class AttestationVerificationManagerService extends SystemService { private void verifyAttestationForAllVerifiers( AttestationProfile profile, int localBindingType, Bundle requirements, byte[] attestation, AndroidFuture<IVerificationResult> resultCallback) { - // TODO(b/201696614): Implement IVerificationResult result = new IVerificationResult(); - result.resultCode = RESULT_UNKNOWN; + // TODO(b/201696614): Implement result.token = null; + switch (profile.getAttestationProfileId()) { + case PROFILE_SELF_TRUSTED: + Slog.d(TAG, "Verifying Self trusted profile."); + try { + result.resultCode = + AttestationVerificationSelfTrustedVerifierForTesting.getInstance() + .verifyAttestation(localBindingType, requirements, attestation); + } catch (Throwable t) { + result.resultCode = RESULT_FAILURE; + } + break; + default: + Slog.d(TAG, "No profile found, defaulting."); + result.resultCode = RESULT_UNKNOWN; + } resultCallback.complete(result); } diff --git a/services/core/java/com/android/server/security/AttestationVerificationSelfTrustedVerifierForTesting.java b/services/core/java/com/android/server/security/AttestationVerificationSelfTrustedVerifierForTesting.java new file mode 100644 index 000000000000..58df2bd982dc --- /dev/null +++ b/services/core/java/com/android/server/security/AttestationVerificationSelfTrustedVerifierForTesting.java @@ -0,0 +1,224 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.security; + +import static android.security.attestationverification.AttestationVerificationManager.PARAM_CHALLENGE; +import static android.security.attestationverification.AttestationVerificationManager.RESULT_FAILURE; +import static android.security.attestationverification.AttestationVerificationManager.RESULT_SUCCESS; +import static android.security.attestationverification.AttestationVerificationManager.TYPE_CHALLENGE; + +import android.annotation.NonNull; +import android.os.Build; +import android.os.Bundle; +import android.security.keystore.KeyGenParameterSpec; +import android.security.keystore.KeyProperties; +import android.util.Log; +import android.util.Slog; + +import com.android.internal.org.bouncycastle.asn1.ASN1InputStream; +import com.android.internal.org.bouncycastle.asn1.ASN1ObjectIdentifier; +import com.android.internal.org.bouncycastle.asn1.ASN1OctetString; +import com.android.internal.org.bouncycastle.asn1.ASN1Sequence; +import com.android.internal.org.bouncycastle.asn1.x509.Certificate; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.security.KeyPairGenerator; +import java.security.KeyStore; +import java.security.cert.CertPath; +import java.security.cert.CertPathValidator; +import java.security.cert.CertificateEncodingException; +import java.security.cert.CertificateException; +import java.security.cert.CertificateFactory; +import java.security.cert.PKIXParameters; +import java.security.cert.TrustAnchor; +import java.security.cert.X509Certificate; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Set; + +/** + * Verifies {@code PROFILE_SELF_TRUSTED} attestations. + * + * Verifies that the attesting environment can create an attestation with the same root certificate + * as the verifying device with a matching attestation challenge. Skips CRL revocations checking + * so this verifier can work in a hermetic test environment. + * + * This verifier profile is intended to be used only for testing. + */ +class AttestationVerificationSelfTrustedVerifierForTesting { + private static final String TAG = "AVF"; + private static final boolean DEBUG = Build.IS_DEBUGGABLE && Log.isLoggable(TAG, Log.VERBOSE); + + // The OID for the extension Android Keymint puts into device-generated certificates. + private static final String ANDROID_KEYMINT_KEY_DESCRIPTION_EXTENSION_OID = + "1.3.6.1.4.1.11129.2.1.17"; + + // ASN.1 sequence index values for the Android Keymint extension. + private static final int ATTESTATION_CHALLENGE_INDEX = 4; + + private static final String ANDROID_KEYSTORE = "AndroidKeyStore"; + private static final String GOLDEN_ALIAS = + AttestationVerificationSelfTrustedVerifierForTesting.class.getCanonicalName() + + ".Golden"; + + private static volatile AttestationVerificationSelfTrustedVerifierForTesting + sAttestationVerificationSelfTrustedVerifier = null; + + private final CertificateFactory mCertificateFactory; + private final CertPathValidator mCertPathValidator; + private final KeyStore mAndroidKeyStore; + private X509Certificate mGoldenRootCert; + + static AttestationVerificationSelfTrustedVerifierForTesting getInstance() + throws Exception { + if (sAttestationVerificationSelfTrustedVerifier == null) { + synchronized (AttestationVerificationSelfTrustedVerifierForTesting.class) { + if (sAttestationVerificationSelfTrustedVerifier == null) { + sAttestationVerificationSelfTrustedVerifier = + new AttestationVerificationSelfTrustedVerifierForTesting(); + } + } + } + return sAttestationVerificationSelfTrustedVerifier; + } + + private static void debugVerboseLog(String str, Throwable t) { + if (DEBUG) { + Slog.v(TAG, str, t); + } + } + + private static void debugVerboseLog(String str) { + if (DEBUG) { + Slog.v(TAG, str); + } + } + + private AttestationVerificationSelfTrustedVerifierForTesting() throws Exception { + mCertificateFactory = CertificateFactory.getInstance("X.509"); + mCertPathValidator = CertPathValidator.getInstance("PKIX"); + mAndroidKeyStore = KeyStore.getInstance(ANDROID_KEYSTORE); + mAndroidKeyStore.load(null); + if (!mAndroidKeyStore.containsAlias(GOLDEN_ALIAS)) { + KeyPairGenerator kpg = + KeyPairGenerator.getInstance(KeyProperties.KEY_ALGORITHM_EC, ANDROID_KEYSTORE); + KeyGenParameterSpec parameterSpec = new KeyGenParameterSpec.Builder( + GOLDEN_ALIAS, KeyProperties.PURPOSE_SIGN | KeyProperties.PURPOSE_VERIFY) + .setAttestationChallenge(GOLDEN_ALIAS.getBytes()) + .setDigests(KeyProperties.DIGEST_SHA256, KeyProperties.DIGEST_SHA512).build(); + kpg.initialize(parameterSpec); + kpg.generateKeyPair(); + } + + X509Certificate[] goldenCerts = (X509Certificate[]) + ((KeyStore.PrivateKeyEntry) mAndroidKeyStore.getEntry(GOLDEN_ALIAS, null)) + .getCertificateChain(); + mGoldenRootCert = goldenCerts[goldenCerts.length - 1]; + } + + int verifyAttestation( + int localBindingType, @NonNull Bundle requirements, @NonNull byte[] attestation) { + List<X509Certificate> certificates = new ArrayList<>(); + ByteArrayInputStream bis = new ByteArrayInputStream(attestation); + try { + while (bis.available() > 0) { + certificates.add((X509Certificate) mCertificateFactory.generateCertificate(bis)); + } + } catch (CertificateException e) { + debugVerboseLog("Unable to parse certificates from attestation", e); + return RESULT_FAILURE; + } + + if (localBindingType == TYPE_CHALLENGE + && validateRequirements(requirements) + && checkLeafChallenge(requirements, certificates) + && verifyCertificateChain(certificates)) { + return RESULT_SUCCESS; + } + + return RESULT_FAILURE; + } + + private boolean verifyCertificateChain(List<X509Certificate> certificates) { + if (certificates.size() < 2) { + debugVerboseLog("Certificate chain less than 2 in size."); + return false; + } + + try { + CertPath certificatePath = mCertificateFactory.generateCertPath(certificates); + PKIXParameters validationParams = new PKIXParameters(getTrustAnchors()); + // Skipping revocation checking because we want this to work in a hermetic test + // environment. + validationParams.setRevocationEnabled(false); + mCertPathValidator.validate(certificatePath, validationParams); + } catch (Throwable t) { + debugVerboseLog("Invalid certificate chain", t); + return false; + } + + return true; + } + + private Set<TrustAnchor> getTrustAnchors() { + return Collections.singleton(new TrustAnchor(mGoldenRootCert, null)); + } + + private boolean validateRequirements(Bundle requirements) { + if (requirements.size() != 1) { + debugVerboseLog("Requirements does not contain exactly 1 key."); + return false; + } + if (!requirements.containsKey(PARAM_CHALLENGE)) { + debugVerboseLog("Requirements does not contain key: " + PARAM_CHALLENGE); + return false; + } + return true; + } + + private boolean checkLeafChallenge(Bundle requirements, List<X509Certificate> certificates) { + // Verify challenge + byte[] challenge; + try { + challenge = getChallengeFromCert(certificates.get(0)); + } catch (Throwable t) { + debugVerboseLog("Unable to parse challenge from certificate.", t); + return false; + } + + if (Arrays.equals(requirements.getByteArray(PARAM_CHALLENGE), challenge)) { + return true; + } else { + debugVerboseLog("Self-Trusted validation failed; challenge mismatch."); + return false; + } + } + + private byte[] getChallengeFromCert(@NonNull X509Certificate x509Certificate) + throws CertificateEncodingException, IOException { + Certificate certificate = Certificate.getInstance( + new ASN1InputStream(x509Certificate.getEncoded()).readObject()); + ASN1Sequence keyAttributes = (ASN1Sequence) certificate.getTBSCertificate().getExtensions() + .getExtensionParsedValue( + new ASN1ObjectIdentifier(ANDROID_KEYMINT_KEY_DESCRIPTION_EXTENSION_OID)); + return ((ASN1OctetString) keyAttributes.getObjectAt(ATTESTATION_CHALLENGE_INDEX)) + .getOctets(); + } +} diff --git a/services/core/java/com/android/server/statusbar/StatusBarManagerService.java b/services/core/java/com/android/server/statusbar/StatusBarManagerService.java index 8a87c96fcaaa..94f483c65eb5 100644 --- a/services/core/java/com/android/server/statusbar/StatusBarManagerService.java +++ b/services/core/java/com/android/server/statusbar/StatusBarManagerService.java @@ -53,6 +53,7 @@ import android.hardware.biometrics.PromptInfo; import android.hardware.display.DisplayManager; import android.hardware.display.DisplayManager.DisplayListener; import android.hardware.fingerprint.IUdfpsHbmListener; +import android.media.MediaRoute2Info; import android.net.Uri; import android.os.Binder; import android.os.Build; @@ -92,6 +93,7 @@ import com.android.internal.statusbar.IAddTileResultCallback; import com.android.internal.statusbar.ISessionListener; import com.android.internal.statusbar.IStatusBar; import com.android.internal.statusbar.IStatusBarService; +import com.android.internal.statusbar.IUndoMediaTransferCallback; import com.android.internal.statusbar.NotificationVisibility; import com.android.internal.statusbar.RegisterStatusBarResult; import com.android.internal.statusbar.StatusBarIcon; @@ -1265,6 +1267,12 @@ public class StatusBarManagerService extends IStatusBarService.Stub implements D "StatusBarManagerService"); } + private void enforceMediaContentControl() { + mContext.enforceCallingOrSelfPermission( + android.Manifest.permission.MEDIA_CONTENT_CONTROL, + "StatusBarManagerService"); + } + /** * For targetSdk S+ we require STATUS_BAR. For targetSdk < S, we only require EXPAND_STATUS_BAR * but also require that it falls into one of the allowed use-cases to lock down abuse vector. @@ -1987,6 +1995,53 @@ public class StatusBarManagerService extends IStatusBarService.Stub implements D return false; } + /** + * Notifies the system of a new media tap-to-transfer state for the *sender* device. See + * {@link StatusBarManager.updateMediaTapToTransferSenderDisplay} for more information. + * + * @param undoCallback a callback that will be triggered if the user elects to undo a media + * transfer. + * + * Requires the caller to have the {@link android.Manifest.permission.MEDIA_CONTENT_CONTROL} + * permission. + */ + @Override + public void updateMediaTapToTransferSenderDisplay( + @StatusBarManager.MediaTransferSenderState int displayState, + @NonNull MediaRoute2Info routeInfo, + @Nullable IUndoMediaTransferCallback undoCallback + ) { + enforceMediaContentControl(); + if (mBar != null) { + try { + mBar.updateMediaTapToTransferSenderDisplay(displayState, routeInfo, undoCallback); + } catch (RemoteException e) { + Slog.e(TAG, "updateMediaTapToTransferSenderDisplay", e); + } + } + } + + /** + * Notifies the system of a new media tap-to-transfer state for the *receiver* device. See + * {@link StatusBarManager.updateMediaTapToTransferReceiverDisplay} for more information. + * + * Requires the caller to have the {@link android.Manifest.permission.MEDIA_CONTENT_CONTROL} + * permission. + */ + @Override + public void updateMediaTapToTransferReceiverDisplay( + @StatusBarManager.MediaTransferReceiverState int displayState, + MediaRoute2Info routeInfo) { + enforceMediaContentControl(); + if (mBar != null) { + try { + mBar.updateMediaTapToTransferReceiverDisplay(displayState, routeInfo); + } catch (RemoteException e) { + Slog.e(TAG, "updateMediaTapToTransferReceiverDisplay", e); + } + } + } + /** @hide */ public void passThroughShellCommand(String[] args, FileDescriptor fd) { enforceStatusBarOrShell(); diff --git a/services/core/java/com/android/server/trust/TrustAgentWrapper.java b/services/core/java/com/android/server/trust/TrustAgentWrapper.java index 06ce4a41afec..1dea3d7943d8 100644 --- a/services/core/java/com/android/server/trust/TrustAgentWrapper.java +++ b/services/core/java/com/android/server/trust/TrustAgentWrapper.java @@ -71,6 +71,7 @@ public class TrustAgentWrapper { private static final int MSG_ESCROW_TOKEN_STATE = 9; private static final int MSG_UNLOCK_USER = 10; private static final int MSG_SHOW_KEYGUARD_ERROR_MESSAGE = 11; + private static final int MSG_LOCK_USER = 12; /** * Time in uptime millis that we wait for the service connection, both when starting @@ -100,6 +101,8 @@ public class TrustAgentWrapper { // Trust state private boolean mTrusted; + private boolean mWaitingForTrustableDowngrade = false; + private boolean mTrustable; private CharSequence mMessage; private boolean mDisplayTrustGrantedMessage; private boolean mTrustDisabledByDpm; @@ -108,6 +111,25 @@ public class TrustAgentWrapper { private AlarmManager mAlarmManager; private final Intent mAlarmIntent; private PendingIntent mAlarmPendingIntent; + private final BroadcastReceiver mTrustableDowngradeReceiver = new BroadcastReceiver() { + @Override + public void onReceive(Context context, Intent intent) { + if (!TrustManagerService.ENABLE_ACTIVE_UNLOCK_FLAG) { + return; + } + if (!mWaitingForTrustableDowngrade) { + return; + } + // are these the broadcasts we want to listen to + if (Intent.ACTION_SCREEN_OFF.equals(intent.getAction()) + || Intent.ACTION_USER_PRESENT.equals(intent.getAction())) { + mTrusted = false; + mTrustable = true; + mWaitingForTrustableDowngrade = false; + mTrustManagerService.updateTrust(mUserId, 0); + } + } + }; private final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() { @Override @@ -126,16 +148,21 @@ public class TrustAgentWrapper { public void handleMessage(Message msg) { switch (msg.what) { case MSG_GRANT_TRUST: - // TODO(b/213631675): Respect FLAG_GRANT_TRUST_TEMPORARY_AND_RENEWABLE if (!isConnected()) { Log.w(TAG, "Agent is not connected, cannot grant trust: " + mName.flattenToShortString()); return; } mTrusted = true; + mTrustable = false; mMessage = (CharSequence) msg.obj; int flags = msg.arg1; mDisplayTrustGrantedMessage = (flags & FLAG_GRANT_TRUST_DISPLAY_MESSAGE) != 0; + if ((flags & TrustAgentService.FLAG_GRANT_TRUST_TEMPORARY_AND_RENEWABLE) != 0) { + mWaitingForTrustableDowngrade = true; + } else { + mWaitingForTrustableDowngrade = false; + } long durationMs = msg.getData().getLong(DATA_DURATION); if (durationMs > 0) { final long duration; @@ -270,6 +297,13 @@ public class TrustAgentWrapper { mTrustManagerService.showKeyguardErrorMessage(message); break; } + case MSG_LOCK_USER: { + mTrusted = false; + mTrustable = false; + mTrustManagerService.updateTrust(mUserId, 0 /* flags */); + mTrustManagerService.lockUser(mUserId); + break; + } } } }; @@ -295,6 +329,11 @@ public class TrustAgentWrapper { } @Override + public void lockUser() { + mHandler.sendEmptyMessage(MSG_LOCK_USER); + } + + @Override public void setManagingTrust(boolean managingTrust) { if (DEBUG) Slog.d(TAG, "managingTrust()"); mHandler.obtainMessage(MSG_MANAGING_TRUST, managingTrust ? 1 : 0, 0).sendToTarget(); @@ -427,6 +466,9 @@ public class TrustAgentWrapper { final String pathUri = mAlarmIntent.toUri(Intent.URI_INTENT_SCHEME); alarmFilter.addDataPath(pathUri, PatternMatcher.PATTERN_LITERAL); + IntentFilter trustableFilter = new IntentFilter(Intent.ACTION_USER_PRESENT); + trustableFilter.addAction(Intent.ACTION_SCREEN_OFF); + // Schedules a restart for when connecting times out. If the connection succeeds, // the restart is canceled in mCallback's onConnected. scheduleRestart(); @@ -435,6 +477,7 @@ public class TrustAgentWrapper { if (mBound) { mContext.registerReceiver(mBroadcastReceiver, alarmFilter, PERMISSION, null, Context.RECEIVER_EXPORTED); + mContext.registerReceiver(mTrustableDowngradeReceiver, trustableFilter); } else { Log.e(TAG, "Can't bind to TrustAgent " + mName.flattenToShortString()); } @@ -591,6 +634,10 @@ public class TrustAgentWrapper { return mTrusted && mManagingTrust && !mTrustDisabledByDpm; } + public boolean isTrustable() { + return mTrustable && mManagingTrust && !mTrustDisabledByDpm; + } + public boolean isManagingTrust() { return mManagingTrust && !mTrustDisabledByDpm; } diff --git a/services/core/java/com/android/server/trust/TrustManagerService.java b/services/core/java/com/android/server/trust/TrustManagerService.java index 52f7d101ce99..6aafd4aec0ab 100644 --- a/services/core/java/com/android/server/trust/TrustManagerService.java +++ b/services/core/java/com/android/server/trust/TrustManagerService.java @@ -54,6 +54,7 @@ import android.os.Message; import android.os.PersistableBundle; import android.os.RemoteException; import android.os.SystemClock; +import android.os.SystemProperties; import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; @@ -65,6 +66,7 @@ import android.util.ArraySet; import android.util.AttributeSet; import android.util.Log; import android.util.Slog; +import android.util.SparseArray; import android.util.SparseBooleanArray; import android.util.Xml; import android.view.IWindowManager; @@ -122,8 +124,7 @@ public class TrustManagerService extends SystemService { private static final int MSG_DISPATCH_UNLOCK_LOCKOUT = 13; private static final int MSG_REFRESH_DEVICE_LOCKED_FOR_USER = 14; private static final int MSG_SCHEDULE_TRUST_TIMEOUT = 15; - private static final int MSG_USER_REQUESTED_UNLOCK = 16; - private static final int MSG_ENABLE_TRUST_AGENT = 17; + public static final int MSG_USER_REQUESTED_UNLOCK = 16; private static final String REFRESH_DEVICE_LOCKED_EXCEPT_USER = "except"; @@ -146,6 +147,21 @@ public class TrustManagerService extends SystemService { @GuardedBy("mUserIsTrusted") private final SparseBooleanArray mUserIsTrusted = new SparseBooleanArray(); + //TODO(b/215724686): remove flag + public static final boolean ENABLE_ACTIVE_UNLOCK_FLAG = SystemProperties.getBoolean( + "fw.enable_active_unlock_flag", true); + + private enum TrustState { + UNTRUSTED, // the phone is not unlocked by any trustagents + TRUSTABLE, // the phone is in a semi-locked state that can be unlocked if + // FLAG_GRANT_TRUST_TEMPORARY_AND_RENEWABLE is passed and a trustagent is trusted + TRUSTED // the phone is unlocked + }; + + @GuardedBy("mUserTrustState") + private final SparseArray<TrustManagerService.TrustState> mUserTrustState = + new SparseArray<>(); + /** * Stores the locked state for users on the device. There are three different type of users * which are handled slightly differently: @@ -229,7 +245,6 @@ public class TrustManagerService extends SystemService { } // Extend unlock config and logic - private final class SettingsObserver extends ContentObserver { private final Uri TRUST_AGENTS_EXTEND_UNLOCK = Settings.Secure.getUriFor(Settings.Secure.TRUST_AGENTS_EXTEND_UNLOCK); @@ -397,6 +412,14 @@ public class TrustManagerService extends SystemService { } private void updateTrust(int userId, int flags, boolean isFromUnlock) { + if (ENABLE_ACTIVE_UNLOCK_FLAG) { + updateTrustWithRenewableUnlock(userId, flags, isFromUnlock); + } else { + updateTrustWithExtendUnlock(userId, flags, isFromUnlock); + } + } + + private void updateTrustWithExtendUnlock(int userId, int flags, boolean isFromUnlock) { boolean managed = aggregateIsTrustManaged(userId); dispatchOnTrustManagedChanged(managed, userId); if (mStrongAuthTracker.isTrustAllowedForUser(userId) @@ -442,6 +465,65 @@ public class TrustManagerService extends SystemService { } } + private void updateTrustWithRenewableUnlock(int userId, int flags, boolean isFromUnlock) { + boolean managed = aggregateIsTrustManaged(userId); + dispatchOnTrustManagedChanged(managed, userId); + if (mStrongAuthTracker.isTrustAllowedForUser(userId) + && isTrustUsuallyManagedInternal(userId) != managed) { + updateTrustUsuallyManaged(userId, managed); + } + + boolean trustedByAtLeastOneAgent = aggregateIsTrusted(userId); + boolean trustableByAtLeastOneAgent = aggregateIsTrustable(userId); + boolean wasTrusted; + boolean wasTrustable; + TrustState pendingTrustState; + + IWindowManager wm = WindowManagerGlobal.getWindowManagerService(); + boolean alreadyUnlocked = false; + try { + alreadyUnlocked = !wm.isKeyguardLocked(); + } catch (RemoteException e) { + } + + synchronized (mUserTrustState) { + wasTrusted = (mUserTrustState.get(userId) == TrustState.TRUSTED); + wasTrustable = (mUserTrustState.get(userId) == TrustState.TRUSTABLE); + boolean renewingTrust = wasTrustable && ( + (flags & TrustAgentService.FLAG_GRANT_TRUST_TEMPORARY_AND_RENEWABLE) != 0); + boolean canMoveToTrusted = alreadyUnlocked || isFromUnlock || renewingTrust; + boolean upgradingTrustForCurrentUser = (userId == mCurrentUser); + + if (trustedByAtLeastOneAgent && wasTrusted) { + // no change + return; + } else if (trustedByAtLeastOneAgent && canMoveToTrusted + && upgradingTrustForCurrentUser) { + pendingTrustState = TrustState.TRUSTED; + } else if (trustableByAtLeastOneAgent && (wasTrusted || wasTrustable) + && upgradingTrustForCurrentUser) { + pendingTrustState = TrustState.TRUSTABLE; + } else { + pendingTrustState = TrustState.UNTRUSTED; + } + + mUserTrustState.put(userId, pendingTrustState); + } + if (DEBUG) Slog.d(TAG, "pendingTrustState: " + pendingTrustState); + + boolean isNowTrusted = pendingTrustState == TrustState.TRUSTED; + dispatchOnTrustChanged(isNowTrusted, userId, flags, getTrustGrantedMessages(userId)); + if (isNowTrusted != wasTrusted) { + refreshDeviceLockedForUser(userId); + if (!isNowTrusted) { + maybeLockScreen(userId); + } else { + scheduleTrustTimeout(userId, false /* override */); + } + } + } + + private void updateTrustUsuallyManaged(int userId, boolean managed) { synchronized (mTrustUsuallyManagedForUser) { mTrustUsuallyManagedForUser.put(userId, managed); @@ -473,6 +555,20 @@ public class TrustManagerService extends SystemService { mLockPatternUtils.unlockUserWithToken(handle, token, userId); } + /** + * Locks the phone and requires some auth (not trust) like a biometric or passcode before + * unlocking. + */ + public void lockUser(int userId) { + mLockPatternUtils.requireStrongAuth( + StrongAuthTracker.SOME_AUTH_REQUIRED_AFTER_USER_REQUEST, userId); + try { + WindowManagerGlobal.getWindowManagerService().lockNow(null); + } catch (RemoteException e) { + Slog.e(TAG, "Error locking screen when called from trust agent"); + } + } + void showKeyguardErrorMessage(CharSequence message) { dispatchOnTrustError(message); } @@ -632,24 +728,6 @@ public class TrustManagerService extends SystemService { } } - - /** - * Uses {@link LockPatternUtils} to enable the setting for trust agent in the specified - * component name. This should only be used for testing. - */ - private void enableTrustAgentForUserForTest(@NonNull ComponentName componentName, int userId) { - Log.i(TAG, - "Enabling trust agent " + componentName.flattenToString() + " for user " + userId); - List<ComponentName> agents = - new ArrayList<>(mLockPatternUtils.getEnabledTrustAgents(userId)); - if (!agents.contains(componentName)) { - agents.add(componentName); - } - // Even if the agent was already there, we still call setEnabledTrustAgents to trigger a - // refresh of installed agents. - mLockPatternUtils.setEnabledTrustAgents(agents, userId); - } - boolean isDeviceLockedInner(int userId) { synchronized (mDeviceLockedForUser) { return mDeviceLockedForUser.get(userId, true); @@ -948,7 +1026,6 @@ public class TrustManagerService extends SystemService { continue; } allowedAgents.add(resolveInfo); - if (DEBUG) Slog.d(TAG, "Adding agent " + getComponentName(resolveInfo)); } return allowedAgents; } @@ -970,6 +1047,21 @@ public class TrustManagerService extends SystemService { return false; } + private boolean aggregateIsTrustable(int userId) { + if (!mStrongAuthTracker.isTrustAllowedForUser(userId)) { + return false; + } + for (int i = 0; i < mActiveAgents.size(); i++) { + AgentInfo info = mActiveAgents.valueAt(i); + if (info.userId == userId) { + if (info.agent.isTrustable()) { + return true; + } + } + } + return false; + } + private List<String> getTrustGrantedMessages(int userId) { if (!mStrongAuthTracker.isTrustAllowedForUser(userId)) { return new ArrayList<>(); @@ -1178,13 +1270,6 @@ public class TrustManagerService extends SystemService { } @Override - public void enableTrustAgentForUserForTest(ComponentName componentName, int userId) - throws RemoteException { - enforceReportPermission(); - mHandler.obtainMessage(MSG_ENABLE_TRUST_AGENT, userId, 0, componentName).sendToTarget(); - } - - @Override public void reportKeyguardShowingChanged() throws RemoteException { enforceReportPermission(); // coalesce refresh messages. @@ -1460,9 +1545,6 @@ public class TrustManagerService extends SystemService { // This is also called when the security mode of a user changes. refreshDeviceLockedForUser(UserHandle.USER_ALL); break; - case MSG_ENABLE_TRUST_AGENT: - enableTrustAgentForUserForTest((ComponentName) msg.obj, msg.arg1); - break; case MSG_KEYGUARD_SHOWING_CHANGED: refreshDeviceLockedForUser(mCurrentUser); break; diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index 5f04b7e2621a..6836e315437c 100644 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java @@ -7655,13 +7655,15 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A * <li>{@link LetterboxConfiguration#getIsEducationEnabled} is true. * <li>The activity is eligible for fixed orientation letterbox. * <li>The activity is in fullscreen. + * <li>The activity is portrait-only. * </ul> */ // TODO(b/215316431): Add tests boolean isEligibleForLetterboxEducation() { return mWmService.mLetterboxConfiguration.getIsEducationEnabled() && mIsEligibleForFixedOrientationLetterbox - && getWindowingMode() == WINDOWING_MODE_FULLSCREEN; + && getWindowingMode() == WINDOWING_MODE_FULLSCREEN + && getRequestedConfigurationOrientation() == ORIENTATION_PORTRAIT; } /** diff --git a/services/core/java/com/android/server/wm/BackNavigationController.java b/services/core/java/com/android/server/wm/BackNavigationController.java index a8779fa79675..45a6cb9d3920 100644 --- a/services/core/java/com/android/server/wm/BackNavigationController.java +++ b/services/core/java/com/android/server/wm/BackNavigationController.java @@ -29,6 +29,7 @@ import android.os.SystemProperties; import android.util.Slog; import android.view.SurfaceControl; import android.window.BackNavigationInfo; +import android.window.IOnBackInvokedCallback; import android.window.TaskSnapshot; import com.android.internal.annotations.VisibleForTesting; @@ -91,29 +92,41 @@ class BackNavigationController { HardwareBuffer screenshotBuffer = null; int prevTaskId; int prevUserId; + IOnBackInvokedCallback callback; synchronized (task.mWmService.mGlobalLock) { activityRecord = task.topRunningActivity(); removedWindowContainer = activityRecord; taskWindowConfiguration = task.getTaskInfo().configuration.windowConfiguration; - ProtoLog.d(WM_DEBUG_BACK_PREVIEW, "startBackNavigation task=%s, topRunningActivity=%s", - task, activityRecord); - - // IME is visible, back gesture will dismiss it, nothing to preview. - if (task.getDisplayContent().getImeContainer().isVisible()) { - return null; - } - - // Current Activity is home, there is no previous activity to display - if (activityRecord.isActivityTypeHome()) { - return null; + WindowState topChild = activityRecord.getTopChild(); + callback = topChild.getOnBackInvokedCallback(); + + ProtoLog.d(WM_DEBUG_BACK_PREVIEW, "startBackNavigation task=%s, " + + "topRunningActivity=%s, topWindow=%s backCallback=%s", + task, activityRecord, topChild, + callback != null ? callback.getClass().getSimpleName() : null); + + // For IME and Home, either a callback is registered, or we do nothing. In both cases, + // we don't need to pass the leashes below. + if (task.getDisplayContent().getImeContainer().isVisible() + || activityRecord.isActivityTypeHome()) { + if (callback != null) { + return new BackNavigationInfo(BackNavigationInfo.TYPE_CALLBACK, + null /* topWindowLeash */, null /* screenshotSurface */, + null /* screenshotBuffer */, null /* taskWindowConfiguration */, + null /* onBackNavigationDone */, callback /* onBackInvokedCallback */); + } else { + return null; + } } prev = task.getActivity( (r) -> !r.finishing && r.getTask() == task && !r.isTopRunningActivity()); - if (prev != null) { + if (callback != null) { + backType = BackNavigationInfo.TYPE_CALLBACK; + } else if (prev != null) { backType = BackNavigationInfo.TYPE_CROSS_ACTIVITY; } else if (task.returnsToHomeRootTask()) { prevTask = null; @@ -148,7 +161,7 @@ class BackNavigationController { // Prepare a leash to animate the current top window animLeash = removedWindowContainer.makeAnimationLeash() - .setName("BackPreview Leash") + .setName("BackPreview Leash for " + removedWindowContainer) .setHidden(false) .setBLASTLayer() .build(); @@ -158,7 +171,7 @@ class BackNavigationController { } SurfaceControl.Builder builder = new SurfaceControl.Builder() - .setName("BackPreview Screenshot") + .setName("BackPreview Screenshot for " + prev) .setParent(animationLeashParent) .setHidden(false) .setBLASTLayer(); @@ -171,6 +184,10 @@ class BackNavigationController { screenshotBuffer = getTaskSnapshot(prevTaskId, prevUserId); } } + + // The Animation leash needs to be above the screenshot surface, but the animation leash + // needs to be added before to be in the synchronized block. + tx.setLayer(animLeash, 1); tx.apply(); WindowContainer<?> finalRemovedWindowContainer = removedWindowContainer; @@ -183,13 +200,16 @@ class BackNavigationController { return null; } + RemoteCallback onBackNavigationDone = new RemoteCallback( + result -> resetSurfaces(finalRemovedWindowContainer + )); return new BackNavigationInfo(backType, animLeash, screenshotSurface, screenshotBuffer, taskWindowConfiguration, - new RemoteCallback(result -> resetSurfaces(finalRemovedWindowContainer - ))); + onBackNavigationDone, + callback); } diff --git a/services/core/java/com/android/server/wm/InputManagerCallback.java b/services/core/java/com/android/server/wm/InputManagerCallback.java index f91969b2c558..1f0fdcf0a8d2 100644 --- a/services/core/java/com/android/server/wm/InputManagerCallback.java +++ b/services/core/java/com/android/server/wm/InputManagerCallback.java @@ -24,6 +24,7 @@ import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM; import static com.android.server.wm.WindowManagerService.H.ON_POINTER_DOWN_OUTSIDE_FOCUS; import android.annotation.NonNull; +import android.annotation.Nullable; import android.graphics.PointF; import android.os.Debug; import android.os.IBinder; @@ -254,6 +255,25 @@ final class InputManagerCallback implements InputManagerService.WindowManagerCal } } + @Override + @Nullable + public SurfaceControl createSurfaceForGestureMonitor(String name, int displayId) { + synchronized (mService.mGlobalLock) { + final DisplayContent dc = mService.mRoot.getDisplayContent(displayId); + if (dc == null) { + Slog.e(TAG, "Failed to create a gesture monitor on display: " + displayId + + " - DisplayContent not found."); + return null; + } + return mService.makeSurfaceBuilder(dc.getSession()) + .setContainerLayer() + .setName(name) + .setCallsite("createSurfaceForGestureMonitor") + .setParent(dc.getSurfaceControl()) + .build(); + } + } + /** Waits until the built-in input devices have been configured. */ public boolean waitForInputDevicesReady(long timeoutMillis) { synchronized (mInputDevicesReadyMonitor) { diff --git a/services/core/java/com/android/server/wm/InsetsPolicy.java b/services/core/java/com/android/server/wm/InsetsPolicy.java index 10776abee51e..1e121737e2ac 100644 --- a/services/core/java/com/android/server/wm/InsetsPolicy.java +++ b/services/core/java/com/android/server/wm/InsetsPolicy.java @@ -32,6 +32,7 @@ import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_STATUS_FORCE_ import android.annotation.NonNull; import android.annotation.Nullable; +import android.app.ActivityTaskManager; import android.app.StatusBarManager; import android.graphics.Insets; import android.graphics.Rect; @@ -134,7 +135,7 @@ class InsetsPolicy { /** Updates the target which can control system bars. */ void updateBarControlTarget(@Nullable WindowState focusedWin) { - if (mFocusedWin != focusedWin){ + if (mFocusedWin != focusedWin) { abortTransient(); } mFocusedWin = focusedWin; @@ -156,7 +157,7 @@ class InsetsPolicy { } boolean isHidden(@InternalInsetsType int type) { - final InsetsSourceProvider provider = mStateController.peekSourceProvider(type); + final InsetsSourceProvider provider = mStateController.peekSourceProvider(type); return provider != null && provider.hasWindow() && !provider.getSource().isVisible(); } @@ -181,6 +182,10 @@ class InsetsPolicy { mShowingTransientTypes.toArray(), isGestureOnSystemBar); } updateBarControlTarget(mFocusedWin); + dispatchTransientSystemBarsVisibilityChanged( + mFocusedWin, + isTransient(ITYPE_STATUS_BAR) || isTransient(ITYPE_NAVIGATION_BAR), + isGestureOnSystemBar); // The leashes can be created while updating bar control target. The surface transaction // of the new leashes might not be applied yet. The callback posted here ensures we can @@ -198,6 +203,12 @@ class InsetsPolicy { if (mShowingTransientTypes.size() == 0) { return; } + + dispatchTransientSystemBarsVisibilityChanged( + mFocusedWin, + /* areVisible= */ false, + /* wereRevealedFromSwipeOnSystemBar= */ false); + startAnimation(false /* show */, () -> { synchronized (mDisplayContent.mWmService.mGlobalLock) { for (int i = mShowingTransientTypes.size() - 1; i >= 0; i--) { @@ -373,6 +384,11 @@ class InsetsPolicy { mDisplayContent.getDisplayId(), mShowingTransientTypes.toArray()); } mShowingTransientTypes.clear(); + + dispatchTransientSystemBarsVisibilityChanged( + mFocusedWin, + /* areVisible= */ false, + /* wereRevealedFromSwipeOnSystemBar= */ false); } private @Nullable InsetsControlTarget getStatusControlTarget(@Nullable WindowState focusedWin, @@ -521,6 +537,32 @@ class InsetsPolicy { listener.mControlCallbacks.controlAnimationUnchecked(typesReady, controls, show); } + private void dispatchTransientSystemBarsVisibilityChanged( + @Nullable WindowState focusedWindow, + boolean areVisible, + boolean wereRevealedFromSwipeOnSystemBar) { + if (focusedWindow == null) { + return; + } + + Task task = focusedWindow.getTask(); + if (task == null) { + return; + } + + int taskId = task.mTaskId; + boolean isValidTaskId = taskId != ActivityTaskManager.INVALID_TASK_ID; + if (!isValidTaskId) { + return; + } + + mDisplayContent.mWmService.mTaskSystemBarsListenerController + .dispatchTransientSystemBarVisibilityChanged( + taskId, + areVisible, + wereRevealedFromSwipeOnSystemBar); + } + private class BarWindow { private final int mId; diff --git a/services/core/java/com/android/server/wm/RootWindowContainer.java b/services/core/java/com/android/server/wm/RootWindowContainer.java index 76a7981fa946..ee03d02791ff 100644 --- a/services/core/java/com/android/server/wm/RootWindowContainer.java +++ b/services/core/java/com/android/server/wm/RootWindowContainer.java @@ -981,6 +981,29 @@ class RootWindowContainer extends WindowContainer<DisplayContent> mWmService.checkDrawnWindowsLocked(); } + final int N = mWmService.mPendingRemove.size(); + if (N > 0) { + if (mWmService.mPendingRemoveTmp.length < N) { + mWmService.mPendingRemoveTmp = new WindowState[N + 10]; + } + mWmService.mPendingRemove.toArray(mWmService.mPendingRemoveTmp); + mWmService.mPendingRemove.clear(); + ArrayList<DisplayContent> displayList = new ArrayList(); + for (i = 0; i < N; i++) { + final WindowState w = mWmService.mPendingRemoveTmp[i]; + w.removeImmediately(); + final DisplayContent displayContent = w.getDisplayContent(); + if (displayContent != null && !displayList.contains(displayContent)) { + displayList.add(displayContent); + } + } + + for (int j = displayList.size() - 1; j >= 0; --j) { + final DisplayContent dc = displayList.get(j); + dc.assignWindowLayers(true /*setLayoutNeeded*/); + } + } + forAllDisplays(dc -> { dc.getInputMonitor().updateInputWindowsLw(true /*force*/); dc.updateSystemGestureExclusion(); diff --git a/services/core/java/com/android/server/wm/Session.java b/services/core/java/com/android/server/wm/Session.java index 2ae2b4370522..f26c53938077 100644 --- a/services/core/java/com/android/server/wm/Session.java +++ b/services/core/java/com/android/server/wm/Session.java @@ -885,8 +885,16 @@ class Session extends IWindowSession.Stub implements IBinder.DeathRecipient { } @Override - public void setOnBackInvokedCallback(IWindow iWindow, - IOnBackInvokedCallback iOnBackInvokedCallback) throws RemoteException { - // TODO: Set the callback to the WindowState of the window. + public void setOnBackInvokedCallback(IWindow window, + IOnBackInvokedCallback onBackInvokedCallback) throws RemoteException { + synchronized (mService.mGlobalLock) { + WindowState windowState = mService.windowForClientLocked(this, window, false); + if (windowState == null) { + Slog.e(TAG_WM, + "setOnBackInvokedCallback(): Can't find window state for window:" + window); + } else { + windowState.setOnBackInvokedCallback(onBackInvokedCallback); + } + } } } diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java index 97735a29b027..b84ef773f85a 100644 --- a/services/core/java/com/android/server/wm/Task.java +++ b/services/core/java/com/android/server/wm/Task.java @@ -2197,10 +2197,6 @@ class Task extends TaskFragment { final Rect taskBounds = getBounds(); width = taskBounds.width(); height = taskBounds.height(); - - final int outset = getTaskOutset(); - width += 2 * outset; - height += 2 * outset; } if (width == mLastSurfaceSize.x && height == mLastSurfaceSize.y) { return; @@ -2209,28 +2205,6 @@ class Task extends TaskFragment { mLastSurfaceSize.set(width, height); } - /** - * Calculate an amount by which to expand the task bounds in each direction. - * Used to make room for shadows in the pinned windowing mode. - */ - int getTaskOutset() { - // If we are drawing shadows on the task then don't outset the root task. - if (mWmService.mRenderShadowsInCompositor) { - return 0; - } - DisplayContent displayContent = getDisplayContent(); - if (inPinnedWindowingMode() && displayContent != null) { - final DisplayMetrics displayMetrics = displayContent.getDisplayMetrics(); - - // We multiply by two to match the client logic for converting view elevation - // to insets, as in {@link WindowManager.LayoutParams#setSurfaceInsets} - return (int) Math.ceil( - mWmService.dipToPixel(PINNED_WINDOWING_MODE_ELEVATION_IN_DIP, displayMetrics) - * 2); - } - return 0; - } - @VisibleForTesting Point getLastSurfaceSize() { return mLastSurfaceSize; @@ -4338,7 +4312,7 @@ class Task extends TaskFragment { */ private void updateShadowsRadius(boolean taskIsFocused, SurfaceControl.Transaction pendingTransaction) { - if (!mWmService.mRenderShadowsInCompositor || !isRootTask()) return; + if (!isRootTask()) return; final float newShadowRadius = getShadowRadius(taskIsFocused); if (mShadowRadius != newShadowRadius) { @@ -6015,14 +5989,6 @@ class Task extends TaskFragment { scheduleAnimation(); } - @Override - void getRelativePosition(Point outPos) { - super.getRelativePosition(outPos); - final int outset = getTaskOutset(); - outPos.x -= outset; - outPos.y -= outset; - } - private Point getRelativePosition() { Point position = new Point(); getRelativePosition(position); diff --git a/services/core/java/com/android/server/wm/TaskSystemBarsListenerController.java b/services/core/java/com/android/server/wm/TaskSystemBarsListenerController.java new file mode 100644 index 000000000000..acb6061de93f --- /dev/null +++ b/services/core/java/com/android/server/wm/TaskSystemBarsListenerController.java @@ -0,0 +1,63 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.wm; + +import com.android.internal.os.BackgroundThread; +import com.android.server.wm.WindowManagerInternal.TaskSystemBarsListener; + +import java.util.HashSet; +import java.util.concurrent.Executor; + +/** + * Manages dispatch of task system bar changes to interested listeners. All invocations must be + * performed while the {@link WindowManagerService#getWindowManagerLock() Window Manager Lock} is + * held. + */ +final class TaskSystemBarsListenerController { + + private final HashSet<TaskSystemBarsListener> mListeners = new HashSet<>(); + private final Executor mBackgroundExecutor; + + TaskSystemBarsListenerController() { + this.mBackgroundExecutor = BackgroundThread.getExecutor(); + } + + void registerListener(TaskSystemBarsListener listener) { + mListeners.add(listener); + } + + void unregisterListener(TaskSystemBarsListener listener) { + mListeners.remove(listener); + } + + void dispatchTransientSystemBarVisibilityChanged( + int taskId, + boolean visible, + boolean wereRevealedFromSwipeOnSystemBar) { + HashSet<TaskSystemBarsListener> localListeners; + localListeners = new HashSet<>(mListeners); + + mBackgroundExecutor.execute(() -> { + for (TaskSystemBarsListener listener : localListeners) { + listener.onTransientSystemBarsVisibilityChanged( + taskId, + visible, + wereRevealedFromSwipeOnSystemBar); + } + }); + } +} diff --git a/services/core/java/com/android/server/wm/WindowManagerInternal.java b/services/core/java/com/android/server/wm/WindowManagerInternal.java index 20fa7a9da256..4900f9292f2a 100644 --- a/services/core/java/com/android/server/wm/WindowManagerInternal.java +++ b/services/core/java/com/android/server/wm/WindowManagerInternal.java @@ -256,6 +256,25 @@ public abstract class WindowManagerInternal { } /** + * An interface to be notified when the system bars for a task change. + */ + public interface TaskSystemBarsListener { + + /** + * Called when the visibility of the system bars of a task change. + * + * @param taskId the identifier of the task. + * @param visible if the transient system bars are visible. + * @param wereRevealedFromSwipeOnSystemBar if the transient bars were revealed due to a + * swipe gesture on a system bar. + */ + void onTransientSystemBarsVisibilityChanged( + int taskId, + boolean visible, + boolean wereRevealedFromSwipeOnSystemBar); + } + + /** * An interface to be notified when keyguard exit animation should start. */ public interface KeyguardExitAnimationStartListener { @@ -519,6 +538,20 @@ public abstract class WindowManagerInternal { public abstract void registerAppTransitionListener(AppTransitionListener listener); /** + * Registers a listener to be notified to when the system bars of a task changes. + * + * @param listener The listener to register. + */ + public abstract void registerTaskSystemBarsListener(TaskSystemBarsListener listener); + + /** + * Registers a listener to be notified to when the system bars of a task changes. + * + * @param listener The listener to unregister. + */ + public abstract void unregisterTaskSystemBarsListener(TaskSystemBarsListener listener); + + /** * Registers a listener to be notified to start the keyguard exit animation. * * @param listener The listener to register. diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index b37cb4f286f9..22c430ff8016 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -222,6 +222,7 @@ import android.util.DisplayMetrics; import android.util.EventLog; import android.util.MergedConfiguration; import android.util.Slog; +import android.util.SparseArray; import android.util.SparseBooleanArray; import android.util.TimeUtils; import android.util.TypedValue; @@ -461,11 +462,6 @@ public class WindowManagerService extends IWindowManager.Stub int mVr2dDisplayId = INVALID_DISPLAY; boolean mVrModeEnabled = false; - /* If true, shadows drawn around the window will be rendered by the system compositor. If - * false, shadows will be drawn by the client by setting an elevation on the root view and - * the contents will be inset by the shadow radius. */ - boolean mRenderShadowsInCompositor = false; - /** * Tracks a map of input tokens to info that is used to decide whether to intercept * a key event. @@ -586,6 +582,20 @@ public class WindowManagerService extends IWindowManager.Stub final ArrayList<WindowState> mResizingWindows = new ArrayList<>(); /** + * Windows whose animations have ended and now must be removed. + */ + final ArrayList<WindowState> mPendingRemove = new ArrayList<>(); + + /** + * Used when processing mPendingRemove to avoid working on the original array. + */ + WindowState[] mPendingRemoveTmp = new WindowState[20]; + + // TODO: use WindowProcessController once go/wm-unified is done. + /** Mapping of process pids to configurations */ + final SparseArray<Configuration> mProcessConfigurations = new SparseArray<>(); + + /** * Mapping of displayId to {@link DisplayImePolicy}. * Note that this can be accessed without holding the lock. */ @@ -683,6 +693,7 @@ public class WindowManagerService extends IWindowManager.Stub () -> mDisplayRotationController = null; final DisplayWindowListenerController mDisplayNotificationController; + final TaskSystemBarsListenerController mTaskSystemBarsListenerController; boolean mDisplayFrozen = false; long mDisplayFreezeTime = 0; @@ -795,8 +806,6 @@ public class WindowManagerService extends IWindowManager.Stub resolver.registerContentObserver(mForceResizableUri, false, this, UserHandle.USER_ALL); resolver.registerContentObserver(mDevEnableNonResizableMultiWindowUri, false, this, UserHandle.USER_ALL); - resolver.registerContentObserver(mRenderShadowsInCompositorUri, false, this, - UserHandle.USER_ALL); resolver.registerContentObserver(mDisplaySettingsPathUri, false, this, UserHandle.USER_ALL); } @@ -837,11 +846,6 @@ public class WindowManagerService extends IWindowManager.Stub return; } - if (mRenderShadowsInCompositorUri.equals(uri)) { - setShadowRenderer(); - return; - } - if (mDisplaySettingsPathUri.equals(uri)) { updateDisplaySettingsLocation(); return; @@ -956,11 +960,6 @@ public class WindowManagerService extends IWindowManager.Stub } } - private void setShadowRenderer() { - mRenderShadowsInCompositor = Settings.Global.getInt(mContext.getContentResolver(), - DEVELOPMENT_RENDER_SHADOWS_IN_COMPOSITOR, 1) != 0; - } - PowerManager mPowerManager; PowerManagerInternal mPowerManagerInternal; @@ -1265,6 +1264,7 @@ public class WindowManagerService extends IWindowManager.Stub mScreenFrozenLock.setReferenceCounted(false); mDisplayNotificationController = new DisplayWindowListenerController(this); + mTaskSystemBarsListenerController = new TaskSystemBarsListenerController(); mActivityManager = ActivityManager.getService(); mActivityTaskManager = ActivityTaskManager.getService(); @@ -1378,7 +1378,6 @@ public class WindowManagerService extends IWindowManager.Stub float[] spotColor = {0.f, 0.f, 0.f, spotShadowAlpha}; SurfaceControl.setGlobalShadowSettings(ambientColor, spotColor, lightY, lightZ, lightRadius); - setShadowRenderer(); } /** @@ -2036,6 +2035,7 @@ public class WindowManagerService extends IWindowManager.Stub dc.mWinRemovedSinceNullFocus.add(win); } mEmbeddedWindowController.onWindowRemoved(win); + mPendingRemove.remove(win); mResizingWindows.remove(win); updateNonSystemOverlayWindowsVisibilityIfNeeded(win, false /* surfaceShown */); mWindowsChanged = true; @@ -3837,14 +3837,20 @@ public class WindowManagerService extends IWindowManager.Stub } /** - * Generates and returns an up-to-date {@link Bitmap} for the specified taskId. The returned - * bitmap will be full size and will not include any secure content. + * Generates and returns an up-to-date {@link Bitmap} for the specified taskId. * - * @param taskId The task ID of the task for which a snapshot is requested. + * @param taskId The task ID of the task for which a Bitmap is requested. + * @param layerCaptureArgsBuilder A {@link SurfaceControl.LayerCaptureArgs.Builder} with + * arguments for how to capture the Bitmap. The caller can + * specify any arguments, but this method will ensure that the + * specified task's SurfaceControl is used and the crop is set to + * the bounds of that task. * @return The Bitmap, or null if no task with the specified ID can be found or the bitmap could * not be generated. */ - @Nullable public Bitmap captureTaskBitmap(int taskId) { + @Nullable + public Bitmap captureTaskBitmap(int taskId, + @NonNull SurfaceControl.LayerCaptureArgs.Builder layerCaptureArgsBuilder) { if (mTaskSnapshotController.shouldDisableSnapshots()) { return null; } @@ -3858,9 +3864,7 @@ public class WindowManagerService extends IWindowManager.Stub task.getBounds(mTmpRect); final SurfaceControl sc = task.getSurfaceControl(); final SurfaceControl.ScreenshotHardwareBuffer buffer = SurfaceControl.captureLayers( - new SurfaceControl.LayerCaptureArgs.Builder(sc) - .setSourceCrop(mTmpRect) - .build()); + layerCaptureArgsBuilder.setLayer(sc).setSourceCrop(mTmpRect).build()); if (buffer == null) { Slog.w(TAG, "Could not get screenshot buffer for taskId: " + taskId); return null; @@ -6364,6 +6368,23 @@ public class WindowManagerService extends IWindowManager.Stub } } } + if (mPendingRemove.size() > 0) { + pw.println(); + pw.println(" Remove pending for:"); + for (int i=mPendingRemove.size()-1; i>=0; i--) { + WindowState w = mPendingRemove.get(i); + if (windows == null || windows.contains(w)) { + pw.print(" Remove #"); pw.print(i); pw.print(' '); + pw.print(w); + if (dumpAll) { + pw.println(":"); + w.dump(pw, " ", true); + } else { + pw.println(); + } + } + } + } if (mForceRemoves != null && mForceRemoves.size() > 0) { pw.println(); pw.println(" Windows force removing:"); @@ -7591,6 +7612,20 @@ public class WindowManagerService extends IWindowManager.Stub } @Override + public void registerTaskSystemBarsListener(TaskSystemBarsListener listener) { + synchronized (mGlobalLock) { + mTaskSystemBarsListenerController.registerListener(listener); + } + } + + @Override + public void unregisterTaskSystemBarsListener(TaskSystemBarsListener listener) { + synchronized (mGlobalLock) { + mTaskSystemBarsListenerController.unregisterListener(listener); + } + } + + @Override public void registerKeyguardExitAnimationStartListener( KeyguardExitAnimationStartListener listener) { synchronized (mGlobalLock) { diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java index 0a02b4442518..0d72e9a567bc 100644 --- a/services/core/java/com/android/server/wm/WindowState.java +++ b/services/core/java/com/android/server/wm/WindowState.java @@ -106,6 +106,7 @@ import static android.view.WindowManagerPolicyConstants.TYPE_LAYER_OFFSET; import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_ADD_REMOVE; import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_APP_TRANSITIONS; +import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_BACK_PREVIEW; import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_FOCUS; import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_FOCUS_LIGHT; import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_ORIENTATION; @@ -245,6 +246,7 @@ import android.view.animation.Animation; import android.view.animation.AnimationUtils; import android.view.animation.Interpolator; import android.window.ClientWindowFrames; +import android.window.IOnBackInvokedCallback; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.policy.KeyInterceptionInfo; @@ -845,6 +847,11 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP } }; + /** + * @see #setOnBackInvokedCallback(IOnBackInvokedCallback) + */ + private IOnBackInvokedCallback mOnBackInvokedCallback; + @Override WindowState asWindowState() { return this; @@ -1061,6 +1068,22 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP return true; } + /** + * Used by {@link android.window.WindowOnBackInvokedDispatcher} to set the callback to be + * called when a back navigation action is initiated. + * @see BackNavigationController + */ + void setOnBackInvokedCallback(@Nullable IOnBackInvokedCallback onBackInvokedCallback) { + ProtoLog.d(WM_DEBUG_BACK_PREVIEW, "%s: Setting back callback %s", + this, onBackInvokedCallback); + mOnBackInvokedCallback = onBackInvokedCallback; + } + + @Nullable + IOnBackInvokedCallback getOnBackInvokedCallback() { + return mOnBackInvokedCallback; + } + interface PowerManagerWrapper { void wakeUp(long time, @WakeReason int reason, String details); @@ -4887,20 +4910,15 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP if (hasSurface) { mWmService.mDestroySurface.add(this); } + if (mRemoveOnExit) { + mWmService.mPendingRemove.add(this); + mRemoveOnExit = false; + } } mAnimatingExit = false; getDisplayContent().mWallpaperController.hideWallpapers(this); } - @Override - boolean handleCompleteDeferredRemoval() { - if (mRemoveOnExit) { - mRemoveOnExit = false; - removeImmediately(); - } - return super.handleCompleteDeferredRemoval(); - } - boolean clearAnimatingFlags() { boolean didSomething = false; // We don't want to clear it out for windows that get replaced, because the @@ -5403,17 +5421,6 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP outPoint.offset(-parentBounds.left, -parentBounds.top); } - Task rootTask = getRootTask(); - - // If we have root task outsets, that means the top-left - // will be outset, and we need to inset ourselves - // to account for it. If we actually have shadows we will - // then un-inset ourselves by the surfaceInsets. - if (rootTask != null) { - final int outset = rootTask.getTaskOutset(); - outPoint.offset(outset, outset); - } - // The surface size is larger than the window if the window has positive surface insets. transformSurfaceInsetsPosition(mTmpPoint, mAttrs.surfaceInsets); outPoint.offset(-mTmpPoint.x, -mTmpPoint.y); diff --git a/services/core/jni/com_android_server_location_GnssLocationProvider.cpp b/services/core/jni/com_android_server_location_GnssLocationProvider.cpp index 161d7ce350fc..0584604ac7b9 100644 --- a/services/core/jni/com_android_server_location_GnssLocationProvider.cpp +++ b/services/core/jni/com_android_server_location_GnssLocationProvider.cpp @@ -244,6 +244,9 @@ bool hasLatLong(const GnssLocation_V2_0& location) { return hasLatLong(location.v1_0); } +bool isSvStatusRegistered = false; +bool isNmeaRegistered = false; + } // namespace static inline jboolean boolToJbool(bool value) { @@ -505,6 +508,13 @@ uint32_t GnssCallback::getConstellationType( template <class T_list, class T_sv_info> Return<void> GnssCallback::gnssSvStatusCbImpl(const T_list& svStatus) { + // In HIDL or AIDL v1, if no listener is registered, do not report svInfoList to the framework. + if (gnssHalAidl == nullptr || gnssHalAidl->getInterfaceVersion() <= 1) { + if (!isSvStatusRegistered) { + return Void(); + } + } + JNIEnv* env = getJniEnv(); uint32_t listSize = getGnssSvInfoListSize(svStatus); @@ -566,8 +576,12 @@ Return<void> GnssCallback::gnssSvStatusCbImpl(const T_list& svStatus) { return Void(); } -Return<void> GnssCallback::gnssNmeaCb( - int64_t timestamp, const ::android::hardware::hidl_string& nmea) { +Return<void> GnssCallback::gnssNmeaCb(int64_t timestamp, + const ::android::hardware::hidl_string& nmea) { + // In HIDL, if no listener is registered, do not report nmea to the framework. + if (!isNmeaRegistered) { + return Void(); + } JNIEnv* env = getJniEnv(); /* * The Java code will call back to read these values. @@ -680,6 +694,12 @@ Status GnssCallbackAidl::gnssLocationCb(const GnssLocationAidl& location) { } Status GnssCallbackAidl::gnssNmeaCb(const int64_t timestamp, const std::string& nmea) { + // In AIDL v1, if no listener is registered, do not report nmea to the framework. + if (gnssHalAidl != nullptr && gnssHalAidl->getInterfaceVersion() <= 1) { + if (!isNmeaRegistered) { + return Status::ok(); + } + } JNIEnv* env = getJniEnv(); /* * The Java code will call back to read these values. @@ -1562,6 +1582,58 @@ static jboolean android_location_gnss_hal_GnssNative_stop(JNIEnv* /* env */, jcl return checkHidlReturn(result, "IGnss stop() failed."); } +static jboolean android_location_gnss_hal_GnssNative_start_sv_status_collection(JNIEnv* /* env */, + jclass) { + isSvStatusRegistered = true; + if (gnssHalAidl != nullptr && gnssHalAidl->getInterfaceVersion() >= 2) { + auto status = gnssHalAidl->startSvStatus(); + return checkAidlStatus(status, "IGnssAidl startSvStatus() failed."); + } + if (gnssHal == nullptr) { + return JNI_FALSE; + } + return JNI_TRUE; +} + +static jboolean android_location_gnss_hal_GnssNative_stop_sv_status_collection(JNIEnv* /* env */, + jclass) { + isSvStatusRegistered = false; + if (gnssHalAidl != nullptr && gnssHalAidl->getInterfaceVersion() >= 2) { + auto status = gnssHalAidl->stopSvStatus(); + return checkAidlStatus(status, "IGnssAidl stopSvStatus() failed."); + } + if (gnssHal == nullptr) { + return JNI_FALSE; + } + return JNI_TRUE; +} + +static jboolean android_location_gnss_hal_GnssNative_start_nmea_message_collection( + JNIEnv* /* env */, jclass) { + isNmeaRegistered = true; + if (gnssHalAidl != nullptr && gnssHalAidl->getInterfaceVersion() >= 2) { + auto status = gnssHalAidl->startNmea(); + return checkAidlStatus(status, "IGnssAidl startNmea() failed."); + } + if (gnssHal == nullptr) { + return JNI_FALSE; + } + return JNI_TRUE; +} + +static jboolean android_location_gnss_hal_GnssNative_stop_nmea_message_collection(JNIEnv* /* env */, + jclass) { + isNmeaRegistered = false; + if (gnssHalAidl != nullptr && gnssHalAidl->getInterfaceVersion() >= 2) { + auto status = gnssHalAidl->stopNmea(); + return checkAidlStatus(status, "IGnssAidl stopNmea() failed."); + } + if (gnssHal == nullptr) { + return JNI_FALSE; + } + return JNI_TRUE; +} + static void android_location_gnss_hal_GnssNative_delete_aiding_data(JNIEnv* /* env */, jclass, jint flags) { if (gnssHalAidl != nullptr && gnssHalAidl->getInterfaceVersion() >= 2) { @@ -1989,7 +2061,7 @@ static SingleSatCorrection_V1_0 getSingleSatCorrection_1_0_withoutConstellation( jfloat eplMeters = env->CallFloatMethod(singleSatCorrectionObj, method_correctionSatEpl); jfloat eplUncMeters = env->CallFloatMethod(singleSatCorrectionObj, method_correctionSatEplUnc); uint16_t corrFlags = static_cast<uint16_t>(correctionFlags); - jobject reflectingPlaneObj; + jobject reflectingPlaneObj = nullptr; bool has_ref_plane = (corrFlags & GnssSingleSatCorrectionFlags::HAS_REFLECTING_PLANE) != 0; if (has_ref_plane) { reflectingPlaneObj = @@ -2013,6 +2085,7 @@ static SingleSatCorrection_V1_0 getSingleSatCorrection_1_0_withoutConstellation( .azimuthDegrees = azimuthDegreeRefPlane, }; } + env->DeleteLocalRef(reflectingPlaneObj); SingleSatCorrection_V1_0 singleSatCorrection = { .singleSatCorrectionFlags = corrFlags, @@ -2044,6 +2117,7 @@ static void getSingleSatCorrectionList_1_1(JNIEnv* env, jobject singleSatCorrect }; list[i] = singleSatCorrection_1_1; + env->DeleteLocalRef(singleSatCorrectionObj); } } @@ -2061,6 +2135,7 @@ static void getSingleSatCorrectionList_1_0(JNIEnv* env, jobject singleSatCorrect singleSatCorrection.constellation = static_cast<GnssConstellationType_V1_0>(constType), list[i] = singleSatCorrection; + env->DeleteLocalRef(singleSatCorrectionObj); } } @@ -2131,6 +2206,7 @@ static jboolean android_location_gnss_hal_GnssNative_inject_measurement_correcti hidl_vec<SingleSatCorrection_V1_0> list(len); getSingleSatCorrectionList_1_0(env, singleSatCorrectionList, list); + env->DeleteLocalRef(singleSatCorrectionList); measurementCorrections_1_0.satCorrections = list; auto result = gnssCorrectionsIface_V1_0->setCorrections(measurementCorrections_1_0); @@ -2365,6 +2441,16 @@ static const JNINativeMethod sLocationProviderMethods[] = { {"native_is_gnss_visibility_control_supported", "()Z", reinterpret_cast<void*>( android_location_gnss_hal_GnssNative_is_gnss_visibility_control_supported)}, + {"native_start_sv_status_collection", "()Z", + reinterpret_cast<void*>(android_location_gnss_hal_GnssNative_start_sv_status_collection)}, + {"native_stop_sv_status_collection", "()Z", + reinterpret_cast<void*>(android_location_gnss_hal_GnssNative_stop_sv_status_collection)}, + {"native_start_nmea_message_collection", "()Z", + reinterpret_cast<void*>( + android_location_gnss_hal_GnssNative_start_nmea_message_collection)}, + {"native_stop_nmea_message_collection", "()Z", + reinterpret_cast<void*>( + android_location_gnss_hal_GnssNative_stop_nmea_message_collection)}, }; static const JNINativeMethod sBatchingMethods[] = { diff --git a/services/core/xsd/display-device-config/display-device-config.xsd b/services/core/xsd/display-device-config/display-device-config.xsd index 79d80366efd3..be0ddc155ae0 100644 --- a/services/core/xsd/display-device-config/display-device-config.xsd +++ b/services/core/xsd/display-device-config/display-device-config.xsd @@ -123,6 +123,18 @@ <xs:annotation name="nonnull"/> <xs:annotation name="final"/> </xs:element> + <!-- The minimum HDR video size at which high-brightness-mode is allowed to operate. + Default is 0.5 if not specified--> + <xs:element name="minimumHdrPercentOfScreen" type="nonNegativeDecimal" + minOccurs="0" maxOccurs="1"> + <xs:annotation name="nullable"/> + <xs:annotation name="final"/> + </xs:element> + <!-- This LUT specifies how to boost HDR brightness at given SDR brightness (nits). --> + <xs:element type="sdrHdrRatioMap" name="sdrHdrRatioMap" minOccurs="0" maxOccurs="1"> + <xs:annotation name="nullable"/> + <xs:annotation name="final"/> + </xs:element> </xs:all> <xs:attribute name="enabled" type="xs:boolean" use="optional"/> </xs:complexType> @@ -158,6 +170,14 @@ </xs:restriction> </xs:simpleType> + <!-- Maps to DisplayDeviceConfig.INTERPOLATION_* values. --> + <xs:simpleType name="interpolation"> + <xs:restriction base="xs:string"> + <xs:enumeration value="default"/> + <xs:enumeration value="linear"/> + </xs:restriction> + </xs:simpleType> + <xs:complexType name="thermalThrottling"> <xs:complexType> <xs:element type="brightnessThrottlingMap" name="brightnessThrottlingMap"> @@ -196,6 +216,7 @@ <xs:annotation name="final"/> </xs:element> </xs:sequence> + <xs:attribute name="interpolation" type="interpolation" use="optional"/> </xs:complexType> <xs:complexType name="point"> @@ -211,6 +232,28 @@ </xs:sequence> </xs:complexType> + <xs:complexType name="sdrHdrRatioMap"> + <xs:sequence> + <xs:element name="point" type="sdrHdrRatioPoint" maxOccurs="unbounded" minOccurs="2"> + <xs:annotation name="nonnull"/> + <xs:annotation name="final"/> + </xs:element> + </xs:sequence> + </xs:complexType> + + <xs:complexType name="sdrHdrRatioPoint"> + <xs:sequence> + <xs:element type="nonNegativeDecimal" name="sdrNits"> + <xs:annotation name="nonnull"/> + <xs:annotation name="final"/> + </xs:element> + <xs:element type="nonNegativeDecimal" name="hdrRatio"> + <xs:annotation name="nonnull"/> + <xs:annotation name="final"/> + </xs:element> + </xs:sequence> + </xs:complexType> + <xs:simpleType name="nonNegativeDecimal"> <xs:restriction base="xs:decimal"> <xs:minInclusive value="0.0"/> diff --git a/services/core/xsd/display-device-config/schema/current.txt b/services/core/xsd/display-device-config/schema/current.txt index 0b7df4d0bc7c..2890d686186e 100644 --- a/services/core/xsd/display-device-config/schema/current.txt +++ b/services/core/xsd/display-device-config/schema/current.txt @@ -90,23 +90,35 @@ package com.android.server.display.config { ctor public HighBrightnessMode(); method @NonNull public final boolean getAllowInLowPowerMode_all(); method public boolean getEnabled(); + method @Nullable public final java.math.BigDecimal getMinimumHdrPercentOfScreen_all(); method @NonNull public final java.math.BigDecimal getMinimumLux_all(); method @Nullable public final com.android.server.display.config.RefreshRateRange getRefreshRate_all(); + method @Nullable public final com.android.server.display.config.SdrHdrRatioMap getSdrHdrRatioMap_all(); method @NonNull public final com.android.server.display.config.ThermalStatus getThermalStatusLimit_all(); method public com.android.server.display.config.HbmTiming getTiming_all(); method @NonNull public final java.math.BigDecimal getTransitionPoint_all(); method public final void setAllowInLowPowerMode_all(@NonNull boolean); method public void setEnabled(boolean); + method public final void setMinimumHdrPercentOfScreen_all(@Nullable java.math.BigDecimal); method public final void setMinimumLux_all(@NonNull java.math.BigDecimal); method public final void setRefreshRate_all(@Nullable com.android.server.display.config.RefreshRateRange); + method public final void setSdrHdrRatioMap_all(@Nullable com.android.server.display.config.SdrHdrRatioMap); method public final void setThermalStatusLimit_all(@NonNull com.android.server.display.config.ThermalStatus); method public void setTiming_all(com.android.server.display.config.HbmTiming); method public final void setTransitionPoint_all(@NonNull java.math.BigDecimal); } + public enum Interpolation { + method public String getRawName(); + enum_constant public static final com.android.server.display.config.Interpolation _default; + enum_constant public static final com.android.server.display.config.Interpolation linear; + } + public class NitsMap { ctor public NitsMap(); + method public com.android.server.display.config.Interpolation getInterpolation(); method @NonNull public final java.util.List<com.android.server.display.config.Point> getPoint(); + method public void setInterpolation(com.android.server.display.config.Interpolation); } public class Point { @@ -125,6 +137,19 @@ package com.android.server.display.config { method public final void setMinimum(java.math.BigInteger); } + public class SdrHdrRatioMap { + ctor public SdrHdrRatioMap(); + method @NonNull public final java.util.List<com.android.server.display.config.SdrHdrRatioPoint> getPoint(); + } + + public class SdrHdrRatioPoint { + ctor public SdrHdrRatioPoint(); + method @NonNull public final java.math.BigDecimal getHdrRatio(); + method @NonNull public final java.math.BigDecimal getSdrNits(); + method public final void setHdrRatio(@NonNull java.math.BigDecimal); + method public final void setSdrNits(@NonNull java.math.BigDecimal); + } + public class SensorDetails { ctor public SensorDetails(); method @Nullable public final String getName(); diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyData.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyData.java index 26c442dc1f47..e18e0020407f 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyData.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyData.java @@ -23,6 +23,7 @@ import android.app.admin.DevicePolicyManager; import android.content.ComponentName; import android.os.FileUtils; import android.os.PersistableBundle; +import android.os.UserHandle; import android.util.ArrayMap; import android.util.ArraySet; import android.util.DebugUtils; @@ -83,7 +84,7 @@ class DevicePolicyData { private static final String ATTR_NEW_USER_DISCLAIMER = "new-user-disclaimer"; // Values of ATTR_NEW_USER_DISCLAIMER - static final String NEW_USER_DISCLAIMER_SHOWN = "shown"; + static final String NEW_USER_DISCLAIMER_ACKNOWLEDGED = "acked"; static final String NEW_USER_DISCLAIMER_NOT_NEEDED = "not_needed"; static final String NEW_USER_DISCLAIMER_NEEDED = "needed"; @@ -613,6 +614,28 @@ class DevicePolicyData { } } + boolean isNewUserDisclaimerAcknowledged() { + if (mNewUserDisclaimer == null) { + if (mUserId == UserHandle.USER_SYSTEM) { + return true; + } + Slogf.w(TAG, "isNewUserDisclaimerAcknowledged(%d): mNewUserDisclaimer is null", + mUserId); + return false; + } + switch (mNewUserDisclaimer) { + case NEW_USER_DISCLAIMER_ACKNOWLEDGED: + case NEW_USER_DISCLAIMER_NOT_NEEDED: + return true; + case NEW_USER_DISCLAIMER_NEEDED: + return false; + default: + Slogf.w(TAG, "isNewUserDisclaimerAcknowledged(%d): invalid value %d", mUserId, + mNewUserDisclaimer); + return false; + } + } + void dump(IndentingPrintWriter pw) { pw.println(); pw.println("Enabled Device Admins (User " + mUserId + ", provisioningState: " diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 79d993268359..e99b1f9a408c 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -10951,7 +10951,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { if (mPendingUserCreatedCallbackTokens.contains(token)) { // Ignore because it was triggered by createAndManageUser() Slogf.d(LOG_TAG, "handleNewUserCreated(): ignoring for user " + userId - + " due to token" + token); + + " due to token " + token); mPendingUserCreatedCallbackTokens.remove(token); return; } @@ -10978,10 +10978,11 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { @Override public void acknowledgeNewUserDisclaimer() { CallerIdentity callerIdentity = getCallerIdentity(); - canManageUsers(callerIdentity); + Preconditions.checkCallAuthorization(canManageUsers(callerIdentity) + || hasCallingOrSelfPermission(permission.INTERACT_ACROSS_USERS)); setShowNewUserDisclaimer(callerIdentity.getUserId(), - DevicePolicyData.NEW_USER_DISCLAIMER_SHOWN); + DevicePolicyData.NEW_USER_DISCLAIMER_ACKNOWLEDGED); } private void setShowNewUserDisclaimer(@UserIdInt int userId, String value) { @@ -11014,6 +11015,18 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { } @Override + public boolean isNewUserDisclaimerAcknowledged() { + CallerIdentity callerIdentity = getCallerIdentity(); + Preconditions.checkCallAuthorization(canManageUsers(callerIdentity) + || hasCallingOrSelfPermission(permission.INTERACT_ACROSS_USERS)); + int userId = callerIdentity.getUserId(); + synchronized (getLockObject()) { + DevicePolicyData policyData = getUserData(userId); + return policyData.isNewUserDisclaimerAcknowledged(); + } + } + + @Override public boolean removeUser(ComponentName who, UserHandle userHandle) { Objects.requireNonNull(who, "ComponentName is null"); Objects.requireNonNull(userHandle, "UserHandle is null"); @@ -11070,6 +11083,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { switched = mInjector.getIActivityManager().switchUser(userId); if (!switched) { Slogf.w(LOG_TAG, "Failed to switch to user %d", userId); + } else { + Slogf.d(LOG_TAG, "Switched"); } return switched; } catch (RemoteException e) { @@ -11093,18 +11108,12 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { } private @UserIdInt int getLogoutUserIdUnchecked() { - if (!mInjector.userManagerIsHeadlessSystemUserMode()) { - // mLogoutUserId is USER_SYSTEM as well, but there's no need to acquire the lock - return UserHandle.USER_SYSTEM; - } synchronized (getLockObject()) { return mLogoutUserId; } } private void clearLogoutUser() { - if (!mInjector.userManagerIsHeadlessSystemUserMode()) return; // ignore - synchronized (getLockObject()) { setLogoutUserIdLocked(UserHandle.USER_NULL); } @@ -11112,8 +11121,6 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { @GuardedBy("getLockObject()") private void setLogoutUserIdLocked(@UserIdInt int userId) { - if (!mInjector.userManagerIsHeadlessSystemUserMode()) return; // ignore - if (userId == UserHandle.USER_CURRENT) { userId = getCurrentForegroundUserId(); } @@ -11196,8 +11203,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { return UserManager.USER_OPERATION_ERROR_MANAGED_PROFILE; } - // TODO(b/204585343): remove the headless system user check? - if (mInjector.userManagerIsHeadlessSystemUserMode() && callingUserId != mInjector + if (callingUserId != mInjector .binderWithCleanCallingIdentity(() -> getCurrentForegroundUserId())) { Slogf.d(LOG_TAG, "logoutUser(): user %d is in background, just stopping, not switching", callingUserId); @@ -11210,11 +11216,18 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { @Override public int logoutUserInternal() { CallerIdentity caller = getCallerIdentity(); - Preconditions.checkCallAuthorization( - canManageUsers(caller) || hasCallingOrSelfPermission(permission.CREATE_USERS)); + Preconditions.checkCallAuthorization(canManageUsers(caller) + || hasCallingOrSelfPermission(permission.INTERACT_ACROSS_USERS)); - int result = logoutUserUnchecked(getCurrentForegroundUserId()); - Slogf.d(LOG_TAG, "logout called by uid %d. Result: %d", caller.getUid(), result); + int currentUserId = getCurrentForegroundUserId(); + if (VERBOSE_LOG) { + Slogf.v(LOG_TAG, "logout() called by uid %d; current user is %d", caller.getUid(), + currentUserId); + } + int result = logoutUserUnchecked(currentUserId); + if (VERBOSE_LOG) { + Slogf.v(LOG_TAG, "Result of logout(): %d", result); + } return result; } @@ -17705,6 +17718,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { startTime, callerPackage); + onCreateAndProvisionManagedProfileStarted(provisioningParams); + installExistingAdminPackage(userInfo.id, admin.getPackageName()); if (!enableAdminAndSetProfileOwner( userInfo.id, caller.getUserId(), admin, provisioningParams.getOwnerName())) { @@ -17725,6 +17740,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { } } + onCreateAndProvisionManagedProfileCompleted(provisioningParams); + sendProvisioningCompletedBroadcast( userInfo.id, ACTION_PROVISION_MANAGED_PROFILE, @@ -17746,6 +17763,29 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { } } + /** + * Callback called at the beginning of {@link #createAndProvisionManagedProfile( + * ManagedProfileProvisioningParams, String)} after the relevant prechecks have passed. + * + * <p>The logic in this method blocks provisioning. + * + * <p>This method is meant to be overridden by OEMs. + */ + private void onCreateAndProvisionManagedProfileStarted( + ManagedProfileProvisioningParams provisioningParams) {} + + /** + * Callback called at the end of {@link #createAndProvisionManagedProfile( + * ManagedProfileProvisioningParams, String)} after all the other provisioning tasks + * have completed successfully. + * + * <p>The logic in this method blocks provisioning. + * + * <p>This method is meant to be overridden by OEMs. + */ + private void onCreateAndProvisionManagedProfileCompleted( + ManagedProfileProvisioningParams provisioningParams) {} + private void resetInteractAcrossProfilesAppOps() { mInjector.getCrossProfileApps().clearInteractAcrossProfilesAppOps(); pregrantDefaultInteractAcrossProfilesAppOps(); @@ -17985,6 +18025,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { ERROR_PRE_CONDITION_FAILED, "Provisioning preconditions failed with result: " + result); } + onProvisionFullyManagedDeviceStarted(provisioningParams); setTimeAndTimezone(provisioningParams.getTimeZone(), provisioningParams.getLocalTime()); setLocale(provisioningParams.getLocale()); @@ -18010,6 +18051,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { disallowAddUser(); setAdminCanGrantSensorsPermissionForUserUnchecked(deviceOwnerUserId, provisioningParams.canDeviceOwnerGrantSensorsPermissions()); + onProvisionFullyManagedDeviceCompleted(provisioningParams); sendProvisioningCompletedBroadcast( deviceOwnerUserId, ACTION_PROVISION_MANAGED_DEVICE, @@ -18025,6 +18067,29 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { } } + /** + * Callback called at the beginning of {@link #provisionFullyManagedDevice( + * FullyManagedDeviceProvisioningParams, String)} after the relevant prechecks have passed. + * + * <p>The logic in this method blocks provisioning. + * + * <p>This method is meant to be overridden by OEMs. + */ + private void onProvisionFullyManagedDeviceStarted( + FullyManagedDeviceProvisioningParams provisioningParams) {} + + /** + * Callback called at the end of {@link #provisionFullyManagedDevice( + * FullyManagedDeviceProvisioningParams, String)} after all the other provisioning tasks + * have completed successfully. + * + * <p>The logic in this method blocks provisioning. + * + * <p>This method is meant to be overridden by OEMs. + */ + private void onProvisionFullyManagedDeviceCompleted( + FullyManagedDeviceProvisioningParams provisioningParams) {} + private void setTimeAndTimezone(String timeZone, long localTime) { try { final AlarmManager alarmManager = mContext.getSystemService(AlarmManager.class); @@ -18278,12 +18343,16 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { private void setDeviceOwnerTypeLocked(ComponentName admin, @DeviceOwnerType int deviceOwnerType) { String packageName = admin.getPackageName(); + boolean isAdminTestOnly; verifyDeviceOwnerTypePreconditionsLocked(admin); - Preconditions.checkState(!mOwners.isDeviceOwnerTypeSetForDeviceOwner(packageName), - "The device owner type has already been set for " + packageName); - mOwners.setDeviceOwnerType(packageName, deviceOwnerType); + isAdminTestOnly = isAdminTestOnlyLocked(admin, mOwners.getDeviceOwnerUserId()); + Preconditions.checkState(isAdminTestOnly + || !mOwners.isDeviceOwnerTypeSetForDeviceOwner(packageName), + "Test only admins can only set the device owner type more than once"); + + mOwners.setDeviceOwnerType(packageName, deviceOwnerType, isAdminTestOnly); } @Override @@ -18459,9 +18528,10 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { final CallerIdentity caller = getCallerIdentity(); Preconditions.checkCallAuthorization( isDefaultDeviceOwner(caller) || isProfileOwnerOfOrganizationOwnedDevice(caller) - || isSystemUid(caller), + || canQueryAdminPolicy(caller), "SSID allowlist can only be retrieved by a device owner or " - + "a profile owner on an organization-owned device or a system app."); + + "a profile owner on an organization-owned device or " + + "an app with the QUERY_ADMIN_POLICY permission."); synchronized (getLockObject()) { final ActiveAdmin admin = getDeviceOwnerOrProfileOwnerOfOrganizationOwnedDeviceLocked( UserHandle.USER_SYSTEM); @@ -18497,9 +18567,10 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { final CallerIdentity caller = getCallerIdentity(); Preconditions.checkCallAuthorization( isDefaultDeviceOwner(caller) || isProfileOwnerOfOrganizationOwnedDevice(caller) - || isSystemUid(caller), + || canQueryAdminPolicy(caller), "SSID denylist can only be retrieved by a device owner or " - + "a profile owner on an organization-owned device or a system app."); + + "a profile owner on an organization-owned device or " + + "an app with the QUERY_ADMIN_POLICY permission."); synchronized (getLockObject()) { final ActiveAdmin admin = getDeviceOwnerOrProfileOwnerOfOrganizationOwnedDeviceLocked( UserHandle.USER_SYSTEM); diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/Owners.java b/services/devicepolicy/java/com/android/server/devicepolicy/Owners.java index 3584728a2e62..fe8f2235ed63 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/Owners.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/Owners.java @@ -637,13 +637,15 @@ class Owners { } } - void setDeviceOwnerType(String packageName, @DeviceOwnerType int deviceOwnerType) { + void setDeviceOwnerType(String packageName, @DeviceOwnerType int deviceOwnerType, + boolean isAdminTestOnly) { synchronized (mLock) { if (!hasDeviceOwner()) { Slog.e(TAG, "Attempting to set a device owner type when there is no device owner"); return; - } else if (isDeviceOwnerTypeSetForDeviceOwner(packageName)) { - Slog.e(TAG, "Device owner type for " + packageName + " has already been set"); + } else if (!isAdminTestOnly && isDeviceOwnerTypeSetForDeviceOwner(packageName)) { + Slog.e(TAG, "Setting the device owner type more than once is only allowed" + + " for test only admins"); return; } diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index c9aeabd17191..c2dec067c870 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -154,6 +154,7 @@ import com.android.server.os.NativeTombstoneManagerService; import com.android.server.os.SchedulingPolicyService; import com.android.server.people.PeopleService; import com.android.server.pm.ApexManager; +import com.android.server.pm.ApexSystemServiceInfo; import com.android.server.pm.CrossProfileAppsService; import com.android.server.pm.DataLoaderManagerService; import com.android.server.pm.DynamicCodeLoggingService; @@ -224,8 +225,8 @@ import java.text.SimpleDateFormat; import java.util.Arrays; import java.util.Date; import java.util.LinkedList; +import java.util.List; import java.util.Locale; -import java.util.Map; import java.util.Timer; import java.util.TreeSet; import java.util.concurrent.CountDownLatch; @@ -366,6 +367,8 @@ public final class SystemServer implements Dumpable { "com.android.server.adb.AdbService$Lifecycle"; private static final String SPEECH_RECOGNITION_MANAGER_SERVICE_CLASS = "com.android.server.speech.SpeechRecognitionManagerService"; + private static final String WALLPAPER_EFFECTS_GENERATION_MANAGER_SERVICE_CLASS = + "com.android.server.wallpapereffectsgeneration.WallpaperEffectsGenerationManagerService"; private static final String APP_PREDICTION_MANAGER_SERVICE_CLASS = "com.android.server.appprediction.AppPredictionManagerService"; private static final String CONTENT_SUGGESTIONS_SERVICE_CLASS = @@ -1390,7 +1393,6 @@ public final class SystemServer implements Dumpable { DynamicSystemService dynamicSystem = null; IStorageManager storageManager = null; NetworkManagementService networkManagement = null; - IpSecService ipSecService = null; VpnManagerService vpnManager = null; VcnManagementService vcnManagement = null; NetworkStatsService networkStats = null; @@ -1470,7 +1472,7 @@ public final class SystemServer implements Dumpable { // TelecomLoader hooks into classes with defined HFP logic, // so check for either telephony or microphone. if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_MICROPHONE) || - mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) { + mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) { t.traceBegin("StartTelecomLoaderService"); mSystemServiceManager.startService(TelecomLoaderService.class); t.traceEnd(); @@ -1478,7 +1480,7 @@ public final class SystemServer implements Dumpable { t.traceBegin("StartTelephonyRegistry"); telephonyRegistry = new TelephonyRegistry( - context, new TelephonyRegistry.ConfigurationProvider()); + context, new TelephonyRegistry.ConfigurationProvider()); ServiceManager.addService("telephony.registry", telephonyRegistry); t.traceEnd(); @@ -1895,16 +1897,6 @@ public final class SystemServer implements Dumpable { } t.traceEnd(); - - t.traceBegin("StartIpSecService"); - try { - ipSecService = IpSecService.create(context); - ServiceManager.addService(Context.IPSEC_SERVICE, ipSecService); - } catch (Throwable e) { - reportWtf("starting IpSec Service", e); - } - t.traceEnd(); - t.traceBegin("StartFontManagerService"); mSystemServiceManager.startService(new FontManagerService.Lifecycle(context, safeMode)); t.traceEnd(); @@ -2126,6 +2118,14 @@ public final class SystemServer implements Dumpable { Slog.i(TAG, "Wallpaper service disabled by config"); } + // WallpaperEffectsGeneration manager service + // TODO (b/135218095): Use deviceHasConfigString(context, + // R.string.config_defaultWallpaperEffectsGenerationService) + t.traceBegin("StartWallpaperEffectsGenerationService"); + mSystemServiceManager.startService( + WALLPAPER_EFFECTS_GENERATION_MANAGER_SERVICE_CLASS); + t.traceEnd(); + t.traceBegin("StartAudioService"); if (!isArc) { mSystemServiceManager.startService(AudioService.Lifecycle.class); @@ -2783,7 +2783,6 @@ public final class SystemServer implements Dumpable { final TelephonyRegistry telephonyRegistryF = telephonyRegistry; final MediaRouterService mediaRouterF = mediaRouter; final MmsServiceBroker mmsServiceF = mmsService; - final IpSecService ipSecServiceF = ipSecService; final VpnManagerService vpnManagerF = vpnManager; final VcnManagementService vcnManagementF = vcnManagement; final WindowManagerService windowManagerF = wm; @@ -2875,15 +2874,6 @@ public final class SystemServer implements Dumpable { .networkScoreAndNetworkManagementServiceReady(); } t.traceEnd(); - t.traceBegin("MakeIpSecServiceReady"); - try { - if (ipSecServiceF != null) { - ipSecServiceF.systemReady(); - } - } catch (Throwable e) { - reportWtf("making IpSec Service ready", e); - } - t.traceEnd(); t.traceBegin("MakeNetworkStatsServiceReady"); try { if (networkStatsF != null) { @@ -3008,7 +2998,9 @@ public final class SystemServer implements Dumpable { t.traceEnd(); t.traceBegin("MakeTelephonyRegistryReady"); try { - if (telephonyRegistryF != null) telephonyRegistryF.systemRunning(); + if (telephonyRegistryF != null) { + telephonyRegistryF.systemRunning(); + } } catch (Throwable e) { reportWtf("Notifying TelephonyRegistry running", e); } @@ -3073,10 +3065,12 @@ public final class SystemServer implements Dumpable { */ private void startApexServices(@NonNull TimingsTraceAndSlog t) { t.traceBegin("startApexServices"); - Map<String, String> services = ApexManager.getInstance().getApexSystemServices(); - // TODO(satayev): introduce android:order for services coming the same apexes - for (String name : new TreeSet<>(services.keySet())) { - String jarPath = services.get(name); + // TODO(b/192880996): get the list from "android" package, once the manifest entries + // are migrated to system manifest. + List<ApexSystemServiceInfo> services = ApexManager.getInstance().getApexSystemServices(); + for (ApexSystemServiceInfo info : services) { + String name = info.getName(); + String jarPath = info.getJarPath(); t.traceBegin("starting " + name); if (TextUtils.isEmpty(jarPath)) { mSystemServiceManager.startService(name); diff --git a/services/tests/apexsystemservices/apexes/test_com.android.server/Android.bp b/services/tests/apexsystemservices/apexes/test_com.android.server/Android.bp index 16d624199d5a..0a9b7b1302cc 100644 --- a/services/tests/apexsystemservices/apexes/test_com.android.server/Android.bp +++ b/services/tests/apexsystemservices/apexes/test_com.android.server/Android.bp @@ -32,7 +32,7 @@ apex_test { name: "test_com.android.server", manifest: "manifest.json", androidManifest: "AndroidManifest.xml", - java_libs: ["FakeApexSystemService"], + java_libs: ["FakeApexSystemServices"], file_contexts: ":apex.test-file_contexts", key: "test_com.android.server.key", updatable: false, diff --git a/services/tests/apexsystemservices/apexes/test_com.android.server/AndroidManifest.xml b/services/tests/apexsystemservices/apexes/test_com.android.server/AndroidManifest.xml index eb741cad4ad9..6bec28463dc3 100644 --- a/services/tests/apexsystemservices/apexes/test_com.android.server/AndroidManifest.xml +++ b/services/tests/apexsystemservices/apexes/test_com.android.server/AndroidManifest.xml @@ -21,21 +21,29 @@ <application android:hasCode="false" android:testOnly="true"> <apex-system-service android:name="com.android.server.testing.FakeApexSystemService" - android:path="/apex/test_com.android.server/javalib/FakeApexSystemService.jar" - android:minSdkVersion="30"/> + android:path="/apex/test_com.android.server/javalib/FakeApexSystemServices.jar" + android:minSdkVersion="30" + /> + + <apex-system-service + android:name="com.android.server.testing.FakeApexSystemService2" + android:path="/apex/test_com.android.server/javalib/FakeApexSystemServices.jar" + android:minSdkVersion="30" + android:initOrder="1" + /> <!-- Always inactive system service, since maxSdkVersion is low --> <apex-system-service - android:name="com.android.apex.test.OldApexSystemService" - android:path="/apex/com.android.apex.test/javalib/fake.jar" + android:name="com.android.server.testing.OldApexSystemService" + android:path="/apex/test_com.android.server/javalib/fake.jar" android:minSdkVersion="1" android:maxSdkVersion="1" /> <!-- Always inactive system service, since minSdkVersion is high --> <apex-system-service - android:name="com.android.apex.test.NewApexSystemService" - android:path="/apex/com.android.apex.test/javalib/fake.jar" + android:name="com.android.server.testing.NewApexSystemService" + android:path="/apex/test_com.android.server/javalib/fake.jar" android:minSdkVersion="999999" /> </application> diff --git a/services/tests/apexsystemservices/service/Android.bp b/services/tests/apexsystemservices/services/Android.bp index 9d04f39f2237..477ea4cdad37 100644 --- a/services/tests/apexsystemservices/service/Android.bp +++ b/services/tests/apexsystemservices/services/Android.bp @@ -8,7 +8,7 @@ package { } java_library { - name: "FakeApexSystemService", + name: "FakeApexSystemServices", srcs: ["**/*.java"], sdk_version: "system_server_current", libs: [ diff --git a/services/tests/apexsystemservices/service/src/com/android/server/testing/FakeApexSystemService.java b/services/tests/apexsystemservices/services/src/com/android/server/testing/FakeApexSystemService.java index 4947c3455cc7..4947c3455cc7 100644 --- a/services/tests/apexsystemservices/service/src/com/android/server/testing/FakeApexSystemService.java +++ b/services/tests/apexsystemservices/services/src/com/android/server/testing/FakeApexSystemService.java diff --git a/services/tests/apexsystemservices/services/src/com/android/server/testing/FakeApexSystemService2.java b/services/tests/apexsystemservices/services/src/com/android/server/testing/FakeApexSystemService2.java new file mode 100644 index 000000000000..e83343b9c996 --- /dev/null +++ b/services/tests/apexsystemservices/services/src/com/android/server/testing/FakeApexSystemService2.java @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.testing; + +import android.content.Context; +import android.util.Log; + +import androidx.annotation.NonNull; + +import com.android.server.SystemService; + +/** + * A fake system service that just logs when it is started. + */ +public class FakeApexSystemService2 extends SystemService { + + private static final String TAG = "FakeApexSystemService"; + + public FakeApexSystemService2(@NonNull Context context) { + super(context); + } + + @Override + public void onStart() { + Log.d(TAG, "FakeApexSystemService2 onStart"); + } +} diff --git a/services/tests/apexsystemservices/src/com/android/server/ApexSystemServicesTestCases.java b/services/tests/apexsystemservices/src/com/android/server/ApexSystemServicesTestCases.java index 2b453a9265bb..10635a138eb9 100644 --- a/services/tests/apexsystemservices/src/com/android/server/ApexSystemServicesTestCases.java +++ b/services/tests/apexsystemservices/src/com/android/server/ApexSystemServicesTestCases.java @@ -37,9 +37,15 @@ import org.junit.rules.RuleChain; import org.junit.rules.TemporaryFolder; import org.junit.runner.RunWith; +import java.util.Objects; +import java.util.regex.Pattern; +import java.util.stream.Collectors; + @RunWith(DeviceJUnit4ClassRunner.class) public class ApexSystemServicesTestCases extends BaseHostJUnit4Test { + private static final int REBOOT_TIMEOUT = 1 * 60 * 1000; + private final InstallUtilsHost mHostUtils = new InstallUtilsHost(this); private final TemporaryFolder mTemporaryFolder = new TemporaryFolder(); private final SystemPreparer mPreparer = new SystemPreparer(mTemporaryFolder, this::getDevice); @@ -67,7 +73,7 @@ public class ApexSystemServicesTestCases extends BaseHostJUnit4Test { } @Test - public void noApexSystemServerStartsWithoutApex() throws Exception { + public void testNoApexSystemServiceStartsWithoutApex() throws Exception { mPreparer.reboot(); assertThat(getFakeApexSystemServiceLogcat()) @@ -75,20 +81,55 @@ public class ApexSystemServicesTestCases extends BaseHostJUnit4Test { } @Test - public void apexSystemServerStarts() throws Exception { + public void testApexSystemServiceStarts() throws Exception { // Pre-install the apex String apex = "test_com.android.server.apex"; mPreparer.pushResourceFile(apex, "/system/apex/" + apex); // Reboot activates the apex mPreparer.reboot(); + mDevice.waitForBootComplete(REBOOT_TIMEOUT); + assertThat(getFakeApexSystemServiceLogcat()) .contains("FakeApexSystemService onStart"); } + @Test + public void testInitOrder() throws Exception { + // Pre-install the apex + String apex = "test_com.android.server.apex"; + mPreparer.pushResourceFile(apex, "/system/apex/" + apex); + // Reboot activates the apex + mPreparer.reboot(); + + mDevice.waitForBootComplete(REBOOT_TIMEOUT); + + assertThat(getFakeApexSystemServiceLogcat().lines() + .map(ApexSystemServicesTestCases::getDebugMessage) + .filter(Objects::nonNull) + .collect(Collectors.toList())) + .containsExactly( + // Second service has a higher initOrder and must be started first + "FakeApexSystemService2 onStart", + "FakeApexSystemService onStart" + ) + .inOrder(); + } + private String getFakeApexSystemServiceLogcat() throws DeviceNotAvailableException { return mDevice.executeAdbCommand("logcat", "-v", "brief", "-d", "FakeApexSystemService:D", "*:S"); } + private static final Pattern DEBUG_MESSAGE = + Pattern.compile("(FakeApexSystemService[0-9]* onStart)"); + + private static String getDebugMessage(String logcatLine) { + return DEBUG_MESSAGE.matcher(logcatLine) + .results() + .map(m -> m.group(1)) + .findFirst() + .orElse(null); + } + } diff --git a/services/tests/mockingservicestests/Android.bp b/services/tests/mockingservicestests/Android.bp index 9e221bec4749..75669d50c75d 100644 --- a/services/tests/mockingservicestests/Android.bp +++ b/services/tests/mockingservicestests/Android.bp @@ -52,6 +52,7 @@ android_test { "service-blobstore", "service-jobscheduler", "service-permission.impl", + "service-supplementalprocess.impl", "services.core", "services.devicepolicy", "services.net", diff --git a/services/tests/mockingservicestests/res/xml/gama_manager_service_metadata_config_disabled.xml b/services/tests/mockingservicestests/res/xml/gama_manager_service_metadata_config_disabled.xml new file mode 100644 index 000000000000..eb154518c911 --- /dev/null +++ b/services/tests/mockingservicestests/res/xml/gama_manager_service_metadata_config_disabled.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<game-mode-config + xmlns:android="http://schemas.android.com/apk/res/android" + android:supportsPerformanceGameMode="false" + android:supportsBatteryGameMode="false" + android:allowGameAngleDriver="false" + android:allowGameDownscaling="false" + android:allowGameFpsOverride="false" +/>
\ No newline at end of file diff --git a/services/tests/mockingservicestests/res/xml/gama_manager_service_metadata_config_enabled.xml b/services/tests/mockingservicestests/res/xml/gama_manager_service_metadata_config_enabled.xml new file mode 100644 index 000000000000..65b7467b80f5 --- /dev/null +++ b/services/tests/mockingservicestests/res/xml/gama_manager_service_metadata_config_enabled.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<game-mode-config + xmlns:android="http://schemas.android.com/apk/res/android" + android:supportsPerformanceGameMode="false" + android:supportsBatteryGameMode="false" + android:allowGameAngleDriver="true" + android:allowGameDownscaling="true" + android:allowGameFpsOverride="true" +/>
\ No newline at end of file diff --git a/services/tests/mockingservicestests/src/android/service/games/GameSessionTest.java b/services/tests/mockingservicestests/src/android/service/games/GameSessionTest.java index fec9b1249d17..e89c812ba1fb 100644 --- a/services/tests/mockingservicestests/src/android/service/games/GameSessionTest.java +++ b/services/tests/mockingservicestests/src/android/service/games/GameSessionTest.java @@ -359,6 +359,34 @@ public final class GameSessionTest { LifecycleTrackingGameSession.LifecycleMethodCall.ON_DESTROY).inOrder(); } + @Test + public void dispatchTransientVisibilityChanged_valueUnchanged_doesNotInvokeCallback() { + mGameSession.dispatchTransientSystemBarVisibilityFromRevealGestureChanged(false); + + assertThat(mGameSession.mCapturedTransientSystemBarVisibilityFromRevealGestures).hasSize(0); + } + + @Test + public void dispatchTransientVisibilityChanged_valueChanged_invokesCallback() { + mGameSession.dispatchTransientSystemBarVisibilityFromRevealGestureChanged(true); + + assertThat(mGameSession.mCapturedTransientSystemBarVisibilityFromRevealGestures) + .containsExactly(true).inOrder(); + } + + @Test + public void dispatchTransientVisibilityChanged_manyTimes_invokesCallbackWhenValueChanges() { + mGameSession.dispatchTransientSystemBarVisibilityFromRevealGestureChanged(false); + mGameSession.dispatchTransientSystemBarVisibilityFromRevealGestureChanged(true); + mGameSession.dispatchTransientSystemBarVisibilityFromRevealGestureChanged(false); + mGameSession.dispatchTransientSystemBarVisibilityFromRevealGestureChanged(false); + mGameSession.dispatchTransientSystemBarVisibilityFromRevealGestureChanged(true); + mGameSession.dispatchTransientSystemBarVisibilityFromRevealGestureChanged(true); + + assertThat(mGameSession.mCapturedTransientSystemBarVisibilityFromRevealGestures) + .containsExactly(true, false, true).inOrder(); + } + private static class LifecycleTrackingGameSession extends GameSession { private enum LifecycleMethodCall { ON_CREATE, @@ -368,6 +396,8 @@ public final class GameSessionTest { } final List<LifecycleMethodCall> mLifecycleMethodCalls = new ArrayList<>(); + final List<Boolean> mCapturedTransientSystemBarVisibilityFromRevealGestures = + new ArrayList<>(); @Override public void onCreate() { @@ -387,5 +417,11 @@ public final class GameSessionTest { mLifecycleMethodCalls.add(LifecycleMethodCall.ON_GAME_TASK_UNFOCUSED); } } + + @Override + public void onTransientSystemBarVisibilityFromRevealGestureChanged( + boolean visibleDueToGesture) { + mCapturedTransientSystemBarVisibilityFromRevealGestures.add(visibleDueToGesture); + } } } diff --git a/services/tests/mockingservicestests/src/com/android/server/am/BackgroundRestrictionTest.java b/services/tests/mockingservicestests/src/com/android/server/am/BackgroundRestrictionTest.java index 28c91aaefd8b..76709536b40b 100644 --- a/services/tests/mockingservicestests/src/com/android/server/am/BackgroundRestrictionTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/am/BackgroundRestrictionTest.java @@ -101,6 +101,7 @@ import android.os.SystemClock; import android.os.UidBatteryConsumer; import android.os.UserHandle; import android.provider.DeviceConfig; +import android.telephony.TelephonyManager; import android.util.Log; import android.util.Pair; @@ -211,6 +212,7 @@ public final class BackgroundRestrictionTest { @Mock private PermissionManagerServiceInternal mPermissionManagerServiceInternal; @Mock private MediaSessionManager mMediaSessionManager; @Mock private RoleManager mRoleManager; + @Mock private TelephonyManager mTelephonyManager; private long mCurrentTimeMillis; @@ -2309,6 +2311,11 @@ public final class BackgroundRestrictionTest { } @Override + TelephonyManager getTelephonyManager() { + return mTelephonyManager; + } + + @Override AppFGSTracker getAppFGSTracker() { return mAppFGSTracker; } diff --git a/services/tests/mockingservicestests/src/com/android/server/app/GameManagerServiceTests.java b/services/tests/mockingservicestests/src/com/android/server/app/GameManagerServiceTests.java index eed2d4251cd7..d2358a08624d 100644 --- a/services/tests/mockingservicestests/src/com/android/server/app/GameManagerServiceTests.java +++ b/services/tests/mockingservicestests/src/com/android/server/app/GameManagerServiceTests.java @@ -23,20 +23,32 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertThrows; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.eq; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.Manifest; import android.app.GameManager; import android.app.GameModeInfo; +import android.app.GameState; import android.content.Context; import android.content.ContextWrapper; import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.UserInfo; +import android.content.res.AssetManager; +import android.content.res.Resources; +import android.content.res.XmlResourceParser; +import android.hardware.power.Mode; import android.os.Bundle; +import android.os.PowerManagerInternal; import android.os.test.TestLooper; import android.platform.test.annotations.Presubmit; import android.provider.DeviceConfig; @@ -46,6 +58,7 @@ import androidx.test.InstrumentationRegistry; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; +import com.android.server.LocalServices; import com.android.server.SystemService; import org.junit.After; @@ -76,6 +89,8 @@ public class GameManagerServiceTests { private TestLooper mTestLooper; @Mock private PackageManager mMockPackageManager; + @Mock + private PowerManagerInternal mMockPowerManager; // Stolen from ConnectivityServiceTest.MockContext class MockContext extends ContextWrapper { @@ -149,19 +164,27 @@ public class GameManagerServiceTests { mPackageName = mMockContext.getPackageName(); final ApplicationInfo applicationInfo = new ApplicationInfo(); applicationInfo.category = ApplicationInfo.CATEGORY_GAME; + applicationInfo.packageName = mPackageName; final PackageInfo pi = new PackageInfo(); pi.packageName = mPackageName; pi.applicationInfo = applicationInfo; final List<PackageInfo> packages = new ArrayList<>(); packages.add(pi); + + final Resources resources = + InstrumentationRegistry.getInstrumentation().getContext().getResources(); + when(mMockPackageManager.getResourcesForApplication(anyString())) + .thenReturn(resources); when(mMockPackageManager.getInstalledPackagesAsUser(anyInt(), anyInt())) .thenReturn(packages); when(mMockPackageManager.getApplicationInfoAsUser(anyString(), anyInt(), anyInt())) .thenReturn(applicationInfo); + LocalServices.addService(PowerManagerInternal.class, mMockPowerManager); } @After public void tearDown() throws Exception { + LocalServices.removeServiceForTest(PowerManagerInternal.class); GameManagerService gameManagerService = new GameManagerService(mMockContext); gameManagerService.disableCompatScale(mPackageName); if (mMockingSession != null) { @@ -310,6 +333,46 @@ public class GameManagerServiceTests { .thenReturn(applicationInfo); } + private void mockInterventionsEnabledFromXml() throws Exception { + final ApplicationInfo applicationInfo = mMockPackageManager.getApplicationInfoAsUser( + mPackageName, PackageManager.GET_META_DATA, USER_ID_1); + Bundle metaDataBundle = new Bundle(); + final int resId = 123; + metaDataBundle.putInt( + GameManagerService.GamePackageConfiguration.METADATA_GAME_MODE_CONFIG, resId); + applicationInfo.metaData = metaDataBundle; + when(mMockPackageManager.getApplicationInfoAsUser(anyString(), anyInt(), anyInt())) + .thenReturn(applicationInfo); + seedGameManagerServiceMetaDataFromFile(mPackageName, resId, + "res/xml/gama_manager_service_metadata_config_enabled.xml"); + } + + private void mockInterventionsDisabledFromXml() throws Exception { + final ApplicationInfo applicationInfo = mMockPackageManager.getApplicationInfoAsUser( + mPackageName, PackageManager.GET_META_DATA, USER_ID_1); + Bundle metaDataBundle = new Bundle(); + final int resId = 123; + metaDataBundle.putInt( + GameManagerService.GamePackageConfiguration.METADATA_GAME_MODE_CONFIG, resId); + applicationInfo.metaData = metaDataBundle; + when(mMockPackageManager.getApplicationInfoAsUser(anyString(), anyInt(), anyInt())) + .thenReturn(applicationInfo); + seedGameManagerServiceMetaDataFromFile(mPackageName, resId, + "res/xml/gama_manager_service_metadata_config_disabled.xml"); + } + + + private void seedGameManagerServiceMetaDataFromFile(String packageName, int resId, + String fileName) + throws Exception { + AssetManager assetManager = + InstrumentationRegistry.getInstrumentation().getContext().getAssets(); + XmlResourceParser xmlResourceParser = + assetManager.openXmlResourceParser(fileName); + when(mMockPackageManager.getXml(eq(packageName), eq(resId), any())) + .thenReturn(xmlResourceParser); + } + /** * By default game mode is not supported. */ @@ -499,8 +562,8 @@ public class GameManagerServiceTests { gameManagerService.getConfig(mPackageName); assertEquals(config.getGameModeConfiguration(gameMode).getUseAngle(), angleEnabled); - // Validate GameManagerService.getAngleEnabled() returns the correct value. - assertEquals(gameManagerService.getAngleEnabled(mPackageName, USER_ID_1), angleEnabled); + // Validate GameManagerService.isAngleEnabled() returns the correct value. + assertEquals(gameManagerService.isAngleEnabled(mPackageName, USER_ID_1), angleEnabled); } private void checkFps(GameManagerService gameManagerService, int gameMode, int fps) { @@ -511,7 +574,7 @@ public class GameManagerServiceTests { } GameManagerService.GamePackageConfiguration config = gameManagerService.getConfig(mPackageName); - assertEquals(config.getGameModeConfiguration(gameMode).getFps(), fps); + assertEquals(fps, config.getGameModeConfiguration(gameMode).getFps()); } /** @@ -893,6 +956,36 @@ public class GameManagerServiceTests { } @Test + public void testGameModeConfigAllowFpsTrue() throws Exception { + mockDeviceConfigAll(); + mockModifyGameModeGranted(); + mockInterventionsEnabledFromXml(); + GameManagerService gameManagerService = new GameManagerService(mMockContext, + mTestLooper.getLooper()); + startUser(gameManagerService, USER_ID_1); + GameManagerService.GamePackageConfiguration config = + gameManagerService.getConfig(mPackageName); + assertEquals(90, + config.getGameModeConfiguration(GameManager.GAME_MODE_PERFORMANCE).getFps()); + assertEquals(30, config.getGameModeConfiguration(GameManager.GAME_MODE_BATTERY).getFps()); + } + + @Test + public void testGameModeConfigAllowFpsFalse() throws Exception { + mockDeviceConfigAll(); + mockModifyGameModeGranted(); + mockInterventionsDisabledFromXml(); + GameManagerService gameManagerService = new GameManagerService(mMockContext, + mTestLooper.getLooper()); + startUser(gameManagerService, USER_ID_1); + GameManagerService.GamePackageConfiguration config = + gameManagerService.getConfig(mPackageName); + assertEquals(0, + config.getGameModeConfiguration(GameManager.GAME_MODE_PERFORMANCE).getFps()); + assertEquals(0, config.getGameModeConfiguration(GameManager.GAME_MODE_BATTERY).getFps()); + } + + @Test public void testInterventionFps() throws Exception { mockDeviceConfigAll(); mockModifyGameModeGranted(); @@ -1052,4 +1145,41 @@ public class GameManagerServiceTests { assertEquals(GameManager.GAME_MODE_UNSUPPORTED, gameModeInfo.getActiveGameMode()); assertEquals(0, gameModeInfo.getAvailableGameModes().length); } + + @Test + public void testGameStateLoadingRequiresPerformanceMode() { + mockDeviceConfigNone(); + mockModifyGameModeGranted(); + GameManagerService gameManagerService = + new GameManagerService(mMockContext, mTestLooper.getLooper()); + startUser(gameManagerService, USER_ID_1); + GameState gameState = new GameState(true, GameState.MODE_NONE); + gameManagerService.setGameState(mPackageName, gameState, USER_ID_1); + mTestLooper.dispatchAll(); + verify(mMockPowerManager, never()).setPowerMode(anyInt(), anyBoolean()); + } + + private void setGameState(boolean isLoading) { + mockDeviceConfigNone(); + mockModifyGameModeGranted(); + GameManagerService gameManagerService = + new GameManagerService(mMockContext, mTestLooper.getLooper()); + startUser(gameManagerService, USER_ID_1); + gameManagerService.setGameMode( + mPackageName, GameManager.GAME_MODE_PERFORMANCE, USER_ID_1); + GameState gameState = new GameState(isLoading, GameState.MODE_NONE); + gameManagerService.setGameState(mPackageName, gameState, USER_ID_1); + mTestLooper.dispatchAll(); + verify(mMockPowerManager, times(1)).setPowerMode(Mode.GAME_LOADING, isLoading); + } + + @Test + public void testSetGameStateLoading() { + setGameState(true); + } + + @Test + public void testSetGameStateNotLoading() { + setGameState(false); + } } diff --git a/services/tests/mockingservicestests/src/com/android/server/app/GameServiceProviderInstanceImplTest.java b/services/tests/mockingservicestests/src/com/android/server/app/GameServiceProviderInstanceImplTest.java index b0ffcf34ac07..7f571195f5f8 100644 --- a/services/tests/mockingservicestests/src/com/android/server/app/GameServiceProviderInstanceImplTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/app/GameServiceProviderInstanceImplTest.java @@ -31,7 +31,6 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.verifyZeroInteractions; import android.Manifest; @@ -61,6 +60,7 @@ import android.service.games.IGameServiceController; import android.service.games.IGameSession; import android.service.games.IGameSessionController; import android.service.games.IGameSessionService; +import android.view.SurfaceControl; import android.view.SurfaceControlViewHost.SurfacePackage; import androidx.test.filters.SmallTest; @@ -72,6 +72,7 @@ import com.android.internal.util.ConcurrentUtils; import com.android.internal.util.FunctionalUtils.ThrowingConsumer; import com.android.internal.util.Preconditions; import com.android.server.wm.WindowManagerInternal; +import com.android.server.wm.WindowManagerInternal.TaskSystemBarsListener; import com.android.server.wm.WindowManagerService; import org.junit.After; @@ -112,6 +113,7 @@ public final class GameServiceProviderInstanceImplTest { private static final ComponentName GAME_B_MAIN_ACTIVITY = new ComponentName(GAME_B_PACKAGE, "com.package.game.b.MainActivity"); + private static final Bitmap TEST_BITMAP = Bitmap.createBitmap(32, 32, Bitmap.Config.ARGB_8888); private MockitoSession mMockingSession; @@ -131,6 +133,7 @@ public final class GameServiceProviderInstanceImplTest { private FakeGameSessionService mFakeGameSessionService; private FakeServiceConnector<IGameSessionService> mFakeGameSessionServiceConnector; private ArrayList<ITaskStackListener> mTaskStackListeners; + private ArrayList<TaskSystemBarsListener> mTaskSystemBarsListeners; private ArrayList<RunningTaskInfo> mRunningTaskInfos; @Mock @@ -159,15 +162,25 @@ public final class GameServiceProviderInstanceImplTest { mTaskStackListeners.add(invocation.getArgument(0)); return null; }).when(mMockActivityTaskManager).registerTaskStackListener(any()); + doAnswer(invocation -> { + mTaskStackListeners.remove(invocation.getArgument(0)); + return null; + }).when(mMockActivityTaskManager).unregisterTaskStackListener(any()); + + mTaskSystemBarsListeners = new ArrayList<>(); + doAnswer(invocation -> { + mTaskSystemBarsListeners.add(invocation.getArgument(0)); + return null; + }).when(mMockWindowManagerInternal).registerTaskSystemBarsListener(any()); + doAnswer(invocation -> { + mTaskSystemBarsListeners.remove(invocation.getArgument(0)); + return null; + }).when(mMockWindowManagerInternal).unregisterTaskSystemBarsListener(any()); mRunningTaskInfos = new ArrayList<>(); when(mMockActivityTaskManager.getTasks(anyInt(), anyBoolean(), anyBoolean())).thenReturn( mRunningTaskInfos); - doAnswer(invocation -> { - mTaskStackListeners.remove(invocation.getArgument(0)); - return null; - }).when(mMockActivityTaskManager).unregisterTaskStackListener(any()); mGameServiceProviderInstance = new GameServiceProviderInstanceImpl( new UserHandle(USER_ID), @@ -304,6 +317,7 @@ public final class GameServiceProviderInstanceImplTest { throws Exception { mGameServiceProviderInstance.start(); + mockPermissionGranted(Manifest.permission.MANAGE_GAME_ACTIVITY); mFakeGameService.requestCreateGameSession(10); assertThat(mFakeGameSessionService.getCapturedCreateInvocations()).isEmpty(); @@ -325,6 +339,7 @@ public final class GameServiceProviderInstanceImplTest { mGameServiceProviderInstance.start(); startTask(10, GAME_A_MAIN_ACTIVITY); + mockPermissionGranted(Manifest.permission.MANAGE_GAME_ACTIVITY); mFakeGameService.requestCreateGameSession(10); FakeGameSessionService.CapturedCreateInvocation capturedCreateInvocation = @@ -339,6 +354,7 @@ public final class GameServiceProviderInstanceImplTest { mGameServiceProviderInstance.start(); dispatchTaskCreated(10, GAME_A_MAIN_ACTIVITY); + mockPermissionGranted(Manifest.permission.MANAGE_GAME_ACTIVITY); mFakeGameService.requestCreateGameSession(10); assertThat(mFakeGameSessionService.getCapturedCreateInvocations()).isEmpty(); @@ -348,6 +364,7 @@ public final class GameServiceProviderInstanceImplTest { public void gameTaskStartedAndSessionRequested_createsGameSession() throws Exception { mGameServiceProviderInstance.start(); startTask(10, GAME_A_MAIN_ACTIVITY); + mockPermissionGranted(Manifest.permission.MANAGE_GAME_ACTIVITY); mFakeGameService.requestCreateGameSession(10); FakeGameSession gameSession10 = new FakeGameSession(); @@ -365,7 +382,9 @@ public final class GameServiceProviderInstanceImplTest { mGameServiceProviderInstance.start(); startTask(10, GAME_A_MAIN_ACTIVITY); + mockPermissionGranted(Manifest.permission.MANAGE_GAME_ACTIVITY); mFakeGameService.requestCreateGameSession(10); + mockPermissionGranted(Manifest.permission.MANAGE_GAME_ACTIVITY); mFakeGameService.requestCreateGameSession(10); CreateGameSessionRequest expectedCreateGameSessionRequest = new CreateGameSessionRequest(10, @@ -379,6 +398,7 @@ public final class GameServiceProviderInstanceImplTest { public void gameSessionSuccessfullyCreated_createsTaskOverlay() throws Exception { mGameServiceProviderInstance.start(); startTask(10, GAME_A_MAIN_ACTIVITY); + mockPermissionGranted(Manifest.permission.MANAGE_GAME_ACTIVITY); mFakeGameService.requestCreateGameSession(10); FakeGameSession gameSession10 = new FakeGameSession(); @@ -387,13 +407,67 @@ public final class GameServiceProviderInstanceImplTest { .complete(new CreateGameSessionResult(gameSession10, mockSurfacePackage10)); verify(mMockWindowManagerInternal).addTaskOverlay(eq(10), eq(mockSurfacePackage10)); - verifyNoMoreInteractions(mMockWindowManagerInternal); + } + + @Test + public void taskSystemBarsListenerChanged_noAssociatedGameSession_doesNothing() { + mGameServiceProviderInstance.start(); + + dispatchTaskSystemBarsEvent(taskSystemBarsListener -> { + taskSystemBarsListener.onTransientSystemBarsVisibilityChanged( + 10, + /* areVisible= */ false, + /* wereRevealedFromSwipeOnSystemBar= */ false); + }); + } + + @Test + public void systemBarsTransientShownDueToGesture_hasGameSession_propagatesToGameSession() { + mGameServiceProviderInstance.start(); + startTask(10, GAME_A_MAIN_ACTIVITY); + mFakeGameService.requestCreateGameSession(10); + + FakeGameSession gameSession10 = new FakeGameSession(); + SurfacePackage mockSurfacePackage10 = Mockito.mock(SurfacePackage.class); + mFakeGameSessionService.removePendingFutureForTaskId(10) + .complete(new CreateGameSessionResult(gameSession10, mockSurfacePackage10)); + + dispatchTaskSystemBarsEvent(taskSystemBarsListener -> { + taskSystemBarsListener.onTransientSystemBarsVisibilityChanged( + 10, + /* areVisible= */ true, + /* wereRevealedFromSwipeOnSystemBar= */ true); + }); + + assertThat(gameSession10.mAreTransientSystemBarsVisibleFromRevealGesture).isTrue(); + } + + @Test + public void systemBarsTransientShownButNotGesture_hasGameSession_notPropagatedToGameSession() { + mGameServiceProviderInstance.start(); + startTask(10, GAME_A_MAIN_ACTIVITY); + mFakeGameService.requestCreateGameSession(10); + + FakeGameSession gameSession10 = new FakeGameSession(); + SurfacePackage mockSurfacePackage10 = Mockito.mock(SurfacePackage.class); + mFakeGameSessionService.removePendingFutureForTaskId(10) + .complete(new CreateGameSessionResult(gameSession10, mockSurfacePackage10)); + + dispatchTaskSystemBarsEvent(taskSystemBarsListener -> { + taskSystemBarsListener.onTransientSystemBarsVisibilityChanged( + 10, + /* areVisible= */ true, + /* wereRevealedFromSwipeOnSystemBar= */ false); + }); + + assertThat(gameSession10.mAreTransientSystemBarsVisibleFromRevealGesture).isFalse(); } @Test public void gameTaskFocused_propagatedToGameSession() throws Exception { mGameServiceProviderInstance.start(); startTask(10, GAME_A_MAIN_ACTIVITY); + mockPermissionGranted(Manifest.permission.MANAGE_GAME_ACTIVITY); mFakeGameService.requestCreateGameSession(10); FakeGameSession gameSession10 = new FakeGameSession(); @@ -419,6 +493,7 @@ public final class GameServiceProviderInstanceImplTest { mGameServiceProviderInstance.start(); startTask(10, GAME_A_MAIN_ACTIVITY); + mockPermissionGranted(Manifest.permission.MANAGE_GAME_ACTIVITY); mFakeGameService.requestCreateGameSession(10); FakeGameSession gameSession10 = new FakeGameSession(); @@ -435,6 +510,7 @@ public final class GameServiceProviderInstanceImplTest { mGameServiceProviderInstance.start(); startTask(10, GAME_A_MAIN_ACTIVITY); + mockPermissionGranted(Manifest.permission.MANAGE_GAME_ACTIVITY); mFakeGameService.requestCreateGameSession(10); dispatchTaskRemoved(10); @@ -452,6 +528,7 @@ public final class GameServiceProviderInstanceImplTest { mGameServiceProviderInstance.start(); startTask(10, GAME_A_MAIN_ACTIVITY); + mockPermissionGranted(Manifest.permission.MANAGE_GAME_ACTIVITY); mFakeGameService.requestCreateGameSession(10); FakeGameSession gameSession10 = new FakeGameSession(); @@ -469,6 +546,7 @@ public final class GameServiceProviderInstanceImplTest { mGameServiceProviderInstance.start(); startTask(10, GAME_A_MAIN_ACTIVITY); + mockPermissionGranted(Manifest.permission.MANAGE_GAME_ACTIVITY); mFakeGameService.requestCreateGameSession(10); FakeGameSession gameSession10 = new FakeGameSession(); @@ -480,7 +558,6 @@ public final class GameServiceProviderInstanceImplTest { verify(mMockWindowManagerInternal).addTaskOverlay(eq(10), eq(mockSurfacePackage10)); verify(mMockWindowManagerInternal).removeTaskOverlay(eq(10), eq(mockSurfacePackage10)); - verifyNoMoreInteractions(mMockWindowManagerInternal); } @Test @@ -489,6 +566,7 @@ public final class GameServiceProviderInstanceImplTest { mGameServiceProviderInstance.start(); startTask(10, GAME_A_MAIN_ACTIVITY); + mockPermissionGranted(Manifest.permission.MANAGE_GAME_ACTIVITY); mFakeGameService.requestCreateGameSession(10); FakeGameSession gameSession10 = new FakeGameSession(); @@ -516,6 +594,7 @@ public final class GameServiceProviderInstanceImplTest { startTask(10, GAME_A_MAIN_ACTIVITY); startTask(11, GAME_A_MAIN_ACTIVITY); + mockPermissionGranted(Manifest.permission.MANAGE_GAME_ACTIVITY); mFakeGameService.requestCreateGameSession(10); FakeGameSession gameSession10 = new FakeGameSession(); @@ -533,6 +612,7 @@ public final class GameServiceProviderInstanceImplTest { mGameServiceProviderInstance.start(); startTask(10, GAME_A_MAIN_ACTIVITY); + mockPermissionGranted(Manifest.permission.MANAGE_GAME_ACTIVITY); mFakeGameService.requestCreateGameSession(10); FakeGameSession gameSession10 = new FakeGameSession(); @@ -560,6 +640,7 @@ public final class GameServiceProviderInstanceImplTest { mGameServiceProviderInstance.start(); startTask(10, GAME_A_MAIN_ACTIVITY); + mockPermissionGranted(Manifest.permission.MANAGE_GAME_ACTIVITY); mFakeGameService.requestCreateGameSession(10); FakeGameSession gameSession10 = new FakeGameSession(); @@ -589,6 +670,7 @@ public final class GameServiceProviderInstanceImplTest { mGameServiceProviderInstance.start(); startTask(10, GAME_A_MAIN_ACTIVITY); + mockPermissionGranted(Manifest.permission.MANAGE_GAME_ACTIVITY); mFakeGameService.requestCreateGameSession(10); FakeGameSession gameSession10 = new FakeGameSession(); @@ -622,10 +704,19 @@ public final class GameServiceProviderInstanceImplTest { } @Test + public void createGameSession_failurePermissionDenied() throws Exception { + mGameServiceProviderInstance.start(); + startTask(10, GAME_A_MAIN_ACTIVITY); + mockPermissionDenied(Manifest.permission.MANAGE_GAME_ACTIVITY); + assertThrows(SecurityException.class, () -> mFakeGameService.requestCreateGameSession(10)); + } + + @Test public void stop_severalActiveGameSessions_destroysGameSessionsAndUnbinds() throws Exception { mGameServiceProviderInstance.start(); startTask(10, GAME_A_MAIN_ACTIVITY); + mockPermissionGranted(Manifest.permission.MANAGE_GAME_ACTIVITY); mFakeGameService.requestCreateGameSession(10); FakeGameSession gameSession10 = new FakeGameSession(); @@ -653,8 +744,14 @@ public final class GameServiceProviderInstanceImplTest { public void takeScreenshot_failureNoBitmapCaptured() throws Exception { mGameServiceProviderInstance.start(); startTask(10, GAME_A_MAIN_ACTIVITY); + mockPermissionGranted(Manifest.permission.MANAGE_GAME_ACTIVITY); mFakeGameService.requestCreateGameSession(10); + FakeGameSession gameSession10 = new FakeGameSession(); + SurfacePackage mockOverlaySurfacePackage = Mockito.mock(SurfacePackage.class); + mFakeGameSessionService.removePendingFutureForTaskId(10) + .complete(new CreateGameSessionResult(gameSession10, mockOverlaySurfacePackage)); + IGameSessionController gameSessionController = getOnlyElement( mFakeGameSessionService.getCapturedCreateInvocations()).mGameSessionController; AndroidFuture<GameScreenshotResult> resultFuture = new AndroidFuture<>(); @@ -663,17 +760,28 @@ public final class GameServiceProviderInstanceImplTest { GameScreenshotResult result = resultFuture.get(); assertEquals(GameScreenshotResult.GAME_SCREENSHOT_ERROR_INTERNAL_ERROR, result.getStatus()); - verify(mMockWindowManagerService).captureTaskBitmap(10); + + verify(mMockWindowManagerService).captureTaskBitmap(eq(10), any()); } @Test public void takeScreenshot_success() throws Exception { - when(mMockWindowManagerService.captureTaskBitmap(10)).thenReturn(TEST_BITMAP); + SurfaceControl mockOverlaySurfaceControl = Mockito.mock(SurfaceControl.class); + SurfaceControl[] excludeLayers = new SurfaceControl[1]; + excludeLayers[0] = mockOverlaySurfaceControl; + when(mMockWindowManagerService.captureTaskBitmap(eq(10), any())).thenReturn(TEST_BITMAP); mGameServiceProviderInstance.start(); startTask(10, GAME_A_MAIN_ACTIVITY); + mockPermissionGranted(Manifest.permission.MANAGE_GAME_ACTIVITY); mFakeGameService.requestCreateGameSession(10); + FakeGameSession gameSession10 = new FakeGameSession(); + SurfacePackage mockOverlaySurfacePackage = Mockito.mock(SurfacePackage.class); + when(mockOverlaySurfacePackage.getSurfaceControl()).thenReturn(mockOverlaySurfaceControl); + mFakeGameSessionService.removePendingFutureForTaskId(10) + .complete(new CreateGameSessionResult(gameSession10, mockOverlaySurfacePackage)); + IGameSessionController gameSessionController = getOnlyElement( mFakeGameSessionService.getCapturedCreateInvocations()).mGameSessionController; AndroidFuture<GameScreenshotResult> resultFuture = new AndroidFuture<>(); @@ -695,6 +803,7 @@ public final class GameServiceProviderInstanceImplTest { mGameServiceProviderInstance.start(); startTask(10, GAME_A_MAIN_ACTIVITY); + mockPermissionGranted(Manifest.permission.MANAGE_GAME_ACTIVITY); mFakeGameService.requestCreateGameSession(10); FakeGameSession gameSession10 = new FakeGameSession(); @@ -723,6 +832,7 @@ public final class GameServiceProviderInstanceImplTest { mGameServiceProviderInstance.start(); startTask(10, GAME_A_MAIN_ACTIVITY); + mockPermissionGranted(Manifest.permission.MANAGE_GAME_ACTIVITY); mFakeGameService.requestCreateGameSession(10); FakeGameSession gameSession10 = new FakeGameSession(); @@ -742,10 +852,11 @@ public final class GameServiceProviderInstanceImplTest { public void restartGame_failurePermissionDenied() throws Exception { mGameServiceProviderInstance.start(); startTask(10, GAME_A_MAIN_ACTIVITY); + mockPermissionGranted(Manifest.permission.MANAGE_GAME_ACTIVITY); mFakeGameService.requestCreateGameSession(10); - IGameSessionController gameSessionController = Objects.requireNonNull(getOnlyElement( mFakeGameSessionService.getCapturedCreateInvocations())).mGameSessionController; + mockPermissionDenied(Manifest.permission.MANAGE_GAME_ACTIVITY); assertThrows(SecurityException.class, () -> gameSessionController.restartGame(10)); } @@ -799,6 +910,13 @@ public final class GameServiceProviderInstanceImplTest { mMockContext.setPermission(permission, PackageManager.PERMISSION_DENIED); } + private void dispatchTaskSystemBarsEvent( + ThrowingConsumer<TaskSystemBarsListener> taskSystemBarsListenerConsumer) { + for (TaskSystemBarsListener listener : mTaskSystemBarsListeners) { + taskSystemBarsListenerConsumer.accept(listener); + } + } + static final class FakeGameService extends IGameService.Stub { private IGameServiceController mGameServiceController; @@ -913,6 +1031,7 @@ public final class GameServiceProviderInstanceImplTest { private static class FakeGameSession extends IGameSession.Stub { boolean mIsDestroyed = false; boolean mIsFocused = false; + boolean mAreTransientSystemBarsVisibleFromRevealGesture = false; @Override public void onDestroyed() { @@ -923,6 +1042,11 @@ public final class GameServiceProviderInstanceImplTest { public void onTaskFocusChanged(boolean focused) { mIsFocused = focused; } + + @Override + public void onTransientSystemBarVisibilityFromRevealGestureChanged(boolean areVisible) { + mAreTransientSystemBarsVisibleFromRevealGesture = areVisible; + } } private final class MockContext extends ContextWrapper { @@ -974,5 +1098,4 @@ public final class GameServiceProviderInstanceImplTest { return mLastStartedIntent; } } - } diff --git a/services/tests/mockingservicestests/src/com/android/server/job/JobSchedulerServiceTest.java b/services/tests/mockingservicestests/src/com/android/server/job/JobSchedulerServiceTest.java index bdeb2b4fd839..f9bdad6c62ba 100644 --- a/services/tests/mockingservicestests/src/com/android/server/job/JobSchedulerServiceTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/job/JobSchedulerServiceTest.java @@ -204,6 +204,49 @@ public class JobSchedulerServiceTest { jobInfoBuilder.build(), callingUid, "com.android.test", 0, testTag); } + @Test + public void testGetMinJobExecutionGuaranteeMs() { + JobStatus ejMax = createJobStatus("testGetMinJobExecutionGuaranteeMs", + createJobInfo(1).setExpedited(true)); + JobStatus ejHigh = createJobStatus("testGetMinJobExecutionGuaranteeMs", + createJobInfo(2).setExpedited(true).setPriority(JobInfo.PRIORITY_HIGH)); + JobStatus ejMaxDowngraded = createJobStatus("testGetMinJobExecutionGuaranteeMs", + createJobInfo(3).setExpedited(true)); + JobStatus ejHighDowngraded = createJobStatus("testGetMinJobExecutionGuaranteeMs", + createJobInfo(4).setExpedited(true).setPriority(JobInfo.PRIORITY_HIGH)); + JobStatus jobHigh = createJobStatus("testGetMinJobExecutionGuaranteeMs", + createJobInfo(5).setPriority(JobInfo.PRIORITY_HIGH)); + JobStatus jobDef = createJobStatus("testGetMinJobExecutionGuaranteeMs", + createJobInfo(6)); + + spyOn(ejMax); + spyOn(ejHigh); + spyOn(ejMaxDowngraded); + spyOn(ejHighDowngraded); + spyOn(jobHigh); + spyOn(jobDef); + + when(ejMax.shouldTreatAsExpeditedJob()).thenReturn(true); + when(ejHigh.shouldTreatAsExpeditedJob()).thenReturn(true); + when(ejMaxDowngraded.shouldTreatAsExpeditedJob()).thenReturn(false); + when(ejHighDowngraded.shouldTreatAsExpeditedJob()).thenReturn(false); + when(jobHigh.shouldTreatAsExpeditedJob()).thenReturn(false); + when(jobDef.shouldTreatAsExpeditedJob()).thenReturn(false); + + assertEquals(mService.mConstants.RUNTIME_MIN_EJ_GUARANTEE_MS, + mService.getMinJobExecutionGuaranteeMs(ejMax)); + assertEquals(mService.mConstants.RUNTIME_MIN_EJ_GUARANTEE_MS, + mService.getMinJobExecutionGuaranteeMs(ejHigh)); + assertEquals(mService.mConstants.RUNTIME_MIN_HIGH_PRIORITY_GUARANTEE_MS, + mService.getMinJobExecutionGuaranteeMs(ejMaxDowngraded)); + assertEquals(mService.mConstants.RUNTIME_MIN_HIGH_PRIORITY_GUARANTEE_MS, + mService.getMinJobExecutionGuaranteeMs(ejHighDowngraded)); + assertEquals(mService.mConstants.RUNTIME_MIN_HIGH_PRIORITY_GUARANTEE_MS, + mService.getMinJobExecutionGuaranteeMs(jobHigh)); + assertEquals(mService.mConstants.RUNTIME_MIN_GUARANTEE_MS, + mService.getMinJobExecutionGuaranteeMs(jobDef)); + } + /** * Confirm that {@link JobSchedulerService#getRescheduleJobForPeriodic(JobStatus)} returns a job * with the correct delay and deadline constraints if the periodic job is scheduled with the diff --git a/services/tests/mockingservicestests/src/com/android/server/job/controllers/QuotaControllerTest.java b/services/tests/mockingservicestests/src/com/android/server/job/controllers/QuotaControllerTest.java index 153ce17ec9dd..9d6793ca4b7b 100644 --- a/services/tests/mockingservicestests/src/com/android/server/job/controllers/QuotaControllerTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/job/controllers/QuotaControllerTest.java @@ -30,6 +30,7 @@ import static com.android.dx.mockito.inline.extended.ExtendedMockito.mockitoSess 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.job.JobSchedulerService.ACTIVE_INDEX; +import static com.android.server.job.JobSchedulerService.EXEMPTED_INDEX; import static com.android.server.job.JobSchedulerService.FREQUENT_INDEX; import static com.android.server.job.JobSchedulerService.NEVER_INDEX; import static com.android.server.job.JobSchedulerService.RARE_INDEX; @@ -536,6 +537,7 @@ public class QuotaControllerTest { ExecutionStats expectedStats = new ExecutionStats(); expectedStats.expirationTimeElapsed = now + 24 * HOUR_IN_MILLIS; + expectedStats.allowedTimePerPeriodMs = 10 * MINUTE_IN_MILLIS; expectedStats.windowSizeMs = 24 * HOUR_IN_MILLIS; expectedStats.jobCountLimit = mQcConstants.MAX_JOB_COUNT_RARE; expectedStats.sessionCountLimit = mQcConstants.MAX_SESSION_COUNT_RARE; @@ -595,6 +597,7 @@ public class QuotaControllerTest { assertNotNull(mQuotaController.getEJTimingSessions(10, "com.android.test")); ExecutionStats expectedStats = new ExecutionStats(); + expectedStats.allowedTimePerPeriodMs = 10 * MINUTE_IN_MILLIS; expectedStats.expirationTimeElapsed = now + 24 * HOUR_IN_MILLIS; expectedStats.windowSizeMs = 24 * HOUR_IN_MILLIS; expectedStats.jobCountLimit = mQcConstants.MAX_JOB_COUNT_RARE; @@ -638,11 +641,13 @@ public class QuotaControllerTest { ExecutionStats expectedStats = new ExecutionStats(); ExecutionStats inputStats = new ExecutionStats(); + inputStats.allowedTimePerPeriodMs = 10 * MINUTE_IN_MILLIS; inputStats.windowSizeMs = expectedStats.windowSizeMs = 12 * HOUR_IN_MILLIS; inputStats.jobCountLimit = expectedStats.jobCountLimit = 100; inputStats.sessionCountLimit = expectedStats.sessionCountLimit = 100; // Invalid time is now +24 hours since there are no sessions at all for the app. expectedStats.expirationTimeElapsed = now + 24 * HOUR_IN_MILLIS; + expectedStats.allowedTimePerPeriodMs = 10 * MINUTE_IN_MILLIS; synchronized (mQuotaController.mLock) { mQuotaController.updateExecutionStatsLocked(0, "com.android.test.not.run", inputStats); } @@ -827,6 +832,8 @@ public class QuotaControllerTest { ExecutionStats expectedStats = new ExecutionStats(); ExecutionStats inputStats = new ExecutionStats(); + inputStats.allowedTimePerPeriodMs = expectedStats.allowedTimePerPeriodMs = + 10 * MINUTE_IN_MILLIS; inputStats.windowSizeMs = expectedStats.windowSizeMs = 24 * HOUR_IN_MILLIS; inputStats.jobCountLimit = expectedStats.jobCountLimit = mQcConstants.MAX_JOB_COUNT_RARE; inputStats.sessionCountLimit = expectedStats.sessionCountLimit = @@ -924,6 +931,7 @@ public class QuotaControllerTest { ExecutionStats expectedStats = new ExecutionStats(); // Active + expectedStats.allowedTimePerPeriodMs = 10 * MINUTE_IN_MILLIS; expectedStats.windowSizeMs = 10 * MINUTE_IN_MILLIS; expectedStats.jobCountLimit = mQcConstants.MAX_JOB_COUNT_ACTIVE; expectedStats.sessionCountLimit = mQcConstants.MAX_SESSION_COUNT_ACTIVE; @@ -1006,6 +1014,7 @@ public class QuotaControllerTest { ExecutionStats expectedStats = new ExecutionStats(); // Active + expectedStats.allowedTimePerPeriodMs = 10 * MINUTE_IN_MILLIS; expectedStats.windowSizeMs = 10 * MINUTE_IN_MILLIS; expectedStats.jobCountLimit = mQcConstants.MAX_JOB_COUNT_ACTIVE; expectedStats.sessionCountLimit = mQcConstants.MAX_SESSION_COUNT_ACTIVE; @@ -1242,6 +1251,7 @@ public class QuotaControllerTest { setDeviceConfigLong(QcConstants.KEY_WINDOW_SIZE_FREQUENT_MS, 6 * HOUR_IN_MILLIS); ExecutionStats expectedStats = new ExecutionStats(); + expectedStats.allowedTimePerPeriodMs = originalStatsActive.allowedTimePerPeriodMs; expectedStats.windowSizeMs = originalStatsActive.windowSizeMs; expectedStats.jobCountLimit = originalStatsActive.jobCountLimit; expectedStats.sessionCountLimit = originalStatsActive.sessionCountLimit; @@ -1261,6 +1271,7 @@ public class QuotaControllerTest { assertTrue(originalStatsActive == newStatsActive); assertEquals(expectedStats, newStatsActive); + expectedStats.allowedTimePerPeriodMs = originalStatsWorking.allowedTimePerPeriodMs; expectedStats.windowSizeMs = originalStatsWorking.windowSizeMs; expectedStats.jobCountLimit = originalStatsWorking.jobCountLimit; expectedStats.sessionCountLimit = originalStatsWorking.sessionCountLimit; @@ -1277,6 +1288,7 @@ public class QuotaControllerTest { assertTrue(originalStatsWorking == newStatsWorking); assertNotEquals(expectedStats, newStatsWorking); + expectedStats.allowedTimePerPeriodMs = originalStatsFrequent.allowedTimePerPeriodMs; expectedStats.windowSizeMs = originalStatsFrequent.windowSizeMs; expectedStats.jobCountLimit = originalStatsFrequent.jobCountLimit; expectedStats.sessionCountLimit = originalStatsFrequent.sessionCountLimit; @@ -1293,6 +1305,7 @@ public class QuotaControllerTest { assertTrue(originalStatsFrequent == newStatsFrequent); assertNotEquals(expectedStats, newStatsFrequent); + expectedStats.allowedTimePerPeriodMs = originalStatsRare.allowedTimePerPeriodMs; expectedStats.windowSizeMs = originalStatsRare.windowSizeMs; expectedStats.jobCountLimit = originalStatsRare.jobCountLimit; expectedStats.sessionCountLimit = originalStatsRare.sessionCountLimit; @@ -1354,7 +1367,8 @@ public class QuotaControllerTest { @Test public void testGetMaxJobExecutionTimeLocked_Regular_Active() { JobStatus job = createJobStatus("testGetMaxJobExecutionTimeLocked_Regular_Active", 0); - setDeviceConfigLong(QcConstants.KEY_ALLOWED_TIME_PER_PERIOD_MS, 10 * MINUTE_IN_MILLIS); + setDeviceConfigLong(QcConstants.KEY_ALLOWED_TIME_PER_PERIOD_ACTIVE_MS, + 10 * MINUTE_IN_MILLIS); setDeviceConfigLong(QcConstants.KEY_WINDOW_SIZE_ACTIVE_MS, 10 * MINUTE_IN_MILLIS); setDeviceConfigLong(QcConstants.KEY_MAX_EXECUTION_TIME_MS, 2 * HOUR_IN_MILLIS); setDischarging(); @@ -2886,11 +2900,12 @@ public class QuotaControllerTest { public void testMaybeScheduleStartAlarmLocked_JobCount_RateLimitingWindow() { // Set rate limiting period different from allowed time to confirm code sets based on // the former. - setDeviceConfigLong(QcConstants.KEY_ALLOWED_TIME_PER_PERIOD_MS, 10 * MINUTE_IN_MILLIS); + final int standbyBucket = WORKING_INDEX; + setDeviceConfigLong(QcConstants.KEY_ALLOWED_TIME_PER_PERIOD_WORKING_MS, + 10 * MINUTE_IN_MILLIS); setDeviceConfigLong(QcConstants.KEY_RATE_LIMITING_WINDOW_MS, 5 * MINUTE_IN_MILLIS); final long now = JobSchedulerService.sElapsedRealtimeClock.millis(); - final int standbyBucket = WORKING_INDEX; JobStatus jobStatus = createJobStatus("testMaybeScheduleStartAlarmLocked", 1); setStandbyBucket(standbyBucket, jobStatus); @@ -2953,8 +2968,8 @@ public class QuotaControllerTest { @Test public void testMaybeScheduleStartAlarmLocked_SmallRollingQuota_UpdatedAllowedTime() { // Make sure any new value is used correctly. - setDeviceConfigLong(QcConstants.KEY_ALLOWED_TIME_PER_PERIOD_MS, - mQcConstants.ALLOWED_TIME_PER_PERIOD_MS / 2); + setDeviceConfigLong(QcConstants.KEY_ALLOWED_TIME_PER_PERIOD_WORKING_MS, + mQcConstants.ALLOWED_TIME_PER_PERIOD_WORKING_MS / 2); runTestMaybeScheduleStartAlarmLocked_SmallRollingQuota_AllowedTimeCheck(); mQuotaController.getTimingSessions(SOURCE_USER_ID, SOURCE_PACKAGE).clear(); @@ -2977,8 +2992,8 @@ public class QuotaControllerTest { // Make sure any new value is used correctly. setDeviceConfigLong(QcConstants.KEY_IN_QUOTA_BUFFER_MS, mQcConstants.IN_QUOTA_BUFFER_MS * 2); - setDeviceConfigLong(QcConstants.KEY_ALLOWED_TIME_PER_PERIOD_MS, - mQcConstants.ALLOWED_TIME_PER_PERIOD_MS / 2); + setDeviceConfigLong(QcConstants.KEY_ALLOWED_TIME_PER_PERIOD_WORKING_MS, + mQcConstants.ALLOWED_TIME_PER_PERIOD_WORKING_MS / 2); setDeviceConfigLong(QcConstants.KEY_MAX_EXECUTION_TIME_MS, mQcConstants.MAX_EXECUTION_TIME_MS / 2); @@ -3002,7 +3017,8 @@ public class QuotaControllerTest { // Working set window size is 2 hours. final int standbyBucket = WORKING_INDEX; final long contributionMs = mQcConstants.IN_QUOTA_BUFFER_MS / 2; - final long remainingTimeMs = mQcConstants.ALLOWED_TIME_PER_PERIOD_MS - contributionMs; + final long remainingTimeMs = + mQcConstants.ALLOWED_TIME_PER_PERIOD_WORKING_MS - contributionMs; // Session straddles edge of bucket window. Only the contribution should be counted towards // the quota. @@ -3062,16 +3078,28 @@ public class QuotaControllerTest { @Test public void testConstantsUpdating_ValidValues() { - setDeviceConfigLong(QcConstants.KEY_ALLOWED_TIME_PER_PERIOD_MS, 5 * MINUTE_IN_MILLIS); + setDeviceConfigLong(QcConstants.KEY_ALLOWED_TIME_PER_PERIOD_EXEMPTED_MS, + 8 * MINUTE_IN_MILLIS); + setDeviceConfigLong(QcConstants.KEY_ALLOWED_TIME_PER_PERIOD_ACTIVE_MS, + 5 * MINUTE_IN_MILLIS); + setDeviceConfigLong(QcConstants.KEY_ALLOWED_TIME_PER_PERIOD_WORKING_MS, + 7 * MINUTE_IN_MILLIS); + setDeviceConfigLong(QcConstants.KEY_ALLOWED_TIME_PER_PERIOD_FREQUENT_MS, + 2 * MINUTE_IN_MILLIS); + setDeviceConfigLong(QcConstants.KEY_ALLOWED_TIME_PER_PERIOD_RARE_MS, 4 * MINUTE_IN_MILLIS); + setDeviceConfigLong(QcConstants.KEY_ALLOWED_TIME_PER_PERIOD_RESTRICTED_MS, + 11 * MINUTE_IN_MILLIS); setDeviceConfigLong(QcConstants.KEY_IN_QUOTA_BUFFER_MS, 2 * MINUTE_IN_MILLIS); setDeviceConfigFloat(QcConstants.KEY_ALLOWED_TIME_SURPLUS_PRIORITY_LOW, .7f); setDeviceConfigFloat(QcConstants.KEY_ALLOWED_TIME_SURPLUS_PRIORITY_MIN, .2f); + setDeviceConfigLong(QcConstants.KEY_WINDOW_SIZE_EXEMPTED_MS, 99 * MINUTE_IN_MILLIS); setDeviceConfigLong(QcConstants.KEY_WINDOW_SIZE_ACTIVE_MS, 15 * MINUTE_IN_MILLIS); setDeviceConfigLong(QcConstants.KEY_WINDOW_SIZE_WORKING_MS, 30 * MINUTE_IN_MILLIS); setDeviceConfigLong(QcConstants.KEY_WINDOW_SIZE_FREQUENT_MS, 45 * MINUTE_IN_MILLIS); setDeviceConfigLong(QcConstants.KEY_WINDOW_SIZE_RARE_MS, 60 * MINUTE_IN_MILLIS); setDeviceConfigLong(QcConstants.KEY_WINDOW_SIZE_RESTRICTED_MS, 120 * MINUTE_IN_MILLIS); setDeviceConfigLong(QcConstants.KEY_MAX_EXECUTION_TIME_MS, 3 * HOUR_IN_MILLIS); + setDeviceConfigInt(QcConstants.KEY_MAX_JOB_COUNT_EXEMPTED, 6000); setDeviceConfigInt(QcConstants.KEY_MAX_JOB_COUNT_ACTIVE, 5000); setDeviceConfigInt(QcConstants.KEY_MAX_JOB_COUNT_WORKING, 4000); setDeviceConfigInt(QcConstants.KEY_MAX_JOB_COUNT_FREQUENT, 3000); @@ -3079,6 +3107,7 @@ public class QuotaControllerTest { setDeviceConfigInt(QcConstants.KEY_MAX_JOB_COUNT_RESTRICTED, 2000); setDeviceConfigLong(QcConstants.KEY_RATE_LIMITING_WINDOW_MS, 15 * MINUTE_IN_MILLIS); setDeviceConfigInt(QcConstants.KEY_MAX_JOB_COUNT_PER_RATE_LIMITING_WINDOW, 500); + setDeviceConfigInt(QcConstants.KEY_MAX_SESSION_COUNT_EXEMPTED, 600); setDeviceConfigInt(QcConstants.KEY_MAX_SESSION_COUNT_ACTIVE, 500); setDeviceConfigInt(QcConstants.KEY_MAX_SESSION_COUNT_WORKING, 400); setDeviceConfigInt(QcConstants.KEY_MAX_SESSION_COUNT_FREQUENT, 300); @@ -3088,6 +3117,7 @@ public class QuotaControllerTest { setDeviceConfigLong(QcConstants.KEY_TIMING_SESSION_COALESCING_DURATION_MS, 10 * SECOND_IN_MILLIS); setDeviceConfigLong(QcConstants.KEY_MIN_QUOTA_CHECK_DELAY_MS, 7 * MINUTE_IN_MILLIS); + setDeviceConfigLong(QcConstants.KEY_EJ_LIMIT_EXEMPTED_MS, 3 * HOUR_IN_MILLIS); setDeviceConfigLong(QcConstants.KEY_EJ_LIMIT_ACTIVE_MS, 2 * HOUR_IN_MILLIS); setDeviceConfigLong(QcConstants.KEY_EJ_LIMIT_WORKING_MS, 90 * MINUTE_IN_MILLIS); setDeviceConfigLong(QcConstants.KEY_EJ_LIMIT_FREQUENT_MS, 1 * HOUR_IN_MILLIS); @@ -3104,10 +3134,23 @@ public class QuotaControllerTest { 84 * SECOND_IN_MILLIS); setDeviceConfigLong(QcConstants.KEY_EJ_GRACE_PERIOD_TOP_APP_MS, 83 * SECOND_IN_MILLIS); - assertEquals(5 * MINUTE_IN_MILLIS, mQuotaController.getAllowedTimePerPeriodMs()); + assertEquals(8 * MINUTE_IN_MILLIS, + mQuotaController.getAllowedTimePerPeriodMs()[EXEMPTED_INDEX]); + assertEquals(5 * MINUTE_IN_MILLIS, + mQuotaController.getAllowedTimePerPeriodMs()[ACTIVE_INDEX]); + assertEquals(7 * MINUTE_IN_MILLIS, + mQuotaController.getAllowedTimePerPeriodMs()[WORKING_INDEX]); + assertEquals(2 * MINUTE_IN_MILLIS, + mQuotaController.getAllowedTimePerPeriodMs()[FREQUENT_INDEX]); + assertEquals(4 * MINUTE_IN_MILLIS, + mQuotaController.getAllowedTimePerPeriodMs()[RARE_INDEX]); + assertEquals(11 * MINUTE_IN_MILLIS, + mQuotaController.getAllowedTimePerPeriodMs()[RESTRICTED_INDEX]); assertEquals(2 * MINUTE_IN_MILLIS, mQuotaController.getInQuotaBufferMs()); assertEquals(.7f, mQuotaController.getAllowedTimeSurplusPriorityLow(), 1e-6); assertEquals(.2f, mQuotaController.getAllowedTimeSurplusPriorityMin(), 1e-6); + assertEquals(99 * MINUTE_IN_MILLIS, + mQuotaController.getBucketWindowSizes()[EXEMPTED_INDEX]); assertEquals(15 * MINUTE_IN_MILLIS, mQuotaController.getBucketWindowSizes()[ACTIVE_INDEX]); assertEquals(30 * MINUTE_IN_MILLIS, mQuotaController.getBucketWindowSizes()[WORKING_INDEX]); assertEquals(45 * MINUTE_IN_MILLIS, @@ -3118,12 +3161,14 @@ public class QuotaControllerTest { assertEquals(3 * HOUR_IN_MILLIS, mQuotaController.getMaxExecutionTimeMs()); assertEquals(15 * MINUTE_IN_MILLIS, mQuotaController.getRateLimitingWindowMs()); assertEquals(500, mQuotaController.getMaxJobCountPerRateLimitingWindow()); + assertEquals(6000, mQuotaController.getBucketMaxJobCounts()[EXEMPTED_INDEX]); assertEquals(5000, mQuotaController.getBucketMaxJobCounts()[ACTIVE_INDEX]); assertEquals(4000, mQuotaController.getBucketMaxJobCounts()[WORKING_INDEX]); assertEquals(3000, mQuotaController.getBucketMaxJobCounts()[FREQUENT_INDEX]); assertEquals(2000, mQuotaController.getBucketMaxJobCounts()[RARE_INDEX]); assertEquals(2000, mQuotaController.getBucketMaxJobCounts()[RESTRICTED_INDEX]); assertEquals(50, mQuotaController.getMaxSessionCountPerRateLimitingWindow()); + assertEquals(600, mQuotaController.getBucketMaxSessionCounts()[EXEMPTED_INDEX]); assertEquals(500, mQuotaController.getBucketMaxSessionCounts()[ACTIVE_INDEX]); assertEquals(400, mQuotaController.getBucketMaxSessionCounts()[WORKING_INDEX]); assertEquals(300, mQuotaController.getBucketMaxSessionCounts()[FREQUENT_INDEX]); @@ -3132,6 +3177,7 @@ public class QuotaControllerTest { assertEquals(10 * SECOND_IN_MILLIS, mQuotaController.getTimingSessionCoalescingDurationMs()); assertEquals(7 * MINUTE_IN_MILLIS, mQuotaController.getMinQuotaCheckDelayMs()); + assertEquals(3 * HOUR_IN_MILLIS, mQuotaController.getEJLimitsMs()[EXEMPTED_INDEX]); assertEquals(2 * HOUR_IN_MILLIS, mQuotaController.getEJLimitsMs()[ACTIVE_INDEX]); assertEquals(90 * MINUTE_IN_MILLIS, mQuotaController.getEJLimitsMs()[WORKING_INDEX]); assertEquals(HOUR_IN_MILLIS, mQuotaController.getEJLimitsMs()[FREQUENT_INDEX]); @@ -3151,16 +3197,24 @@ public class QuotaControllerTest { @Test public void testConstantsUpdating_InvalidValues() { // Test negatives/too low. - setDeviceConfigLong(QcConstants.KEY_ALLOWED_TIME_PER_PERIOD_MS, -MINUTE_IN_MILLIS); + setDeviceConfigLong(QcConstants.KEY_ALLOWED_TIME_PER_PERIOD_EXEMPTED_MS, -MINUTE_IN_MILLIS); + setDeviceConfigLong(QcConstants.KEY_ALLOWED_TIME_PER_PERIOD_ACTIVE_MS, -MINUTE_IN_MILLIS); + setDeviceConfigLong(QcConstants.KEY_ALLOWED_TIME_PER_PERIOD_WORKING_MS, -MINUTE_IN_MILLIS); + setDeviceConfigLong(QcConstants.KEY_ALLOWED_TIME_PER_PERIOD_FREQUENT_MS, -MINUTE_IN_MILLIS); + setDeviceConfigLong(QcConstants.KEY_ALLOWED_TIME_PER_PERIOD_RARE_MS, -MINUTE_IN_MILLIS); + setDeviceConfigLong(QcConstants.KEY_ALLOWED_TIME_PER_PERIOD_RESTRICTED_MS, + -MINUTE_IN_MILLIS); setDeviceConfigLong(QcConstants.KEY_IN_QUOTA_BUFFER_MS, -MINUTE_IN_MILLIS); setDeviceConfigFloat(QcConstants.KEY_ALLOWED_TIME_SURPLUS_PRIORITY_LOW, -.1f); setDeviceConfigFloat(QcConstants.KEY_ALLOWED_TIME_SURPLUS_PRIORITY_MIN, -.01f); + setDeviceConfigLong(QcConstants.KEY_WINDOW_SIZE_EXEMPTED_MS, -MINUTE_IN_MILLIS); setDeviceConfigLong(QcConstants.KEY_WINDOW_SIZE_ACTIVE_MS, -MINUTE_IN_MILLIS); setDeviceConfigLong(QcConstants.KEY_WINDOW_SIZE_WORKING_MS, -MINUTE_IN_MILLIS); setDeviceConfigLong(QcConstants.KEY_WINDOW_SIZE_FREQUENT_MS, -MINUTE_IN_MILLIS); setDeviceConfigLong(QcConstants.KEY_WINDOW_SIZE_RARE_MS, -MINUTE_IN_MILLIS); setDeviceConfigLong(QcConstants.KEY_WINDOW_SIZE_RESTRICTED_MS, -MINUTE_IN_MILLIS); setDeviceConfigLong(QcConstants.KEY_MAX_EXECUTION_TIME_MS, -MINUTE_IN_MILLIS); + setDeviceConfigInt(QcConstants.KEY_MAX_JOB_COUNT_EXEMPTED, -1); setDeviceConfigInt(QcConstants.KEY_MAX_JOB_COUNT_ACTIVE, -1); setDeviceConfigInt(QcConstants.KEY_MAX_JOB_COUNT_WORKING, 1); setDeviceConfigInt(QcConstants.KEY_MAX_JOB_COUNT_FREQUENT, 1); @@ -3168,6 +3222,7 @@ public class QuotaControllerTest { setDeviceConfigInt(QcConstants.KEY_MAX_JOB_COUNT_RESTRICTED, -1); setDeviceConfigLong(QcConstants.KEY_RATE_LIMITING_WINDOW_MS, 15 * SECOND_IN_MILLIS); setDeviceConfigInt(QcConstants.KEY_MAX_JOB_COUNT_PER_RATE_LIMITING_WINDOW, 0); + setDeviceConfigInt(QcConstants.KEY_MAX_SESSION_COUNT_EXEMPTED, -1); setDeviceConfigInt(QcConstants.KEY_MAX_SESSION_COUNT_ACTIVE, -1); setDeviceConfigInt(QcConstants.KEY_MAX_SESSION_COUNT_WORKING, 0); setDeviceConfigInt(QcConstants.KEY_MAX_SESSION_COUNT_FREQUENT, -3); @@ -3176,6 +3231,7 @@ public class QuotaControllerTest { setDeviceConfigInt(QcConstants.KEY_MAX_SESSION_COUNT_PER_RATE_LIMITING_WINDOW, 0); setDeviceConfigLong(QcConstants.KEY_TIMING_SESSION_COALESCING_DURATION_MS, -1); setDeviceConfigLong(QcConstants.KEY_MIN_QUOTA_CHECK_DELAY_MS, -1); + setDeviceConfigLong(QcConstants.KEY_EJ_LIMIT_EXEMPTED_MS, -1); setDeviceConfigLong(QcConstants.KEY_EJ_LIMIT_ACTIVE_MS, -1); setDeviceConfigLong(QcConstants.KEY_EJ_LIMIT_WORKING_MS, -1); setDeviceConfigLong(QcConstants.KEY_EJ_LIMIT_FREQUENT_MS, -1); @@ -3191,10 +3247,19 @@ public class QuotaControllerTest { setDeviceConfigLong(QcConstants.KEY_EJ_GRACE_PERIOD_TEMP_ALLOWLIST_MS, -1); setDeviceConfigLong(QcConstants.KEY_EJ_GRACE_PERIOD_TOP_APP_MS, -1); - assertEquals(MINUTE_IN_MILLIS, mQuotaController.getAllowedTimePerPeriodMs()); + assertEquals(MINUTE_IN_MILLIS, + mQuotaController.getAllowedTimePerPeriodMs()[EXEMPTED_INDEX]); + assertEquals(MINUTE_IN_MILLIS, mQuotaController.getAllowedTimePerPeriodMs()[ACTIVE_INDEX]); + assertEquals(MINUTE_IN_MILLIS, mQuotaController.getAllowedTimePerPeriodMs()[WORKING_INDEX]); + assertEquals(MINUTE_IN_MILLIS, + mQuotaController.getAllowedTimePerPeriodMs()[FREQUENT_INDEX]); + assertEquals(MINUTE_IN_MILLIS, mQuotaController.getAllowedTimePerPeriodMs()[RARE_INDEX]); + assertEquals(MINUTE_IN_MILLIS, + mQuotaController.getAllowedTimePerPeriodMs()[RESTRICTED_INDEX]); assertEquals(0, mQuotaController.getInQuotaBufferMs()); assertEquals(0f, mQuotaController.getAllowedTimeSurplusPriorityLow(), 1e-6); assertEquals(0f, mQuotaController.getAllowedTimeSurplusPriorityMin(), 1e-6); + assertEquals(MINUTE_IN_MILLIS, mQuotaController.getBucketWindowSizes()[EXEMPTED_INDEX]); assertEquals(MINUTE_IN_MILLIS, mQuotaController.getBucketWindowSizes()[ACTIVE_INDEX]); assertEquals(MINUTE_IN_MILLIS, mQuotaController.getBucketWindowSizes()[WORKING_INDEX]); assertEquals(MINUTE_IN_MILLIS, mQuotaController.getBucketWindowSizes()[FREQUENT_INDEX]); @@ -3203,12 +3268,14 @@ public class QuotaControllerTest { assertEquals(HOUR_IN_MILLIS, mQuotaController.getMaxExecutionTimeMs()); assertEquals(30 * SECOND_IN_MILLIS, mQuotaController.getRateLimitingWindowMs()); assertEquals(10, mQuotaController.getMaxJobCountPerRateLimitingWindow()); + assertEquals(10, mQuotaController.getBucketMaxJobCounts()[EXEMPTED_INDEX]); assertEquals(10, mQuotaController.getBucketMaxJobCounts()[ACTIVE_INDEX]); assertEquals(10, mQuotaController.getBucketMaxJobCounts()[WORKING_INDEX]); assertEquals(10, mQuotaController.getBucketMaxJobCounts()[FREQUENT_INDEX]); assertEquals(10, mQuotaController.getBucketMaxJobCounts()[RARE_INDEX]); assertEquals(10, mQuotaController.getBucketMaxJobCounts()[RESTRICTED_INDEX]); assertEquals(10, mQuotaController.getMaxSessionCountPerRateLimitingWindow()); + assertEquals(1, mQuotaController.getBucketMaxSessionCounts()[EXEMPTED_INDEX]); assertEquals(1, mQuotaController.getBucketMaxSessionCounts()[ACTIVE_INDEX]); assertEquals(1, mQuotaController.getBucketMaxSessionCounts()[WORKING_INDEX]); assertEquals(1, mQuotaController.getBucketMaxSessionCounts()[FREQUENT_INDEX]); @@ -3216,6 +3283,7 @@ public class QuotaControllerTest { assertEquals(0, mQuotaController.getBucketMaxSessionCounts()[RESTRICTED_INDEX]); assertEquals(0, mQuotaController.getTimingSessionCoalescingDurationMs()); assertEquals(0, mQuotaController.getMinQuotaCheckDelayMs()); + assertEquals(15 * MINUTE_IN_MILLIS, mQuotaController.getEJLimitsMs()[EXEMPTED_INDEX]); assertEquals(15 * MINUTE_IN_MILLIS, mQuotaController.getEJLimitsMs()[ACTIVE_INDEX]); assertEquals(15 * MINUTE_IN_MILLIS, mQuotaController.getEJLimitsMs()[WORKING_INDEX]); assertEquals(10 * MINUTE_IN_MILLIS, mQuotaController.getEJLimitsMs()[FREQUENT_INDEX]); @@ -3233,17 +3301,37 @@ public class QuotaControllerTest { // Invalid configurations. // In_QUOTA_BUFFER should never be greater than ALLOWED_TIME_PER_PERIOD - setDeviceConfigLong(QcConstants.KEY_ALLOWED_TIME_PER_PERIOD_MS, 2 * MINUTE_IN_MILLIS); + setDeviceConfigLong(QcConstants.KEY_ALLOWED_TIME_PER_PERIOD_EXEMPTED_MS, + 10 * MINUTE_IN_MILLIS); + setDeviceConfigLong(QcConstants.KEY_ALLOWED_TIME_PER_PERIOD_ACTIVE_MS, + 10 * MINUTE_IN_MILLIS); + setDeviceConfigLong(QcConstants.KEY_ALLOWED_TIME_PER_PERIOD_WORKING_MS, + 10 * MINUTE_IN_MILLIS); + setDeviceConfigLong(QcConstants.KEY_ALLOWED_TIME_PER_PERIOD_FREQUENT_MS, + 2 * MINUTE_IN_MILLIS); + setDeviceConfigLong(QcConstants.KEY_ALLOWED_TIME_PER_PERIOD_RARE_MS, 10 * MINUTE_IN_MILLIS); + setDeviceConfigLong(QcConstants.KEY_ALLOWED_TIME_PER_PERIOD_RESTRICTED_MS, + 10 * MINUTE_IN_MILLIS); setDeviceConfigLong(QcConstants.KEY_IN_QUOTA_BUFFER_MS, 5 * MINUTE_IN_MILLIS); assertTrue(mQuotaController.getInQuotaBufferMs() - <= mQuotaController.getAllowedTimePerPeriodMs()); + <= mQuotaController.getAllowedTimePerPeriodMs()[FREQUENT_INDEX]); // Test larger than a day. Controller should cap at one day. - setDeviceConfigLong(QcConstants.KEY_ALLOWED_TIME_PER_PERIOD_MS, 25 * HOUR_IN_MILLIS); + setDeviceConfigLong(QcConstants.KEY_ALLOWED_TIME_PER_PERIOD_EXEMPTED_MS, + 25 * HOUR_IN_MILLIS); + setDeviceConfigLong(QcConstants.KEY_ALLOWED_TIME_PER_PERIOD_ACTIVE_MS, 25 * HOUR_IN_MILLIS); + setDeviceConfigLong(QcConstants.KEY_ALLOWED_TIME_PER_PERIOD_WORKING_MS, + 25 * HOUR_IN_MILLIS); + setDeviceConfigLong(QcConstants.KEY_ALLOWED_TIME_PER_PERIOD_FREQUENT_MS, + 25 * HOUR_IN_MILLIS); + setDeviceConfigLong(QcConstants.KEY_ALLOWED_TIME_PER_PERIOD_RARE_MS, 25 * HOUR_IN_MILLIS); + setDeviceConfigLong(QcConstants.KEY_ALLOWED_TIME_PER_PERIOD_RESTRICTED_MS, + 25 * HOUR_IN_MILLIS); setDeviceConfigLong(QcConstants.KEY_IN_QUOTA_BUFFER_MS, 25 * HOUR_IN_MILLIS); setDeviceConfigFloat(QcConstants.KEY_ALLOWED_TIME_SURPLUS_PRIORITY_LOW, 1f); setDeviceConfigFloat(QcConstants.KEY_ALLOWED_TIME_SURPLUS_PRIORITY_MIN, .95f); + setDeviceConfigLong(QcConstants.KEY_WINDOW_SIZE_EXEMPTED_MS, 25 * HOUR_IN_MILLIS); setDeviceConfigLong(QcConstants.KEY_WINDOW_SIZE_ACTIVE_MS, 25 * HOUR_IN_MILLIS); setDeviceConfigLong(QcConstants.KEY_WINDOW_SIZE_WORKING_MS, 25 * HOUR_IN_MILLIS); setDeviceConfigLong(QcConstants.KEY_WINDOW_SIZE_FREQUENT_MS, 25 * HOUR_IN_MILLIS); @@ -3254,6 +3342,7 @@ public class QuotaControllerTest { setDeviceConfigLong(QcConstants.KEY_TIMING_SESSION_COALESCING_DURATION_MS, 25 * HOUR_IN_MILLIS); setDeviceConfigLong(QcConstants.KEY_MIN_QUOTA_CHECK_DELAY_MS, 25 * HOUR_IN_MILLIS); + setDeviceConfigLong(QcConstants.KEY_EJ_LIMIT_EXEMPTED_MS, 25 * HOUR_IN_MILLIS); setDeviceConfigLong(QcConstants.KEY_EJ_LIMIT_ACTIVE_MS, 25 * HOUR_IN_MILLIS); setDeviceConfigLong(QcConstants.KEY_EJ_LIMIT_WORKING_MS, 25 * HOUR_IN_MILLIS); setDeviceConfigLong(QcConstants.KEY_EJ_LIMIT_FREQUENT_MS, 25 * HOUR_IN_MILLIS); @@ -3269,10 +3358,21 @@ public class QuotaControllerTest { setDeviceConfigLong(QcConstants.KEY_EJ_GRACE_PERIOD_TEMP_ALLOWLIST_MS, 25 * HOUR_IN_MILLIS); setDeviceConfigLong(QcConstants.KEY_EJ_GRACE_PERIOD_TOP_APP_MS, 25 * HOUR_IN_MILLIS); - assertEquals(24 * HOUR_IN_MILLIS, mQuotaController.getAllowedTimePerPeriodMs()); + assertEquals(24 * HOUR_IN_MILLIS, + mQuotaController.getAllowedTimePerPeriodMs()[EXEMPTED_INDEX]); + assertEquals(24 * HOUR_IN_MILLIS, + mQuotaController.getAllowedTimePerPeriodMs()[ACTIVE_INDEX]); + assertEquals(24 * HOUR_IN_MILLIS, + mQuotaController.getAllowedTimePerPeriodMs()[WORKING_INDEX]); + assertEquals(24 * HOUR_IN_MILLIS, + mQuotaController.getAllowedTimePerPeriodMs()[FREQUENT_INDEX]); + assertEquals(24 * HOUR_IN_MILLIS, mQuotaController.getAllowedTimePerPeriodMs()[RARE_INDEX]); + assertEquals(24 * HOUR_IN_MILLIS, + mQuotaController.getAllowedTimePerPeriodMs()[RESTRICTED_INDEX]); assertEquals(5 * MINUTE_IN_MILLIS, mQuotaController.getInQuotaBufferMs()); assertEquals(.9f, mQuotaController.getAllowedTimeSurplusPriorityLow(), 1e-6); assertEquals(.9f, mQuotaController.getAllowedTimeSurplusPriorityMin(), 1e-6); + assertEquals(24 * HOUR_IN_MILLIS, mQuotaController.getBucketWindowSizes()[EXEMPTED_INDEX]); assertEquals(24 * HOUR_IN_MILLIS, mQuotaController.getBucketWindowSizes()[ACTIVE_INDEX]); assertEquals(24 * HOUR_IN_MILLIS, mQuotaController.getBucketWindowSizes()[WORKING_INDEX]); assertEquals(24 * HOUR_IN_MILLIS, mQuotaController.getBucketWindowSizes()[FREQUENT_INDEX]); @@ -3284,6 +3384,7 @@ public class QuotaControllerTest { assertEquals(15 * MINUTE_IN_MILLIS, mQuotaController.getTimingSessionCoalescingDurationMs()); assertEquals(15 * MINUTE_IN_MILLIS, mQuotaController.getMinQuotaCheckDelayMs()); + assertEquals(24 * HOUR_IN_MILLIS, mQuotaController.getEJLimitsMs()[EXEMPTED_INDEX]); assertEquals(24 * HOUR_IN_MILLIS, mQuotaController.getEJLimitsMs()[ACTIVE_INDEX]); assertEquals(24 * HOUR_IN_MILLIS, mQuotaController.getEJLimitsMs()[WORKING_INDEX]); assertEquals(24 * HOUR_IN_MILLIS, mQuotaController.getEJLimitsMs()[FREQUENT_INDEX]); diff --git a/services/tests/mockingservicestests/src/com/android/server/pm/MockSystem.kt b/services/tests/mockingservicestests/src/com/android/server/pm/MockSystem.kt index 6ae003163e4b..4ec1641b7157 100644 --- a/services/tests/mockingservicestests/src/com/android/server/pm/MockSystem.kt +++ b/services/tests/mockingservicestests/src/com/android/server/pm/MockSystem.kt @@ -69,6 +69,7 @@ import com.android.server.pm.permission.PermissionManagerServiceInternal import com.android.server.pm.pkg.parsing.ParsingPackage import com.android.server.pm.pkg.parsing.ParsingPackageUtils import com.android.server.pm.verify.domain.DomainVerificationManagerInternal +import com.android.server.supplementalprocess.SupplementalProcessManagerLocal import com.android.server.testutils.TestHandler import com.android.server.testutils.mock import com.android.server.testutils.nullable @@ -335,6 +336,7 @@ class MockSystem(withSession: (StaticMockitoSessionBuilder) -> Unit = {}) { stageServicesExtensionScan() stageSystemSharedLibraryScan() stagePermissionsControllerScan() + stageSupplementalProcessScan() stageInstantAppResolverScan() } @@ -569,6 +571,22 @@ class MockSystem(withSession: (StaticMockitoSessionBuilder) -> Unit = {}) { } @Throws(Exception::class) + private fun stageSupplementalProcessScan() { + stageScanNewPackage("com.android.supplemental.process", + 1L, systemPartitions[0].privAppFolder, + withPackage = { pkg: PackageImpl -> + val applicationInfo: ApplicationInfo = createBasicApplicationInfo(pkg) + mockQueryServices(SupplementalProcessManagerLocal.SERVICE_INTERFACE, + createBasicServiceInfo( + pkg, applicationInfo, "SupplementalProcessService")) + pkg + }, + withSetting = { setting: PackageSettingBuilder -> + setting.setPkgFlags(ApplicationInfo.FLAG_SYSTEM) + }) + } + + @Throws(Exception::class) private fun stageSystemSharedLibraryScan() { stageScanNewPackage("android.ext.shared", 1L, systemPartitions[0].appFolder, diff --git a/services/tests/servicestests/src/com/android/server/DockObserverTest.java b/services/tests/servicestests/src/com/android/server/DockObserverTest.java new file mode 100644 index 000000000000..c325778a5683 --- /dev/null +++ b/services/tests/servicestests/src/com/android/server/DockObserverTest.java @@ -0,0 +1,134 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server; + +import static com.google.common.truth.Truth.assertThat; + +import android.content.Intent; +import android.os.Looper; +import android.testing.AndroidTestingRunner; +import android.testing.TestableContext; +import android.testing.TestableLooper; + +import androidx.test.core.app.ApplicationProvider; + +import com.android.internal.R; +import com.android.internal.util.test.BroadcastInterceptingContext; + +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; + +import java.util.concurrent.ExecutionException; + +@RunWith(AndroidTestingRunner.class) +@TestableLooper.RunWithLooper +public class DockObserverTest { + + @Rule + public TestableContext mContext = + new TestableContext(ApplicationProvider.getApplicationContext(), null); + + private final BroadcastInterceptingContext mInterceptingContext = + new BroadcastInterceptingContext(mContext); + + BroadcastInterceptingContext.FutureIntent updateExtconDockState(DockObserver observer, + String extconDockState) { + BroadcastInterceptingContext.FutureIntent futureIntent = + mInterceptingContext.nextBroadcastIntent(Intent.ACTION_DOCK_EVENT); + observer.setDockStateFromProviderForTesting( + DockObserver.ExtconStateProvider.fromString(extconDockState)); + TestableLooper.get(this).processAllMessages(); + return futureIntent; + } + + DockObserver observerWithMappingConfig(String[] configEntries) { + mContext.getOrCreateTestableResources().addOverride( + R.array.config_dockExtconStateMapping, + configEntries); + return new DockObserver(mInterceptingContext); + } + + void assertDockEventIntentWithExtraThenUndock(DockObserver observer, String extconDockState, + int expectedExtra) throws ExecutionException, InterruptedException { + assertThat(updateExtconDockState(observer, extconDockState) + .get().getIntExtra(Intent.EXTRA_DOCK_STATE, -1)) + .isEqualTo(expectedExtra); + assertThat(updateExtconDockState(observer, "DOCK=0") + .get().getIntExtra(Intent.EXTRA_DOCK_STATE, -1)) + .isEqualTo(Intent.EXTRA_DOCK_STATE_UNDOCKED); + } + + @Before + public void setUp() { + if (Looper.myLooper() == null) { + Looper.prepare(); + } + } + + @Test + public void testDockIntentBroadcast_onlyAfterBootReady() + throws ExecutionException, InterruptedException { + DockObserver observer = new DockObserver(mInterceptingContext); + BroadcastInterceptingContext.FutureIntent futureIntent = + updateExtconDockState(observer, "DOCK=1"); + updateExtconDockState(observer, "DOCK=1").assertNotReceived(); + // Last boot phase reached + observer.onBootPhase(SystemService.PHASE_ACTIVITY_MANAGER_READY); + TestableLooper.get(this).processAllMessages(); + assertThat(futureIntent.get().getIntExtra(Intent.EXTRA_DOCK_STATE, -1)) + .isEqualTo(Intent.EXTRA_DOCK_STATE_DESK); + } + + @Test + public void testDockIntentBroadcast_customConfigResource() + throws ExecutionException, InterruptedException { + DockObserver observer = observerWithMappingConfig( + new String[] {"2,KEY1=1,KEY2=2", "3,KEY3=3"}); + observer.onBootPhase(SystemService.PHASE_ACTIVITY_MANAGER_READY); + + // Mapping should not match + assertDockEventIntentWithExtraThenUndock(observer, "DOCK=1", + Intent.EXTRA_DOCK_STATE_DESK); + assertDockEventIntentWithExtraThenUndock(observer, "DOCK=1\nKEY1=1", + Intent.EXTRA_DOCK_STATE_DESK); + assertDockEventIntentWithExtraThenUndock(observer, "DOCK=1\nKEY2=2", + Intent.EXTRA_DOCK_STATE_DESK); + + // 1st mapping now matches + assertDockEventIntentWithExtraThenUndock(observer, "DOCK=1\nKEY2=2\nKEY1=1", + Intent.EXTRA_DOCK_STATE_CAR); + + // 2nd mapping now matches + assertDockEventIntentWithExtraThenUndock(observer, "DOCK=1\nKEY3=3", + Intent.EXTRA_DOCK_STATE_LE_DESK); + } + + @Test + public void testDockIntentBroadcast_customConfigResourceWithWildcard() + throws ExecutionException, InterruptedException { + DockObserver observer = observerWithMappingConfig(new String[] { + "2,KEY2=2", + "3,KEY3=3", + "4" + }); + observer.onBootPhase(SystemService.PHASE_ACTIVITY_MANAGER_READY); + assertDockEventIntentWithExtraThenUndock(observer, "DOCK=1\nKEY5=5", + Intent.EXTRA_DOCK_STATE_HE_DESK); + } +} diff --git a/services/tests/servicestests/src/com/android/server/attention/AttentionManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/attention/AttentionManagerServiceTest.java index 9ee1205b4325..3890d4d006e2 100644 --- a/services/tests/servicestests/src/com/android/server/attention/AttentionManagerServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/attention/AttentionManagerServiceTest.java @@ -24,14 +24,20 @@ import static com.android.server.attention.AttentionManagerService.KEY_STALE_AFT import static com.google.common.truth.Truth.assertThat; +import static junit.framework.Assert.fail; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoMoreInteractions; +import static org.mockito.Mockito.verifyZeroInteractions; import android.attention.AttentionManagerInternal.AttentionCallbackInternal; +import android.attention.AttentionManagerInternal.ProximityCallbackInternal; import android.content.ComponentName; import android.content.Context; import android.os.IBinder; @@ -42,6 +48,7 @@ import android.os.RemoteException; import android.provider.DeviceConfig; import android.service.attention.IAttentionCallback; import android.service.attention.IAttentionService; +import android.service.attention.IProximityCallback; import androidx.test.filters.SmallTest; @@ -49,6 +56,7 @@ import com.android.server.attention.AttentionManagerService.AttentionCheck; import com.android.server.attention.AttentionManagerService.AttentionCheckCache; import com.android.server.attention.AttentionManagerService.AttentionCheckCacheBuffer; import com.android.server.attention.AttentionManagerService.AttentionHandler; +import com.android.server.attention.AttentionManagerService.ProximityUpdate; import org.junit.Before; import org.junit.Test; @@ -59,10 +67,13 @@ import org.mockito.MockitoAnnotations; /** * Tests for {@link com.android.server.attention.AttentionManagerService} */ +@SuppressWarnings("GuardedBy") @SmallTest public class AttentionManagerServiceTest { + private static final double PROXIMITY_SUCCESS_STATE = 1.0; private AttentionManagerService mSpyAttentionManager; private final int mTimeout = 1000; + private final Object mLock = new Object(); @Mock private AttentionCallbackInternal mMockAttentionCallbackInternal; @Mock @@ -73,6 +84,8 @@ public class AttentionManagerServiceTest { private IThermalService mMockIThermalService; @Mock Context mContext; + @Mock + private ProximityCallbackInternal mMockProximityCallbackInternal; @Before public void setUp() throws RemoteException { @@ -84,7 +97,6 @@ public class AttentionManagerServiceTest { doReturn(true).when(mMockIPowerManager).isInteractive(); mPowerManager = new PowerManager(mContext, mMockIPowerManager, mMockIThermalService, null); - Object mLock = new Object(); // setup a spy on attention manager AttentionManagerService attentionManager = new AttentionManagerService( mContext, @@ -100,6 +112,119 @@ public class AttentionManagerServiceTest { mSpyAttentionManager); mSpyAttentionManager.mCurrentAttentionCheck = attentionCheck; mSpyAttentionManager.mService = new MockIAttentionService(); + doNothing().when(mSpyAttentionManager).freeIfInactiveLocked(); + } + + @Test + public void testRegisterProximityUpdates_returnFalseWhenServiceDisabled() { + mSpyAttentionManager.mIsServiceEnabled = false; + + assertThat(mSpyAttentionManager.onStartProximityUpdates(mMockProximityCallbackInternal)) + .isFalse(); + } + + @Test + public void testRegisterProximityUpdates_returnFalseWhenServiceUnavailable() { + mSpyAttentionManager.mIsServiceEnabled = true; + doReturn(false).when(mSpyAttentionManager).isServiceAvailable(); + + assertThat(mSpyAttentionManager.onStartProximityUpdates(mMockProximityCallbackInternal)) + .isFalse(); + } + + @Test + public void testRegisterProximityUpdates_returnFalseWhenPowerManagerNotInteract() + throws RemoteException { + mSpyAttentionManager.mIsServiceEnabled = true; + doReturn(true).when(mSpyAttentionManager).isServiceAvailable(); + doReturn(false).when(mMockIPowerManager).isInteractive(); + + assertThat(mSpyAttentionManager.onStartProximityUpdates(mMockProximityCallbackInternal)) + .isFalse(); + } + + @Test + public void testRegisterProximityUpdates_callOnSuccess() throws RemoteException { + mSpyAttentionManager.mIsServiceEnabled = true; + doReturn(true).when(mSpyAttentionManager).isServiceAvailable(); + doReturn(true).when(mMockIPowerManager).isInteractive(); + + assertThat(mSpyAttentionManager.onStartProximityUpdates(mMockProximityCallbackInternal)) + .isTrue(); + verify(mMockProximityCallbackInternal, times(1)) + .onProximityUpdate(PROXIMITY_SUCCESS_STATE); + } + + @Test + public void testRegisterProximityUpdates_callOnSuccessTwiceInARow() throws RemoteException { + mSpyAttentionManager.mIsServiceEnabled = true; + doReturn(true).when(mSpyAttentionManager).isServiceAvailable(); + doReturn(true).when(mMockIPowerManager).isInteractive(); + + assertThat(mSpyAttentionManager.onStartProximityUpdates(mMockProximityCallbackInternal)) + .isTrue(); + + ProximityUpdate prevProximityUpdate = mSpyAttentionManager.mCurrentProximityUpdate; + assertThat(mSpyAttentionManager.onStartProximityUpdates(mMockProximityCallbackInternal)) + .isTrue(); + assertThat(mSpyAttentionManager.mCurrentProximityUpdate).isEqualTo(prevProximityUpdate); + verify(mMockProximityCallbackInternal, times(1)) + .onProximityUpdate(PROXIMITY_SUCCESS_STATE); + } + + @Test + public void testUnregisterProximityUpdates_noCrashWhenNoCallbackIsRegistered() { + mSpyAttentionManager.onStopProximityUpdates(mMockProximityCallbackInternal); + verifyZeroInteractions(mMockProximityCallbackInternal); + } + + @Test + public void testUnregisterProximityUpdates_noCrashWhenCallbackMismatched() + throws RemoteException { + mSpyAttentionManager.mIsServiceEnabled = true; + doReturn(true).when(mSpyAttentionManager).isServiceAvailable(); + doReturn(true).when(mMockIPowerManager).isInteractive(); + mSpyAttentionManager.onStartProximityUpdates(mMockProximityCallbackInternal); + verify(mMockProximityCallbackInternal, times(1)) + .onProximityUpdate(PROXIMITY_SUCCESS_STATE); + + ProximityCallbackInternal mismatchedCallback = new ProximityCallbackInternal() { + @Override + public void onProximityUpdate(double distance) { + fail("Callback shouldn't have responded."); + } + }; + mSpyAttentionManager.onStopProximityUpdates(mismatchedCallback); + + verifyNoMoreInteractions(mMockProximityCallbackInternal); + } + + @Test + public void testUnregisterProximityUpdates_cancelRegistrationWhenMatched() + throws RemoteException { + mSpyAttentionManager.mIsServiceEnabled = true; + doReturn(true).when(mSpyAttentionManager).isServiceAvailable(); + doReturn(true).when(mMockIPowerManager).isInteractive(); + mSpyAttentionManager.onStartProximityUpdates(mMockProximityCallbackInternal); + mSpyAttentionManager.onStopProximityUpdates(mMockProximityCallbackInternal); + + assertThat(mSpyAttentionManager.mCurrentProximityUpdate).isNull(); + } + + @Test + public void testUnregisterProximityUpdates_noCrashWhenTwiceInARow() throws RemoteException { + // Attention Service registers proximity updates. + mSpyAttentionManager.mIsServiceEnabled = true; + doReturn(true).when(mSpyAttentionManager).isServiceAvailable(); + doReturn(true).when(mMockIPowerManager).isInteractive(); + mSpyAttentionManager.onStartProximityUpdates(mMockProximityCallbackInternal); + verify(mMockProximityCallbackInternal, times(1)) + .onProximityUpdate(PROXIMITY_SUCCESS_STATE); + + // Attention Service unregisters the proximity update twice in a row. + mSpyAttentionManager.onStopProximityUpdates(mMockProximityCallbackInternal); + mSpyAttentionManager.onStopProximityUpdates(mMockProximityCallbackInternal); + verifyNoMoreInteractions(mMockProximityCallbackInternal); } @Test @@ -127,7 +252,6 @@ public class AttentionManagerServiceTest { mSpyAttentionManager.mIsServiceEnabled = true; doReturn(true).when(mSpyAttentionManager).isServiceAvailable(); doReturn(true).when(mMockIPowerManager).isInteractive(); - doNothing().when(mSpyAttentionManager).freeIfInactiveLocked(); mSpyAttentionManager.mCurrentAttentionCheck = null; AttentionCallbackInternal callback = Mockito.mock(AttentionCallbackInternal.class); @@ -213,6 +337,13 @@ public class AttentionManagerServiceTest { public void cancelAttentionCheck(IAttentionCallback callback) { } + public void onStartProximityUpdates(IProximityCallback callback) throws RemoteException { + callback.onProximityUpdate(PROXIMITY_SUCCESS_STATE); + } + + public void onStopProximityUpdates() throws RemoteException { + } + public IBinder asBinder() { return null; } diff --git a/services/tests/servicestests/src/com/android/server/audio/AudioDeviceBrokerTest.java b/services/tests/servicestests/src/com/android/server/audio/AudioDeviceBrokerTest.java index 9e1445cf589d..bdea679a3311 100644 --- a/services/tests/servicestests/src/com/android/server/audio/AudioDeviceBrokerTest.java +++ b/services/tests/servicestests/src/com/android/server/audio/AudioDeviceBrokerTest.java @@ -30,7 +30,7 @@ import android.content.Context; import android.content.Intent; import android.media.AudioManager; import android.media.AudioSystem; -import android.media.BtProfileConnectionInfo; +import android.media.BluetoothProfileConnectionInfo; import android.util.Log; import androidx.test.InstrumentationRegistry; @@ -100,7 +100,7 @@ public class AudioDeviceBrokerTest { mAudioDeviceBroker.queueOnBluetoothActiveDeviceChanged( new AudioDeviceBroker.BtDeviceChangedData(mFakeBtDevice, null, - BtProfileConnectionInfo.a2dpInfo(true, 1), "testSource")); + BluetoothProfileConnectionInfo.createA2dpInfo(true, 1), "testSource")); Thread.sleep(2 * MAX_MESSAGE_HANDLING_DELAY_MS); verify(mSpyDevInventory, times(1)).setBluetoothActiveDevice( any(AudioDeviceBroker.BtDeviceInfo.class) @@ -208,13 +208,13 @@ public class AudioDeviceBrokerTest { // first connection: ensure the device is connected as a starting condition for the test mAudioDeviceBroker.queueOnBluetoothActiveDeviceChanged( new AudioDeviceBroker.BtDeviceChangedData(mFakeBtDevice, null, - BtProfileConnectionInfo.a2dpInfo(true, 1), "testSource")); + BluetoothProfileConnectionInfo.createA2dpInfo(true, 1), "testSource")); Thread.sleep(MAX_MESSAGE_HANDLING_DELAY_MS); // disconnection mAudioDeviceBroker.queueOnBluetoothActiveDeviceChanged( new AudioDeviceBroker.BtDeviceChangedData(null, mFakeBtDevice, - BtProfileConnectionInfo.a2dpInfo(false, -1), "testSource")); + BluetoothProfileConnectionInfo.createA2dpInfo(false, -1), "testSource")); if (delayAfterDisconnection > 0) { Thread.sleep(delayAfterDisconnection); } @@ -222,7 +222,7 @@ public class AudioDeviceBrokerTest { // reconnection mAudioDeviceBroker.queueOnBluetoothActiveDeviceChanged( new AudioDeviceBroker.BtDeviceChangedData(mFakeBtDevice, null, - BtProfileConnectionInfo.a2dpInfo(true, 2), "testSource")); + BluetoothProfileConnectionInfo.createA2dpInfo(true, 2), "testSource")); Thread.sleep(AudioService.BECOMING_NOISY_DELAY_MS + MAX_MESSAGE_HANDLING_DELAY_MS); // Verify disconnection has been cancelled and we're seeing two connections attempts, diff --git a/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java b/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java index 64ce6b282f17..c877bd141220 100644 --- a/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java +++ b/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java @@ -7737,30 +7737,20 @@ public class DevicePolicyManagerTest extends DpmTestBase { dpm.setDeviceOwnerType(admin1, DEVICE_OWNER_TYPE_FINANCED); - int returnedDeviceOwnerType = dpm.getDeviceOwnerType(admin1); - assertThat(dpms.mOwners.hasDeviceOwner()).isTrue(); - assertThat(returnedDeviceOwnerType).isEqualTo(DEVICE_OWNER_TYPE_FINANCED); - + assertThat(dpm.getDeviceOwnerType(admin1)).isEqualTo(DEVICE_OWNER_TYPE_FINANCED); initializeDpms(); - - returnedDeviceOwnerType = dpm.getDeviceOwnerType(admin1); - assertThat(dpms.mOwners.hasDeviceOwner()).isTrue(); - assertThat(returnedDeviceOwnerType).isEqualTo(DEVICE_OWNER_TYPE_FINANCED); + assertThat(dpm.getDeviceOwnerType(admin1)).isEqualTo(DEVICE_OWNER_TYPE_FINANCED); } @Test - public void testSetDeviceOwnerType_asDeviceOwner_throwsExceptionWhenSetDeviceOwnerTypeAgain() + public void testSetDeviceOwnerType_asDeviceOwner_setDeviceOwnerTypeTwice_success() throws Exception { setDeviceOwner(); + dpm.setDeviceOwnerType(admin1, DEVICE_OWNER_TYPE_DEFAULT); dpm.setDeviceOwnerType(admin1, DEVICE_OWNER_TYPE_FINANCED); - int returnedDeviceOwnerType = dpm.getDeviceOwnerType(admin1); - assertThat(dpms.mOwners.hasDeviceOwner()).isTrue(); - assertThat(returnedDeviceOwnerType).isEqualTo(DEVICE_OWNER_TYPE_FINANCED); - - assertThrows(IllegalStateException.class, - () -> dpm.setDeviceOwnerType(admin1, DEVICE_OWNER_TYPE_DEFAULT)); + assertThat(dpm.getDeviceOwnerType(admin1)).isEqualTo(DEVICE_OWNER_TYPE_FINANCED); } @Test diff --git a/services/tests/servicestests/src/com/android/server/devicepolicy/OwnersTest.java b/services/tests/servicestests/src/com/android/server/devicepolicy/OwnersTest.java index 02a8ae8fbecd..9a5254d3e00d 100644 --- a/services/tests/servicestests/src/com/android/server/devicepolicy/OwnersTest.java +++ b/services/tests/servicestests/src/com/android/server/devicepolicy/OwnersTest.java @@ -93,7 +93,7 @@ public class OwnersTest extends DpmTestBase { assertThat(owners.getProfileOwnerUserRestrictionsNeedsMigration(21)).isFalse(); owners.setDeviceOwnerType(owners.getDeviceOwnerPackageName(), - DEVICE_OWNER_TYPE_FINANCED); + DEVICE_OWNER_TYPE_FINANCED, /* isAdminTestOnly= */ false); // There is no device owner, so the default owner type should be returned. assertThat(owners.getDeviceOwnerType(owners.getDeviceOwnerPackageName())).isEqualTo( DEVICE_OWNER_TYPE_DEFAULT); @@ -367,7 +367,7 @@ public class OwnersTest extends DpmTestBase { owners.setDeviceOwnerUserRestrictionsMigrated(); owners.setDeviceOwnerType(owners.getDeviceOwnerPackageName(), - DEVICE_OWNER_TYPE_FINANCED); + DEVICE_OWNER_TYPE_FINANCED, /* isAdminTestOnly= */ false); assertThat(owners.getDeviceOwnerType(owners.getDeviceOwnerPackageName())).isEqualTo( DEVICE_OWNER_TYPE_FINANCED); @@ -399,7 +399,7 @@ public class OwnersTest extends DpmTestBase { owners.setProfileOwnerUserRestrictionsMigrated(11); owners.setDeviceOwnerType(owners.getDeviceOwnerPackageName(), - DEVICE_OWNER_TYPE_DEFAULT); + DEVICE_OWNER_TYPE_DEFAULT, /* isAdminTestOnly= */ false); // The previous device owner type should persist. assertThat(owners.getDeviceOwnerType(owners.getDeviceOwnerPackageName())).isEqualTo( DEVICE_OWNER_TYPE_FINANCED); @@ -585,7 +585,8 @@ public class OwnersTest extends DpmTestBase { assertThat(owners.getProfileOwnerFile(11).exists()).isTrue(); String previousDeviceOwnerPackageName = owners.getDeviceOwnerPackageName(); - owners.setDeviceOwnerType(previousDeviceOwnerPackageName, DEVICE_OWNER_TYPE_FINANCED); + owners.setDeviceOwnerType(previousDeviceOwnerPackageName, DEVICE_OWNER_TYPE_FINANCED, + /* isAdminTestOnly= */ false); assertThat(owners.getDeviceOwnerType(previousDeviceOwnerPackageName)).isEqualTo( DEVICE_OWNER_TYPE_FINANCED); owners.setDeviceOwnerProtectedPackages( diff --git a/services/tests/servicestests/src/com/android/server/display/AutomaticBrightnessControllerTest.java b/services/tests/servicestests/src/com/android/server/display/AutomaticBrightnessControllerTest.java index 4caa85cee7db..f5a56891b5f5 100644 --- a/services/tests/servicestests/src/com/android/server/display/AutomaticBrightnessControllerTest.java +++ b/services/tests/servicestests/src/com/android/server/display/AutomaticBrightnessControllerTest.java @@ -81,6 +81,7 @@ public class AutomaticBrightnessControllerTest { @Mock HysteresisLevels mScreenBrightnessThresholds; @Mock Handler mNoOpHandler; @Mock HighBrightnessModeController mHbmController; + @Mock BrightnessThrottler mBrightnessThrottler; @Before public void setUp() { @@ -128,12 +129,15 @@ public class AutomaticBrightnessControllerTest { INITIAL_LIGHT_SENSOR_RATE, BRIGHTENING_LIGHT_DEBOUNCE_CONFIG, DARKENING_LIGHT_DEBOUNCE_CONFIG, RESET_AMBIENT_LUX_AFTER_WARMUP_CONFIG, mAmbientBrightnessThresholds, mScreenBrightnessThresholds, - mContext, mHbmController, mIdleBrightnessMappingStrategy, + mContext, mHbmController, mBrightnessThrottler, mIdleBrightnessMappingStrategy, AMBIENT_LIGHT_HORIZON_SHORT, AMBIENT_LIGHT_HORIZON_LONG ); when(mHbmController.getCurrentBrightnessMax()).thenReturn(BRIGHTNESS_MAX_FLOAT); when(mHbmController.getCurrentBrightnessMin()).thenReturn(BRIGHTNESS_MIN_FLOAT); + // Disable brightness throttling by default. Individual tests can enable it as needed. + when(mBrightnessThrottler.getBrightnessCap()).thenReturn(BRIGHTNESS_MAX_FLOAT); + when(mBrightnessThrottler.isThrottled()).thenReturn(false); // Configure the brightness controller and grab an instance of the sensor listener, // through which we can deliver fake (for test) sensor values. @@ -420,4 +424,47 @@ public class AutomaticBrightnessControllerTest { assertEquals(600f, hysteresisLevels.getBrighteningThreshold(500f), EPSILON); assertEquals(250f, hysteresisLevels.getDarkeningThreshold(500f), EPSILON); } + + @Test + public void testBrightnessGetsThrottled() throws Exception { + Sensor lightSensor = TestUtils.createSensor(Sensor.TYPE_LIGHT, "Light Sensor"); + mController = setupController(lightSensor); + + ArgumentCaptor<SensorEventListener> listenerCaptor = + ArgumentCaptor.forClass(SensorEventListener.class); + verify(mSensorManager).registerListener(listenerCaptor.capture(), eq(lightSensor), + eq(INITIAL_LIGHT_SENSOR_RATE * 1000), any(Handler.class)); + SensorEventListener listener = listenerCaptor.getValue(); + + // Set up system to return max brightness at 100 lux + final float normalizedBrightness = BRIGHTNESS_MAX_FLOAT; + final float lux = 100.0f; + when(mAmbientBrightnessThresholds.getBrighteningThreshold(lux)) + .thenReturn(lux); + when(mAmbientBrightnessThresholds.getDarkeningThreshold(lux)) + .thenReturn(lux); + when(mBrightnessMappingStrategy.getBrightness(eq(lux), eq(null), anyInt())) + .thenReturn(normalizedBrightness); + + // Sensor reads 100 lux. We should get max brightness. + listener.onSensorChanged(TestUtils.createSensorEvent(lightSensor, (int) lux)); + assertEquals(BRIGHTNESS_MAX_FLOAT, mController.getAutomaticScreenBrightness(), 0.0f); + + // Apply throttling and notify ABC (simulates DisplayPowerController#updatePowerState()) + final float throttledBrightness = 0.123f; + when(mBrightnessThrottler.getBrightnessCap()).thenReturn(throttledBrightness); + when(mBrightnessThrottler.isThrottled()).thenReturn(true); + mController.configure(AUTO_BRIGHTNESS_ENABLED, null /* configuration */, + BRIGHTNESS_MAX_FLOAT /* brightness */, false /* userChangedBrightness */, + 0 /* adjustment */, false /* userChanged */, DisplayPowerRequest.POLICY_BRIGHT); + assertEquals(throttledBrightness, mController.getAutomaticScreenBrightness(), 0.0f); + + // Remove throttling and notify ABC again + when(mBrightnessThrottler.getBrightnessCap()).thenReturn(BRIGHTNESS_MAX_FLOAT); + when(mBrightnessThrottler.isThrottled()).thenReturn(false); + mController.configure(AUTO_BRIGHTNESS_ENABLED, null /* configuration */, + BRIGHTNESS_MAX_FLOAT /* brightness */, false /* userChangedBrightness */, + 0 /* adjustment */, false /* userChanged */, DisplayPowerRequest.POLICY_BRIGHT); + assertEquals(BRIGHTNESS_MAX_FLOAT, mController.getAutomaticScreenBrightness(), 0.0f); + } } diff --git a/services/tests/servicestests/src/com/android/server/display/BrightnessMappingStrategyTest.java b/services/tests/servicestests/src/com/android/server/display/BrightnessMappingStrategyTest.java index 24a47516a366..f352de4ea54e 100644 --- a/services/tests/servicestests/src/com/android/server/display/BrightnessMappingStrategyTest.java +++ b/services/tests/servicestests/src/com/android/server/display/BrightnessMappingStrategyTest.java @@ -36,8 +36,11 @@ import android.util.Spline; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; +import com.android.server.display.whitebalance.DisplayWhiteBalanceController; + import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.Mock; import java.util.Arrays; @@ -147,11 +150,14 @@ public class BrightnessMappingStrategyTest { private static final float TOLERANCE = 0.0001f; + @Mock + DisplayWhiteBalanceController mMockDwbc; + @Test public void testSimpleStrategyMappingAtControlPoints() { Resources res = createResources(LUX_LEVELS, DISPLAY_LEVELS_BACKLIGHT); DisplayDeviceConfig ddc = createDdc(); - BrightnessMappingStrategy simple = BrightnessMappingStrategy.create(res, ddc); + BrightnessMappingStrategy simple = BrightnessMappingStrategy.create(res, ddc, mMockDwbc); assertNotNull("BrightnessMappingStrategy should not be null", simple); for (int i = 0; i < LUX_LEVELS.length; i++) { final float expectedLevel = MathUtils.map(PowerManager.BRIGHTNESS_OFF + 1, @@ -166,7 +172,7 @@ public class BrightnessMappingStrategyTest { public void testSimpleStrategyMappingBetweenControlPoints() { Resources res = createResources(LUX_LEVELS, DISPLAY_LEVELS_BACKLIGHT); DisplayDeviceConfig ddc = createDdc(); - BrightnessMappingStrategy simple = BrightnessMappingStrategy.create(res, ddc); + BrightnessMappingStrategy simple = BrightnessMappingStrategy.create(res, ddc, mMockDwbc); assertNotNull("BrightnessMappingStrategy should not be null", simple); for (int i = 1; i < LUX_LEVELS.length; i++) { final float lux = (LUX_LEVELS[i - 1] + LUX_LEVELS[i]) / 2; @@ -181,7 +187,7 @@ public class BrightnessMappingStrategyTest { public void testSimpleStrategyIgnoresNewConfiguration() { Resources res = createResources(LUX_LEVELS, DISPLAY_LEVELS_BACKLIGHT); DisplayDeviceConfig ddc = createDdc(); - BrightnessMappingStrategy strategy = BrightnessMappingStrategy.create(res, ddc); + BrightnessMappingStrategy strategy = BrightnessMappingStrategy.create(res, ddc, mMockDwbc); final float[] lux = { 0f, 1f }; final float[] nits = { 0, PowerManager.BRIGHTNESS_ON }; @@ -196,7 +202,7 @@ public class BrightnessMappingStrategyTest { public void testSimpleStrategyIgnoresNullConfiguration() { Resources res = createResources(LUX_LEVELS, DISPLAY_LEVELS_BACKLIGHT); DisplayDeviceConfig ddc = createDdc(); - BrightnessMappingStrategy strategy = BrightnessMappingStrategy.create(res, ddc); + BrightnessMappingStrategy strategy = BrightnessMappingStrategy.create(res, ddc, mMockDwbc); strategy.setBrightnessConfiguration(null); final int N = DISPLAY_LEVELS_BACKLIGHT.length; @@ -210,7 +216,7 @@ public class BrightnessMappingStrategyTest { public void testPhysicalStrategyMappingAtControlPoints() { Resources res = createResources(LUX_LEVELS, DISPLAY_LEVELS_NITS); DisplayDeviceConfig ddc = createDdc(); - BrightnessMappingStrategy physical = BrightnessMappingStrategy.create(res, ddc); + BrightnessMappingStrategy physical = BrightnessMappingStrategy.create(res, ddc, mMockDwbc); assertNotNull("BrightnessMappingStrategy should not be null", physical); for (int i = 0; i < LUX_LEVELS.length; i++) { final float expectedLevel = MathUtils.map(DISPLAY_RANGE_NITS[0], DISPLAY_RANGE_NITS[1], @@ -227,7 +233,7 @@ public class BrightnessMappingStrategyTest { public void testPhysicalStrategyMappingBetweenControlPoints() { Resources res = createResources(LUX_LEVELS, DISPLAY_LEVELS_NITS); DisplayDeviceConfig ddc = createDdc(DISPLAY_RANGE_NITS, BACKLIGHT_RANGE_ZERO_TO_ONE); - BrightnessMappingStrategy physical = BrightnessMappingStrategy.create(res, ddc); + BrightnessMappingStrategy physical = BrightnessMappingStrategy.create(res, ddc, mMockDwbc); assertNotNull("BrightnessMappingStrategy should not be null", physical); Spline brightnessToNits = Spline.createSpline(BACKLIGHT_RANGE_ZERO_TO_ONE, DISPLAY_RANGE_NITS); @@ -244,7 +250,7 @@ public class BrightnessMappingStrategyTest { public void testPhysicalStrategyUsesNewConfigurations() { Resources res = createResources(LUX_LEVELS, DISPLAY_LEVELS_NITS); DisplayDeviceConfig ddc = createDdc(); - BrightnessMappingStrategy strategy = BrightnessMappingStrategy.create(res, ddc); + BrightnessMappingStrategy strategy = BrightnessMappingStrategy.create(res, ddc, mMockDwbc); final float[] lux = { 0f, 1f }; final float[] nits = { @@ -269,7 +275,7 @@ public class BrightnessMappingStrategyTest { public void testPhysicalStrategyRecalculateSplines() { Resources res = createResources(LUX_LEVELS, DISPLAY_LEVELS_NITS); DisplayDeviceConfig ddc = createDdc(DISPLAY_RANGE_NITS); - BrightnessMappingStrategy strategy = BrightnessMappingStrategy.create(res, ddc); + BrightnessMappingStrategy strategy = BrightnessMappingStrategy.create(res, ddc, mMockDwbc); float[] adjustedNits50p = new float[DISPLAY_RANGE_NITS.length]; for (int i = 0; i < DISPLAY_RANGE_NITS.length; i++) { adjustedNits50p[i] = DISPLAY_RANGE_NITS[i] * 0.5f; @@ -301,7 +307,7 @@ public class BrightnessMappingStrategyTest { Resources res = createResources(LUX_LEVELS, DISPLAY_LEVELS_BACKLIGHT, DISPLAY_LEVELS_NITS); DisplayDeviceConfig ddc = createDdc(); - BrightnessMappingStrategy strategy = BrightnessMappingStrategy.create(res, ddc); + BrightnessMappingStrategy strategy = BrightnessMappingStrategy.create(res, ddc, mMockDwbc); assertTrue(strategy instanceof BrightnessMappingStrategy.PhysicalMappingStrategy); } @@ -314,13 +320,13 @@ public class BrightnessMappingStrategyTest { lux[idx+1] = tmp; Resources res = createResources(lux, DISPLAY_LEVELS_NITS); DisplayDeviceConfig ddc = createDdc(); - BrightnessMappingStrategy strategy = BrightnessMappingStrategy.create(res, ddc); + BrightnessMappingStrategy strategy = BrightnessMappingStrategy.create(res, ddc, mMockDwbc); assertNull(strategy); // And make sure we get the same result even if it's monotone but not increasing. lux[idx] = lux[idx+1]; res = createResources(lux, DISPLAY_LEVELS_NITS); - strategy = BrightnessMappingStrategy.create(res, ddc); + strategy = BrightnessMappingStrategy.create(res, ddc, mMockDwbc); assertNull(strategy); } @@ -333,11 +339,11 @@ public class BrightnessMappingStrategyTest { lux[lux.length - 1] = lux[lux.length - 2] + 1; Resources res = createResources(lux, DISPLAY_LEVELS_NITS); DisplayDeviceConfig ddc = createDdc(); - BrightnessMappingStrategy strategy = BrightnessMappingStrategy.create(res, ddc); + BrightnessMappingStrategy strategy = BrightnessMappingStrategy.create(res, ddc, mMockDwbc); assertNull(strategy); res = createResources(lux, DISPLAY_LEVELS_BACKLIGHT); - strategy = BrightnessMappingStrategy.create(res, ddc); + strategy = BrightnessMappingStrategy.create(res, ddc, mMockDwbc); assertNull(strategy); // Extra backlight level @@ -345,14 +351,14 @@ public class BrightnessMappingStrategyTest { DISPLAY_LEVELS_BACKLIGHT, DISPLAY_LEVELS_BACKLIGHT.length+1); backlight[backlight.length - 1] = backlight[backlight.length - 2] + 1; res = createResources(LUX_LEVELS, backlight); - strategy = BrightnessMappingStrategy.create(res, ddc); + strategy = BrightnessMappingStrategy.create(res, ddc, mMockDwbc); assertNull(strategy); // Extra nits level final float[] nits = Arrays.copyOf(DISPLAY_RANGE_NITS, DISPLAY_LEVELS_NITS.length+1); nits[nits.length - 1] = nits[nits.length - 2] + 1; res = createResources(LUX_LEVELS, nits); - strategy = BrightnessMappingStrategy.create(res, ddc); + strategy = BrightnessMappingStrategy.create(res, ddc, mMockDwbc); assertNull(strategy); } @@ -361,17 +367,17 @@ public class BrightnessMappingStrategyTest { Resources res = createResources(LUX_LEVELS, EMPTY_INT_ARRAY /*brightnessLevelsBacklight*/, DISPLAY_LEVELS_NITS); DisplayDeviceConfig ddc = createDdc(EMPTY_FLOAT_ARRAY /*nitsRange*/); - BrightnessMappingStrategy physical = BrightnessMappingStrategy.create(res, ddc); + BrightnessMappingStrategy physical = BrightnessMappingStrategy.create(res, ddc, mMockDwbc); assertNull(physical); res = createResources(LUX_LEVELS, EMPTY_INT_ARRAY /*brightnessLevelsBacklight*/, DISPLAY_LEVELS_NITS); - physical = BrightnessMappingStrategy.create(res, ddc); + physical = BrightnessMappingStrategy.create(res, ddc, mMockDwbc); assertNull(physical); res = createResources(LUX_LEVELS, EMPTY_INT_ARRAY /*brightnessLevelsBacklight*/, DISPLAY_LEVELS_NITS); - physical = BrightnessMappingStrategy.create(res, ddc); + physical = BrightnessMappingStrategy.create(res, ddc, mMockDwbc); assertNull(physical); } @@ -380,10 +386,10 @@ public class BrightnessMappingStrategyTest { Resources res = createResources(LUX_LEVELS, EMPTY_INT_ARRAY /*brightnessLevelsBacklight*/, DISPLAY_LEVELS_NITS); DisplayDeviceConfig ddc = createDdc(DISPLAY_RANGE_NITS, BACKLIGHT_RANGE_ZERO_TO_ONE); - assertStrategyAdaptsToUserDataPoints(BrightnessMappingStrategy.create(res, ddc)); + assertStrategyAdaptsToUserDataPoints(BrightnessMappingStrategy.create(res, ddc, mMockDwbc)); ddc = createDdc(DISPLAY_RANGE_NITS, BACKLIGHT_RANGE_ZERO_TO_ONE); res = createResources(LUX_LEVELS, DISPLAY_LEVELS_BACKLIGHT); - assertStrategyAdaptsToUserDataPoints(BrightnessMappingStrategy.create(res, ddc)); + assertStrategyAdaptsToUserDataPoints(BrightnessMappingStrategy.create(res, ddc, mMockDwbc)); } @Test @@ -394,7 +400,7 @@ public class BrightnessMappingStrategyTest { // Create an idle mode bms // This will fail if it tries to fetch the wrong configuration. BrightnessMappingStrategy bms = BrightnessMappingStrategy.createForIdleMode(res, ddc, - null); + mMockDwbc); assertNotNull("BrightnessMappingStrategy should not be null", bms); // Ensure that the config is the one we set @@ -586,7 +592,8 @@ public class BrightnessMappingStrategyTest { Resources resources = createResources(GAMMA_CORRECTION_LUX, GAMMA_CORRECTION_NITS); DisplayDeviceConfig ddc = createDdc(); - BrightnessMappingStrategy strategy = BrightnessMappingStrategy.create(resources, ddc); + BrightnessMappingStrategy strategy = BrightnessMappingStrategy.create(resources, ddc, + mMockDwbc); // Let's start with a validity check: assertEquals(y1, strategy.getBrightness(x1), 0.0001f /* tolerance */); assertEquals(y2, strategy.getBrightness(x2), 0.0001f /* tolerance */); @@ -614,7 +621,8 @@ public class BrightnessMappingStrategyTest { final float y3 = GAMMA_CORRECTION_SPLINE.interpolate(x3); Resources resources = createResources(GAMMA_CORRECTION_LUX, GAMMA_CORRECTION_NITS); DisplayDeviceConfig ddc = createDdc(); - BrightnessMappingStrategy strategy = BrightnessMappingStrategy.create(resources, ddc); + BrightnessMappingStrategy strategy = BrightnessMappingStrategy.create(resources, ddc, + mMockDwbc); // Validity check: assertEquals(y1, strategy.getBrightness(x1), 0.0001f /* tolerance */); assertEquals(y2, strategy.getBrightness(x2), 0.0001f /* tolerance */); @@ -639,7 +647,8 @@ public class BrightnessMappingStrategyTest { // just make sure the adjustment reflects the change. Resources resources = createResources(GAMMA_CORRECTION_LUX, GAMMA_CORRECTION_NITS); DisplayDeviceConfig ddc = createDdc(); - BrightnessMappingStrategy strategy = BrightnessMappingStrategy.create(resources, ddc); + BrightnessMappingStrategy strategy = BrightnessMappingStrategy.create(resources, ddc, + mMockDwbc); assertEquals(0.0f, strategy.getAutoBrightnessAdjustment(), 0.0001f /* tolerance */); strategy.addUserDataPoint(2500, 1.0f); assertEquals(+1.0f, strategy.getAutoBrightnessAdjustment(), 0.0001f /* tolerance */); @@ -660,7 +669,8 @@ public class BrightnessMappingStrategyTest { final float y4 = GAMMA_CORRECTION_SPLINE.interpolate(x4); Resources resources = createResources(GAMMA_CORRECTION_LUX, GAMMA_CORRECTION_NITS); DisplayDeviceConfig ddc = createDdc(); - BrightnessMappingStrategy strategy = BrightnessMappingStrategy.create(resources, ddc); + BrightnessMappingStrategy strategy = BrightnessMappingStrategy.create(resources, ddc, + mMockDwbc); // Validity, as per tradition: assertEquals(y0, strategy.getBrightness(x0), 0.0001f /* tolerance */); assertEquals(y2, strategy.getBrightness(x2), 0.0001f /* tolerance */); diff --git a/services/tests/servicestests/src/com/android/server/display/HighBrightnessModeControllerTest.java b/services/tests/servicestests/src/com/android/server/display/HighBrightnessModeControllerTest.java index 6203c2f54f07..53fa3e2db376 100644 --- a/services/tests/servicestests/src/com/android/server/display/HighBrightnessModeControllerTest.java +++ b/services/tests/servicestests/src/com/android/server/display/HighBrightnessModeControllerTest.java @@ -22,11 +22,14 @@ import static android.hardware.display.BrightnessInfo.HIGH_BRIGHTNESS_MODE_HDR; import static android.hardware.display.BrightnessInfo.HIGH_BRIGHTNESS_MODE_OFF; import static android.hardware.display.BrightnessInfo.HIGH_BRIGHTNESS_MODE_SUNLIGHT; + import static com.android.server.display.AutomaticBrightnessController.AUTO_BRIGHTNESS_DISABLED; import static com.android.server.display.AutomaticBrightnessController.AUTO_BRIGHTNESS_ENABLED; import static com.android.server.display.AutomaticBrightnessController .AUTO_BRIGHTNESS_OFF_DUE_TO_DISPLAY_STATE; +import static com.android.server.display.DisplayDeviceConfig.HDR_PERCENT_OF_SCREEN_REQUIRED_DEFAULT; + import static com.android.server.display.HighBrightnessModeController.HBM_TRANSITION_POINT_INVALID; import static org.junit.Assert.assertEquals; @@ -111,7 +114,8 @@ public class HighBrightnessModeControllerTest { private static final HighBrightnessModeData DEFAULT_HBM_DATA = new HighBrightnessModeData(MINIMUM_LUX, TRANSITION_POINT, TIME_WINDOW_MILLIS, TIME_ALLOWED_IN_WINDOW_MILLIS, TIME_MINIMUM_AVAILABLE_TO_ENABLE_MILLIS, - THERMAL_STATUS_LIMIT, ALLOW_IN_LOW_POWER_MODE); + THERMAL_STATUS_LIMIT, ALLOW_IN_LOW_POWER_MODE, + HDR_PERCENT_OF_SCREEN_REQUIRED_DEFAULT); @Before public void setUp() { @@ -136,7 +140,7 @@ public class HighBrightnessModeControllerTest { initHandler(null); final HighBrightnessModeController hbmc = new HighBrightnessModeController( mInjectorMock, mHandler, DISPLAY_WIDTH, DISPLAY_HEIGHT, mDisplayToken, - mDisplayUniqueId, DEFAULT_MIN, DEFAULT_MAX, null, () -> {}, mContextSpy); + mDisplayUniqueId, DEFAULT_MIN, DEFAULT_MAX, null, null, () -> {}, mContextSpy); assertState(hbmc, DEFAULT_MIN, DEFAULT_MAX, HIGH_BRIGHTNESS_MODE_OFF); assertEquals(hbmc.getTransitionPoint(), HBM_TRANSITION_POINT_INVALID, 0.0f); } @@ -146,7 +150,7 @@ public class HighBrightnessModeControllerTest { initHandler(null); final HighBrightnessModeController hbmc = new HighBrightnessModeController( mInjectorMock, mHandler, DISPLAY_WIDTH, DISPLAY_HEIGHT, mDisplayToken, - mDisplayUniqueId, DEFAULT_MIN, DEFAULT_MAX, null, () -> {}, mContextSpy); + mDisplayUniqueId, DEFAULT_MIN, DEFAULT_MAX, null, null, () -> {}, mContextSpy); hbmc.setAutoBrightnessEnabled(AUTO_BRIGHTNESS_ENABLED); hbmc.onAmbientLuxChange(MINIMUM_LUX - 1); // below allowed range assertState(hbmc, DEFAULT_MIN, DEFAULT_MAX, HIGH_BRIGHTNESS_MODE_OFF); @@ -703,7 +707,7 @@ public class HighBrightnessModeControllerTest { initHandler(clock); return new HighBrightnessModeController(mInjectorMock, mHandler, DISPLAY_WIDTH, DISPLAY_HEIGHT, mDisplayToken, mDisplayUniqueId, DEFAULT_MIN, DEFAULT_MAX, - DEFAULT_HBM_DATA, () -> {}, mContextSpy); + DEFAULT_HBM_DATA, null, () -> {}, mContextSpy); } private void initHandler(OffsettableClock clock) { diff --git a/services/tests/servicestests/src/com/android/server/hdmi/FakeHdmiCecConfig.java b/services/tests/servicestests/src/com/android/server/hdmi/FakeHdmiCecConfig.java index d441143272d9..0028969d85a0 100644 --- a/services/tests/servicestests/src/com/android/server/hdmi/FakeHdmiCecConfig.java +++ b/services/tests/servicestests/src/com/android/server/hdmi/FakeHdmiCecConfig.java @@ -165,6 +165,17 @@ final class FakeHdmiCecConfig extends HdmiCecConfig { R.bool.config_cecTvSendStandbyOnSleepDisabled_default); doReturn(true).when(resources).getBoolean( + R.bool.config_cecSetMenuLanguage_userConfigurable); + doReturn(true).when(resources).getBoolean( + R.bool.config_cecSetMenuLanguageEnabled_allowed); + doReturn(true).when(resources).getBoolean( + R.bool.config_cecSetMenuLanguageEnabled_default); + doReturn(true).when(resources).getBoolean( + R.bool.config_cecSetMenuLanguageDisabled_allowed); + doReturn(false).when(resources).getBoolean( + R.bool.config_cecSetMenuLanguageDisabled_default); + + doReturn(true).when(resources).getBoolean( R.bool.config_cecRcProfileTv_userConfigurable); doReturn(true).when(resources).getBoolean( R.bool.config_cecRcProfileTvNone_allowed); diff --git a/services/tests/servicestests/src/com/android/server/hdmi/HdmiCecConfigTest.java b/services/tests/servicestests/src/com/android/server/hdmi/HdmiCecConfigTest.java index 85d30a6dbc36..8e756aea27a9 100644 --- a/services/tests/servicestests/src/com/android/server/hdmi/HdmiCecConfigTest.java +++ b/services/tests/servicestests/src/com/android/server/hdmi/HdmiCecConfigTest.java @@ -83,6 +83,7 @@ public final class HdmiCecConfigTest { HdmiControlManager.CEC_SETTING_NAME_VOLUME_CONTROL_MODE, HdmiControlManager.CEC_SETTING_NAME_TV_WAKE_ON_ONE_TOUCH_PLAY, HdmiControlManager.CEC_SETTING_NAME_TV_SEND_STANDBY_ON_SLEEP, + HdmiControlManager.CEC_SETTING_NAME_SET_MENU_LANGUAGE, HdmiControlManager.CEC_SETTING_NAME_RC_PROFILE_TV, HdmiControlManager.CEC_SETTING_NAME_RC_PROFILE_SOURCE_HANDLES_ROOT_MENU, HdmiControlManager.CEC_SETTING_NAME_RC_PROFILE_SOURCE_HANDLES_SETUP_MENU, @@ -121,6 +122,7 @@ public final class HdmiCecConfigTest { HdmiControlManager.CEC_SETTING_NAME_VOLUME_CONTROL_MODE, HdmiControlManager.CEC_SETTING_NAME_TV_WAKE_ON_ONE_TOUCH_PLAY, HdmiControlManager.CEC_SETTING_NAME_TV_SEND_STANDBY_ON_SLEEP, + HdmiControlManager.CEC_SETTING_NAME_SET_MENU_LANGUAGE, HdmiControlManager.CEC_SETTING_NAME_RC_PROFILE_TV, HdmiControlManager.CEC_SETTING_NAME_RC_PROFILE_SOURCE_HANDLES_ROOT_MENU, HdmiControlManager.CEC_SETTING_NAME_RC_PROFILE_SOURCE_HANDLES_SETUP_MENU, @@ -159,6 +161,7 @@ public final class HdmiCecConfigTest { HdmiControlManager.CEC_SETTING_NAME_VOLUME_CONTROL_MODE, HdmiControlManager.CEC_SETTING_NAME_TV_WAKE_ON_ONE_TOUCH_PLAY, HdmiControlManager.CEC_SETTING_NAME_TV_SEND_STANDBY_ON_SLEEP, + HdmiControlManager.CEC_SETTING_NAME_SET_MENU_LANGUAGE, HdmiControlManager.CEC_SETTING_NAME_RC_PROFILE_TV, HdmiControlManager.CEC_SETTING_NAME_RC_PROFILE_SOURCE_HANDLES_ROOT_MENU, HdmiControlManager.CEC_SETTING_NAME_RC_PROFILE_SOURCE_HANDLES_SETUP_MENU, @@ -317,8 +320,10 @@ public final class HdmiCecConfigTest { @Test public void getDefaultStringValue_MultipleDefaults() { setBooleanResource(R.bool.config_cecPowerControlModeBroadcast_default, true); - assertThrows(RuntimeException.class, - () -> new HdmiCecConfig(mContext, mStorageAdapter)); + HdmiCecConfig hdmiCecConfig = new HdmiCecConfig(mContext, mStorageAdapter); + assertThat(hdmiCecConfig.getDefaultStringValue( + HdmiControlManager.CEC_SETTING_NAME_POWER_CONTROL_MODE)) + .isEqualTo(HdmiControlManager.POWER_CONTROL_MODE_BROADCAST); } @Test diff --git a/services/tests/servicestests/src/com/android/server/hdmi/HdmiControlServiceTest.java b/services/tests/servicestests/src/com/android/server/hdmi/HdmiControlServiceTest.java index 7751ef564138..c48a974ddbb2 100644 --- a/services/tests/servicestests/src/com/android/server/hdmi/HdmiControlServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/hdmi/HdmiControlServiceTest.java @@ -42,6 +42,7 @@ import android.hardware.hdmi.HdmiControlManager; import android.hardware.hdmi.HdmiPortInfo; import android.hardware.hdmi.IHdmiCecVolumeControlFeatureListener; import android.hardware.hdmi.IHdmiControlStatusChangeListener; +import android.hardware.hdmi.IHdmiVendorCommandListener; import android.os.Binder; import android.os.Looper; import android.os.RemoteException; @@ -747,6 +748,114 @@ public class HdmiControlServiceTest { } @Test + public void addVendorCommandListener_receiveCallback_VendorCmdNoIdTest() { + int destAddress = mHdmiControlServiceSpy.playback().getDeviceInfo().getLogicalAddress(); + int sourceAddress = Constants.ADDR_TV; + byte[] params = {0x00, 0x01, 0x02, 0x03}; + int vendorId = 0x123456; + + VendorCommandListener vendorCmdListener = + new VendorCommandListener(sourceAddress, destAddress, params, vendorId); + mHdmiControlServiceSpy.addVendorCommandListener(vendorCmdListener, vendorId); + mTestLooper.dispatchAll(); + + HdmiCecMessage vendorCommandNoId = + HdmiCecMessageBuilder.buildVendorCommand(sourceAddress, destAddress, params); + mNativeWrapper.onCecMessage(vendorCommandNoId); + mTestLooper.dispatchAll(); + assertThat(vendorCmdListener.mVendorCommandCallbackReceived).isTrue(); + assertThat(vendorCmdListener.mParamsCorrect).isTrue(); + assertThat(vendorCmdListener.mHasVendorId).isFalse(); + } + + @Test + public void addVendorCommandListener_receiveCallback_VendorCmdWithIdTest() { + int destAddress = mHdmiControlServiceSpy.playback().getDeviceInfo().getLogicalAddress(); + int sourceAddress = Constants.ADDR_TV; + byte[] params = {0x00, 0x01, 0x02, 0x03}; + int vendorId = 0x123456; + + VendorCommandListener vendorCmdListener = + new VendorCommandListener(sourceAddress, destAddress, params, vendorId); + mHdmiControlServiceSpy.addVendorCommandListener(vendorCmdListener, vendorId); + mTestLooper.dispatchAll(); + + HdmiCecMessage vendorCommandWithId = + HdmiCecMessageBuilder.buildVendorCommandWithId( + sourceAddress, destAddress, vendorId, params); + mNativeWrapper.onCecMessage(vendorCommandWithId); + mTestLooper.dispatchAll(); + assertThat(vendorCmdListener.mVendorCommandCallbackReceived).isTrue(); + assertThat(vendorCmdListener.mParamsCorrect).isTrue(); + assertThat(vendorCmdListener.mHasVendorId).isTrue(); + } + + @Test + public void addVendorCommandListener_noCallback_VendorCmdDiffIdTest() { + int destAddress = mHdmiControlServiceSpy.playback().getDeviceInfo().getLogicalAddress(); + int sourceAddress = Constants.ADDR_TV; + byte[] params = {0x00, 0x01, 0x02, 0x03}; + int vendorId = 0x123456; + int diffVendorId = 0x345678; + + VendorCommandListener vendorCmdListener = + new VendorCommandListener(sourceAddress, destAddress, params, vendorId); + mHdmiControlServiceSpy.addVendorCommandListener(vendorCmdListener, vendorId); + mTestLooper.dispatchAll(); + + HdmiCecMessage vendorCommandWithDiffId = + HdmiCecMessageBuilder.buildVendorCommandWithId( + sourceAddress, destAddress, diffVendorId, params); + mNativeWrapper.onCecMessage(vendorCommandWithDiffId); + mTestLooper.dispatchAll(); + assertThat(vendorCmdListener.mVendorCommandCallbackReceived).isFalse(); + } + + private static class VendorCommandListener extends IHdmiVendorCommandListener.Stub { + boolean mVendorCommandCallbackReceived = false; + boolean mParamsCorrect = false; + boolean mHasVendorId = false; + + int mSourceAddress; + int mDestAddress; + byte[] mParams; + int mVendorId; + + VendorCommandListener(int sourceAddress, int destAddress, byte[] params, int vendorId) { + this.mSourceAddress = sourceAddress; + this.mDestAddress = destAddress; + this.mParams = params.clone(); + this.mVendorId = vendorId; + } + + @Override + public void onReceived( + int sourceAddress, int destAddress, byte[] params, boolean hasVendorId) { + mVendorCommandCallbackReceived = true; + if (mSourceAddress == sourceAddress && mDestAddress == destAddress) { + byte[] expectedParams; + if (hasVendorId) { + // If the command has vendor ID, we have to add it to mParams. + expectedParams = new byte[params.length]; + expectedParams[0] = (byte) ((mVendorId >> 16) & 0xFF); + expectedParams[1] = (byte) ((mVendorId >> 8) & 0xFF); + expectedParams[2] = (byte) (mVendorId & 0xFF); + System.arraycopy(mParams, 0, expectedParams, 3, mParams.length); + } else { + expectedParams = params.clone(); + } + if (Arrays.equals(expectedParams, params)) { + mParamsCorrect = true; + } + } + mHasVendorId = hasVendorId; + } + + @Override + public void onControlStateChanged(boolean enabled, int reason) {} + } + + @Test public void dispatchMessageToLocalDevice_broadcastMessage_returnsHandled() { HdmiCecMessage message = HdmiCecMessageBuilder.buildStandby( Constants.ADDR_TV, diff --git a/services/tests/servicestests/src/com/android/server/pm/ApexManagerTest.java b/services/tests/servicestests/src/com/android/server/pm/ApexManagerTest.java index 7f7c716bc1f0..2f5993d1d989 100644 --- a/services/tests/servicestests/src/com/android/server/pm/ApexManagerTest.java +++ b/services/tests/servicestests/src/com/android/server/pm/ApexManagerTest.java @@ -61,7 +61,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.util.Map; +import java.util.List; @SmallTest @Presubmit @@ -136,9 +136,10 @@ public class ApexManagerTest { mApexManager.scanApexPackagesTraced(mPackageParser2, ParallelPackageParser.makeExecutorService()); - Map<String, String> services = mApexManager.getApexSystemServices(); + List<ApexSystemServiceInfo> services = mApexManager.getApexSystemServices(); assertThat(services).hasSize(1); - assertThat(services).containsKey("com.android.apex.test.ApexSystemService"); + assertThat(services.stream().map(ApexSystemServiceInfo::getName).findFirst().orElse(null)) + .matches("com.android.apex.test.ApexSystemService"); } @Test diff --git a/services/tests/uiservicestests/src/com/android/server/notification/NotificationRecordTest.java b/services/tests/uiservicestests/src/com/android/server/notification/NotificationRecordTest.java index 75420337a63e..7e27e5438a0c 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationRecordTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationRecordTest.java @@ -66,6 +66,7 @@ import android.os.Vibrator; import android.provider.Settings; import android.service.notification.Adjustment; import android.service.notification.StatusBarNotification; +import android.util.ArraySet; import android.widget.RemoteViews; import androidx.test.filters.SmallTest; @@ -1304,4 +1305,45 @@ public class NotificationRecordTest extends UiServiceTestCase { assertFalse(record.isConversation()); } + + @Test + public void mergePhoneNumbers_nulls() { + // make sure nothing dies if we just don't have any phone numbers + StatusBarNotification sbn = getNotification(PKG_N_MR1, true /* noisy */, + true /* defaultSound */, false /* buzzy */, false /* defaultBuzz */, + false /* lights */, false /* defaultLights */, null /* group */); + NotificationRecord record = new NotificationRecord(mMockContext, sbn, defaultChannel); + + // by default, no phone numbers + assertNull(record.getPhoneNumbers()); + + // nothing happens if we attempt to merge phone numbers but there aren't any + record.mergePhoneNumbers(null); + assertNull(record.getPhoneNumbers()); + } + + @Test + public void mergePhoneNumbers_addNumbers() { + StatusBarNotification sbn = getNotification(PKG_N_MR1, true /* noisy */, + true /* defaultSound */, false /* buzzy */, false /* defaultBuzz */, + false /* lights */, false /* defaultLights */, null /* group */); + NotificationRecord record = new NotificationRecord(mMockContext, sbn, defaultChannel); + + // by default, no phone numbers + assertNull(record.getPhoneNumbers()); + + // make sure it behaves properly when we merge in some real content + record.mergePhoneNumbers(new ArraySet<>( + new String[]{"16175551212", "16175552121"})); + assertTrue(record.getPhoneNumbers().contains("16175551212")); + assertTrue(record.getPhoneNumbers().contains("16175552121")); + assertFalse(record.getPhoneNumbers().contains("16175553434")); + + // now merge in a new number, make sure old ones are still there and the new one + // is also there + record.mergePhoneNumbers(new ArraySet<>(new String[]{"16175553434"})); + assertTrue(record.getPhoneNumbers().contains("16175551212")); + assertTrue(record.getPhoneNumbers().contains("16175552121")); + assertTrue(record.getPhoneNumbers().contains("16175553434")); + } } diff --git a/services/tests/uiservicestests/src/com/android/server/notification/ValidateNotificationPeopleTest.java b/services/tests/uiservicestests/src/com/android/server/notification/ValidateNotificationPeopleTest.java index 0bf105d62053..0552a8350329 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/ValidateNotificationPeopleTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/ValidateNotificationPeopleTest.java @@ -19,8 +19,13 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.contains; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.isNull; +import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -29,6 +34,7 @@ import android.app.Person; import android.content.ContentProvider; import android.content.ContentResolver; import android.content.Context; +import android.database.Cursor; import android.net.Uri; import android.os.Bundle; import android.os.UserManager; @@ -43,6 +49,8 @@ import com.android.server.UiServiceTestCase; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; +import org.mockito.invocation.InvocationOnMock; +import org.mockito.stubbing.Answer; import java.util.ArrayList; import java.util.Arrays; @@ -240,6 +248,118 @@ public class ValidateNotificationPeopleTest extends UiServiceTestCase { assertFalse(ContentProvider.uriHasUserId(queryUri.getValue())); } + @Test + public void testMergePhoneNumbers_noPhoneNumber() { + // If merge phone number is called but the contacts lookup turned up no available + // phone number (HAS_PHONE_NUMBER is false), then no query should happen. + + // setup of various bits required for querying + final Context mockContext = mock(Context.class); + final ContentResolver mockContentResolver = mock(ContentResolver.class); + when(mockContext.getContentResolver()).thenReturn(mockContentResolver); + final int contactId = 12345; + final Uri lookupUri = Uri.withAppendedPath( + ContactsContract.Contacts.CONTENT_LOOKUP_URI, String.valueOf(contactId)); + + // when the contact is looked up, we return a cursor that has one entry whose info is: + // _ID: 1 + // LOOKUP_KEY: "testlookupkey" + // STARRED: 0 + // HAS_PHONE_NUMBER: 0 + Cursor cursor = makeMockCursor(1, "testlookupkey", 0, 0); + when(mockContentResolver.query(any(), any(), any(), any(), any())).thenReturn(cursor); + + // call searchContacts and then mergePhoneNumbers, make sure we never actually + // query the content resolver for a phone number + new ValidateNotificationPeople().searchContactsAndLookupNumbers(mockContext, lookupUri); + verify(mockContentResolver, never()).query( + eq(ContactsContract.CommonDataKinds.Phone.CONTENT_URI), + eq(new String[] { ContactsContract.CommonDataKinds.Phone.NORMALIZED_NUMBER }), + contains(ContactsContract.Contacts.LOOKUP_KEY), + any(), // selection args + isNull()); // sort order + } + + @Test + public void testMergePhoneNumbers_hasNumber() { + // If merge phone number is called and the contact lookup has a phone number, + // make sure there's then a subsequent query for the phone number. + + // setup of various bits required for querying + final Context mockContext = mock(Context.class); + final ContentResolver mockContentResolver = mock(ContentResolver.class); + when(mockContext.getContentResolver()).thenReturn(mockContentResolver); + final int contactId = 12345; + final Uri lookupUri = Uri.withAppendedPath( + ContactsContract.Contacts.CONTENT_LOOKUP_URI, String.valueOf(contactId)); + + // when the contact is looked up, we return a cursor that has one entry whose info is: + // _ID: 1 + // LOOKUP_KEY: "testlookupkey" + // STARRED: 0 + // HAS_PHONE_NUMBER: 1 + Cursor cursor = makeMockCursor(1, "testlookupkey", 0, 1); + + // make sure to add some specifics so this cursor is only returned for the + // contacts database lookup. + when(mockContentResolver.query(eq(lookupUri), any(), + isNull(), isNull(), isNull())).thenReturn(cursor); + + // in the case of a phone lookup, return null cursor; that's not an error case + // and we're not checking the actual storing of the phone data here. + when(mockContentResolver.query(eq(ContactsContract.CommonDataKinds.Phone.CONTENT_URI), + eq(new String[] { ContactsContract.CommonDataKinds.Phone.NORMALIZED_NUMBER }), + contains(ContactsContract.Contacts.LOOKUP_KEY), + any(), isNull())).thenReturn(null); + + // call searchContacts and then mergePhoneNumbers, and check that we query + // once for the + new ValidateNotificationPeople().searchContactsAndLookupNumbers(mockContext, lookupUri); + verify(mockContentResolver, times(1)).query( + eq(ContactsContract.CommonDataKinds.Phone.CONTENT_URI), + eq(new String[] { ContactsContract.CommonDataKinds.Phone.NORMALIZED_NUMBER }), + contains(ContactsContract.Contacts.LOOKUP_KEY), + eq(new String[] { "testlookupkey" }), // selection args + isNull()); // sort order + } + + // Creates a cursor that points to one item of Contacts data with the specified + // columns. + private Cursor makeMockCursor(int id, String lookupKey, int starred, int hasPhone) { + Cursor mockCursor = mock(Cursor.class); + when(mockCursor.moveToFirst()).thenReturn(true); + doAnswer(new Answer<Boolean>() { + boolean mAccessed = false; + @Override + public Boolean answer(InvocationOnMock invocation) throws Throwable { + if (!mAccessed) { + mAccessed = true; + return true; + } + return false; + } + + }).when(mockCursor).moveToNext(); + + // id + when(mockCursor.getColumnIndex(ContactsContract.Contacts._ID)).thenReturn(0); + when(mockCursor.getInt(0)).thenReturn(id); + + // lookup key + when(mockCursor.getColumnIndex(ContactsContract.Contacts.LOOKUP_KEY)).thenReturn(1); + when(mockCursor.getString(1)).thenReturn(lookupKey); + + // starred + when(mockCursor.getColumnIndex(ContactsContract.Contacts.STARRED)).thenReturn(2); + when(mockCursor.getInt(2)).thenReturn(starred); + + // has phone number + when(mockCursor.getColumnIndex(ContactsContract.Contacts.HAS_PHONE_NUMBER)).thenReturn(3); + when(mockCursor.getInt(3)).thenReturn(hasPhone); + + return mockCursor; + } + private void assertStringArrayEquals(String message, String[] expected, String[] result) { String expectedString = Arrays.toString(expected); String resultString = Arrays.toString(result); diff --git a/services/tests/uiservicestests/src/com/android/server/notification/ZenModeFilteringTest.java b/services/tests/uiservicestests/src/com/android/server/notification/ZenModeFilteringTest.java index 0f18cc61a95a..abcc8c1e99cb 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/ZenModeFilteringTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/ZenModeFilteringTest.java @@ -50,11 +50,13 @@ import android.telephony.TelephonyManager; import android.test.suitebuilder.annotation.SmallTest; import android.testing.AndroidTestingRunner; import android.testing.TestableLooper; +import android.util.ArraySet; import com.android.internal.messages.nano.SystemMessageProto.SystemMessage; import com.android.internal.util.NotificationMessagingUtil; import com.android.server.UiServiceTestCase; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -72,6 +74,8 @@ public class ZenModeFilteringTest extends UiServiceTestCase { @Mock private TelephonyManager mTelephonyManager; + private long mTestStartTime; + @Before public void setUp() { MockitoAnnotations.initMocks(this); @@ -79,6 +83,13 @@ public class ZenModeFilteringTest extends UiServiceTestCase { // for repeat callers / matchesCallFilter mContext.addMockSystemService(TelephonyManager.class, mTelephonyManager); + mTestStartTime = System.currentTimeMillis(); + } + + @After + public void tearDown() { + // make sure to get rid of any data stored in repeat callers + mZenModeFiltering.cleanUpCallersAfter(mTestStartTime); } private NotificationRecord getNotificationRecord() { @@ -108,7 +119,10 @@ public class ZenModeFilteringTest extends UiServiceTestCase { return extras; } - private NotificationRecord getNotificationRecordWithPeople(String[] people) { + // Create a notification record with the people String array as the + // bundled extras, and the numbers ArraySet as additional phone numbers. + private NotificationRecord getRecordWithPeopleInfo(String[] people, + ArraySet<String> numbers) { // set up notification record NotificationRecord r = mock(NotificationRecord.class); StatusBarNotification sbn = mock(StatusBarNotification.class); @@ -116,6 +130,7 @@ public class ZenModeFilteringTest extends UiServiceTestCase { notification.extras = makeExtrasBundleWithPeople(people); when(sbn.getNotification()).thenReturn(notification); when(r.getSbn()).thenReturn(sbn); + when(r.getPhoneNumbers()).thenReturn(numbers); return r; } @@ -339,7 +354,7 @@ public class ZenModeFilteringTest extends UiServiceTestCase { // after calls given an email with an exact string match, make sure that // matchesCallFilter returns the right thing String[] mailSource = new String[]{"mailto:hello.world"}; - mZenModeFiltering.recordCall(getNotificationRecordWithPeople(mailSource)); + mZenModeFiltering.recordCall(getRecordWithPeopleInfo(mailSource, null)); // set up policy to only allow repeat callers Policy policy = new Policy( @@ -362,7 +377,7 @@ public class ZenModeFilteringTest extends UiServiceTestCase { when(mTelephonyManager.getNetworkCountryIso()).thenReturn("us"); String[] telSource = new String[]{"tel:+1-617-555-1212"}; - mZenModeFiltering.recordCall(getNotificationRecordWithPeople(telSource)); + mZenModeFiltering.recordCall(getRecordWithPeopleInfo(telSource, null)); // set up policy to only allow repeat callers Policy policy = new Policy( @@ -406,7 +421,7 @@ public class ZenModeFilteringTest extends UiServiceTestCase { when(mTelephonyManager.getNetworkCountryIso()).thenReturn("us"); String[] telSource = new String[]{"tel:%2B16175551212"}; - mZenModeFiltering.recordCall(getNotificationRecordWithPeople(telSource)); + mZenModeFiltering.recordCall(getRecordWithPeopleInfo(telSource, null)); // set up policy to only allow repeat callers Policy policy = new Policy( @@ -419,25 +434,64 @@ public class ZenModeFilteringTest extends UiServiceTestCase { Bundle different1 = makeExtrasBundleWithPeople(new String[]{"tel:%2B16175553434"}); Bundle different2 = makeExtrasBundleWithPeople(new String[]{"tel:+16175553434"}); - assertTrue("same number should match", + assertTrue("same number 1 should match", ZenModeFiltering.matchesCallFilter(mContext, ZEN_MODE_IMPORTANT_INTERRUPTIONS, policy, UserHandle.SYSTEM, same1, null, 0, 0)); - assertTrue("same number should match", + assertTrue("same number 2 should match", ZenModeFiltering.matchesCallFilter(mContext, ZEN_MODE_IMPORTANT_INTERRUPTIONS, policy, UserHandle.SYSTEM, same2, null, 0, 0)); - assertTrue("same number should match", + assertTrue("same number 3 should match", ZenModeFiltering.matchesCallFilter(mContext, ZEN_MODE_IMPORTANT_INTERRUPTIONS, policy, UserHandle.SYSTEM, same3, null, 0, 0)); - assertFalse("different number should not match", + assertFalse("different number 1 should not match", ZenModeFiltering.matchesCallFilter(mContext, ZEN_MODE_IMPORTANT_INTERRUPTIONS, policy, UserHandle.SYSTEM, different1, null, 0, 0)); - assertFalse("different number should not match", + assertFalse("different number 2 should not match", ZenModeFiltering.matchesCallFilter(mContext, ZEN_MODE_IMPORTANT_INTERRUPTIONS, policy, UserHandle.SYSTEM, different2, null, 0, 0)); } + + @Test + public void testMatchesCallFilter_repeatCallers_viaRecordPhoneNumbers() { + // make sure that phone numbers that are passed in via the NotificationRecord's + // cached phone numbers field (from a contact lookup if the record is provided a contact + // uri) also get recorded in the repeat callers list. + + // set up telephony manager behavior + when(mTelephonyManager.getNetworkCountryIso()).thenReturn("us"); + + String[] contactSource = new String[]{"content://contacts/lookup/uri-here"}; + ArraySet<String> contactNumbers = new ArraySet<>( + new String[]{"1-617-555-1212", "1-617-555-3434"}); + NotificationRecord record = getRecordWithPeopleInfo(contactSource, contactNumbers); + record.mergePhoneNumbers(contactNumbers); + mZenModeFiltering.recordCall(record); + + // set up policy to only allow repeat callers + Policy policy = new Policy( + PRIORITY_CATEGORY_REPEAT_CALLERS, 0, 0, 0, CONVERSATION_SENDERS_NONE); + + // both phone numbers should register here + Bundle tel1 = makeExtrasBundleWithPeople(new String[]{"tel:+1-617-555-1212"}); + Bundle tel2 = makeExtrasBundleWithPeople(new String[]{"tel:16175553434"}); + Bundle different = makeExtrasBundleWithPeople(new String[]{"tel:16175555656"}); + + assertTrue("contact number 1 should match", + ZenModeFiltering.matchesCallFilter(mContext, ZEN_MODE_IMPORTANT_INTERRUPTIONS, + policy, UserHandle.SYSTEM, + tel1, null, 0, 0)); + assertTrue("contact number 2 should match", + ZenModeFiltering.matchesCallFilter(mContext, ZEN_MODE_IMPORTANT_INTERRUPTIONS, + policy, UserHandle.SYSTEM, + tel2, null, 0, 0)); + assertFalse("different number should not match", + ZenModeFiltering.matchesCallFilter(mContext, ZEN_MODE_IMPORTANT_INTERRUPTIONS, + policy, UserHandle.SYSTEM, + different, null, 0, 0)); + } } diff --git a/services/tests/wmtests/src/com/android/server/wm/BackNavigationControllerTests.java b/services/tests/wmtests/src/com/android/server/wm/BackNavigationControllerTests.java index 687779d686d1..fb3a6264169a 100644 --- a/services/tests/wmtests/src/com/android/server/wm/BackNavigationControllerTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/BackNavigationControllerTests.java @@ -16,6 +16,7 @@ package com.android.server.wm; +import static android.view.WindowManager.LayoutParams.FIRST_APPLICATION_WINDOW; import static android.window.BackNavigationInfo.typeToString; import static com.google.common.truth.Truth.assertThat; @@ -71,7 +72,8 @@ public class BackNavigationControllerTests extends WindowTestsBase { @Test public void backTypeCrossActivityWhenBackToPreviousActivity() { Task task = createTopTaskWithActivity(); - mAtm.setFocusedTask(task.mTaskId, createActivityRecord(task)); + mAtm.setFocusedTask(task.mTaskId, + createAppWindow(task, FIRST_APPLICATION_WINDOW, "window").mActivityRecord); BackNavigationInfo backNavigationInfo = mBackNavigationController.startBackNavigation(task, new StubTransaction()); assertThat(backNavigationInfo).isNotNull(); @@ -85,7 +87,7 @@ public class BackNavigationControllerTests extends WindowTestsBase { @Test public void backNavInfoFullyPopulated() { Task task = createTopTaskWithActivity(); - createActivityRecord(task); + createAppWindow(task, FIRST_APPLICATION_WINDOW, "window"); // We need a mock screenshot so TaskSnapshotController taskSnapshotController = createMockTaskSnapshotController(); @@ -115,6 +117,7 @@ public class BackNavigationControllerTests extends WindowTestsBase { private Task createTopTaskWithActivity() { Task task = createTask(mDefaultDisplay); ActivityRecord record = createActivityRecord(task); + createWindow(null, FIRST_APPLICATION_WINDOW, record, "window"); when(record.mSurfaceControl.isValid()).thenReturn(true); mAtm.setFocusedTask(task.mTaskId, record); return task; diff --git a/services/tests/wmtests/src/com/android/server/wm/RootTaskTests.java b/services/tests/wmtests/src/com/android/server/wm/RootTaskTests.java index 65b5cf5f13c4..dcaa511bf7cc 100644 --- a/services/tests/wmtests/src/com/android/server/wm/RootTaskTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/RootTaskTests.java @@ -80,7 +80,6 @@ import android.app.IApplicationThread; import android.app.WindowConfiguration; import android.content.ComponentName; import android.content.pm.ActivityInfo; -import android.graphics.Rect; import android.os.Binder; import android.os.UserHandle; import android.platform.test.annotations.Presubmit; @@ -231,34 +230,6 @@ public class RootTaskTests extends WindowTestsBase { } @Test - public void testTaskOutset() { - final Task task = createTask(mDisplayContent); - final int taskOutset = 10; - spyOn(task); - doReturn(taskOutset).when(task).getTaskOutset(); - doReturn(true).when(task).inMultiWindowMode(); - - // Mock the resolved override windowing mode to non-fullscreen - final WindowConfiguration windowConfiguration = - task.getResolvedOverrideConfiguration().windowConfiguration; - spyOn(windowConfiguration); - doReturn(WINDOWING_MODE_MULTI_WINDOW) - .when(windowConfiguration).getWindowingMode(); - - // Prevent adjust task dimensions - doNothing().when(task).adjustForMinimalTaskDimensions(any(), any(), any()); - - final Rect taskBounds = new Rect(200, 200, 800, 1000); - // Update surface position and size by the given bounds. - task.setBounds(taskBounds); - - assertEquals(taskBounds.width() + 2 * taskOutset, task.getLastSurfaceSize().x); - assertEquals(taskBounds.height() + 2 * taskOutset, task.getLastSurfaceSize().y); - assertEquals(taskBounds.left - taskOutset, task.getLastSurfacePosition().x); - assertEquals(taskBounds.top - taskOutset, task.getLastSurfacePosition().y); - } - - @Test public void testActivityAndTaskGetsProperType() { final Task task1 = new TaskBuilder(mSupervisor).build(); ActivityRecord activity1 = createNonAttachedActivityRecord(mDisplayContent); diff --git a/services/usage/java/com/android/server/usage/BroadcastResponseStatsTracker.java b/services/usage/java/com/android/server/usage/BroadcastResponseStatsTracker.java index e65501329cdf..27e8d69aa762 100644 --- a/services/usage/java/com/android/server/usage/BroadcastResponseStatsTracker.java +++ b/services/usage/java/com/android/server/usage/BroadcastResponseStatsTracker.java @@ -16,6 +16,8 @@ package com.android.server.usage; +import static android.app.ActivityManager.procStateToString; + import static com.android.server.usage.UsageStatsService.DEBUG_RESPONSE_STATS; import android.annotation.ElapsedRealtimeLong; @@ -23,6 +25,7 @@ import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.UserIdInt; +import android.app.ActivityManager.ProcessState; import android.app.usage.BroadcastResponseStats; import android.os.UserHandle; import android.text.TextUtils; @@ -78,12 +81,17 @@ class BroadcastResponseStatsTracker { // TODO (206518114): Move all callbacks handling to a handler thread. void reportBroadcastDispatchEvent(int sourceUid, @NonNull String targetPackage, UserHandle targetUser, long idForResponseEvent, - @ElapsedRealtimeLong long timestampMs) { + @ElapsedRealtimeLong long timestampMs, @ProcessState int targetUidProcState) { if (DEBUG_RESPONSE_STATS) { - Slog.d(TAG, TextUtils.formatSimple( - "reportBroadcastDispatchEvent; srcUid=%d, tgtPkg=%s, tgtUsr=%d, id=%d, ts=%s", + Slog.d(TAG, TextUtils.formatSimple("reportBroadcastDispatchEvent; " + + "srcUid=%d, tgtPkg=%s, tgtUsr=%d, id=%d, ts=%s, state=%s", sourceUid, targetPackage, targetUser, idForResponseEvent, - TimeUtils.formatDuration(timestampMs))); + TimeUtils.formatDuration(timestampMs), procStateToString(targetUidProcState))); + } + if (targetUidProcState <= mAppStandby.getBroadcastResponseFgThresholdState()) { + // No need to track the broadcast response state while the target app is + // in the foreground. + return; } synchronized (mLock) { final LongSparseArray<BroadcastEvent> broadcastEvents = diff --git a/services/usage/java/com/android/server/usage/UsageStatsService.java b/services/usage/java/com/android/server/usage/UsageStatsService.java index 6906f20f26c2..4a761a7a47be 100644 --- a/services/usage/java/com/android/server/usage/UsageStatsService.java +++ b/services/usage/java/com/android/server/usage/UsageStatsService.java @@ -42,6 +42,7 @@ import android.annotation.Nullable; import android.annotation.SuppressLint; import android.annotation.UserIdInt; import android.app.ActivityManager; +import android.app.ActivityManager.ProcessState; import android.app.AppOpsManager; import android.app.IUidObserver; import android.app.PendingIntent; @@ -1813,6 +1814,7 @@ public class UsageStatsService extends SystemService implements synchronized (mLock) { mResponseStatsTracker.dump(idpw); } + return; } else if (arg != null && !arg.startsWith("-")) { // Anything else that doesn't start with '-' is a pkg to filter pkgs.add(arg); @@ -3042,9 +3044,9 @@ public class UsageStatsService extends SystemService implements @Override public void reportBroadcastDispatched(int sourceUid, @NonNull String targetPackage, @NonNull UserHandle targetUser, long idForResponseEvent, - @ElapsedRealtimeLong long timestampMs) { + @ElapsedRealtimeLong long timestampMs, @ProcessState int targetUidProcState) { mResponseStatsTracker.reportBroadcastDispatchEvent(sourceUid, targetPackage, - targetUser, idForResponseEvent, timestampMs); + targetUser, idForResponseEvent, timestampMs, targetUidProcState); } @Override diff --git a/services/wallpapereffectsgeneration/Android.bp b/services/wallpapereffectsgeneration/Android.bp new file mode 100644 index 000000000000..4dbb0fd82db1 --- /dev/null +++ b/services/wallpapereffectsgeneration/Android.bp @@ -0,0 +1,22 @@ +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"], +} + +filegroup { + name: "services.wallpapereffectsgeneration-sources", + srcs: ["java/**/*.java"], + path: "java", + visibility: ["//frameworks/base/services"], +} + +java_library_static { + name: "services.wallpapereffectsgeneration", + defaults: ["platform_service_defaults"], + srcs: [":services.wallpapereffectsgeneration-sources"], + libs: ["services.core"], +} diff --git a/services/wallpapereffectsgeneration/java/com/android/server/wallpapereffectsgeneration/RemoteWallpaperEffectsGenerationService.java b/services/wallpapereffectsgeneration/java/com/android/server/wallpapereffectsgeneration/RemoteWallpaperEffectsGenerationService.java new file mode 100644 index 000000000000..c228dafcee8e --- /dev/null +++ b/services/wallpapereffectsgeneration/java/com/android/server/wallpapereffectsgeneration/RemoteWallpaperEffectsGenerationService.java @@ -0,0 +1,113 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.server.wallpapereffectsgeneration; + +import android.annotation.NonNull; +import android.content.ComponentName; +import android.content.Context; +import android.os.IBinder; +import android.service.wallpapereffectsgeneration.IWallpaperEffectsGenerationService; +import android.service.wallpapereffectsgeneration.WallpaperEffectsGenerationService; +import android.text.format.DateUtils; + +import com.android.internal.infra.AbstractMultiplePendingRequestsRemoteService; + + +/** + * Proxy to the + * {@link android.service.wallpapereffectsgeneration.WallpaperEffectsGenerationService} + * implementation in another process. + */ +public class RemoteWallpaperEffectsGenerationService extends + AbstractMultiplePendingRequestsRemoteService<RemoteWallpaperEffectsGenerationService, + IWallpaperEffectsGenerationService> { + + private static final String TAG = + RemoteWallpaperEffectsGenerationService.class.getSimpleName(); + + private static final long TIMEOUT_REMOTE_REQUEST_MILLIS = 2 * DateUtils.SECOND_IN_MILLIS; + + private final RemoteWallpaperEffectsGenerationServiceCallback mCallback; + + public RemoteWallpaperEffectsGenerationService(Context context, + ComponentName componentName, int userId, + RemoteWallpaperEffectsGenerationServiceCallback callback, + boolean bindInstantServiceAllowed, + boolean verbose) { + super(context, WallpaperEffectsGenerationService.SERVICE_INTERFACE, + componentName, userId, callback, + context.getMainThreadHandler(), + bindInstantServiceAllowed ? Context.BIND_ALLOW_INSTANT : 0, + verbose, /* initialCapacity= */ 1); + mCallback = callback; + } + + @Override + protected IWallpaperEffectsGenerationService getServiceInterface(IBinder service) { + return IWallpaperEffectsGenerationService.Stub.asInterface(service); + } + + @Override + protected long getTimeoutIdleBindMillis() { + return PERMANENT_BOUND_TIMEOUT_MS; + } + + @Override + protected long getRemoteRequestMillis() { + return TIMEOUT_REMOTE_REQUEST_MILLIS; + } + + /** + * Schedules a request to bind to the remote service. + */ + public void reconnect() { + super.scheduleBind(); + } + + /** + * Schedule async request on remote service. + */ + public void scheduleOnResolvedService( + @NonNull AsyncRequest<IWallpaperEffectsGenerationService> request) { + scheduleAsyncRequest(request); + } + + /** + * Execute async request on remote service immediately instead of sending it to Handler queue. + */ + public void executeOnResolvedService( + @NonNull AsyncRequest<IWallpaperEffectsGenerationService> request) { + executeAsyncRequest(request); + } + + /** + * Notifies server (WallpaperEffectsGenerationPerUserService) about unexpected events.. + */ + public interface RemoteWallpaperEffectsGenerationServiceCallback + extends VultureCallback<RemoteWallpaperEffectsGenerationService> { + /** + * Notifies change in connected state of the remote service. + */ + void onConnectedStateChanged(boolean connected); + } + + @Override // from AbstractRemoteService + protected void handleOnConnectedStateChanged(boolean connected) { + if (mCallback != null) { + mCallback.onConnectedStateChanged(connected); + } + } +} diff --git a/services/wallpapereffectsgeneration/java/com/android/server/wallpapereffectsgeneration/WallpaperEffectsGenerationManagerService.java b/services/wallpapereffectsgeneration/java/com/android/server/wallpapereffectsgeneration/WallpaperEffectsGenerationManagerService.java new file mode 100644 index 000000000000..0d0b3e098750 --- /dev/null +++ b/services/wallpapereffectsgeneration/java/com/android/server/wallpapereffectsgeneration/WallpaperEffectsGenerationManagerService.java @@ -0,0 +1,185 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.wallpapereffectsgeneration; + +import static android.Manifest.permission.MANAGE_WALLPAPER_EFFECTS_GENERATION; +import static android.app.ActivityManagerInternal.ALLOW_NON_FULL; +import static android.content.Context.WALLPAPER_EFFECTS_GENERATION_SERVICE; +import static android.content.pm.PackageManager.PERMISSION_GRANTED; + +import android.annotation.NonNull; +import android.annotation.Nullable; +import android.annotation.UserIdInt; +import android.app.ActivityManagerInternal; +import android.app.wallpapereffectsgeneration.CinematicEffectRequest; +import android.app.wallpapereffectsgeneration.CinematicEffectResponse; +import android.app.wallpapereffectsgeneration.ICinematicEffectListener; +import android.app.wallpapereffectsgeneration.IWallpaperEffectsGenerationManager; +import android.content.Context; +import android.os.Binder; +import android.os.RemoteException; +import android.os.ResultReceiver; +import android.os.ShellCallback; +import android.util.Slog; + +import com.android.server.LocalServices; +import com.android.server.infra.AbstractMasterSystemService; +import com.android.server.infra.FrameworkResourcesServiceNameResolver; +import com.android.server.wm.ActivityTaskManagerInternal; + +import java.io.FileDescriptor; +import java.util.function.Consumer; + +/** + * A service used to return wallpaper effect given a request. + */ +public class WallpaperEffectsGenerationManagerService extends + AbstractMasterSystemService<WallpaperEffectsGenerationManagerService, + WallpaperEffectsGenerationPerUserService> { + private static final String TAG = + WallpaperEffectsGenerationManagerService.class.getSimpleName(); + private static final boolean DEBUG = false; + private static final int MAX_TEMP_SERVICE_DURATION_MS = 1_000 * 60 * 2; // 2 minutes + private final ActivityTaskManagerInternal mActivityTaskManagerInternal; + + public WallpaperEffectsGenerationManagerService(Context context) { + super(context, + new FrameworkResourcesServiceNameResolver(context, + com.android.internal.R.string.config_defaultWallpaperEffectsGenerationService), + null, + PACKAGE_UPDATE_POLICY_NO_REFRESH | PACKAGE_RESTART_POLICY_NO_REFRESH); + mActivityTaskManagerInternal = LocalServices.getService(ActivityTaskManagerInternal.class); + } + + @Override + protected WallpaperEffectsGenerationPerUserService newServiceLocked(int resolvedUserId, + boolean disabled) { + return new WallpaperEffectsGenerationPerUserService(this, mLock, resolvedUserId); + } + + @Override + public void onStart() { + publishBinderService(WALLPAPER_EFFECTS_GENERATION_SERVICE, + new WallpaperEffectsGenerationManagerStub()); + } + + @Override + protected void enforceCallingPermissionForManagement() { + getContext().enforceCallingPermission(MANAGE_WALLPAPER_EFFECTS_GENERATION, TAG); + } + + @Override // from AbstractMasterSystemService + protected void onServicePackageUpdatedLocked(@UserIdInt int userId) { + final WallpaperEffectsGenerationPerUserService service = peekServiceForUserLocked(userId); + if (service != null) { + service.onPackageUpdatedLocked(); + } + } + + @Override // from AbstractMasterSystemService + protected void onServicePackageRestartedLocked(@UserIdInt int userId) { + final WallpaperEffectsGenerationPerUserService service = peekServiceForUserLocked(userId); + if (service != null) { + service.onPackageRestartedLocked(); + } + } + + @Override + protected int getMaximumTemporaryServiceDurationMs() { + return MAX_TEMP_SERVICE_DURATION_MS; + } + + private class WallpaperEffectsGenerationManagerStub + extends IWallpaperEffectsGenerationManager.Stub { + @Override + public void generateCinematicEffect(@NonNull CinematicEffectRequest request, + @NonNull ICinematicEffectListener listener) { + if (!runForUserLocked("generateCinematicEffect", (service) -> + service.onGenerateCinematicEffectLocked(request, listener))) { + try { + listener.onCinematicEffectGenerated( + new CinematicEffectResponse.Builder( + CinematicEffectResponse.CINEMATIC_EFFECT_STATUS_ERROR, + request.getTaskId()).build()); + } catch (RemoteException e) { + if (DEBUG) { + Slog.d(TAG, "fail to invoke cinematic effect listener for task[" + + request.getTaskId() + "]"); + } + } + } + } + + @Override + public void returnCinematicEffectResponse(@NonNull CinematicEffectResponse response) { + runForUserLocked("returnCinematicResponse", (service) -> + service.onReturnCinematicEffectResponseLocked(response)); + } + + public void onShellCommand(@Nullable FileDescriptor in, @Nullable FileDescriptor out, + @Nullable FileDescriptor err, + @NonNull String[] args, @Nullable ShellCallback callback, + @NonNull ResultReceiver resultReceiver) { + new WallpaperEffectsGenerationManagerServiceShellCommand( + WallpaperEffectsGenerationManagerService.this) + .exec(this, in, out, err, args, callback, resultReceiver); + } + + /** + * Execute the operation for the user locked. Return true if + * WallpaperEffectsGenerationPerUserService is found for the user. + * Otherwise return false. + */ + private boolean runForUserLocked(@NonNull final String func, + @NonNull final Consumer<WallpaperEffectsGenerationPerUserService> c) { + ActivityManagerInternal am = LocalServices.getService(ActivityManagerInternal.class); + final int userId = am.handleIncomingUser(Binder.getCallingPid(), Binder.getCallingUid(), + Binder.getCallingUserHandle().getIdentifier(), false, ALLOW_NON_FULL, + null, null); + if (DEBUG) { + Slog.d(TAG, "runForUserLocked:" + func + " from pid=" + Binder.getCallingPid() + + ", uid=" + Binder.getCallingUid()); + } + Context ctx = getContext(); + if (!(ctx.checkCallingPermission(MANAGE_WALLPAPER_EFFECTS_GENERATION) + == PERMISSION_GRANTED + || mServiceNameResolver.isTemporary(userId) + || mActivityTaskManagerInternal.isCallerRecents(Binder.getCallingUid()))) { + String msg = "Permission Denial: Cannot call " + func + " from pid=" + + Binder.getCallingPid() + ", uid=" + Binder.getCallingUid(); + Slog.w(TAG, msg); + throw new SecurityException(msg); + } + final long origId = Binder.clearCallingIdentity(); + boolean accepted = false; + try { + synchronized (mLock) { + final WallpaperEffectsGenerationPerUserService service = + getServiceForUserLocked(userId); + if (service != null) { + accepted = true; + c.accept(service); + } + } + } finally { + Binder.restoreCallingIdentity(origId); + } + + return accepted; + } + } +} diff --git a/services/wallpapereffectsgeneration/java/com/android/server/wallpapereffectsgeneration/WallpaperEffectsGenerationManagerServiceShellCommand.java b/services/wallpapereffectsgeneration/java/com/android/server/wallpapereffectsgeneration/WallpaperEffectsGenerationManagerServiceShellCommand.java new file mode 100644 index 000000000000..fc6f75fc254e --- /dev/null +++ b/services/wallpapereffectsgeneration/java/com/android/server/wallpapereffectsgeneration/WallpaperEffectsGenerationManagerServiceShellCommand.java @@ -0,0 +1,85 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.wallpapereffectsgeneration; + +import android.annotation.NonNull; +import android.os.ShellCommand; + +import java.io.PrintWriter; + +/** + * The shell command implementation for the WallpaperEffectsGenerationService. + */ +public class WallpaperEffectsGenerationManagerServiceShellCommand extends ShellCommand { + + private static final String TAG = + WallpaperEffectsGenerationManagerServiceShellCommand.class.getSimpleName(); + + private final WallpaperEffectsGenerationManagerService mService; + + public WallpaperEffectsGenerationManagerServiceShellCommand( + @NonNull WallpaperEffectsGenerationManagerService service) { + mService = service; + } + + @Override + public int onCommand(String cmd) { + if (cmd == null) { + return handleDefaultCommands(cmd); + } + final PrintWriter pw = getOutPrintWriter(); + switch (cmd) { + case "set": { + final String what = getNextArgRequired(); + switch (what) { + case "temporary-service": { + final int userId = Integer.parseInt(getNextArgRequired()); + String serviceName = getNextArg(); + if (serviceName == null) { + mService.resetTemporaryService(userId); + pw.println("WallpaperEffectsGenerationService temporarily reset. "); + return 0; + } + final int duration = Integer.parseInt(getNextArgRequired()); + mService.setTemporaryService(userId, serviceName, duration); + pw.println("WallpaperEffectsGenerationService temporarily set to " + + serviceName + " for " + duration + "ms"); + break; + } + } + } + break; + default: + return handleDefaultCommands(cmd); + } + return 0; + } + + @Override + public void onHelp() { + try (PrintWriter pw = getOutPrintWriter()) { + pw.println("WallpaperEffectsGenerationService commands:"); + pw.println(" help"); + pw.println(" Prints this help text."); + pw.println(""); + pw.println(" set temporary-service USER_ID [COMPONENT_NAME DURATION]"); + pw.println(" Temporarily (for DURATION ms) changes the service implemtation."); + pw.println(" To reset, call with just the USER_ID argument."); + pw.println(""); + } + } +} diff --git a/services/wallpapereffectsgeneration/java/com/android/server/wallpapereffectsgeneration/WallpaperEffectsGenerationPerUserService.java b/services/wallpapereffectsgeneration/java/com/android/server/wallpapereffectsgeneration/WallpaperEffectsGenerationPerUserService.java new file mode 100644 index 000000000000..d541051e5ab2 --- /dev/null +++ b/services/wallpapereffectsgeneration/java/com/android/server/wallpapereffectsgeneration/WallpaperEffectsGenerationPerUserService.java @@ -0,0 +1,274 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.wallpapereffectsgeneration; + +import android.Manifest; +import android.annotation.NonNull; +import android.annotation.Nullable; +import android.app.AppGlobals; +import android.app.wallpapereffectsgeneration.CinematicEffectRequest; +import android.app.wallpapereffectsgeneration.CinematicEffectResponse; +import android.app.wallpapereffectsgeneration.ICinematicEffectListener; +import android.content.ComponentName; +import android.content.pm.PackageManager; +import android.content.pm.PackageManager.NameNotFoundException; +import android.content.pm.ServiceInfo; +import android.os.RemoteException; +import android.util.Slog; + +import com.android.internal.annotations.GuardedBy; +import com.android.server.infra.AbstractPerUserSystemService; + +/** + * Per-user instance of {@link WallpaperEffectsGenerationManagerService}. + */ +public class WallpaperEffectsGenerationPerUserService extends + AbstractPerUserSystemService<WallpaperEffectsGenerationPerUserService, + WallpaperEffectsGenerationManagerService> implements + RemoteWallpaperEffectsGenerationService.RemoteWallpaperEffectsGenerationServiceCallback { + + private static final String TAG = + WallpaperEffectsGenerationPerUserService.class.getSimpleName(); + + @GuardedBy("mLock") + private CinematicEffectListenerWrapper mCinematicEffectListenerWrapper; + + @Nullable + @GuardedBy("mLock") + private RemoteWallpaperEffectsGenerationService mRemoteService; + + protected WallpaperEffectsGenerationPerUserService( + WallpaperEffectsGenerationManagerService master, + Object lock, int userId) { + super(master, lock, userId); + } + + @Override // from PerUserSystemService + protected ServiceInfo newServiceInfoLocked(@NonNull ComponentName serviceComponent) + throws NameNotFoundException { + ServiceInfo si; + try { + si = AppGlobals.getPackageManager().getServiceInfo(serviceComponent, + PackageManager.GET_META_DATA, mUserId); + } catch (RemoteException e) { + throw new NameNotFoundException("Could not get service for " + serviceComponent); + } + if (!Manifest.permission.BIND_WALLPAPER_EFFECTS_GENERATION_SERVICE.equals(si.permission)) { + Slog.w(TAG, "WallpaperEffectsGenerationService from '" + si.packageName + + "' does not require permission " + + Manifest.permission.BIND_WALLPAPER_EFFECTS_GENERATION_SERVICE); + throw new SecurityException("Service does not require permission " + + Manifest.permission.BIND_WALLPAPER_EFFECTS_GENERATION_SERVICE); + } + return si; + } + + @GuardedBy("mLock") + @Override // from PerUserSystemService + protected boolean updateLocked(boolean disabled) { + final boolean enabledChanged = super.updateLocked(disabled); + updateRemoteServiceLocked(); + return enabledChanged; + } + + /** + * Notifies the service of a new cinematic effect generation request. + */ + @GuardedBy("mLock") + public void onGenerateCinematicEffectLocked( + @NonNull CinematicEffectRequest cinematicEffectRequest, + @NonNull ICinematicEffectListener cinematicEffectListener) { + String newTaskId = cinematicEffectRequest.getTaskId(); + // Previous request is still being processed. + if (mCinematicEffectListenerWrapper != null) { + if (mCinematicEffectListenerWrapper.mTaskId.equals(newTaskId)) { + invokeCinematicListenerAndCleanup( + new CinematicEffectResponse.Builder( + CinematicEffectResponse.CINEMATIC_EFFECT_STATUS_PENDING, newTaskId) + .build() + ); + } else { + invokeCinematicListenerAndCleanup( + new CinematicEffectResponse.Builder( + CinematicEffectResponse.CINEMATIC_EFFECT_STATUS_TOO_MANY_REQUESTS, + newTaskId).build() + ); + } + return; + } + RemoteWallpaperEffectsGenerationService remoteService = ensureRemoteServiceLocked(); + if (remoteService != null) { + remoteService.executeOnResolvedService( + s -> s.onGenerateCinematicEffect(cinematicEffectRequest)); + mCinematicEffectListenerWrapper = + new CinematicEffectListenerWrapper(newTaskId, cinematicEffectListener); + } else { + if (isDebug()) { + Slog.d(TAG, "Remote service not found"); + } + try { + cinematicEffectListener.onCinematicEffectGenerated( + createErrorCinematicEffectResponse(newTaskId)); + } catch (RemoteException e) { + if (isDebug()) { + Slog.d(TAG, "Failed to invoke cinematic effect listener for task [" + newTaskId + + "]"); + } + } + } + } + + /** + * Notifies the service of a generated cinematic effect response. + */ + @GuardedBy("mLock") + public void onReturnCinematicEffectResponseLocked( + @NonNull CinematicEffectResponse cinematicEffectResponse) { + invokeCinematicListenerAndCleanup(cinematicEffectResponse); + } + + @GuardedBy("mLock") + private void updateRemoteServiceLocked() { + if (mRemoteService != null) { + mRemoteService.destroy(); + mRemoteService = null; + } + // End existing response and clean up listener for next request. + if (mCinematicEffectListenerWrapper != null) { + invokeCinematicListenerAndCleanup( + createErrorCinematicEffectResponse(mCinematicEffectListenerWrapper.mTaskId)); + } + + } + + void onPackageUpdatedLocked() { + if (isDebug()) { + Slog.v(TAG, "onPackageUpdatedLocked()"); + } + destroyAndRebindRemoteService(); + } + + void onPackageRestartedLocked() { + if (isDebug()) { + Slog.v(TAG, "onPackageRestartedLocked()"); + } + destroyAndRebindRemoteService(); + } + + private void destroyAndRebindRemoteService() { + if (mRemoteService == null) { + return; + } + + if (isDebug()) { + Slog.d(TAG, "Destroying the old remote service."); + } + mRemoteService.destroy(); + mRemoteService = null; + mRemoteService = ensureRemoteServiceLocked(); + if (mRemoteService != null) { + if (isDebug()) { + Slog.d(TAG, "Rebinding to the new remote service."); + } + mRemoteService.reconnect(); + } + // Clean up listener for next request. + if (mCinematicEffectListenerWrapper != null) { + invokeCinematicListenerAndCleanup( + createErrorCinematicEffectResponse(mCinematicEffectListenerWrapper.mTaskId)); + } + } + + private CinematicEffectResponse createErrorCinematicEffectResponse(String taskId) { + return new CinematicEffectResponse.Builder( + CinematicEffectResponse.CINEMATIC_EFFECT_STATUS_ERROR, + taskId).build(); + } + + @GuardedBy("mLock") + private void invokeCinematicListenerAndCleanup( + CinematicEffectResponse cinematicEffectResponse) { + try { + if (mCinematicEffectListenerWrapper != null + && mCinematicEffectListenerWrapper.mListener != null) { + mCinematicEffectListenerWrapper.mListener.onCinematicEffectGenerated( + cinematicEffectResponse); + } else { + if (isDebug()) { + Slog.w(TAG, "Cinematic effect listener not found for task[" + + mCinematicEffectListenerWrapper.mTaskId + "]"); + } + } + } catch (RemoteException e) { + if (isDebug()) { + Slog.w(TAG, "Error invoking cinematic effect listener for task[" + + mCinematicEffectListenerWrapper.mTaskId + "]"); + } + } finally { + mCinematicEffectListenerWrapper = null; + } + } + + @GuardedBy("mLock") + @Nullable + private RemoteWallpaperEffectsGenerationService ensureRemoteServiceLocked() { + if (mRemoteService == null) { + final String serviceName = getComponentNameLocked(); + if (serviceName == null) { + if (mMaster.verbose) { + Slog.v(TAG, "ensureRemoteServiceLocked(): not set"); + } + return null; + } + ComponentName serviceComponent = ComponentName.unflattenFromString(serviceName); + + mRemoteService = new RemoteWallpaperEffectsGenerationService(getContext(), + serviceComponent, mUserId, this, + mMaster.isBindInstantServiceAllowed(), mMaster.verbose); + } + + return mRemoteService; + } + + @Override // from RemoteWallpaperEffectsGenerationService + public void onServiceDied(RemoteWallpaperEffectsGenerationService service) { + Slog.w(TAG, "remote wallpaper effects generation service died"); + updateRemoteServiceLocked(); + } + + @Override // from RemoteWallpaperEffectsGenerationService + public void onConnectedStateChanged(boolean connected) { + if (!connected) { + Slog.w(TAG, "remote wallpaper effects generation service disconnected"); + updateRemoteServiceLocked(); + } + } + + private static final class CinematicEffectListenerWrapper { + @NonNull + private final String mTaskId; + @NonNull + private final ICinematicEffectListener mListener; + + CinematicEffectListenerWrapper( + @NonNull final String taskId, + @NonNull final ICinematicEffectListener listener) { + mTaskId = taskId; + mListener = listener; + } + } +} diff --git a/telephony/java/android/telephony/Annotation.java b/telephony/java/android/telephony/Annotation.java index e88106cb95fe..86b98f1cbe79 100644 --- a/telephony/java/android/telephony/Annotation.java +++ b/telephony/java/android/telephony/Annotation.java @@ -127,7 +127,9 @@ public class Annotation { ApnSetting.TYPE_EMERGENCY, ApnSetting.TYPE_MCX, ApnSetting.TYPE_XCAP, - // ApnSetting.TYPE_ENTERPRISE + ApnSetting.TYPE_BIP, + ApnSetting.TYPE_VSIM, + ApnSetting.TYPE_ENTERPRISE }) @Retention(RetentionPolicy.SOURCE) public @interface ApnType { @@ -707,6 +709,9 @@ public class Annotation { NetworkCapabilities.NET_CAPABILITY_VSIM, NetworkCapabilities.NET_CAPABILITY_BIP, NetworkCapabilities.NET_CAPABILITY_HEAD_UNIT, + NetworkCapabilities.NET_CAPABILITY_MMTEL, + NetworkCapabilities.NET_CAPABILITY_PRIORITIZE_LATENCY, + NetworkCapabilities.NET_CAPABILITY_PRIORITIZE_BANDWIDTH }) public @interface NetCapability { } @@ -721,4 +726,16 @@ public class Annotation { NetworkAgent.VALIDATION_STATUS_NOT_VALID }) public @interface ValidationStatus {} + + /** @hide */ + @Retention(RetentionPolicy.SOURCE) + @IntDef(prefix = { "NET_CAPABILITY_ENTERPRISE_SUB_LEVEL" }, value = { + NetworkCapabilities.NET_ENTERPRISE_ID_1, + NetworkCapabilities.NET_ENTERPRISE_ID_2, + NetworkCapabilities.NET_ENTERPRISE_ID_3, + NetworkCapabilities.NET_ENTERPRISE_ID_4, + NetworkCapabilities.NET_ENTERPRISE_ID_5 + }) + + public @interface EnterpriseId {} } diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index e0e791321819..3c277b7de018 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -4540,9 +4540,7 @@ public class CarrierConfigManager { * Passing this value as {@link #KEY_SUBSCRIPTION_GROUP_UUID_STRING} will remove the * subscription from a group instead of adding it to a group. * - * TODO: Expose in a future release. - * - * @hide + * <p>This value will work all the way back to {@link android.os.Build.VERSION_CODES#Q}. */ public static final String REMOVE_GROUP_UUID_STRING = "00000000-0000-0000-0000-000000000000"; @@ -4555,9 +4553,7 @@ public class CarrierConfigManager { * <p>If set to {@link #REMOVE_GROUP_UUID_STRING}, then the subscription will be removed from * its current group. * - * TODO: unhide this key. - * - * @hide + * <p>This key will work all the way back to {@link android.os.Build.VERSION_CODES#Q}. */ public static final String KEY_SUBSCRIPTION_GROUP_UUID_STRING = "subscription_group_uuid_string"; @@ -4605,17 +4601,15 @@ public class CarrierConfigManager { "data_switch_validation_min_gap_long"; /** - * A boolean property indicating whether this subscription should be managed as an opportunistic - * subscription. - * - * If true, then this subscription will be selected based on available coverage and will not be - * available for a user in settings menus for selecting macro network providers. If unset, - * defaults to “false”. - * - * TODO: unhide this key. - * - * @hide - */ + * A boolean property indicating whether this subscription should be managed as an opportunistic + * subscription. + * + * If true, then this subscription will be selected based on available coverage and will not be + * available for a user in settings menus for selecting macro network providers. If unset, + * defaults to “false”. + * + * <p>This key will work all the way back to {@link android.os.Build.VERSION_CODES#Q}. + */ public static final String KEY_IS_OPPORTUNISTIC_SUBSCRIPTION_BOOL = "is_opportunistic_subscription_bool"; diff --git a/telephony/java/android/telephony/data/DataProfile.java b/telephony/java/android/telephony/data/DataProfile.java index a166a5d6404c..fa1bae41f433 100644 --- a/telephony/java/android/telephony/data/DataProfile.java +++ b/telephony/java/android/telephony/data/DataProfile.java @@ -26,10 +26,10 @@ import android.annotation.SystemApi; import android.net.NetworkCapabilities; import android.os.Parcel; import android.os.Parcelable; -import android.telephony.Annotation.ApnType; import android.telephony.Annotation.NetCapability; import android.telephony.TelephonyManager; import android.telephony.TelephonyManager.NetworkTypeBitMask; +import android.telephony.data.ApnSetting.ApnType; import android.telephony.data.ApnSetting.AuthType; import android.text.TextUtils; @@ -245,8 +245,7 @@ public final class DataProfile implements Parcelable { * @return The supported APN types bitmask. * @deprecated Use {@link #getApnSetting()} and {@link ApnSetting#getApnTypeBitmask()} instead. */ - @Deprecated - public @ApnType int getSupportedApnTypesBitmask() { + @Deprecated public @ApnType int getSupportedApnTypesBitmask() { if (mApnSetting != null) { return mApnSetting.getApnTypeBitmask(); } @@ -425,6 +424,12 @@ public final class DataProfile implements Parcelable { return ApnSetting.TYPE_MCX; case NetworkCapabilities.NET_CAPABILITY_IA: return ApnSetting.TYPE_IA; + case NetworkCapabilities.NET_CAPABILITY_BIP: + return ApnSetting.TYPE_BIP; + case NetworkCapabilities.NET_CAPABILITY_VSIM: + return ApnSetting.TYPE_VSIM; + case NetworkCapabilities.NET_CAPABILITY_ENTERPRISE: + return ApnSetting.TYPE_ENTERPRISE; default: return ApnSetting.TYPE_NONE; } diff --git a/telephony/java/android/telephony/data/DataServiceCallback.java b/telephony/java/android/telephony/data/DataServiceCallback.java index 1ff6ec1779cd..ec734716f6e4 100644 --- a/telephony/java/android/telephony/data/DataServiceCallback.java +++ b/telephony/java/android/telephony/data/DataServiceCallback.java @@ -261,9 +261,10 @@ public class DataServiceCallback { } /** - * Unthrottles the APN on the current transport. There is no matching "APN throttle" method. - * Instead, the APN is throttled when {@link IDataService#setupDataCall} fails within - * the time specified by {@link DataCallResponse#getRetryDurationMillis}. + * Unthrottles the APN on the current transport. + * The APN is throttled when {@link IDataService#setupDataCall} fails within + * the time specified by {@link DataCallResponse#getRetryDurationMillis} and will remain + * throttled until this method is called. * <p/> * see: {@link DataCallResponse#getRetryDurationMillis} * @@ -284,9 +285,9 @@ public class DataServiceCallback { /** * Unthrottles the DataProfile on the current transport. - * There is no matching "DataProfile throttle" method. - * Instead, the DataProfile is throttled when {@link IDataService#setupDataCall} fails within - * the time specified by {@link DataCallResponse#getRetryDurationMillis}. + * The DataProfile is throttled when {@link IDataService#setupDataCall} fails within + * the time specified by {@link DataCallResponse#getRetryDurationMillis} and will remain + * throttled until this method is called. * <p/> * see: {@link DataCallResponse#getRetryDurationMillis} * diff --git a/telephony/java/android/telephony/data/TrafficDescriptor.java b/telephony/java/android/telephony/data/TrafficDescriptor.java index 2178fc1717b9..66dcf8f49e9c 100644 --- a/telephony/java/android/telephony/data/TrafficDescriptor.java +++ b/telephony/java/android/telephony/data/TrafficDescriptor.java @@ -21,8 +21,13 @@ import android.annotation.Nullable; import android.os.Parcel; import android.os.Parcelable; -import java.util.Arrays; +import java.math.BigInteger; +import java.nio.ByteBuffer; import java.util.Objects; +import java.util.Set; +import java.util.UUID; +import java.util.regex.Matcher; +import java.util.regex.Pattern; /** * A traffic descriptor, as defined in 3GPP TS 24.526 Section 5.2. It is used for UE Route Selection @@ -31,24 +36,215 @@ import java.util.Objects; * not specify the end point to be used for the data call. */ public final class TrafficDescriptor implements Parcelable { + /** + * The OS/App id + * + * @hide + */ + public static final class OsAppId { + /** + * OSId for "Android", using UUID version 5 with namespace ISO OSI. + * Prepended to the OsAppId in TrafficDescriptor to use for URSP matching. + */ + public static final UUID ANDROID_OS_ID = + UUID.fromString("97a498e3-fc92-5c94-8986-0333d06e4e47"); + + /** + * Allowed app ids. + */ + // The following app ids are the only apps id Android supports. OEMs or vendors are + // prohibited to modify/extend the allowed list, especially passing the real package name to + // the network. + private static final Set<String> ALLOWED_APP_IDS = Set.of( + "ENTERPRISE", "PRIORITIZE_LATENCY", "PRIORITIZE_BANDWIDTH", "CBS" + ); + + /** OS id in UUID format. */ + private final @NonNull UUID mOsId; + + /** + * App id in string format. Note that Android will not allow use specific app id. This must + * be a category/capability identifier. + */ + private final @NonNull String mAppId; + + /** + * The differentiator when multiple traffic descriptor has the same OS and app id. Must be + * greater than 1. + */ + private final int mDifferentiator; + + /** + * Constructor + * + * @param osId OS id in UUID format. + * @param appId App id in string format. Note that Android will not allow use specific app + * id. This must be a category/capability identifier. + */ + public OsAppId(@NonNull UUID osId, @NonNull String appId) { + this(osId, appId, 1); + } + + /** + * Constructor + * + * @param osId OS id in UUID format. + * @param appId App id in string format. Note that Android will not allow use specific app + * id. This must be a category/capability identifier. + * @param differentiator The differentiator when multiple traffic descriptor has the same + * OS and app id. Must be greater than 0. + */ + public OsAppId(@NonNull UUID osId, @NonNull String appId, int differentiator) { + Objects.requireNonNull(osId); + Objects.requireNonNull(appId); + if (differentiator < 1) { + throw new IllegalArgumentException("Invalid differentiator " + differentiator); + } + + mOsId = osId; + mAppId = appId; + mDifferentiator = differentiator; + } + + /** + * Constructor from raw byte array. + * + * @param rawOsAppId The raw OS/App id. + */ + public OsAppId(@NonNull byte[] rawOsAppId) { + try { + ByteBuffer bb = ByteBuffer.wrap(rawOsAppId); + // OS id is the first 16 bytes. + mOsId = new UUID(bb.getLong(), bb.getLong()); + // App id length is 1 byte. + int appIdLen = bb.get(); + // The remaining is the app id + differentiator. + byte[] appIdAndDifferentiator = new byte[appIdLen]; + bb.get(appIdAndDifferentiator, 0, appIdLen); + // Extract trailing numbers, for example, "ENTERPRISE", "ENTERPRISE3". + String appIdAndDifferentiatorStr = new String(appIdAndDifferentiator); + Pattern pattern = Pattern.compile("[^0-9]+([0-9]+)$"); + Matcher matcher = pattern.matcher(new String(appIdAndDifferentiator)); + if (matcher.find()) { + mDifferentiator = Integer.parseInt(matcher.group(1)); + mAppId = appIdAndDifferentiatorStr.replace(matcher.group(1), ""); + } else { + mDifferentiator = 1; + mAppId = appIdAndDifferentiatorStr; + } + } catch (Exception e) { + throw new IllegalArgumentException("Failed to decode " + (rawOsAppId != null + ? new BigInteger(1, rawOsAppId).toString(16) : null)); + } + } + + /** + * @return The OS id in UUID format. + */ + public @NonNull UUID getOsId() { + return mOsId; + } + + /** + * @return App id in string format. Note that Android will not allow use specific app id. + * This must be a category/capability identifier. + */ + public @NonNull String getAppId() { + return mAppId; + } + + /** + * @return The differentiator when multiple traffic descriptor has the same OS and app id. + * Must be greater than 1. + */ + public int getDifferentiator() { + return mDifferentiator; + } + + /** + * @return OS/App id in raw byte format. + */ + public @NonNull byte[] getBytes() { + byte[] osAppId = (mAppId + (mDifferentiator > 1 ? mDifferentiator : "")).getBytes(); + // 16 bytes for UUID, 1 byte for length of osAppId, and up to 255 bytes for osAppId + ByteBuffer bb = ByteBuffer.allocate(16 + 1 + osAppId.length); + bb.putLong(mOsId.getMostSignificantBits()); + bb.putLong(mOsId.getLeastSignificantBits()); + bb.put((byte) osAppId.length); + bb.put(osAppId); + return bb.array(); + } + + @Override + public String toString() { + return "[OsAppId: OS=" + mOsId + ", App=" + mAppId + ", differentiator=" + + mDifferentiator + ", raw=" + + new BigInteger(1, getBytes()).toString(16) + "]"; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + OsAppId osAppId = (OsAppId) o; + return mDifferentiator == osAppId.mDifferentiator && mOsId.equals(osAppId.mOsId) + && mAppId.equals(osAppId.mAppId); + } + + @Override + public int hashCode() { + return Objects.hash(mOsId, mAppId, mDifferentiator); + } + } + private final String mDnn; - private final byte[] mOsAppId; + private final OsAppId mOsAppId; private TrafficDescriptor(@NonNull Parcel in) { mDnn = in.readString(); - mOsAppId = in.createByteArray(); + byte[] osAppIdBytes = in.createByteArray(); + OsAppId osAppId = null; + if (osAppIdBytes != null) { + osAppId = new OsAppId(osAppIdBytes); + } + mOsAppId = osAppId; + + enforceAllowedIds(); } /** * Create a traffic descriptor, as defined in 3GPP TS 24.526 Section 5.2 * @param dnn optional DNN, which must be used for traffic matching, if present - * @param osAppId OsId + osAppId of the traffic descriptor + * @param osAppIdRawBytes Raw bytes of OsId + osAppId of the traffic descriptor * * @hide */ - public TrafficDescriptor(String dnn, byte[] osAppId) { + public TrafficDescriptor(String dnn, @Nullable byte[] osAppIdRawBytes) { mDnn = dnn; + OsAppId osAppId = null; + if (osAppIdRawBytes != null) { + osAppId = new OsAppId(osAppIdRawBytes); + } mOsAppId = osAppId; + + enforceAllowedIds(); + } + + /** + * Enforce the OS id and app id are in the allowed list. + * + * @throws IllegalArgumentException if ids are not allowed. + */ + private void enforceAllowedIds() { + if (mOsAppId != null && !mOsAppId.getOsId().equals(OsAppId.ANDROID_OS_ID)) { + throw new IllegalArgumentException("OS id " + mOsAppId.getOsId() + " does not match " + + OsAppId.ANDROID_OS_ID); + } + + if (mOsAppId != null && !OsAppId.ALLOWED_APP_IDS.contains(mOsAppId.getAppId())) { + throw new IllegalArgumentException("Illegal app id " + mOsAppId.getAppId() + + ". Only allowing one of the following " + OsAppId.ALLOWED_APP_IDS); + } } /** @@ -61,13 +257,13 @@ public final class TrafficDescriptor implements Parcelable { } /** - * OsAppId is the app id as defined in 3GPP TS 24.526 Section 5.2, and it identifies a traffic - * category. It includes the OS Id component of the field as defined in the specs. - * @return the OS App ID of this traffic descriptor if one is included by the network, null - * otherwise. + * OsAppId identifies a broader traffic category. Although it names Os/App id, it only includes + * OS version with a general/broader category id used as app id. + * + * @return The id in byte format. {@code null} if not available. */ public @Nullable byte[] getOsAppId() { - return mOsAppId; + return mOsAppId != null ? mOsAppId.getBytes() : null; } @Override @@ -77,13 +273,13 @@ public final class TrafficDescriptor implements Parcelable { @NonNull @Override public String toString() { - return "TrafficDescriptor={mDnn=" + mDnn + ", mOsAppId=" + mOsAppId + "}"; + return "TrafficDescriptor={mDnn=" + mDnn + ", " + mOsAppId + "}"; } @Override public void writeToParcel(@NonNull Parcel dest, int flags) { dest.writeString(mDnn); - dest.writeByteArray(mOsAppId); + dest.writeByteArray(mOsAppId != null ? mOsAppId.getBytes() : null); } public static final @NonNull Parcelable.Creator<TrafficDescriptor> CREATOR = @@ -104,7 +300,7 @@ public final class TrafficDescriptor implements Parcelable { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; TrafficDescriptor that = (TrafficDescriptor) o; - return Objects.equals(mDnn, that.mDnn) && Arrays.equals(mOsAppId, that.mOsAppId); + return Objects.equals(mDnn, that.mDnn) && Objects.equals(mOsAppId, that.mOsAppId); } @Override @@ -148,7 +344,7 @@ public final class TrafficDescriptor implements Parcelable { } /** - * Set the OS App ID (including OS Id as defind in the specs). + * Set the OS App ID (including OS Id as defined in the specs). * * @return The same instance of the builder. */ diff --git a/telephony/java/android/telephony/ims/RcsClientConfiguration.java b/telephony/java/android/telephony/ims/RcsClientConfiguration.java index c25ace0c6a62..f367e404a35b 100644 --- a/telephony/java/android/telephony/ims/RcsClientConfiguration.java +++ b/telephony/java/android/telephony/ims/RcsClientConfiguration.java @@ -34,7 +34,7 @@ public final class RcsClientConfiguration implements Parcelable { /**@hide*/ @StringDef(prefix = "RCS_PROFILE_", - value = {RCS_PROFILE_1_0, RCS_PROFILE_2_3}) + value = {RCS_PROFILE_1_0, RCS_PROFILE_2_3, RCS_PROFILE_2_4}) public @interface StringRcsProfile {} /** @@ -45,6 +45,10 @@ public final class RcsClientConfiguration implements Parcelable { * RCS profile UP 2.3 */ public static final String RCS_PROFILE_2_3 = "UP_2.3"; + /** + * RCS profile UP 2.4 + */ + public static final String RCS_PROFILE_2_4 = "UP_2.4"; private String mRcsVersion; private String mRcsProfile; @@ -58,8 +62,8 @@ public final class RcsClientConfiguration implements Parcelable { * @param rcsVersion The parameter identifies the RCS version supported * by the client. Refer to GSMA RCC.07 "rcs_version" parameter. * @param rcsProfile Identifies a fixed set of RCS services that are - * supported by the client. See {@link #RCS_PROFILE_1_0 } or - * {@link #RCS_PROFILE_2_3 } + * supported by the client. See {@link #RCS_PROFILE_1_0 }, + * {@link #RCS_PROFILE_2_3 } or {@link #RCS_PROFILE_2_4 } * @param clientVendor Identifies the vendor providing the RCS client. * @param clientVersion Identifies the RCS client version. Refer to GSMA * RCC.07 "client_version" parameter. @@ -80,8 +84,8 @@ public final class RcsClientConfiguration implements Parcelable { * @param rcsVersion The parameter identifies the RCS version supported * by the client. Refer to GSMA RCC.07 "rcs_version" parameter. * @param rcsProfile Identifies a fixed set of RCS services that are - * supported by the client. See {@link #RCS_PROFILE_1_0 } or - * {@link #RCS_PROFILE_2_3 } + * supported by the client. See {@link #RCS_PROFILE_1_0 }, + * {@link #RCS_PROFILE_2_3 } or {@link #RCS_PROFILE_2_4 } * @param clientVendor Identifies the vendor providing the RCS client. * @param clientVersion Identifies the RCS client version. Refer to GSMA * RCC.07 "client_version" parameter. diff --git a/tests/AttestationVerificationTest/src/android/security/attestationverification/SystemAttestationVerificationTest.kt b/tests/AttestationVerificationTest/src/android/security/attestationverification/SystemAttestationVerificationTest.kt index 48bfd6f5d33c..62902929fcd5 100644 --- a/tests/AttestationVerificationTest/src/android/security/attestationverification/SystemAttestationVerificationTest.kt +++ b/tests/AttestationVerificationTest/src/android/security/attestationverification/SystemAttestationVerificationTest.kt @@ -11,10 +11,20 @@ import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith import com.google.common.truth.Truth.assertThat +import android.security.attestationverification.AttestationVerificationManager.PARAM_CHALLENGE +import android.security.attestationverification.AttestationVerificationManager.PROFILE_PEER_DEVICE import android.security.attestationverification.AttestationVerificationManager.PROFILE_SELF_TRUSTED -import android.security.attestationverification.AttestationVerificationManager.TYPE_PUBLIC_KEY +import android.security.attestationverification.AttestationVerificationManager.RESULT_FAILURE +import android.security.attestationverification.AttestationVerificationManager.RESULT_SUCCESS import android.security.attestationverification.AttestationVerificationManager.RESULT_UNKNOWN +import android.security.attestationverification.AttestationVerificationManager.TYPE_PUBLIC_KEY +import android.security.attestationverification.AttestationVerificationManager.TYPE_CHALLENGE +import android.security.keystore.KeyGenParameterSpec +import android.security.keystore.KeyProperties import java.lang.IllegalArgumentException +import java.io.ByteArrayOutputStream +import java.security.KeyPairGenerator +import java.security.KeyStore import java.time.Duration import java.util.concurrent.CompletableFuture import java.util.concurrent.TimeUnit @@ -23,25 +33,26 @@ import java.util.concurrent.TimeUnit @SmallTest @RunWith(AndroidJUnit4::class) class SystemAttestationVerificationTest { - @get:Rule val rule = ActivityScenarioRule(TestActivity::class.java) private lateinit var activity: Activity private lateinit var avm: AttestationVerificationManager + private lateinit var androidKeystore: KeyStore @Before fun setup() { rule.getScenario().onActivity { avm = it.getSystemService(AttestationVerificationManager::class.java) activity = it + androidKeystore = KeyStore.getInstance(ANDROID_KEYSTORE).apply { load(null) } } } @Test fun verifyAttestation_returnsUnknown() { val future = CompletableFuture<Int>() - val profile = AttestationProfile(PROFILE_SELF_TRUSTED) + val profile = AttestationProfile(PROFILE_PEER_DEVICE) avm.verifyAttestation(profile, TYPE_PUBLIC_KEY, Bundle(), ByteArray(0), activity.mainExecutor) { result, _ -> future.complete(result) @@ -51,9 +62,82 @@ class SystemAttestationVerificationTest { } @Test - fun verifyToken_returnsUnknown() { + fun verifyAttestation_returnsFailureWithEmptyAttestation() { val future = CompletableFuture<Int>() val profile = AttestationProfile(PROFILE_SELF_TRUSTED) + avm.verifyAttestation(profile, TYPE_CHALLENGE, Bundle(), ByteArray(0), + activity.mainExecutor) { result, _ -> + future.complete(result) + } + + assertThat(future.getSoon()).isEqualTo(RESULT_FAILURE) + } + + @Test + fun verifyAttestation_returnsFailureWithEmptyRequirements() { + val future = CompletableFuture<Int>() + val selfTrusted = TestSelfTrustedAttestation("test", "challengeStr") + avm.verifyAttestation(selfTrusted.profile, selfTrusted.localBindingType, + Bundle(), selfTrusted.attestation, activity.mainExecutor) { result, _ -> + future.complete(result) + } + assertThat(future.getSoon()).isEqualTo(RESULT_FAILURE) + } + + @Test + fun verifyAttestation_returnsFailureWithWrongBindingType() { + val future = CompletableFuture<Int>() + val selfTrusted = TestSelfTrustedAttestation("test", "challengeStr") + avm.verifyAttestation(selfTrusted.profile, TYPE_PUBLIC_KEY, + selfTrusted.requirements, selfTrusted.attestation, activity.mainExecutor) { result, _ -> + future.complete(result) + } + assertThat(future.getSoon()).isEqualTo(RESULT_FAILURE) + } + + @Test + fun verifyAttestation_returnsFailureWithWrongRequirements() { + val future = CompletableFuture<Int>() + val selfTrusted = TestSelfTrustedAttestation("test", "challengeStr") + val wrongKeyRequirements = Bundle() + wrongKeyRequirements.putByteArray( + "wrongBindingKey", "challengeStr".encodeToByteArray()) + avm.verifyAttestation(selfTrusted.profile, selfTrusted.localBindingType, + wrongKeyRequirements, selfTrusted.attestation, activity.mainExecutor) { result, _ -> + future.complete(result) + } + assertThat(future.getSoon()).isEqualTo(RESULT_FAILURE) + } + + @Test + fun verifyAttestation_returnsFailureWithWrongChallenge() { + val future = CompletableFuture<Int>() + val selfTrusted = TestSelfTrustedAttestation("test", "challengeStr") + val wrongChallengeRequirements = Bundle() + wrongChallengeRequirements.putByteArray(PARAM_CHALLENGE, "wrong".encodeToByteArray()) + avm.verifyAttestation(selfTrusted.profile, selfTrusted.localBindingType, + wrongChallengeRequirements, selfTrusted.attestation, activity.mainExecutor) { + result, _ -> future.complete(result) + } + assertThat(future.getSoon()).isEqualTo(RESULT_FAILURE) + } + + // TODO(b/216144791): Add more failure tests for PROFILE_SELF_TRUSTED. + @Test + fun verifyAttestation_returnsSuccess() { + val future = CompletableFuture<Int>() + val selfTrusted = TestSelfTrustedAttestation("test", "challengeStr") + avm.verifyAttestation(selfTrusted.profile, selfTrusted.localBindingType, + selfTrusted.requirements, selfTrusted.attestation, activity.mainExecutor) { result, _ -> + future.complete(result) + } + assertThat(future.getSoon()).isEqualTo(RESULT_SUCCESS) + } + + @Test + fun verifyToken_returnsUnknown() { + val future = CompletableFuture<Int>() + val profile = AttestationProfile(PROFILE_PEER_DEVICE) avm.verifyAttestation(profile, TYPE_PUBLIC_KEY, Bundle(), ByteArray(0), activity.mainExecutor) { _, token -> val result = avm.verifyToken(profile, TYPE_PUBLIC_KEY, Bundle(), token, null) @@ -66,7 +150,7 @@ class SystemAttestationVerificationTest { @Test fun verifyToken_tooBigMaxAgeThrows() { val future = CompletableFuture<VerificationToken>() - val profile = AttestationProfile(PROFILE_SELF_TRUSTED) + val profile = AttestationProfile(PROFILE_PEER_DEVICE) avm.verifyAttestation(profile, TYPE_PUBLIC_KEY, Bundle(), ByteArray(0), activity.mainExecutor) { _, token -> future.complete(token) @@ -87,4 +171,52 @@ class SystemAttestationVerificationTest { super.onCreate(savedInstanceState) } } + + inner class TestSelfTrustedAttestation(val alias: String, val challenge: String) { + val profile = AttestationProfile(PROFILE_SELF_TRUSTED) + val localBindingType = TYPE_CHALLENGE + val requirements: Bundle + val attestation: ByteArray + + init { + val challengeByteArray = challenge.encodeToByteArray() + generateAndStoreKey(alias, challengeByteArray) + attestation = generateCertificatesByteArray(alias) + requirements = Bundle() + requirements.putByteArray(PARAM_CHALLENGE, challengeByteArray) + } + + private fun generateAndStoreKey(alias: String, challenge: ByteArray) { + val kpg: KeyPairGenerator = KeyPairGenerator.getInstance( + KeyProperties.KEY_ALGORITHM_EC, + ANDROID_KEYSTORE + ) + val parameterSpec: KeyGenParameterSpec = KeyGenParameterSpec.Builder( + alias, + KeyProperties.PURPOSE_SIGN or KeyProperties.PURPOSE_VERIFY + ).run { + // a challenge results in a generated attestation + setAttestationChallenge(challenge) + setDigests(KeyProperties.DIGEST_SHA256, KeyProperties.DIGEST_SHA512) + build() + } + kpg.initialize(parameterSpec) + kpg.generateKeyPair() + } + + private fun generateCertificatesByteArray(alias: String): ByteArray { + val pkEntry = androidKeystore.getEntry(alias, null) as KeyStore.PrivateKeyEntry + val certs = pkEntry.certificateChain + val bos = ByteArrayOutputStream() + certs.forEach { + bos.write(it.encoded) + } + return bos.toByteArray() + } + } + + companion object { + private const val TAG = "AVFTEST" + private const val ANDROID_KEYSTORE = "AndroidKeyStore" + } } diff --git a/tests/FlickerTests/AndroidTest.xml b/tests/FlickerTests/AndroidTest.xml index 566c725a3414..98d13e81551d 100644 --- a/tests/FlickerTests/AndroidTest.xml +++ b/tests/FlickerTests/AndroidTest.xml @@ -26,8 +26,16 @@ <option name="shell-timeout" value="6600s" /> <option name="test-timeout" value="6600s" /> <option name="hidden-api-checks" value="false" /> + <option name="device-listeners" + value="com.android.server.wm.flicker.TraceFileReadyListener" /> </test> <metrics_collector class="com.android.tradefed.device.metric.FilePullerLogCollector"> + <option name="pull-pattern-keys" value="(\w)+\.winscope" /> + <option name="pull-pattern-keys" value="(\w)+\.mp4" /> + <option name="collect-on-run-ended-only" value="false" /> + <option name="clean-up" value="true" /> + </metrics_collector> + <metrics_collector class="com.android.tradefed.device.metric.FilePullerLogCollector"> <option name="directory-keys" value="/sdcard/flicker" /> <option name="collect-on-run-ended-only" value="true" /> <option name="clean-up" value="true" /> diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/helpers/TwoActivitiesAppHelper.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/helpers/TwoActivitiesAppHelper.kt index 8fe00297139a..b66c45c7c9f0 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/helpers/TwoActivitiesAppHelper.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/helpers/TwoActivitiesAppHelper.kt @@ -19,11 +19,13 @@ package com.android.server.wm.flicker.helpers import android.app.Instrumentation import android.support.test.launcherhelper.ILauncherStrategy import android.support.test.launcherhelper.LauncherStrategyFactory +import android.view.Display import androidx.test.uiautomator.By import androidx.test.uiautomator.UiDevice import androidx.test.uiautomator.Until import com.android.server.wm.flicker.testapp.ActivityOptions import com.android.server.wm.traces.common.FlickerComponentName +import com.android.server.wm.traces.common.WindowManagerConditionsFactory import com.android.server.wm.traces.parser.toFlickerComponent import com.android.server.wm.traces.parser.windowmanager.WindowManagerStateHelper @@ -36,6 +38,10 @@ class TwoActivitiesAppHelper @JvmOverloads constructor( .getInstance(instr) .launcherStrategy ) : StandardAppHelper(instr, launcherName, component, launcherStrategy) { + + private val secondActivityComponent = + ActivityOptions.SIMPLE_ACTIVITY_AUTO_FOCUS_COMPONENT_NAME.toFlickerComponent() + fun openSecondActivity(device: UiDevice, wmHelper: WindowManagerStateHelper) { val launchActivityButton = By.res(getPackage(), LAUNCH_SECOND_ACTIVITY) val button = device.wait(Until.findObject(launchActivityButton), FIND_TIMEOUT) @@ -47,8 +53,11 @@ class TwoActivitiesAppHelper @JvmOverloads constructor( button.click() device.wait(Until.gone(launchActivityButton), FIND_TIMEOUT) - wmHelper.waitForAppTransitionIdle() - wmHelper.waitForFullScreenApp(component) + wmHelper.waitForFullScreenApp(secondActivityComponent) + wmHelper.waitFor( + WindowManagerConditionsFactory.isAppTransitionIdle(Display.DEFAULT_DISPLAY), + WindowManagerConditionsFactory.hasLayersAnimating().negate() + ) } companion object { diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/ActivitiesTransitionTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/ActivitiesTransitionTest.kt index 648353e34f92..195af589d77c 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/ActivitiesTransitionTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/ActivitiesTransitionTest.kt @@ -70,7 +70,7 @@ class ActivitiesTransitionTest(val testSpec: FlickerTestParameter) { fun buildFlicker(): FlickerBuilder { return FlickerBuilder(instrumentation).apply { setup { - eachRun { + test { testApp.launchViaIntent(wmHelper) wmHelper.waitForFullScreenApp(testApp.component) } diff --git a/tests/vcn/Android.bp b/tests/vcn/Android.bp index 41f73cd9c706..228520e8545b 100644 --- a/tests/vcn/Android.bp +++ b/tests/vcn/Android.bp @@ -18,6 +18,7 @@ android_test { "java/**/*.kt", ], platform_apis: true, + defaults: ["framework-connectivity-test-defaults"], test_suites: ["device-tests"], certificate: "platform", static_libs: [ @@ -28,6 +29,7 @@ android_test { "net-tests-utils", "platform-test-annotations", "services.core", + "service-connectivity-tiramisu-pre-jarjar", ], libs: [ "android.test.runner", diff --git a/tests/vcn/AndroidManifest.xml b/tests/vcn/AndroidManifest.xml index 2ad9aac67029..a8f657c89f76 100644 --- a/tests/vcn/AndroidManifest.xml +++ b/tests/vcn/AndroidManifest.xml @@ -16,7 +16,8 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.frameworks.tests.vcn"> - + <uses-sdk android:minSdkVersion="33" + android:targetSdkVersion="33"/> <application> <uses-library android:name="android.test.runner" /> </application> |