diff options
391 files changed, 7463 insertions, 2435 deletions
diff --git a/Android.bp b/Android.bp index 516fc9c55222..811755d0bdaf 100644 --- a/Android.bp +++ b/Android.bp @@ -368,6 +368,7 @@ java_defaults { jarjar_rules: ":framework-jarjar-rules", javac_shard_size: 150, plugins: [ + "cached-property-annotation-processor", "view-inspector-annotation-processor", "staledataclass-annotation-processor", "error_prone_android_framework", diff --git a/apex/jobscheduler/framework/java/android/app/job/JobParameters.java b/apex/jobscheduler/framework/java/android/app/job/JobParameters.java index 52a761f8d486..31d2ecdb83b0 100644 --- a/apex/jobscheduler/framework/java/android/app/job/JobParameters.java +++ b/apex/jobscheduler/framework/java/android/app/job/JobParameters.java @@ -34,6 +34,7 @@ import android.os.Parcel; import android.os.Parcelable; import android.os.PersistableBundle; import android.os.RemoteException; +import android.os.Process; import android.system.SystemCleaner; import android.util.Log; @@ -638,6 +639,12 @@ public class JobParameters implements Parcelable { * @hide */ public void enableCleaner() { + // JobParameters objects are passed by reference in local Binder + // transactions for clients running as SYSTEM. The life cycle of the + // JobParameters objects are no longer controlled by the client. + if (Process.myUid() == Process.SYSTEM_UID) { + return; + } if (mJobCleanupCallback == null) { initCleaner(new JobCleanupCallback(IJobCallback.Stub.asInterface(callback), jobId)); } diff --git a/core/api/current.txt b/core/api/current.txt index 67b328057efe..34f1b6e9246a 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -6858,43 +6858,43 @@ package android.app { @FlaggedApi("android.app.api_rich_ongoing") public static class Notification.ProgressStyle extends android.app.Notification.Style { ctor public Notification.ProgressStyle(); + method @NonNull public android.app.Notification.ProgressStyle addProgressPoint(@NonNull android.app.Notification.ProgressStyle.Point); method @NonNull public android.app.Notification.ProgressStyle addProgressSegment(@NonNull android.app.Notification.ProgressStyle.Segment); - method @NonNull public android.app.Notification.ProgressStyle addProgressStep(@NonNull android.app.Notification.ProgressStyle.Step); method public int getProgress(); method @Nullable public android.graphics.drawable.Icon getProgressEndIcon(); method public int getProgressMax(); + method @NonNull public java.util.List<android.app.Notification.ProgressStyle.Point> getProgressPoints(); method @NonNull public java.util.List<android.app.Notification.ProgressStyle.Segment> getProgressSegments(); method @Nullable public android.graphics.drawable.Icon getProgressStartIcon(); - method @NonNull public java.util.List<android.app.Notification.ProgressStyle.Step> getProgressSteps(); method @Nullable public android.graphics.drawable.Icon getProgressTrackerIcon(); method public boolean isProgressIndeterminate(); method public boolean isStyledByProgress(); method @NonNull public android.app.Notification.ProgressStyle setProgress(int); method @NonNull public android.app.Notification.ProgressStyle setProgressEndIcon(@Nullable android.graphics.drawable.Icon); method @NonNull public android.app.Notification.ProgressStyle setProgressIndeterminate(boolean); + method @NonNull public android.app.Notification.ProgressStyle setProgressPoints(@NonNull java.util.List<android.app.Notification.ProgressStyle.Point>); method @NonNull public android.app.Notification.ProgressStyle setProgressSegments(@NonNull java.util.List<android.app.Notification.ProgressStyle.Segment>); method @NonNull public android.app.Notification.ProgressStyle setProgressStartIcon(@Nullable android.graphics.drawable.Icon); - method @NonNull public android.app.Notification.ProgressStyle setProgressSteps(@NonNull java.util.List<android.app.Notification.ProgressStyle.Step>); method @NonNull public android.app.Notification.ProgressStyle setProgressTrackerIcon(@Nullable android.graphics.drawable.Icon); method @NonNull public android.app.Notification.ProgressStyle setStyledByProgress(boolean); } + public static final class Notification.ProgressStyle.Point { + ctor public Notification.ProgressStyle.Point(int); + method @ColorInt public int getColor(); + method public int getId(); + method public int getPosition(); + method @NonNull public android.app.Notification.ProgressStyle.Point setColor(@ColorInt int); + method @NonNull public android.app.Notification.ProgressStyle.Point setId(int); + } + public static final class Notification.ProgressStyle.Segment { ctor public Notification.ProgressStyle.Segment(int); method @ColorInt public int getColor(); + method public int getId(); method public int getLength(); - method public int getStableId(); method @NonNull public android.app.Notification.ProgressStyle.Segment setColor(@ColorInt int); - method @NonNull public android.app.Notification.ProgressStyle.Segment setStableId(int); - } - - public static final class Notification.ProgressStyle.Step { - ctor public Notification.ProgressStyle.Step(int); - method @ColorInt public int getColor(); - method public int getPosition(); - method public int getStableId(); - method @NonNull public android.app.Notification.ProgressStyle.Step setColor(@ColorInt int); - method @NonNull public android.app.Notification.ProgressStyle.Step setStableId(int); + method @NonNull public android.app.Notification.ProgressStyle.Segment setId(int); } public abstract static class Notification.Style { @@ -8673,6 +8673,8 @@ package android.app.admin { field public static final int TAG_MAX_SCREEN_LOCK_TIMEOUT_SET = 210019; // 0x33463 field public static final int TAG_MEDIA_MOUNT = 210013; // 0x3345d field public static final int TAG_MEDIA_UNMOUNT = 210014; // 0x3345e + field @FlaggedApi("android.nfc.nfc_state_change_security_log_event_enabled") public static final int TAG_NFC_DISABLED = 210046; // 0x3347e + field @FlaggedApi("android.nfc.nfc_state_change_security_log_event_enabled") public static final int TAG_NFC_ENABLED = 210045; // 0x3347d field public static final int TAG_OS_SHUTDOWN = 210010; // 0x3345a field public static final int TAG_OS_STARTUP = 210009; // 0x33459 field public static final int TAG_PACKAGE_INSTALLED = 210041; // 0x33479 @@ -8787,7 +8789,7 @@ package android.app.appfunctions { @FlaggedApi("android.app.appfunctions.flags.enable_app_function_manager") public abstract class AppFunctionService extends android.app.Service { ctor public AppFunctionService(); method @NonNull public final android.os.IBinder onBind(@Nullable android.content.Intent); - method @Deprecated @MainThread public abstract void onExecuteFunction(@NonNull android.app.appfunctions.ExecuteAppFunctionRequest, @NonNull java.util.function.Consumer<android.app.appfunctions.ExecuteAppFunctionResponse>); + method @Deprecated @MainThread public void onExecuteFunction(@NonNull android.app.appfunctions.ExecuteAppFunctionRequest, @NonNull java.util.function.Consumer<android.app.appfunctions.ExecuteAppFunctionResponse>); method @MainThread public void onExecuteFunction(@NonNull android.app.appfunctions.ExecuteAppFunctionRequest, @NonNull android.os.CancellationSignal, @NonNull java.util.function.Consumer<android.app.appfunctions.ExecuteAppFunctionResponse>); field @NonNull public static final String SERVICE_INTERFACE = "android.app.appfunctions.AppFunctionService"; } @@ -8822,13 +8824,12 @@ package android.app.appfunctions { field @NonNull public static final android.os.Parcelable.Creator<android.app.appfunctions.ExecuteAppFunctionResponse> CREATOR; field public static final String PROPERTY_RETURN_VALUE = "returnValue"; field public static final int RESULT_APP_UNKNOWN_ERROR = 2; // 0x2 - field public static final int RESULT_CANCELLED = 7; // 0x7 + field public static final int RESULT_CANCELLED = 6; // 0x6 field public static final int RESULT_DENIED = 1; // 0x1 - field public static final int RESULT_DISABLED = 6; // 0x6 + field public static final int RESULT_DISABLED = 5; // 0x5 field public static final int RESULT_INTERNAL_ERROR = 3; // 0x3 field public static final int RESULT_INVALID_ARGUMENT = 4; // 0x4 field public static final int RESULT_OK = 0; // 0x0 - field public static final int RESULT_TIMED_OUT = 5; // 0x5 } } @@ -12114,6 +12115,7 @@ package android.content.om { method @NonNull public void setResourceValue(@NonNull String, int, @NonNull String, @Nullable String); method @NonNull public void setResourceValue(@NonNull String, @NonNull android.os.ParcelFileDescriptor, @Nullable String); method @FlaggedApi("android.content.res.asset_file_descriptor_frro") @NonNull public void setResourceValue(@NonNull String, @NonNull android.content.res.AssetFileDescriptor, @Nullable String); + method @FlaggedApi("android.content.res.dimension_frro") public void setResourceValue(@NonNull String, float, int, @Nullable String); method public void setTargetOverlayable(@Nullable String); } @@ -32821,7 +32823,7 @@ package android.os { field @NonNull public static final String RELEASE_OR_PREVIEW_DISPLAY; field @Deprecated public static final String SDK; field public static final int SDK_INT; - field @FlaggedApi("android.sdk.major_minor_versioning_scheme") public static final int SDK_MINOR_INT; + field @FlaggedApi("android.sdk.major_minor_versioning_scheme") public static final int SDK_INT_FULL; field public static final String SECURITY_PATCH; } @@ -32865,6 +32867,9 @@ package android.os { field public static final int VANILLA_ICE_CREAM = 35; // 0x23 } + @FlaggedApi("android.sdk.major_minor_versioning_scheme") public static class Build.VERSION_CODES_FULL { + } + public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable { ctor public Bundle(); ctor public Bundle(ClassLoader); @@ -36989,7 +36994,7 @@ package android.provider { } @FlaggedApi("android.provider.new_default_account_api_enabled") public static final class ContactsContract.RawContacts.DefaultAccount { - ctor public ContactsContract.RawContacts.DefaultAccount(); + method @FlaggedApi("android.provider.new_default_account_api_enabled") @NonNull public static android.provider.ContactsContract.RawContacts.DefaultAccount.DefaultAccountAndState getDefaultAccountForNewContacts(@NonNull android.content.ContentResolver); } @FlaggedApi("android.provider.new_default_account_api_enabled") public static final class ContactsContract.RawContacts.DefaultAccount.DefaultAccountAndState { @@ -54956,6 +54961,7 @@ package android.view.accessibility { method public boolean addAccessibilityStateChangeListener(@NonNull android.view.accessibility.AccessibilityManager.AccessibilityStateChangeListener); method public void addAccessibilityStateChangeListener(@NonNull android.view.accessibility.AccessibilityManager.AccessibilityStateChangeListener, @Nullable android.os.Handler); method public void addAudioDescriptionRequestedChangeListener(@NonNull java.util.concurrent.Executor, @NonNull android.view.accessibility.AccessibilityManager.AudioDescriptionRequestedChangeListener); + method @FlaggedApi("com.android.graphics.hwui.flags.high_contrast_text_small_text_rect") public void addHighContrastTextStateChangeListener(@NonNull java.util.concurrent.Executor, @NonNull android.view.accessibility.AccessibilityManager.HighContrastTextStateChangeListener); method public boolean addTouchExplorationStateChangeListener(@NonNull android.view.accessibility.AccessibilityManager.TouchExplorationStateChangeListener); method public void addTouchExplorationStateChangeListener(@NonNull android.view.accessibility.AccessibilityManager.TouchExplorationStateChangeListener, @Nullable android.os.Handler); method @ColorInt public int getAccessibilityFocusColor(); @@ -54968,12 +54974,14 @@ package android.view.accessibility { method public static boolean isAccessibilityButtonSupported(); method public boolean isAudioDescriptionRequested(); method public boolean isEnabled(); + method @FlaggedApi("com.android.graphics.hwui.flags.high_contrast_text_small_text_rect") public boolean isHighContrastTextEnabled(); method public boolean isRequestFromAccessibilityTool(); method public boolean isTouchExplorationEnabled(); method public void removeAccessibilityRequestPreparer(android.view.accessibility.AccessibilityRequestPreparer); method public boolean removeAccessibilityServicesStateChangeListener(@NonNull android.view.accessibility.AccessibilityManager.AccessibilityServicesStateChangeListener); method public boolean removeAccessibilityStateChangeListener(@NonNull android.view.accessibility.AccessibilityManager.AccessibilityStateChangeListener); method public boolean removeAudioDescriptionRequestedChangeListener(@NonNull android.view.accessibility.AccessibilityManager.AudioDescriptionRequestedChangeListener); + method @FlaggedApi("com.android.graphics.hwui.flags.high_contrast_text_small_text_rect") public void removeHighContrastTextStateChangeListener(@NonNull android.view.accessibility.AccessibilityManager.HighContrastTextStateChangeListener); method public boolean removeTouchExplorationStateChangeListener(@NonNull android.view.accessibility.AccessibilityManager.TouchExplorationStateChangeListener); method public void sendAccessibilityEvent(android.view.accessibility.AccessibilityEvent); field public static final int FLAG_CONTENT_CONTROLS = 4; // 0x4 @@ -54993,6 +55001,10 @@ package android.view.accessibility { method public void onAudioDescriptionRequestedChanged(boolean); } + @FlaggedApi("com.android.graphics.hwui.flags.high_contrast_text_small_text_rect") public static interface AccessibilityManager.HighContrastTextStateChangeListener { + method public void onHighContrastTextStateChanged(boolean); + } + public static interface AccessibilityManager.TouchExplorationStateChangeListener { method public void onTouchExplorationStateChanged(boolean); } diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 4b6c62ecb032..7e43e4664d8a 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -11950,6 +11950,10 @@ package android.provider { field @Deprecated public static final String STATE = "state"; } + @FlaggedApi("android.provider.new_default_account_api_enabled") public static final class ContactsContract.RawContacts.DefaultAccount { + method @FlaggedApi("android.provider.new_default_account_api_enabled") @RequiresPermission(android.Manifest.permission.SET_DEFAULT_ACCOUNT_FOR_CONTACTS) public static void setDefaultAccountForNewContacts(@NonNull android.content.ContentResolver, @NonNull android.provider.ContactsContract.RawContacts.DefaultAccount.DefaultAccountAndState); + } + public static final class ContactsContract.Settings implements android.provider.ContactsContract.SettingsColumns { method @RequiresPermission(android.Manifest.permission.SET_DEFAULT_ACCOUNT_FOR_CONTACTS) public static void setDefaultAccount(@NonNull android.content.ContentResolver, @Nullable android.accounts.Account); } diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index 5b556cc22640..95d3ea51c4d3 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -1960,8 +1960,12 @@ public final class ActivityThread extends ClientTransactionHandler @Override public void dumpCacheInfo(ParcelFileDescriptor pfd, String[] args) { - PropertyInvalidatedCache.dumpCacheInfo(pfd, args); - IoUtils.closeQuietly(pfd); + try { + PropertyInvalidatedCache.dumpCacheInfo(pfd, args); + BroadcastStickyCache.dump(pfd); + } finally { + IoUtils.closeQuietly(pfd); + } } private File getDatabasesDir(Context context) { diff --git a/core/java/android/app/AppOpsManager.java b/core/java/android/app/AppOpsManager.java index f27dc322a2b7..5907af0904ad 100644 --- a/core/java/android/app/AppOpsManager.java +++ b/core/java/android/app/AppOpsManager.java @@ -10153,6 +10153,9 @@ public class AppOpsManager { } p.writeInt(Parcel.EX_HAS_NOTED_APPOPS_REPLY_HEADER); + final int sizePosition = p.dataPosition(); + // Write size placeholder. With this size we can easily skip it in native. + p.writeInt(0); int numAttributionWithNotesAppOps = notedAppOps.size(); p.writeInt(numAttributionWithNotesAppOps); @@ -10169,6 +10172,12 @@ public class AppOpsManager { } } } + + final int payloadPosition = p.dataPosition(); + p.setDataPosition(sizePosition); + // Total header size including 4 bytes size itself. + p.writeInt(payloadPosition - sizePosition); + p.setDataPosition(payloadPosition); } /** @@ -10182,6 +10191,8 @@ public class AppOpsManager { * @hide */ public static void readAndLogNotedAppops(@NonNull Parcel p) { + // Skip size. + p.readInt(); int numAttributionsWithNotedAppOps = p.readInt(); for (int i = 0; i < numAttributionsWithNotedAppOps; i++) { diff --git a/core/java/android/app/ApplicationStartInfo.java b/core/java/android/app/ApplicationStartInfo.java index edcdb6cc58ea..f34341fd14e1 100644 --- a/core/java/android/app/ApplicationStartInfo.java +++ b/core/java/android/app/ApplicationStartInfo.java @@ -34,6 +34,7 @@ import android.util.proto.ProtoInputStream; import android.util.proto.ProtoOutputStream; import android.util.proto.WireTypeMismatchException; +import com.android.internal.annotations.VisibleForTesting; import com.android.internal.util.XmlUtils; import com.android.modules.utils.TypedXmlPullParser; import com.android.modules.utils.TypedXmlSerializer; @@ -777,7 +778,9 @@ public final class ApplicationStartInfo implements Parcelable { mStartComponent = other.mStartComponent; } - private ApplicationStartInfo(@NonNull Parcel in) { + /** @hide */ + @VisibleForTesting + public ApplicationStartInfo(@NonNull Parcel in) { mStartupState = in.readInt(); mPid = in.readInt(); mRealUid = in.readInt(); @@ -1061,12 +1064,21 @@ public final class ApplicationStartInfo implements Parcelable { if (other == null || !(other instanceof ApplicationStartInfo)) { return false; } + final ApplicationStartInfo o = (ApplicationStartInfo) other; - return mPid == o.mPid && mRealUid == o.mRealUid && mPackageUid == o.mPackageUid - && mDefiningUid == o.mDefiningUid && mReason == o.mReason - && mStartupState == o.mStartupState && mStartType == o.mStartType - && mLaunchMode == o.mLaunchMode && TextUtils.equals(mProcessName, o.mProcessName) - && timestampsEquals(o) && mWasForceStopped == o.mWasForceStopped + + return mPid == o.mPid + && mRealUid == o.mRealUid + && mPackageUid == o.mPackageUid + && mDefiningUid == o.mDefiningUid + && mReason == o.mReason + && mStartupState == o.mStartupState + && mStartType == o.mStartType + && mLaunchMode == o.mLaunchMode + && TextUtils.equals(mPackageName, o.mPackageName) + && TextUtils.equals(mProcessName, o.mProcessName) + && timestampsEquals(o) + && mWasForceStopped == o.mWasForceStopped && mMonoticCreationTimeMs == o.mMonoticCreationTimeMs && mStartComponent == o.mStartComponent; } @@ -1074,7 +1086,7 @@ public final class ApplicationStartInfo implements Parcelable { @Override public int hashCode() { return Objects.hash(mPid, mRealUid, mPackageUid, mDefiningUid, mReason, mStartupState, - mStartType, mLaunchMode, mProcessName, mStartupTimestampsNs, + mStartType, mLaunchMode, mPackageName, mProcessName, mStartupTimestampsNs, mMonoticCreationTimeMs, mStartComponent); } diff --git a/core/java/android/app/BroadcastStickyCache.java b/core/java/android/app/BroadcastStickyCache.java index d6f061be3b00..ea8173191a3f 100644 --- a/core/java/android/app/BroadcastStickyCache.java +++ b/core/java/android/app/BroadcastStickyCache.java @@ -27,16 +27,21 @@ import android.net.TetheringManager; import android.net.nsd.NsdManager; import android.net.wifi.WifiManager; import android.net.wifi.p2p.WifiP2pManager; +import android.os.ParcelFileDescriptor; import android.os.SystemProperties; import android.os.UpdateLock; import android.telephony.TelephonyManager; import android.util.ArrayMap; +import android.util.IndentingPrintWriter; import android.view.WindowManagerPolicyConstants; import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.util.ArrayUtils; +import com.android.internal.util.FastPrintWriter; +import java.io.FileOutputStream; +import java.io.PrintWriter; import java.util.ArrayList; /** @hide */ @@ -214,6 +219,41 @@ public class BroadcastStickyCache { } } + public static void dump(@NonNull ParcelFileDescriptor pfd) { + if (!Flags.useStickyBcastCache()) { + return; + } + final PrintWriter pw = new FastPrintWriter(new FileOutputStream(pfd.getFileDescriptor())); + synchronized (sCachedStickyBroadcasts) { + dumpLocked(pw); + } + pw.flush(); + } + + @GuardedBy("sCachedStickyBroadcasts") + private static void dumpLocked(@NonNull PrintWriter pw) { + final IndentingPrintWriter ipw = new IndentingPrintWriter( + pw, " " /* singleIndent */, " " /* prefix */); + ipw.println("Cached sticky broadcasts:"); + ipw.increaseIndent(); + final int count = sCachedStickyBroadcasts.size(); + if (count == 0) { + ipw.println("<empty>"); + } else { + for (int i = 0; i < count; ++i) { + final CachedStickyBroadcast cachedStickyBroadcast = sCachedStickyBroadcasts.get(i); + ipw.print("Entry #"); ipw.print(i); ipw.println(":"); + ipw.increaseIndent(); + ipw.print("filter="); ipw.println(cachedStickyBroadcast.filter.toLongString()); + ipw.print("intent="); ipw.println(cachedStickyBroadcast.intent); + ipw.print("version="); ipw.println(cachedStickyBroadcast.version); + ipw.print("handle="); ipw.println(cachedStickyBroadcast.propertyHandle); + ipw.decreaseIndent(); + } + } + ipw.decreaseIndent(); + } + private static final class CachedStickyBroadcast { @NonNull public final IntentFilter filter; @Nullable public Intent intent; diff --git a/core/java/android/app/IUserSwitchObserver.aidl b/core/java/android/app/IUserSwitchObserver.aidl index cfdb426d6026..1ff7a17e578f 100644 --- a/core/java/android/app/IUserSwitchObserver.aidl +++ b/core/java/android/app/IUserSwitchObserver.aidl @@ -19,10 +19,10 @@ package android.app; import android.os.IRemoteCallback; /** {@hide} */ -oneway interface IUserSwitchObserver { +interface IUserSwitchObserver { void onBeforeUserSwitching(int newUserId); - void onUserSwitching(int newUserId, IRemoteCallback reply); - void onUserSwitchComplete(int newUserId); - void onForegroundProfileSwitch(int newProfileId); - void onLockedBootComplete(int newUserId); + oneway void onUserSwitching(int newUserId, IRemoteCallback reply); + oneway void onUserSwitchComplete(int newUserId); + oneway void onForegroundProfileSwitch(int newProfileId); + oneway void onLockedBootComplete(int newUserId); } diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index e8b0a36ffcfc..0812a1345e44 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -1637,16 +1637,16 @@ public class Notification implements Parcelable public static final String EXTRA_PROGRESS_SEGMENTS = "android.progressSegments"; /** - * {@link #extras} key: an arraylist of {@link android.app.Notification.ProgressStyle.Step} + * {@link #extras} key: an arraylist of {@link ProgressStyle.Point} * bundles provided by a * {@link android.app.Notification.ProgressStyle} notification as supplied to - * {@link ProgressStyle#setProgressSteps} - * or {@link ProgressStyle#addProgressStep(ProgressStyle.Step)}. + * {@link ProgressStyle#setProgressPoints} + * or {@link ProgressStyle#addProgressPoint(ProgressStyle.Point)}. * This extra is a parcelable array list of bundles. * @hide */ @FlaggedApi(Flags.FLAG_API_RICH_ONGOING) - public static final String EXTRA_PROGRESS_STEPS = "android.progressSteps"; + public static final String EXTRA_PROGRESS_POINTS = "android.progressPoints"; /** * {@link #extras} key: whether the progress bar should be styled by its progress as @@ -11159,7 +11159,7 @@ public class Notification implements Parcelable /** * A Notification Style used to to define a notification whose expanded state includes - * a highly customizable progress bar with segments, steps, a custom tracker icon, + * a highly customizable progress bar with segments, points, a custom tracker icon, * and custom icons at the start and end of the progress bar. * * This style is suggested for use cases where the app is showing a tracker to the @@ -11185,8 +11185,8 @@ public class Notification implements Parcelable * .addProgressSegment(new Segment(552).setColor(Color.YELLOW)) * .addProgressSegment(new Segment(253).setColor(Color.YELLOW)) * .addProgressSegment(new Segment(94).setColor(Color.BLUE)) - * .addProgressStep(new Step(60).setColor(Color.RED)) - * .addProgressStep(new Step(560).setColor(Color.YELLOW)) + * .addProgressPoint(new Point(60).setColor(Color.RED)) + * .addProgressPoint(new Point(560).setColor(Color.YELLOW)) * ) * </pre> * @@ -11199,17 +11199,17 @@ public class Notification implements Parcelable */ @FlaggedApi(Flags.FLAG_API_RICH_ONGOING) public static class ProgressStyle extends Notification.Style { - private static final String KEY_ELEMENT_STABLE_ID = "stableId"; + private static final String KEY_ELEMENT_ID = "id"; private static final String KEY_ELEMENT_COLOR = "colorInt"; private static final String KEY_SEGMENT_LENGTH = "length"; - private static final String KEY_STEP_POSITION = "position"; + private static final String KEY_POINT_POSITION = "position"; private static final int MAX_PROGRESS_SEGMENT_LIMIT = 15; - private static final int MAX_PROGRESS_STEP_LIMIT = 5; + private static final int MAX_PROGRESS_STOP_LIMIT = 5; private static final int DEFAULT_PROGRESS_MAX = 100; private List<Segment> mProgressSegments = new ArrayList<>(); - private List<Step> mProgressSteps = new ArrayList<>(); + private List<Point> mProgressPoints = new ArrayList<>(); private int mProgress = 0; @@ -11246,7 +11246,7 @@ public class Notification implements Parcelable nonIndeterminateCheckResult = !Objects.equals(mProgress, progressStyle.mProgress) || !Objects.equals(mIsStyledByProgress, progressStyle.mIsStyledByProgress) || !Objects.equals(mProgressSegments, progressStyle.mProgressSegments) - || !Objects.equals(mProgressSteps, progressStyle.mProgressSteps) + || !Objects.equals(mProgressPoints, progressStyle.mProgressPoints) || !Objects.equals(mTrackerIcon, progressStyle.mTrackerIcon); } @@ -11300,48 +11300,47 @@ public class Notification implements Parcelable } /** - * Gets the steps that are displayed on the progress bar. + * Gets the points that are displayed on the progress bar. *. - * @see #setProgressSteps - * @see #addProgressStep - * @see Step + * @see #setProgressPoints + * @see #addProgressPoint + * @see Point */ - public @NonNull List<Step> getProgressSteps() { - return mProgressSteps; + public @NonNull List<Point> getProgressPoints() { + return mProgressPoints; } /** - * Replaces all the progress steps. + * Replaces all the progress points. * - * Steps are designated points within a progressbar to visualize - * distinct stages or milestones. - * For example, you might use steps to mark stops in a multi-stop - * navigation journey, where each step represents a destination. - * @see Step + * Points within a progress bar are used to visualize distinct stages or milestones. + * For example, you might use points to mark stops in a multi-stop + * navigation journey, where each point represents a destination. + * @see Point */ - public @NonNull ProgressStyle setProgressSteps(@NonNull List<Step> steps) { - mProgressSteps = new ArrayList<>(steps); + public @NonNull ProgressStyle setProgressPoints(@NonNull List<Point> points) { + mProgressPoints = new ArrayList<>(points); return this; } /** - * Adds another step. + * Adds another point. * - * Steps are designated points within a progressbar to visualize - * distinct stages or milestones. - * For example, you might use steps to mark stops in a multi-stop - * navigation journey, where each step represents a destination. + * Points within a progress bar are used to visualize distinct stages or milestones. * - * Steps can be added in any order, as their + * For example, you might use points to mark stops in a multi-stop + * navigation journey, where each point represents a destination. + * + * Points can be added in any order, as their * position within the progress bar is determined by their individual - * {@link Step#getPosition()}. - * @see Step + * {@link Point#getPosition()}. + * @see Point */ - public @NonNull ProgressStyle addProgressStep(@NonNull Step step) { - if (mProgressSteps == null) { - mProgressSteps = new ArrayList<>(); + public @NonNull ProgressStyle addProgressPoint(@NonNull Point point) { + if (mProgressPoints == null) { + mProgressPoints = new ArrayList<>(); } - mProgressSteps.add(step); + mProgressPoints.add(point); return this; } @@ -11414,7 +11413,7 @@ public class Notification implements Parcelable * When specified, the following fields are ignored: * @see #setProgress * @see #setProgressSegments - * @see #setProgressSteps + * @see #setProgressPoints * @see #setProgressTrackerIcon * @see #setStyledByProgress * @@ -11435,7 +11434,7 @@ public class Notification implements Parcelable } /** - * Indicates whether the segments and steps will be styled differently + * Indicates whether the segments and points will be styled differently * based on whether they are behind or ahead of the current progress. * When true, segments appearing ahead of the current progress will be given a * slightly different appearance to indicate that it is part of the progress bar @@ -11558,8 +11557,8 @@ public class Notification implements Parcelable super.addExtras(extras); extras.putParcelableArrayList(EXTRA_PROGRESS_SEGMENTS, getProgressSegmentsAsBundleList(mProgressSegments)); - extras.putParcelableArrayList(EXTRA_PROGRESS_STEPS, - getProgressStepsAsBundleList(mProgressSteps)); + extras.putParcelableArrayList(EXTRA_PROGRESS_POINTS, + getProgressPointsAsBundleList(mProgressPoints)); extras.putInt(EXTRA_PROGRESS, mProgress); extras.putBoolean(EXTRA_PROGRESS_INDETERMINATE, mIndeterminate); @@ -11599,8 +11598,8 @@ public class Notification implements Parcelable mTrackerIcon = extras.getParcelable(EXTRA_PROGRESS_TRACKER_ICON, Icon.class); mStartIcon = extras.getParcelable(EXTRA_PROGRESS_START_ICON, Icon.class); mEndIcon = extras.getParcelable(EXTRA_PROGRESS_END_ICON, Icon.class); - mProgressSteps = getProgressStepsFromBundleList( - extras.getParcelableArrayList(EXTRA_PROGRESS_STEPS, Bundle.class)); + mProgressPoints = getProgressPointsFromBundleList( + extras.getParcelableArrayList(EXTRA_PROGRESS_POINTS, Bundle.class)); } /** @@ -11613,6 +11612,30 @@ public class Notification implements Parcelable // actually be included. return true; } + /** + * @hide + */ + @Override + public RemoteViews makeContentView(boolean increasedHeight) { + final StandardTemplateParams p = mBuilder.mParams.reset() + .viewType(StandardTemplateParams.VIEW_TYPE_NORMAL) + .hideProgress(true) + .fillTextsFrom(mBuilder); + + return getStandardView(mBuilder.getBaseLayoutResource(), p, null /* result */); + } + /** + * @hide + */ + @Override + public RemoteViews makeHeadsUpContentView(boolean increasedHeight) { + final StandardTemplateParams p = mBuilder.mParams.reset() + .viewType(StandardTemplateParams.VIEW_TYPE_HEADS_UP) + .hideProgress(true) + .fillTextsFrom(mBuilder); + + return getStandardView(mBuilder.getHeadsUpBaseLayoutResource(), p, null /* result */); + } private static @NonNull ArrayList<Bundle> getProgressSegmentsAsBundleList( @Nullable List<Segment> progressSegments) { @@ -11626,7 +11649,7 @@ public class Notification implements Parcelable final Bundle bundle = new Bundle(); bundle.putInt(KEY_SEGMENT_LENGTH, segment.getLength()); - bundle.putInt(KEY_ELEMENT_STABLE_ID, segment.getStableId()); + bundle.putInt(KEY_ELEMENT_ID, segment.getId()); bundle.putInt(KEY_ELEMENT_COLOR, segment.getColor()); segments.add(bundle); @@ -11647,11 +11670,11 @@ public class Notification implements Parcelable continue; } - final int stableId = segmentBundle.getInt(KEY_ELEMENT_STABLE_ID); + final int id = segmentBundle.getInt(KEY_ELEMENT_ID); final int color = segmentBundle.getInt(KEY_ELEMENT_COLOR, Notification.COLOR_DEFAULT); final Segment segment = new Segment(length) - .setStableId(stableId).setColor(color); + .setId(id).setColor(color); segments.add(segment); } @@ -11660,48 +11683,48 @@ public class Notification implements Parcelable return segments; } - private static @NonNull ArrayList<Bundle> getProgressStepsAsBundleList( - @Nullable List<Step> progressSteps) { - final ArrayList<Bundle> steps = new ArrayList<>(); - if (progressSteps != null && !progressSteps.isEmpty()) { - for (int i = 0; i < progressSteps.size(); i++) { - final Step step = progressSteps.get(i); - if (step.getPosition() < 0) { + private static @NonNull ArrayList<Bundle> getProgressPointsAsBundleList( + @Nullable List<Point> progressPoints) { + final ArrayList<Bundle> points = new ArrayList<>(); + if (progressPoints != null && !progressPoints.isEmpty()) { + for (int i = 0; i < progressPoints.size(); i++) { + final Point point = progressPoints.get(i); + if (point.getPosition() < 0) { continue; } final Bundle bundle = new Bundle(); - bundle.putInt(KEY_STEP_POSITION, step.getPosition()); - bundle.putInt(KEY_ELEMENT_STABLE_ID, step.getStableId()); - bundle.putInt(KEY_ELEMENT_COLOR, step.getColor()); + bundle.putInt(KEY_POINT_POSITION, point.getPosition()); + bundle.putInt(KEY_ELEMENT_ID, point.getId()); + bundle.putInt(KEY_ELEMENT_COLOR, point.getColor()); - steps.add(bundle); + points.add(bundle); } } - return steps; + return points; } - private static @NonNull List<Step> getProgressStepsFromBundleList( - @Nullable List<Bundle> stepBundleList) { - final ArrayList<Step> steps = new ArrayList<>(); + private static @NonNull List<Point> getProgressPointsFromBundleList( + @Nullable List<Bundle> pointBundleList) { + final ArrayList<Point> points = new ArrayList<>(); - if (stepBundleList != null && !stepBundleList.isEmpty()) { - for (int i = 0; i < stepBundleList.size(); i++) { - final Bundle segmentBundle = stepBundleList.get(i); - final int position = segmentBundle.getInt(KEY_STEP_POSITION); + if (pointBundleList != null && !pointBundleList.isEmpty()) { + for (int i = 0; i < pointBundleList.size(); i++) { + final Bundle pointBundle = pointBundleList.get(i); + final int position = pointBundle.getInt(KEY_POINT_POSITION); if (position < 0) { continue; } - final int stableId = segmentBundle.getInt(KEY_ELEMENT_STABLE_ID); - final int color = segmentBundle.getInt(KEY_ELEMENT_COLOR, + final int id = pointBundle.getInt(KEY_ELEMENT_ID); + final int color = pointBundle.getInt(KEY_ELEMENT_COLOR, Notification.COLOR_DEFAULT); - final Step step = new Step(position).setStableId(stableId).setColor(color); - steps.add(step); + final Point point = new Point(position).setId(id).setColor(color); + points.add(point); } } - return steps; + return points; } /** @@ -11712,7 +11735,7 @@ public class Notification implements Parcelable */ public static final class Segment { private int mLength; - private int mStableId = 0; + private int mId = 0; @ColorInt private int mColor = Notification.COLOR_DEFAULT; @@ -11735,19 +11758,19 @@ public class Notification implements Parcelable } /** - * Gets the stable id of this Segment. + * Gets the id of this Segment. * - * @see #setStableId + * @see #setId */ - public int getStableId() { - return mStableId; + public int getId() { + return mId; } /** * Optional ID used to uniquely identify the element across updates. */ - public @NonNull Segment setStableId(int stableId) { - mStableId = stableId; + public @NonNull Segment setId(int id) { + mId = id; return this; } @@ -11776,45 +11799,44 @@ public class Notification implements Parcelable public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; - Segment segment = (Segment) o; - return mLength == segment.mLength && mStableId == segment.mStableId + final Segment segment = (Segment) o; + return mLength == segment.mLength && mId == segment.mId && mColor == segment.mColor; } @Override public int hashCode() { - return Objects.hash(mLength, mStableId, mColor); + return Objects.hash(mLength, mId, mColor); } } /** - * A step within the progress bar, defining its position and color. - * Steps are designated points within a progressbar to visualize - * distinct stages or milestones. - * For example, you might use steps to mark stops in a multi-stop - * navigation journey, where each step represents a destination. + * A point within the progress bar, defining its position and color. + * Points within a progress bar are used to visualize distinct stages or milestones. + * For example, you might use points to mark stops in a multi-stop + * navigation journey, where each point represents a destination. */ - public static final class Step { + public static final class Point { private int mPosition; - private int mStableId; + private int mId; @ColorInt private int mColor = Notification.COLOR_DEFAULT; /** - * Create a step element. - * The position of this step on the progress bar + * Create a point element. + * The position of this point on the progress bar * relative to {@link ProgressStyle#getProgressMax} * @param position * See {@link #getPosition} */ - public Step(int position) { + public Point(int position) { mPosition = position; } /** - * Gets the position of this Step. - * The position of this step on the progress bar + * Gets the position of this Point. + * The position of this point on the progress bar * relative to {@link ProgressStyle#getProgressMax}. */ public int getPosition() { @@ -11823,17 +11845,17 @@ public class Notification implements Parcelable /** - * Optional ID used to uniqurely identify the element across updates. + * Optional ID used to uniquely identify the element across updates. */ - public int getStableId() { - return mStableId; + public int getId() { + return mId; } /** - * Optional ID used to uniqurely identify the element across updates. + * Optional ID used to uniquely identify the element across updates. */ - public @NonNull Step setStableId(int stableId) { - mStableId = stableId; + public @NonNull Point setId(int id) { + mId = id; return this; } @@ -11850,7 +11872,7 @@ public class Notification implements Parcelable /** * Optional color of this Segment */ - public @NonNull Step setColor(@ColorInt int color) { + public @NonNull Point setColor(@ColorInt int color) { mColor = color; return this; } @@ -11862,14 +11884,14 @@ public class Notification implements Parcelable public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; - Step step = (Step) o; - return mPosition == step.mPosition && mStableId == step.mStableId - && mColor == step.mColor; + final Point point = (Point) o; + return mPosition == point.mPosition && mId == point.mId + && mColor == point.mColor; } @Override public int hashCode() { - return Objects.hash(mPosition, mStableId, mColor); + return Objects.hash(mPosition, mId, mColor); } } } diff --git a/core/java/android/app/ResourcesManager.java b/core/java/android/app/ResourcesManager.java index 84a4eb4acddc..e043a5d0dc67 100644 --- a/core/java/android/app/ResourcesManager.java +++ b/core/java/android/app/ResourcesManager.java @@ -431,16 +431,19 @@ public class ResourcesManager { } /** - * Protected so that tests can override and returns something a fixed value. + * public so that tests can access and override */ @VisibleForTesting - protected @NonNull DisplayMetrics getDisplayMetrics(int displayId, DisplayAdjustments da) { + public @NonNull DisplayMetrics getDisplayMetrics(int displayId, DisplayAdjustments da) { final DisplayManagerGlobal displayManagerGlobal = DisplayManagerGlobal.getInstance(); final DisplayMetrics dm = new DisplayMetrics(); final DisplayInfo displayInfo = displayManagerGlobal != null ? displayManagerGlobal.getDisplayInfo(displayId) : null; if (displayInfo != null) { - displayInfo.getAppMetrics(dm, da); + final Configuration dajConfig = da.getConfiguration(); + displayInfo.getAppMetrics(dm, da.getCompatibilityInfo(), + (mResDisplayId == displayId && Configuration.EMPTY.equals(dajConfig)) + ? mResConfiguration : dajConfig); } else { dm.setToDefaults(); } diff --git a/core/java/android/app/TaskInfo.java b/core/java/android/app/TaskInfo.java index af242dda9341..e882bb564db9 100644 --- a/core/java/android/app/TaskInfo.java +++ b/core/java/android/app/TaskInfo.java @@ -275,7 +275,10 @@ public class TaskInfo { public int parentTaskId; /** - * Whether this task is focused. + * Whether this task is focused on the display. This means the task receives input events that + * target the display. + * CAUTION: This can be true for multiple tasks especially when multiple displays are connected + * in the system. * @hide */ public boolean isFocused; diff --git a/core/java/android/app/UiModeManager.java b/core/java/android/app/UiModeManager.java index 7903f1c0c5c3..2e6f3e1c7f0a 100644 --- a/core/java/android/app/UiModeManager.java +++ b/core/java/android/app/UiModeManager.java @@ -16,6 +16,7 @@ package android.app; +import static android.app.Flags.enableCurrentModeTypeBinderCache; import static android.app.Flags.enableNightModeBinderCache; import android.annotation.CallbackExecutor; @@ -682,6 +683,53 @@ public class UiModeManager { } } + private Integer getCurrentModeTypeFromServer() { + try { + if (sGlobals != null) { + return sGlobals.mService.getCurrentModeType(); + } + return Configuration.UI_MODE_TYPE_NORMAL; + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + + + /** + * Retrieve the current running mode type for the user. + */ + private final IpcDataCache.QueryHandler<Void, Integer> mCurrentModeTypeQuery = + new IpcDataCache.QueryHandler<>() { + + @Override + @NonNull + public Integer apply(Void query) { + return getCurrentModeTypeFromServer(); + } + }; + + private static final String CURRENT_MODE_TYPE_API = "getCurrentModeType"; + + /** + * Cache the current running mode type for a user. + */ + private final IpcDataCache<Void, Integer> mCurrentModeTypeCache = + new IpcDataCache<>(1, IpcDataCache.MODULE_SYSTEM, + CURRENT_MODE_TYPE_API, /* cacheName= */ "CurrentModeTypeCache", + mCurrentModeTypeQuery); + + /** + * Invalidate the current mode type cache. + * + * @hide + */ + @FlaggedApi(Flags.FLAG_ENABLE_CURRENT_MODE_TYPE_BINDER_CACHE) + public static void invalidateCurrentModeTypeCache() { + IpcDataCache.invalidateCache(IpcDataCache.MODULE_SYSTEM, + CURRENT_MODE_TYPE_API); + } + + /** * Return the current running mode type. May be one of * {@link Configuration#UI_MODE_TYPE_NORMAL Configuration.UI_MODE_TYPE_NORMAL}, @@ -693,14 +741,11 @@ public class UiModeManager { * {@link Configuration#UI_MODE_TYPE_VR_HEADSET Configuration.UI_MODE_TYPE_VR_HEADSET}. */ public int getCurrentModeType() { - if (sGlobals != null) { - try { - return sGlobals.mService.getCurrentModeType(); - } catch (RemoteException e) { - throw e.rethrowFromSystemServer(); - } + if (enableCurrentModeTypeBinderCache()) { + return mCurrentModeTypeCache.query(null); + } else { + return getCurrentModeTypeFromServer(); } - return Configuration.UI_MODE_TYPE_NORMAL; } /** diff --git a/core/java/android/app/admin/SecurityLog.java b/core/java/android/app/admin/SecurityLog.java index beb93fd079d9..eb0ea1e6ef4f 100644 --- a/core/java/android/app/admin/SecurityLog.java +++ b/core/java/android/app/admin/SecurityLog.java @@ -16,7 +16,10 @@ package android.app.admin; +import static android.nfc.Flags.FLAG_NFC_STATE_CHANGE_SECURITY_LOG_EVENT_ENABLED; + import android.Manifest; +import android.annotation.FlaggedApi; import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; @@ -100,6 +103,8 @@ public class SecurityLog { TAG_PACKAGE_UPDATED, TAG_PACKAGE_UNINSTALLED, TAG_BACKUP_SERVICE_TOGGLED, + TAG_NFC_ENABLED, + TAG_NFC_DISABLED, }) public @interface SecurityLogTag {} @@ -610,6 +615,18 @@ public class SecurityLog { */ public static final int TAG_BACKUP_SERVICE_TOGGLED = SecurityLogTags.SECURITY_BACKUP_SERVICE_TOGGLED; + + /** + * Indicates that NFC service is enabled. There is no extra payload in the log event. + */ + @FlaggedApi(FLAG_NFC_STATE_CHANGE_SECURITY_LOG_EVENT_ENABLED) + public static final int TAG_NFC_ENABLED = SecurityLogTags.SECURITY_NFC_ENABLED; + + /** + * Indicates that NFC service is disabled. There is no extra payload in the log event. + */ + @FlaggedApi(FLAG_NFC_STATE_CHANGE_SECURITY_LOG_EVENT_ENABLED) + public static final int TAG_NFC_DISABLED = SecurityLogTags.SECURITY_NFC_DISABLED; /** * Event severity level indicating that the event corresponds to normal workflow. */ diff --git a/core/java/android/app/admin/SecurityLogTags.logtags b/core/java/android/app/admin/SecurityLogTags.logtags index 7b3aa7b589b7..8f22c761d535 100644 --- a/core/java/android/app/admin/SecurityLogTags.logtags +++ b/core/java/android/app/admin/SecurityLogTags.logtags @@ -48,4 +48,6 @@ option java_package android.app.admin 210041 security_package_installed (package_name|3),(version_code|1),(user_id|1) 210042 security_package_updated (package_name|3),(version_code|1),(user_id|1) 210043 security_package_uninstalled (package_name|3),(version_code|1),(user_id|1) -210044 security_backup_service_toggled (package|3),(admin_user|1),(enabled|1)
\ No newline at end of file +210044 security_backup_service_toggled (package|3),(admin_user|1),(enabled|1) +210045 security_nfc_enabled +210046 security_nfc_disabled
\ No newline at end of file diff --git a/core/java/android/app/appfunctions/AppFunctionService.java b/core/java/android/app/appfunctions/AppFunctionService.java index 8e417737515e..7a68a656564b 100644 --- a/core/java/android/app/appfunctions/AppFunctionService.java +++ b/core/java/android/app/appfunctions/AppFunctionService.java @@ -35,6 +35,7 @@ import android.os.ICancellationSignal; import android.os.CancellationSignal; import android.os.RemoteCallback; import android.os.RemoteException; +import android.util.Log; import java.util.function.Consumer; @@ -166,9 +167,13 @@ public abstract class AppFunctionService extends Service { */ @MainThread @Deprecated - public abstract void onExecuteFunction( + public void onExecuteFunction( @NonNull ExecuteAppFunctionRequest request, - @NonNull Consumer<ExecuteAppFunctionResponse> callback); + @NonNull Consumer<ExecuteAppFunctionResponse> callback) { + Log.w( + "AppFunctionService", + "Calling deprecated default implementation of onExecuteFunction"); + } /** * Called by the system to execute a specific app function. diff --git a/core/java/android/app/appfunctions/ExecuteAppFunctionResponse.java b/core/java/android/app/appfunctions/ExecuteAppFunctionResponse.java index 2851e92bd57f..a879b1ba6b5c 100644 --- a/core/java/android/app/appfunctions/ExecuteAppFunctionResponse.java +++ b/core/java/android/app/appfunctions/ExecuteAppFunctionResponse.java @@ -96,17 +96,14 @@ public final class ExecuteAppFunctionResponse implements Parcelable { */ public static final int RESULT_INVALID_ARGUMENT = 4; - /** The operation was timed out. */ - public static final int RESULT_TIMED_OUT = 5; - /** The caller tried to execute a disabled app function. */ - public static final int RESULT_DISABLED = 6; + public static final int RESULT_DISABLED = 5; /** * The operation was cancelled. Use this error code to report that a cancellation is done after * receiving a cancellation signal. */ - public static final int RESULT_CANCELLED = 7; + public static final int RESULT_CANCELLED = 6; /** The result code of the app function execution. */ @ResultCode private final int mResultCode; @@ -282,7 +279,6 @@ public final class ExecuteAppFunctionResponse implements Parcelable { RESULT_APP_UNKNOWN_ERROR, RESULT_INTERNAL_ERROR, RESULT_INVALID_ARGUMENT, - RESULT_TIMED_OUT, RESULT_DISABLED, RESULT_CANCELLED }) diff --git a/core/java/android/app/ui_mode_manager.aconfig b/core/java/android/app/ui_mode_manager.aconfig index 9f44a4d5ee01..05b46e02f9ad 100644 --- a/core/java/android/app/ui_mode_manager.aconfig +++ b/core/java/android/app/ui_mode_manager.aconfig @@ -9,4 +9,15 @@ flag { metadata { purpose: PURPOSE_BUGFIX } +} + +flag { + namespace: "systemui" + name: "enable_current_mode_type_binder_cache" + description: "Enables the use of binder caching for current running mode type." + bug: "362572732" + is_fixed_read_only: true + metadata { + purpose: PURPOSE_BUGFIX + } }
\ No newline at end of file diff --git a/core/java/android/companion/virtual/IVirtualDevice.aidl b/core/java/android/companion/virtual/IVirtualDevice.aidl index 8916ce27cf68..6fe0a7342216 100644 --- a/core/java/android/companion/virtual/IVirtualDevice.aidl +++ b/core/java/android/companion/virtual/IVirtualDevice.aidl @@ -84,11 +84,16 @@ interface IVirtualDevice { int getDevicePolicy(int policyType); /** - * Returns whether the device has a valid microphone. - */ + * Returns whether the device has a valid microphone. + */ boolean hasCustomAudioInputSupport(); /** + * Returns whether this device is allowed to create mirror displays. + */ + boolean canCreateMirrorDisplays(); + + /** * Closes the virtual device and frees all associated resources. */ @EnforcePermission("CREATE_VIRTUAL_DEVICE") diff --git a/core/java/android/companion/virtual/flags/flags.aconfig b/core/java/android/companion/virtual/flags/flags.aconfig index e9fa3e15fe05..9eb6d5624f75 100644 --- a/core/java/android/companion/virtual/flags/flags.aconfig +++ b/core/java/android/companion/virtual/flags/flags.aconfig @@ -132,8 +132,16 @@ flag { } flag { - namespace: "virtual_devices" - name: "camera_timestamp_from_surface" - description: "Pass the surface timestamp to the capture result" - bug: "351341245" + namespace: "virtual_devices" + name: "camera_timestamp_from_surface" + description: "Pass the surface timestamp to the capture result" + bug: "351341245" +} + +flag { + namespace: "virtual_devices" + name: "enable_limited_vdm_role" + description: "New VDM role without trusted displays or input" + bug: "370657575" + is_exported: true } diff --git a/core/java/android/content/om/FabricatedOverlay.java b/core/java/android/content/om/FabricatedOverlay.java index 40ffb0ff5c80..64e9c339f2d6 100644 --- a/core/java/android/content/om/FabricatedOverlay.java +++ b/core/java/android/content/om/FabricatedOverlay.java @@ -476,6 +476,20 @@ public class FabricatedOverlay { return entry; } + @NonNull + private static FabricatedOverlayInternalEntry generateFabricatedOverlayInternalEntry( + @NonNull String resourceName, float dimensionValue, + @TypedValue.ComplexDimensionUnit int dimensionUnit, @Nullable String configuration) { + final FabricatedOverlayInternalEntry entry = new FabricatedOverlayInternalEntry(); + entry.resourceName = resourceName; + entry.dataType = TypedValue.TYPE_DIMENSION; + Preconditions.checkArgumentInRange(dimensionUnit, + TypedValue.COMPLEX_UNIT_PX, TypedValue.COMPLEX_UNIT_MM, "dimensionUnit"); + entry.data = TypedValue.createComplexDimension(dimensionValue, dimensionUnit); + entry.configuration = configuration; + return entry; + } + /** * Sets the resource value in the fabricated overlay for the integer-like types with the * configuration. @@ -586,4 +600,25 @@ public class FabricatedOverlay { mOverlay.entries.add( generateFabricatedOverlayInternalEntry(resourceName, value, configuration)); } + + /** + * Sets the resource value in the fabricated overlay for the dimension type with the + * configuration. + * + * @param resourceName name of the target resource to overlay (in the form + * [package]:type/entry) + * @param dimensionValue the float representing the dimension value + * @param dimensionUnit the integer representing the dimension unit + * @param configuration The string representation of the config this overlay is enabled for + */ + @FlaggedApi(android.content.res.Flags.FLAG_DIMENSION_FRRO) + public void setResourceValue( + @NonNull String resourceName, + float dimensionValue, + @TypedValue.ComplexDimensionUnit int dimensionUnit, + @Nullable String configuration) { + ensureValidResourceName(resourceName); + mOverlay.entries.add(generateFabricatedOverlayInternalEntry(resourceName, dimensionValue, + dimensionUnit, configuration)); + } } diff --git a/core/java/android/content/pm/multiuser.aconfig b/core/java/android/content/pm/multiuser.aconfig index fd1a89692da2..cf65539946a9 100644 --- a/core/java/android/content/pm/multiuser.aconfig +++ b/core/java/android/content/pm/multiuser.aconfig @@ -68,6 +68,13 @@ flag { } flag { + name: "multiuser_widget" + namespace: "multiuser" + description: "Implement the Multiuser Widget" + bug: "365748524" +} + +flag { name: "enable_biometrics_to_unlock_private_space" is_exported: true namespace: "profile_experiences" @@ -449,7 +456,6 @@ flag { } } - flag { name: "caching_development_improvements" namespace: "multiuser" @@ -457,3 +463,13 @@ flag { bug: "364947162" is_fixed_read_only: true } + +flag { + name: "show_custom_unlock_title_inside_private_profile" + namespace: "profile_experiences" + description: "When private space is unlocked show dynamic title in unlock factor screens based on lock factor set for the profile" + bug: "323835257" + metadata { + purpose: PURPOSE_BUGFIX + } +} diff --git a/core/java/android/content/res/flags.aconfig b/core/java/android/content/res/flags.aconfig index a5f8199c9a07..0af2f2576137 100644 --- a/core/java/android/content/res/flags.aconfig +++ b/core/java/android/content/res/flags.aconfig @@ -66,3 +66,11 @@ flag { # This flag is read at boot time. is_fixed_read_only: true } + +flag { + name: "dimension_frro" + is_exported: true + namespace: "resource_manager" + description: "Feature flag for passing a dimension to create an frro" + bug: "369672322" +} diff --git a/core/java/android/hardware/biometrics/BiometricPrompt.java b/core/java/android/hardware/biometrics/BiometricPrompt.java index b11961cc2b21..e3fdd267623e 100644 --- a/core/java/android/hardware/biometrics/BiometricPrompt.java +++ b/core/java/android/hardware/biometrics/BiometricPrompt.java @@ -139,6 +139,13 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan public static final int DISMISSED_REASON_CONTENT_VIEW_MORE_OPTIONS = 8; /** + * Dialog dismissal due to the system being unable to retrieve a WindowManager instance required + * to show the dialog. + * @hide + */ + public static final int DISMISSED_REASON_ERROR_NO_WM = 9; + + /** * @hide */ @IntDef({DISMISSED_REASON_BIOMETRIC_CONFIRMED, @@ -148,7 +155,8 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan DISMISSED_REASON_ERROR, DISMISSED_REASON_SERVER_REQUESTED, DISMISSED_REASON_CREDENTIAL_CONFIRMED, - DISMISSED_REASON_CONTENT_VIEW_MORE_OPTIONS}) + DISMISSED_REASON_CONTENT_VIEW_MORE_OPTIONS, + DISMISSED_REASON_ERROR_NO_WM}) @Retention(RetentionPolicy.SOURCE) public @interface DismissedReason {} diff --git a/core/java/android/hardware/display/DisplayManagerGlobal.java b/core/java/android/hardware/display/DisplayManagerGlobal.java index 7185719abdd5..6affd123bfde 100644 --- a/core/java/android/hardware/display/DisplayManagerGlobal.java +++ b/core/java/android/hardware/display/DisplayManagerGlobal.java @@ -792,7 +792,6 @@ public final class DisplayManagerGlobal { public void setVirtualDisplaySurface(IVirtualDisplayCallback token, Surface surface) { try { mDm.setVirtualDisplaySurface(token, surface); - setVirtualDisplayState(token, surface != null); } catch (RemoteException ex) { throw ex.rethrowFromSystemServer(); } @@ -815,14 +814,6 @@ public final class DisplayManagerGlobal { } } - void setVirtualDisplayState(IVirtualDisplayCallback token, boolean isOn) { - try { - mDm.setVirtualDisplayState(token, isOn); - } catch (RemoteException ex) { - throw ex.rethrowFromSystemServer(); - } - } - void setVirtualDisplayRotation(IVirtualDisplayCallback token, @Surface.Rotation int rotation) { try { mDm.setVirtualDisplayRotation(token, rotation); diff --git a/core/java/android/hardware/display/DisplayManagerInternal.java b/core/java/android/hardware/display/DisplayManagerInternal.java index e5980972d590..36e816af8439 100644 --- a/core/java/android/hardware/display/DisplayManagerInternal.java +++ b/core/java/android/hardware/display/DisplayManagerInternal.java @@ -455,6 +455,11 @@ public abstract class DisplayManagerInternal { public abstract void onPresentation(int displayId, boolean isShown); /** + * Called upon the usage of stylus. + */ + public abstract void stylusGestureStarted(long eventTime); + + /** * Describes the requested power state of the display. * * This object is intended to describe the general characteristics of the diff --git a/core/java/android/hardware/display/IDisplayManager.aidl b/core/java/android/hardware/display/IDisplayManager.aidl index aa1539f69722..b612bca5671e 100644 --- a/core/java/android/hardware/display/IDisplayManager.aidl +++ b/core/java/android/hardware/display/IDisplayManager.aidl @@ -115,9 +115,6 @@ interface IDisplayManager { void releaseVirtualDisplay(in IVirtualDisplayCallback token); // No permissions required but must be same Uid as the creator. - void setVirtualDisplayState(in IVirtualDisplayCallback token, boolean isOn); - - // No permissions required but must be same Uid as the creator. void setVirtualDisplayRotation(in IVirtualDisplayCallback token, int rotation); // Get a stable metric for the device's display size. No permissions required. diff --git a/core/java/android/hardware/display/VirtualDisplay.java b/core/java/android/hardware/display/VirtualDisplay.java index 6cc938f5e6f8..32b640583734 100644 --- a/core/java/android/hardware/display/VirtualDisplay.java +++ b/core/java/android/hardware/display/VirtualDisplay.java @@ -112,18 +112,6 @@ public final class VirtualDisplay { } /** - * Sets the on/off state for a virtual display. - * - * @param isOn Whether the display should be on or off. - * @hide - */ - public void setDisplayState(boolean isOn) { - if (mToken != null) { - mGlobal.setVirtualDisplayState(mToken, isOn); - } - } - - /** * Sets the rotation of the virtual display. * * @param rotation the new rotation of the display. May be one of {@link Surface#ROTATION_0}, diff --git a/core/java/android/hardware/usb/flags/system_sw_usb_flags.aconfig b/core/java/android/hardware/usb/flags/system_sw_usb_flags.aconfig index 51024ba64bd9..6a39365567e5 100644 --- a/core/java/android/hardware/usb/flags/system_sw_usb_flags.aconfig +++ b/core/java/android/hardware/usb/flags/system_sw_usb_flags.aconfig @@ -43,3 +43,10 @@ flag { description: "Enable usb state update based on udc sysfs" bug: "339241080" } + +flag { + name: "enable_usb_data_signal_staking_internal" + namespace: "preload_safety" + description: "Enables signal API with staking for internal local service callers" + bug: "369382558" +}
\ No newline at end of file diff --git a/core/java/android/net/vcn/VcnTransportInfo.java b/core/java/android/net/vcn/VcnTransportInfo.java index f5469104be7f..1fc91eea3138 100644 --- a/core/java/android/net/vcn/VcnTransportInfo.java +++ b/core/java/android/net/vcn/VcnTransportInfo.java @@ -17,9 +17,11 @@ package android.net.vcn; import static android.net.NetworkCapabilities.REDACT_FOR_NETWORK_SETTINGS; +import static android.net.vcn.VcnGatewayConnectionConfig.MIN_UDP_PORT_4500_NAT_TIMEOUT_SECONDS; import static android.net.vcn.VcnGatewayConnectionConfig.MIN_UDP_PORT_4500_NAT_TIMEOUT_UNSET; import static android.telephony.SubscriptionManager.INVALID_SUBSCRIPTION_ID; +import android.annotation.IntRange; import android.annotation.NonNull; import android.annotation.Nullable; import android.net.NetworkCapabilities; @@ -29,6 +31,8 @@ import android.os.Parcel; import android.os.Parcelable; import android.telephony.SubscriptionManager; +import com.android.internal.util.Preconditions; + import java.util.Objects; /** @@ -47,6 +51,7 @@ import java.util.Objects; * * @hide */ +// TODO: Do not store WifiInfo and subscription ID in VcnTransportInfo anymore public class VcnTransportInfo implements TransportInfo, Parcelable { @Nullable private final WifiInfo mWifiInfo; private final int mSubId; @@ -195,4 +200,42 @@ public class VcnTransportInfo implements TransportInfo, Parcelable { return new VcnTransportInfo[size]; } }; + + /** This class can be used to construct a {@link VcnTransportInfo}. */ + public static final class Builder { + private int mMinUdpPort4500NatTimeoutSeconds = MIN_UDP_PORT_4500_NAT_TIMEOUT_UNSET; + + /** Construct Builder */ + public Builder() {} + + /** + * Sets the maximum supported IKEv2/IPsec NATT keepalive timeout. + * + * <p>This is used as a power-optimization hint for other IKEv2/IPsec use cases (e.g. VPNs, + * or IWLAN) to reduce the necessary keepalive frequency, thus conserving power and data. + * + * @param minUdpPort4500NatTimeoutSeconds the maximum keepalive timeout supported by the VCN + * Gateway Connection, generally the minimum duration a NAT mapping is cached on the VCN + * Gateway. + * @return this {@link Builder} instance, for chaining + */ + @NonNull + public Builder setMinUdpPort4500NatTimeoutSeconds( + @IntRange(from = MIN_UDP_PORT_4500_NAT_TIMEOUT_SECONDS) + int minUdpPort4500NatTimeoutSeconds) { + Preconditions.checkArgument( + minUdpPort4500NatTimeoutSeconds >= MIN_UDP_PORT_4500_NAT_TIMEOUT_SECONDS, + "Timeout must be at least 120s"); + + mMinUdpPort4500NatTimeoutSeconds = minUdpPort4500NatTimeoutSeconds; + return Builder.this; + } + + /** Build a VcnTransportInfo instance */ + @NonNull + public VcnTransportInfo build() { + return new VcnTransportInfo( + null /* wifiInfo */, INVALID_SUBSCRIPTION_ID, mMinUdpPort4500NatTimeoutSeconds); + } + } } diff --git a/core/java/android/net/vcn/VcnUtils.java b/core/java/android/net/vcn/VcnUtils.java new file mode 100644 index 000000000000..6dc518097737 --- /dev/null +++ b/core/java/android/net/vcn/VcnUtils.java @@ -0,0 +1,97 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package android.net.vcn; + +import static android.telephony.SubscriptionManager.INVALID_SUBSCRIPTION_ID; + +import android.annotation.NonNull; +import android.annotation.Nullable; +import android.net.ConnectivityManager; +import android.net.Network; +import android.net.NetworkCapabilities; +import android.net.NetworkSpecifier; +import android.net.TelephonyNetworkSpecifier; +import android.net.TransportInfo; +import android.net.wifi.WifiInfo; + +import java.util.List; + +/** + * Utility class for VCN callers get information from VCN network + * + * @hide + */ +public class VcnUtils { + /** Get the WifiInfo of the VCN's underlying WiFi network */ + @Nullable + public static WifiInfo getWifiInfoFromVcnCaps( + @NonNull ConnectivityManager connectivityMgr, + @NonNull NetworkCapabilities networkCapabilities) { + final NetworkCapabilities underlyingCaps = + getVcnUnderlyingCaps(connectivityMgr, networkCapabilities); + + if (underlyingCaps == null) { + return null; + } + + final TransportInfo underlyingTransportInfo = underlyingCaps.getTransportInfo(); + if (!(underlyingTransportInfo instanceof WifiInfo)) { + return null; + } + + return (WifiInfo) underlyingTransportInfo; + } + + /** Get the subscription ID of the VCN's underlying Cell network */ + public static int getSubIdFromVcnCaps( + @NonNull ConnectivityManager connectivityMgr, + @NonNull NetworkCapabilities networkCapabilities) { + final NetworkCapabilities underlyingCaps = + getVcnUnderlyingCaps(connectivityMgr, networkCapabilities); + + if (underlyingCaps == null) { + return INVALID_SUBSCRIPTION_ID; + } + + final NetworkSpecifier underlyingNetworkSpecifier = underlyingCaps.getNetworkSpecifier(); + if (!(underlyingNetworkSpecifier instanceof TelephonyNetworkSpecifier)) { + return INVALID_SUBSCRIPTION_ID; + } + + return ((TelephonyNetworkSpecifier) underlyingNetworkSpecifier).getSubscriptionId(); + } + + @Nullable + private static NetworkCapabilities getVcnUnderlyingCaps( + @NonNull ConnectivityManager connectivityMgr, + @NonNull NetworkCapabilities networkCapabilities) { + // Return null if it is not a VCN network + if (networkCapabilities.getTransportInfo() == null + || !(networkCapabilities.getTransportInfo() instanceof VcnTransportInfo)) { + return null; + } + + // As of Android 16, VCN has one underlying network, and only one. If there are more + // than one networks due to future changes in the VCN mainline code, just take the first + // network + final List<Network> underlyingNws = networkCapabilities.getUnderlyingNetworks(); + if (underlyingNws == null) { + return null; + } + + return connectivityMgr.getNetworkCapabilities(underlyingNws.get(0)); + } +} diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java index b9b5295f89b6..c41e626444c9 100644 --- a/core/java/android/os/BatteryStats.java +++ b/core/java/android/os/BatteryStats.java @@ -3088,8 +3088,9 @@ public abstract class BatteryStats { public static final String[] HISTORY_EVENT_CHECKIN_NAMES = new String[] { "Enl", "Epr", "Efg", "Etp", "Esy", "Ewl", "Ejb", "Eur", "Euf", "Ecn", - "Eac", "Epi", "Epu", "Eal", "Est", "Eai", "Eaa", "Etw", - "Esw", "Ewa", "Elw", "Eec", "Esc", "Eds" + "Eac", "Epi", "Epu", "Eal", "Est", "Eai", "Eaa", + "Etw", "Esw", "Ewa", "Elw", "Esc", + "Eds" }; @FunctionalInterface diff --git a/core/java/android/os/BinderProxy.java b/core/java/android/os/BinderProxy.java index 80546cd6770f..3b5a99ed089a 100644 --- a/core/java/android/os/BinderProxy.java +++ b/core/java/android/os/BinderProxy.java @@ -493,6 +493,11 @@ public final class BinderProxy implements IBinder { public native boolean pingBinder(); /** + * Check to see if the process that the binder is in is still alive. + * + * Note, this only reflects the last known death state, if the object + * is linked to death or has made a transactions since the death occurs. + * * @return false if the hosting process is gone */ public native boolean isBinderAlive(); diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java index a8267d1c9d8c..479aa98f80de 100644 --- a/core/java/android/os/Build.java +++ b/core/java/android/os/Build.java @@ -22,6 +22,7 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.RequiresPermission; import android.annotation.SuppressAutoDoc; +import android.annotation.SuppressLint; import android.annotation.SystemApi; import android.annotation.TestApi; import android.app.ActivityThread; @@ -401,33 +402,42 @@ public class Build { * device. This value never changes while a device is booted, but it may * increase when the hardware manufacturer provides an OTA update. * <p> - * Together with {@link SDK_MINOR_INT}, this constant defines the - * <pre>major.minor</pre> version of Android. <pre>SDK_INT</pre> is - * increased and <pre>SDK_MINOR_INT</pre> is set to 0 on new Android - * dessert releases. Between these, Android may also release so called - * minor releases where <pre>SDK_INT</pre> remains unchanged and - * <pre>SDK_MINOR_INT</pre> is increased. Minor releases can add new - * APIs, and have stricter guarantees around backwards compatibility - * (e.g. no changes gated by <pre>targetSdkVersion</pre>) compared to - * major releases. + * This constant records the major version of Android. Use {@link + * SDK_INT_FULL} if you need to consider the minor version of Android + * as well. * <p> * Possible values are defined in {@link Build.VERSION_CODES}. + * @see #SDK_INT_FULL */ public static final int SDK_INT = SystemProperties.getInt( "ro.build.version.sdk", 0); /** - * The minor SDK version of the software currently running on this hardware - * device. This value never changes while a device is booted, but it may - * increase when the hardware manufacturer provides an OTA update. + * The major and minor SDK version of the software currently running on + * this hardware device. This value never changes while a device is + * booted, but it may increase when the hardware manufacturer provides + * an OTA update. + * <p> + * <code>SDK_INT</code> is increased on new Android dessert releases, + * also called major releases. Between these, Android may also release + * minor releases where <code>SDK_INT</code> remains unchanged. Minor + * releases can add new APIs, and have stricter guarantees around + * backwards compatibility (e.g. no changes gated by + * <code>targetSdkVersion</code>) compared to major releases. * <p> - * Together with {@link SDK_INT}, this constant defines the - * <pre>major.minor</pre> version of Android. See {@link SDK_INT} for - * more information. + * <code>SDK_INT_FULL</code> is increased on every release. + * <p> + * Possible values are defined in {@link + * android.os.Build.VERSION_CODES_FULL}. */ @FlaggedApi(Flags.FLAG_MAJOR_MINOR_VERSIONING_SCHEME) - public static final int SDK_MINOR_INT = SystemProperties.getInt( - "ro.build.version.sdk_minor", 0); + public static final int SDK_INT_FULL; + + static { + SDK_INT_FULL = VERSION_CODES_FULL.SDK_INT_MULTIPLIER + * SystemProperties.getInt("ro.build.version.sdk", 0) + + SystemProperties.getInt("ro.build.version.sdk_minor", 0); + } /** * The SDK version of the software that <em>initially</em> shipped on @@ -1264,6 +1274,25 @@ public class Build { } /** + * Enumeration of the currently known SDK major and minor version codes. + * The numbers increase for every release, and are guaranteed to be ordered + * by the release date of each release. The actual values should be + * considered an implementation detail, and the current encoding scheme may + * change in the future. + * + * @see android.os.Build.VERSION#SDK_INT_FULL + */ + @FlaggedApi(Flags.FLAG_MAJOR_MINOR_VERSIONING_SCHEME) + @SuppressLint("AcronymName") + public static class VERSION_CODES_FULL { + private VERSION_CODES_FULL() {} + + // Use the last 5 digits for the minor version. This allows the + // minor version to be set to CUR_DEVELOPMENT. + private static final int SDK_INT_MULTIPLIER = 100000; + } + + /** * The vendor API for 2024 Q2 * * <p>For Android 14-QPR3 and later, the vendor API level is completely decoupled from the SDK diff --git a/core/java/android/os/GraphicsEnvironment.java b/core/java/android/os/GraphicsEnvironment.java index beb9a935a6ee..2d3dd1b9383b 100644 --- a/core/java/android/os/GraphicsEnvironment.java +++ b/core/java/android/os/GraphicsEnvironment.java @@ -598,6 +598,11 @@ public class GraphicsEnvironment { final String abi = chooseAbi(angleInfo); // Build a path that includes installed native libs and APK + // TODO (b/370113081): If the native libraries are not found in this path, + // the system libraries will be loaded instead. + // This can happen if the ANGLE APK is present, + // but accidentally packaged without native libraries. + // TBD if this should fail instead of falling back to the system version. final String paths = angleInfo.nativeLibraryDir + File.pathSeparator + angleInfo.sourceDir diff --git a/core/java/android/os/RemoteCallbackList.java b/core/java/android/os/RemoteCallbackList.java index 2cb86f753078..769cbdd9886d 100644 --- a/core/java/android/os/RemoteCallbackList.java +++ b/core/java/android/os/RemoteCallbackList.java @@ -92,9 +92,9 @@ public class RemoteCallbackList<E extends IInterface> { /** * Add a new callback to the list. This callback will remain in the list * until a corresponding call to {@link #unregister} or its hosting process - * goes away. If the callback was already registered (determined by + * goes away. If the callback was already registered (determined by * checking to see if the {@link IInterface#asBinder callback.asBinder()} - * object is already in the list), then it will be left as-is. + * object is already in the list), then it will be replaced with the new callback. * Registrations are not counted; a single call to {@link #unregister} * will remove a callback after any number calls to register it. * @@ -106,7 +106,7 @@ public class RemoteCallbackList<E extends IInterface> { * * @param cookie Optional additional data to be associated with this * callback. - * + * * @return Returns true if the callback was successfully added to the list. * Returns false if it was not added, either because {@link #kill} had * previously been called or the callback's process has gone away. diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java index 27b1dfbd9b18..d557046280d9 100644 --- a/core/java/android/provider/ContactsContract.java +++ b/core/java/android/provider/ContactsContract.java @@ -3027,6 +3027,46 @@ public final class ContactsContract { */ @FlaggedApi(Flags.FLAG_NEW_DEFAULT_ACCOUNT_API_ENABLED) public static final class DefaultAccount { + /** + * Key in the outgoing Bundle for the default account list. + * + * @hide + */ + public static final String KEY_ELIGIBLE_DEFAULT_ACCOUNTS = + "key_eligible_default_accounts"; + /** + * The method to invoke in order to query eligiblie default accounts. + * + * @hide + */ + public static final String QUERY_ELIGIBLE_DEFAULT_ACCOUNTS_METHOD = + "queryEligibleDefaultAccounts"; + /** + * Key in the Bundle for the default account state. + * + * @hide + */ + public static final String KEY_DEFAULT_ACCOUNT_STATE = + "key_default_account_state"; + /** + * The method to invoke in order to set the default account. + * + * @hide + */ + public static final String SET_DEFAULT_ACCOUNT_FOR_NEW_CONTACTS_METHOD = + "setDefaultAccountForNewContacts"; + /** + * The method to invoke in order to query the default account. + * + * @hide + */ + public static final String QUERY_DEFAULT_ACCOUNT_FOR_NEW_CONTACTS_METHOD = + "queryDefaultAccountForNewContacts"; + + private DefaultAccount() { + + } + /** * Represents the state of the default account, and the actual {@link Account} if it's @@ -3228,6 +3268,94 @@ public final class ContactsContract { public @interface DefaultAccountState { } } + + /** + * Get the account that is set as the default account for new contacts, which should be + * initially selected when creating a new contact on contact management apps. + * + * @param resolver the ContentResolver to query. + * + * @return the default account state for new contacts. + * @throws RuntimeException if failed to look up the default account. + * @throws IllegalStateException if the default account is in an invalid state. + */ + @FlaggedApi(Flags.FLAG_NEW_DEFAULT_ACCOUNT_API_ENABLED) + public static @NonNull DefaultAccountAndState getDefaultAccountForNewContacts( + @NonNull ContentResolver resolver) { + Bundle response = nullSafeCall(resolver, ContactsContract.AUTHORITY_URI, + QUERY_DEFAULT_ACCOUNT_FOR_NEW_CONTACTS_METHOD, null, null); + + int defaultContactsAccountState = response.getInt(KEY_DEFAULT_ACCOUNT_STATE, -1); + if (defaultContactsAccountState + == DefaultAccountAndState.DEFAULT_ACCOUNT_STATE_CLOUD) { + String accountName = response.getString(Settings.ACCOUNT_NAME); + String accountType = response.getString(Settings.ACCOUNT_TYPE); + if (TextUtils.isEmpty(accountName) || TextUtils.isEmpty(accountType)) { + throw new IllegalStateException( + "account name and type cannot be null or empty"); + } + return new DefaultAccountAndState( + DefaultAccountAndState.DEFAULT_ACCOUNT_STATE_CLOUD, + new Account(accountName, accountType)); + } else if (defaultContactsAccountState + == DefaultAccountAndState.DEFAULT_ACCOUNT_STATE_LOCAL + || defaultContactsAccountState + == DefaultAccountAndState.DEFAULT_ACCOUNT_STATE_NOT_SET) { + return new DefaultAccountAndState(defaultContactsAccountState, /*cloudAccount=*/ + null); + } else { + throw new IllegalStateException("Invalid default account state"); + } + } + + /** + * Sets the default account that should be initially selected when creating a new + * contact on + * contact management apps. Apps can only set one of + * The following accounts as the default account: + * <ol> + * <li> local account + * <li> cloud account that are eligible to be set as default account. + * </ol> + * + * @param resolver the ContentResolver to query. + * @param defaultAccountAndState the default account and state to be set. To set the + * local + * account as the + * default account, this parameter should be + * {@link DefaultAccountAndState#ofLocal()}. To set the a + * cloud + * account as the default account, this parameter should + * be + * {@link DefaultAccountAndState#ofCloud(Account)}. To + * set + * the + * default account to a "not set" state, this parameter + * should + * be {@link DefaultAccountAndState#ofNotSet()}. + * + * @throws RuntimeException if it fails to set the default account. + * + * @hide + */ + @RequiresPermission(android.Manifest.permission.SET_DEFAULT_ACCOUNT_FOR_CONTACTS) + @FlaggedApi(Flags.FLAG_NEW_DEFAULT_ACCOUNT_API_ENABLED) + @SystemApi + public static void setDefaultAccountForNewContacts(@NonNull ContentResolver resolver, + @NonNull DefaultAccountAndState defaultAccountAndState) { + Bundle extras = new Bundle(); + + extras.putInt(KEY_DEFAULT_ACCOUNT_STATE, defaultAccountAndState.getState()); + if (defaultAccountAndState.getState() + == DefaultAccountAndState.DEFAULT_ACCOUNT_STATE_CLOUD) { + Account cloudAccount = defaultAccountAndState.getAccount(); + assert cloudAccount != null; + extras.putString(Settings.ACCOUNT_NAME, cloudAccount.name); + extras.putString(Settings.ACCOUNT_TYPE, cloudAccount.type); + } + nullSafeCall(resolver, ContactsContract.AUTHORITY_URI, + SET_DEFAULT_ACCOUNT_FOR_NEW_CONTACTS_METHOD, null, extras); + } } /** @@ -9055,30 +9183,6 @@ public final class ContactsContract { public static final String KEY_DEFAULT_ACCOUNT = "key_default_account"; /** - * Key in the Bundle for the default account state. - * - * @hide - */ - public static final String KEY_DEFAULT_ACCOUNT_STATE = - "key_default_contacts_account_state"; - - /** - * The method to invoke in order to set the default account. - * - * @hide - */ - public static final String SET_DEFAULT_ACCOUNT_FOR_NEW_CONTACTS_METHOD = - "setDefaultAccountForNewContacts"; - - /** - * The method to invoke in order to query the default account. - * - * @hide - */ - public static final String QUERY_DEFAULT_ACCOUNT_FOR_NEW_CONTACTS_METHOD = - "queryDefaultAccountForNewContacts"; - - /** * Get the account that is set as the default account for new contacts, which should be * initially selected when creating a new contact on contact management apps. * If the setting has not been set by any app, it will return null. Once the setting diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index d82af55e2771..a2c41c14593b 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -2092,23 +2092,6 @@ public final class Settings { public static final String ACTION_ZEN_MODE_SETTINGS = "android.settings.ZEN_MODE_SETTINGS"; /** - * Activity Action: Show Zen Mode visual effects configuration settings. - * - * @hide - */ - @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) - public static final String ZEN_MODE_BLOCKED_EFFECTS_SETTINGS = - "android.settings.ZEN_MODE_BLOCKED_EFFECTS_SETTINGS"; - - /** - * Activity Action: Show Zen Mode onboarding activity. - * - * @hide - */ - @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) - public static final String ZEN_MODE_ONBOARDING = "android.settings.ZEN_MODE_ONBOARDING"; - - /** * Activity Action: Show Zen Mode (aka Do Not Disturb) priority configuration settings. */ @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) @@ -8748,35 +8731,6 @@ public final class Settings { /** @hide */ public static final int ZEN_DURATION_FOREVER = 0; /** - * If nonzero, will show the zen upgrade notification when the user toggles DND on/off. - * @hide - */ - @Readable - public static final String SHOW_ZEN_UPGRADE_NOTIFICATION = "show_zen_upgrade_notification"; - - /** - * If nonzero, will show the zen update settings suggestion. - * @hide - */ - @Readable - public static final String SHOW_ZEN_SETTINGS_SUGGESTION = "show_zen_settings_suggestion"; - - /** - * If nonzero, zen has not been updated to reflect new changes. - * @hide - */ - @Readable - public static final String ZEN_SETTINGS_UPDATED = "zen_settings_updated"; - - /** - * If nonzero, zen setting suggestion has been viewed by user - * @hide - */ - @Readable - public static final String ZEN_SETTINGS_SUGGESTION_VIEWED = - "zen_settings_suggestion_viewed"; - - /** * Whether the in call notification is enabled to play sound during calls. The value is * boolean (1 or 0). * @hide @@ -18072,10 +18026,6 @@ public final class Settings { MOVED_TO_SECURE = new HashSet<>(8); MOVED_TO_SECURE.add(Global.INSTALL_NON_MARKET_APPS); MOVED_TO_SECURE.add(Global.ZEN_DURATION); - MOVED_TO_SECURE.add(Global.SHOW_ZEN_UPGRADE_NOTIFICATION); - MOVED_TO_SECURE.add(Global.SHOW_ZEN_SETTINGS_SUGGESTION); - MOVED_TO_SECURE.add(Global.ZEN_SETTINGS_UPDATED); - MOVED_TO_SECURE.add(Global.ZEN_SETTINGS_SUGGESTION_VIEWED); MOVED_TO_SECURE.add(Global.CHARGING_SOUNDS_ENABLED); MOVED_TO_SECURE.add(Global.CHARGING_VIBRATION_ENABLED); MOVED_TO_SECURE.add(Global.NOTIFICATION_BUBBLES); @@ -18910,40 +18860,6 @@ public final class Settings { @Readable public static final String SHOW_MUTE_IN_CRASH_DIALOG = "show_mute_in_crash_dialog"; - - /** - * If nonzero, will show the zen upgrade notification when the user toggles DND on/off. - * @hide - * @deprecated - Use {@link android.provider.Settings.Secure#SHOW_ZEN_UPGRADE_NOTIFICATION} - */ - @Deprecated - public static final String SHOW_ZEN_UPGRADE_NOTIFICATION = "show_zen_upgrade_notification"; - - /** - * If nonzero, will show the zen update settings suggestion. - * @hide - * @deprecated - Use {@link android.provider.Settings.Secure#SHOW_ZEN_SETTINGS_SUGGESTION} - */ - @Deprecated - public static final String SHOW_ZEN_SETTINGS_SUGGESTION = "show_zen_settings_suggestion"; - - /** - * If nonzero, zen has not been updated to reflect new changes. - * @deprecated - Use {@link android.provider.Settings.Secure#ZEN_SETTINGS_UPDATED} - * @hide - */ - @Deprecated - public static final String ZEN_SETTINGS_UPDATED = "zen_settings_updated"; - - /** - * If nonzero, zen setting suggestion has been viewed by user - * @hide - * @deprecated - Use {@link android.provider.Settings.Secure#ZEN_SETTINGS_SUGGESTION_VIEWED} - */ - @Deprecated - public static final String ZEN_SETTINGS_SUGGESTION_VIEWED = - "zen_settings_suggestion_viewed"; - /** * Backup and restore agent timeout parameters. * These parameters are represented by a comma-delimited key-value list. diff --git a/core/java/android/service/notification/ZenModeDiff.java b/core/java/android/service/notification/ZenModeDiff.java index a9c57909e1c1..c9f464716e72 100644 --- a/core/java/android/service/notification/ZenModeDiff.java +++ b/core/java/android/service/notification/ZenModeDiff.java @@ -25,6 +25,7 @@ import android.util.ArraySet; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import java.util.LinkedHashMap; import java.util.Objects; import java.util.Set; @@ -63,6 +64,7 @@ public class ZenModeDiff { public static class FieldDiff<T> { private final T mFrom; private final T mTo; + private final BaseDiff mDetailedDiff; /** * Constructor to create a FieldDiff object with the given values. @@ -72,6 +74,19 @@ public class ZenModeDiff { public FieldDiff(@Nullable T from, @Nullable T to) { mFrom = from; mTo = to; + mDetailedDiff = null; + } + + /** + * Constructor to create a FieldDiff object with the given values, and that has a + * detailed BaseDiff. + * @param from from (old) value + * @param to to (new) value + */ + public FieldDiff(@Nullable T from, @Nullable T to, @Nullable BaseDiff detailedDiff) { + mFrom = from; + mTo = to; + mDetailedDiff = detailedDiff; } /** @@ -93,6 +108,9 @@ public class ZenModeDiff { */ @Override public String toString() { + if (mDetailedDiff != null) { + return mDetailedDiff.toString(); + } return mFrom + "->" + mTo; } @@ -100,6 +118,9 @@ public class ZenModeDiff { * Returns whether this represents an actual diff. */ public boolean hasDiff() { + if (mDetailedDiff != null) { + return mDetailedDiff.hasDiff(); + } // note that Objects.equals handles null values gracefully. return !Objects.equals(mFrom, mTo); } @@ -115,7 +136,8 @@ public class ZenModeDiff { @ExistenceChange private int mExists = NONE; // Map from field name to diffs for any standalone fields in the object. - private ArrayMap<String, FieldDiff> mFields = new ArrayMap<>(); + // LinkedHashMap is specifically chosen here to show insertion order when keys are fetched. + private LinkedHashMap<String, FieldDiff> mFields = new LinkedHashMap<>(); // Functions for actually diffing objects and string representations have to be implemented // by subclasses. @@ -550,8 +572,16 @@ public class ZenModeDiff { if (!Objects.equals(from.enabler, to.enabler)) { addField(FIELD_ENABLER, new FieldDiff<>(from.enabler, to.enabler)); } - if (!Objects.equals(from.zenPolicy, to.zenPolicy)) { - addField(FIELD_ZEN_POLICY, new FieldDiff<>(from.zenPolicy, to.zenPolicy)); + if (android.app.Flags.modesApi()) { + PolicyDiff policyDiff = new PolicyDiff(from.zenPolicy, to.zenPolicy); + if (policyDiff.hasDiff()) { + addField(FIELD_ZEN_POLICY, new FieldDiff<>(from.zenPolicy, to.zenPolicy, + policyDiff)); + } + } else { + if (!Objects.equals(from.zenPolicy, to.zenPolicy)) { + addField(FIELD_ZEN_POLICY, new FieldDiff<>(from.zenPolicy, to.zenPolicy)); + } } if (from.modified != to.modified) { addField(FIELD_MODIFIED, new FieldDiff<>(from.modified, to.modified)); @@ -560,9 +590,12 @@ public class ZenModeDiff { addField(FIELD_PKG, new FieldDiff<>(from.pkg, to.pkg)); } if (android.app.Flags.modesApi()) { - if (!Objects.equals(from.zenDeviceEffects, to.zenDeviceEffects)) { + DeviceEffectsDiff deviceEffectsDiff = new DeviceEffectsDiff(from.zenDeviceEffects, + to.zenDeviceEffects); + if (deviceEffectsDiff.hasDiff()) { addField(FIELD_ZEN_DEVICE_EFFECTS, - new FieldDiff<>(from.zenDeviceEffects, to.zenDeviceEffects)); + new FieldDiff<>(from.zenDeviceEffects, to.zenDeviceEffects, + deviceEffectsDiff)); } if (!Objects.equals(from.triggerDescription, to.triggerDescription)) { addField(FIELD_TRIGGER_DESCRIPTION, @@ -630,7 +663,7 @@ public class ZenModeDiff { sb.append(key); sb.append(":"); - sb.append(diff); + sb.append(diff.toString()); } if (becameActive()) { diff --git a/core/java/android/text/flags/flags.aconfig b/core/java/android/text/flags/flags.aconfig index 3599332af955..ec5b488ccbbd 100644 --- a/core/java/android/text/flags/flags.aconfig +++ b/core/java/android/text/flags/flags.aconfig @@ -178,3 +178,13 @@ flag { purpose: PURPOSE_BUGFIX } } + +flag { + name: "handwriting_unsupported_show_soft_input_fix" + namespace: "text" + description: "Don't show soft keyboard on stylus input if text field doesn't support handwriting and getShowSoftInputOnFocus() returns false." + bug: "363180475" + metadata { + purpose: PURPOSE_BUGFIX + } +} diff --git a/core/java/android/tracing/TEST_MAPPING b/core/java/android/tracing/TEST_MAPPING new file mode 100644 index 000000000000..b51d19da97a5 --- /dev/null +++ b/core/java/android/tracing/TEST_MAPPING @@ -0,0 +1,10 @@ +{ + "postsubmit": [ + { + "name": "TracingTests" + }, + { + "name": "ProtologPerfTests" + } + ] +} diff --git a/core/java/android/view/HandwritingInitiator.java b/core/java/android/view/HandwritingInitiator.java index f1329635f16c..c2179997a92d 100644 --- a/core/java/android/view/HandwritingInitiator.java +++ b/core/java/android/view/HandwritingInitiator.java @@ -19,6 +19,7 @@ package android.view; import static com.android.text.flags.Flags.handwritingCursorPosition; import static com.android.text.flags.Flags.handwritingTrackDisabled; import static com.android.text.flags.Flags.handwritingUnsupportedMessage; +import static com.android.text.flags.Flags.handwritingUnsupportedShowSoftInputFix; import android.annotation.FlaggedApi; import android.annotation.NonNull; @@ -241,7 +242,11 @@ public class HandwritingInitiator { if (!candidateView.hasFocus()) { requestFocusWithoutReveal(candidateView); } - mImm.showSoftInput(candidateView, 0); + if (!handwritingUnsupportedShowSoftInputFix() + || (candidateView instanceof TextView tv + && tv.getShowSoftInputOnFocus())) { + mImm.showSoftInput(candidateView, 0); + } mState.mHandled = true; mState.mShouldInitHandwriting = false; motionEvent.setAction((motionEvent.getAction() diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index 40a75fdcaa06..8fb17c72c462 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -238,7 +238,7 @@ import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityInteractionClient; import android.view.accessibility.AccessibilityManager; import android.view.accessibility.AccessibilityManager.AccessibilityStateChangeListener; -import android.view.accessibility.AccessibilityManager.HighTextContrastChangeListener; +import android.view.accessibility.AccessibilityManager.HighContrastTextStateChangeListener; import android.view.accessibility.AccessibilityNodeIdManager; import android.view.accessibility.AccessibilityNodeInfo; import android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction; @@ -1800,8 +1800,8 @@ public final class ViewRootImpl implements ViewParent, } mAccessibilityManager.addAccessibilityStateChangeListener( mAccessibilityInteractionConnectionManager, mHandler); - mAccessibilityManager.addHighTextContrastStateChangeListener( - mHighContrastTextManager, mHandler); + mAccessibilityManager.addHighContrastTextStateChangeListener( + mExecutor, mHighContrastTextManager); DisplayManagerGlobal .getInstance() .registerDisplayListener( @@ -1838,7 +1838,7 @@ public final class ViewRootImpl implements ViewParent, private void unregisterListeners() { mAccessibilityManager.removeAccessibilityStateChangeListener( mAccessibilityInteractionConnectionManager); - mAccessibilityManager.removeHighTextContrastStateChangeListener( + mAccessibilityManager.removeHighContrastTextStateChangeListener( mHighContrastTextManager); DisplayManagerGlobal .getInstance() @@ -11907,12 +11907,12 @@ public final class ViewRootImpl implements ViewParent, } } - final class HighContrastTextManager implements HighTextContrastChangeListener { + final class HighContrastTextManager implements HighContrastTextStateChangeListener { HighContrastTextManager() { - ThreadedRenderer.setHighContrastText(mAccessibilityManager.isHighTextContrastEnabled()); + ThreadedRenderer.setHighContrastText(mAccessibilityManager.isHighContrastTextEnabled()); } @Override - public void onHighTextContrastStateChanged(boolean enabled) { + public void onHighContrastTextStateChanged(boolean enabled) { ThreadedRenderer.setHighContrastText(enabled); destroyAndInvalidate(); diff --git a/core/java/android/view/Window.java b/core/java/android/view/Window.java index 0582afe6655d..381006c8a21b 100644 --- a/core/java/android/view/Window.java +++ b/core/java/android/view/Window.java @@ -1345,7 +1345,7 @@ public abstract class Window { } /** - * <p>Sets the desired about of HDR headroom to be used when rendering as a ratio of + * <p>Sets the desired amount of HDR headroom to be used when rendering as a ratio of * targetHdrPeakBrightnessInNits / targetSdrWhitePointInNits. Only applies when * {@link #setColorMode(int)} is {@link ActivityInfo#COLOR_MODE_HDR}</p> * diff --git a/core/java/android/view/accessibility/AccessibilityManager.java b/core/java/android/view/accessibility/AccessibilityManager.java index 2b7cf427a562..fd57aec4180b 100644 --- a/core/java/android/view/accessibility/AccessibilityManager.java +++ b/core/java/android/view/accessibility/AccessibilityManager.java @@ -253,7 +253,7 @@ public final class AccessibilityManager { boolean mIsTouchExplorationEnabled; @UnsupportedAppUsage(trackingBug = 123768939L) - boolean mIsHighTextContrastEnabled; + boolean mIsHighContrastTextEnabled; boolean mIsAudioDescriptionByDefaultRequested; @@ -276,8 +276,8 @@ public final class AccessibilityManager { private final ArrayMap<TouchExplorationStateChangeListener, Handler> mTouchExplorationStateChangeListeners = new ArrayMap<>(); - private final ArrayMap<HighTextContrastChangeListener, Handler> - mHighTextContrastStateChangeListeners = new ArrayMap<>(); + private final ArrayMap<HighContrastTextStateChangeListener, Executor> + mHighContrastTextStateChangeListeners = new ArrayMap<>(); private final ArrayMap<AccessibilityServicesStateChangeListener, Executor> mServicesStateChangeListeners = new ArrayMap<>(); @@ -356,21 +356,20 @@ public final class AccessibilityManager { } /** - * Listener for the system high text contrast state. To listen for changes to - * the high text contrast state on the device, implement this interface and + * Listener for the system high contrast text state. To listen for changes to + * the high contrast text state on the device, implement this interface and * register it with the system by calling - * {@link #addHighTextContrastStateChangeListener}. - * - * @hide + * {@link #addHighContrastTextStateChangeListener}. */ - public interface HighTextContrastChangeListener { + @FlaggedApi(com.android.graphics.hwui.flags.Flags.FLAG_HIGH_CONTRAST_TEXT_SMALL_TEXT_RECT) + public interface HighContrastTextStateChangeListener { /** - * Called when the high text contrast enabled state changes. + * Called when the high contrast text enabled state changes. * - * @param enabled Whether high text contrast is enabled. + * @param enabled Whether high contrast text is enabled. */ - void onHighTextContrastStateChanged(boolean enabled); + void onHighContrastTextStateChanged(boolean enabled); } /** @@ -655,24 +654,23 @@ public final class AccessibilityManager { } /** - * Returns if the high text contrast in the system is enabled. + * Returns if high contrast text in the system is enabled. * <p> * <strong>Note:</strong> You need to query this only if you application is * doing its own rendering and does not rely on the platform rendering pipeline. * </p> * - * @return True if high text contrast is enabled, false otherwise. + * @return True if high contrast text is enabled, false otherwise. * - * @hide */ - @UnsupportedAppUsage - public boolean isHighTextContrastEnabled() { + @FlaggedApi(com.android.graphics.hwui.flags.Flags.FLAG_HIGH_CONTRAST_TEXT_SMALL_TEXT_RECT) + public boolean isHighContrastTextEnabled() { synchronized (mLock) { IAccessibilityManager service = getServiceLocked(); if (service == null) { return false; } - return mIsHighTextContrastEnabled; + return mIsHighContrastTextEnabled; } } @@ -1303,32 +1301,32 @@ public final class AccessibilityManager { } /** - * Registers a {@link HighTextContrastChangeListener} for changes in - * the global high text contrast state of the system. + * Registers a {@link HighContrastTextStateChangeListener} for changes in + * the global high contrast text state of the system. * - * @param listener The listener. - * - * @hide + * @param executor a executor to call the listener from + * @param listener The listener to be called */ - public void addHighTextContrastStateChangeListener( - @NonNull HighTextContrastChangeListener listener, @Nullable Handler handler) { + @FlaggedApi(com.android.graphics.hwui.flags.Flags.FLAG_HIGH_CONTRAST_TEXT_SMALL_TEXT_RECT) + public void addHighContrastTextStateChangeListener( + @NonNull @CallbackExecutor Executor executor, + @NonNull HighContrastTextStateChangeListener listener + ) { synchronized (mLock) { - mHighTextContrastStateChangeListeners - .put(listener, (handler == null) ? mHandler : handler); + mHighContrastTextStateChangeListeners.put(listener, executor); } } /** - * Unregisters a {@link HighTextContrastChangeListener}. + * Unregisters a {@link HighContrastTextStateChangeListener}. * * @param listener The listener. - * - * @hide */ - public void removeHighTextContrastStateChangeListener( - @NonNull HighTextContrastChangeListener listener) { + @FlaggedApi(com.android.graphics.hwui.flags.Flags.FLAG_HIGH_CONTRAST_TEXT_SMALL_TEXT_RECT) + public void removeHighContrastTextStateChangeListener( + @NonNull HighContrastTextStateChangeListener listener) { synchronized (mLock) { - mHighTextContrastStateChangeListeners.remove(listener); + mHighContrastTextStateChangeListeners.remove(listener); } } @@ -1505,13 +1503,13 @@ public final class AccessibilityManager { final boolean wasEnabled = isEnabled(); final boolean wasTouchExplorationEnabled = mIsTouchExplorationEnabled; - final boolean wasHighTextContrastEnabled = mIsHighTextContrastEnabled; + final boolean wasHighTextContrastEnabled = mIsHighContrastTextEnabled; final boolean wasAudioDescriptionByDefaultRequested = mIsAudioDescriptionByDefaultRequested; // Ensure listeners get current state from isZzzEnabled() calls. mIsEnabled = enabled; mIsTouchExplorationEnabled = touchExplorationEnabled; - mIsHighTextContrastEnabled = highTextContrastEnabled; + mIsHighContrastTextEnabled = highTextContrastEnabled; mIsAudioDescriptionByDefaultRequested = audioDescriptionEnabled; if (wasEnabled != isEnabled()) { @@ -1523,7 +1521,7 @@ public final class AccessibilityManager { } if (wasHighTextContrastEnabled != highTextContrastEnabled) { - notifyHighTextContrastStateChanged(); + notifyHighContrastTextStateChanged(); } if (wasAudioDescriptionByDefaultRequested @@ -2397,24 +2395,24 @@ public final class AccessibilityManager { } /** - * Notifies the registered {@link HighTextContrastChangeListener}s. + * Notifies the registered {@link HighContrastTextStateChangeListener}s. */ - private void notifyHighTextContrastStateChanged() { + private void notifyHighContrastTextStateChanged() { final boolean isHighTextContrastEnabled; - final ArrayMap<HighTextContrastChangeListener, Handler> listeners; + final ArrayMap<HighContrastTextStateChangeListener, Executor> listeners; synchronized (mLock) { - if (mHighTextContrastStateChangeListeners.isEmpty()) { + if (mHighContrastTextStateChangeListeners.isEmpty()) { return; } - isHighTextContrastEnabled = mIsHighTextContrastEnabled; - listeners = new ArrayMap<>(mHighTextContrastStateChangeListeners); + isHighTextContrastEnabled = mIsHighContrastTextEnabled; + listeners = new ArrayMap<>(mHighContrastTextStateChangeListeners); } final int numListeners = listeners.size(); for (int i = 0; i < numListeners; i++) { - final HighTextContrastChangeListener listener = listeners.keyAt(i); - listeners.valueAt(i).post(() -> - listener.onHighTextContrastStateChanged(isHighTextContrastEnabled)); + final HighContrastTextStateChangeListener listener = listeners.keyAt(i); + listeners.valueAt(i).execute(() -> + listener.onHighContrastTextStateChanged(isHighTextContrastEnabled)); } } diff --git a/core/java/android/window/flags/lse_desktop_experience.aconfig b/core/java/android/window/flags/lse_desktop_experience.aconfig index 70ac12f07a23..b22aa222d1de 100644 --- a/core/java/android/window/flags/lse_desktop_experience.aconfig +++ b/core/java/android/window/flags/lse_desktop_experience.aconfig @@ -162,6 +162,13 @@ flag { } flag { + name: "enable_a11y_metrics" + namespace: "lse_desktop_experience" + description: "Whether to enable log collection for a11y actions in desktop windowing mode" + bug: "341319597" +} + +flag { name: "enable_caption_compat_inset_force_consumption" namespace: "lse_desktop_experience" description: "Enables force-consumption of caption bar insets for immersive apps in freeform" diff --git a/core/java/com/android/internal/notification/SystemNotificationChannels.java b/core/java/com/android/internal/notification/SystemNotificationChannels.java index fef5e83cecca..4aebde536dcf 100644 --- a/core/java/com/android/internal/notification/SystemNotificationChannels.java +++ b/core/java/com/android/internal/notification/SystemNotificationChannels.java @@ -26,6 +26,7 @@ import android.media.AudioAttributes; import android.os.RemoteException; import com.android.internal.R; +import com.android.internal.annotations.VisibleForTesting; import java.util.ArrayList; import java.util.Arrays; @@ -37,38 +38,40 @@ public class SystemNotificationChannels { * @deprecated Legacy system channel, which is no longer used, */ @Deprecated public static String VIRTUAL_KEYBOARD = "VIRTUAL_KEYBOARD"; - public static String PHYSICAL_KEYBOARD = "PHYSICAL_KEYBOARD"; - public static String SECURITY = "SECURITY"; - public static String CAR_MODE = "CAR_MODE"; - public static String ACCOUNT = "ACCOUNT"; - public static String DEVELOPER = "DEVELOPER"; - public static String DEVELOPER_IMPORTANT = "DEVELOPER_IMPORTANT"; - public static String UPDATES = "UPDATES"; - public static String NETWORK_STATUS = "NETWORK_STATUS"; - public static String NETWORK_ALERTS = "NETWORK_ALERTS"; - public static String NETWORK_AVAILABLE = "NETWORK_AVAILABLE"; - public static String VPN = "VPN"; + public static final String PHYSICAL_KEYBOARD = "PHYSICAL_KEYBOARD"; + public static final String SECURITY = "SECURITY"; + public static final String CAR_MODE = "CAR_MODE"; + public static final String ACCOUNT = "ACCOUNT"; + public static final String DEVELOPER = "DEVELOPER"; + public static final String DEVELOPER_IMPORTANT = "DEVELOPER_IMPORTANT"; + public static final String UPDATES = "UPDATES"; + public static final String NETWORK_STATUS = "NETWORK_STATUS"; + public static final String NETWORK_ALERTS = "NETWORK_ALERTS"; + public static final String NETWORK_AVAILABLE = "NETWORK_AVAILABLE"; + public static final String VPN = "VPN"; /** * @deprecated Legacy device admin channel with low importance which is no longer used, * Use the high importance {@link #DEVICE_ADMIN} channel instead. */ - @Deprecated public static String DEVICE_ADMIN_DEPRECATED = "DEVICE_ADMIN"; - public static String DEVICE_ADMIN = "DEVICE_ADMIN_ALERTS"; - public static String ALERTS = "ALERTS"; - public static String RETAIL_MODE = "RETAIL_MODE"; - public static String USB = "USB"; - public static String FOREGROUND_SERVICE = "FOREGROUND_SERVICE"; - public static String HEAVY_WEIGHT_APP = "HEAVY_WEIGHT_APP"; + @Deprecated public static final String DEVICE_ADMIN_DEPRECATED = "DEVICE_ADMIN"; + public static final String DEVICE_ADMIN = "DEVICE_ADMIN_ALERTS"; + public static final String ALERTS = "ALERTS"; + public static final String RETAIL_MODE = "RETAIL_MODE"; + public static final String USB = "USB"; + public static final String FOREGROUND_SERVICE = "FOREGROUND_SERVICE"; + public static final String HEAVY_WEIGHT_APP = "HEAVY_WEIGHT_APP"; /** * @deprecated Legacy system changes channel with low importance which is no longer used, * Use the default importance {@link #SYSTEM_CHANGES} channel instead. */ - @Deprecated public static String SYSTEM_CHANGES_DEPRECATED = "SYSTEM_CHANGES"; - public static String SYSTEM_CHANGES = "SYSTEM_CHANGES_ALERTS"; - public static String DO_NOT_DISTURB = "DO_NOT_DISTURB"; - public static String ACCESSIBILITY_MAGNIFICATION = "ACCESSIBILITY_MAGNIFICATION"; - public static String ACCESSIBILITY_SECURITY_POLICY = "ACCESSIBILITY_SECURITY_POLICY"; - public static String ABUSIVE_BACKGROUND_APPS = "ABUSIVE_BACKGROUND_APPS"; + @Deprecated public static final String SYSTEM_CHANGES_DEPRECATED = "SYSTEM_CHANGES"; + public static final String SYSTEM_CHANGES = "SYSTEM_CHANGES_ALERTS"; + public static final String ACCESSIBILITY_MAGNIFICATION = "ACCESSIBILITY_MAGNIFICATION"; + public static final String ACCESSIBILITY_SECURITY_POLICY = "ACCESSIBILITY_SECURITY_POLICY"; + public static final String ABUSIVE_BACKGROUND_APPS = "ABUSIVE_BACKGROUND_APPS"; + + @VisibleForTesting + static final String OBSOLETE_DO_NOT_DISTURB = "DO_NOT_DISTURB"; public static void createAll(Context context) { final NotificationManager nm = context.getSystemService(NotificationManager.class); @@ -193,11 +196,6 @@ public class SystemNotificationChannels { .build()); channelsList.add(systemChanges); - NotificationChannel dndChanges = new NotificationChannel(DO_NOT_DISTURB, - context.getString(R.string.notification_channel_do_not_disturb), - NotificationManager.IMPORTANCE_LOW); - channelsList.add(dndChanges); - final NotificationChannel newFeaturePrompt = new NotificationChannel( ACCESSIBILITY_MAGNIFICATION, context.getString(R.string.notification_channel_accessibility_magnification), @@ -218,6 +216,9 @@ public class SystemNotificationChannels { channelsList.add(abusiveBackgroundAppsChannel); nm.createNotificationChannels(channelsList); + + // Delete channels created by previous Android versions that are no longer used. + nm.deleteNotificationChannel(OBSOLETE_DO_NOT_DISTURB); } private static String getDeviceAdminNotificationChannelName(Context context) { diff --git a/core/java/com/android/internal/protolog/PerfettoProtoLogImpl.java b/core/java/com/android/internal/protolog/PerfettoProtoLogImpl.java index 4d0cd27fb037..f3dc896a765e 100644 --- a/core/java/com/android/internal/protolog/PerfettoProtoLogImpl.java +++ b/core/java/com/android/internal/protolog/PerfettoProtoLogImpl.java @@ -56,6 +56,7 @@ import android.tracing.perfetto.InitArguments; import android.tracing.perfetto.Producer; import android.tracing.perfetto.TracingContext; import android.util.ArrayMap; +import android.util.ArraySet; import android.util.Log; import android.util.LongArray; import android.util.Slog; @@ -351,6 +352,10 @@ public class PerfettoProtoLogImpl extends IProtoLogClient.Stub implements IProto } private void registerGroupsLocally(@NonNull IProtoLogGroup[] protoLogGroups) { + // Verify we don't have id collisions, if we do we want to know as soon as possible and + // we might want to manually specify an id for the group with a collision + verifyNoCollisionsOrDuplicates(protoLogGroups); + final var groupsLoggingToLogcat = new ArrayList<String>(); for (IProtoLogGroup protoLogGroup : protoLogGroups) { mLogGroups.put(protoLogGroup.name(), protoLogGroup); @@ -369,6 +374,19 @@ public class PerfettoProtoLogImpl extends IProtoLogClient.Stub implements IProto } } + private void verifyNoCollisionsOrDuplicates(@NonNull IProtoLogGroup[] protoLogGroups) { + final var groupId = new ArraySet<Integer>(); + + for (IProtoLogGroup protoLogGroup : protoLogGroups) { + if (groupId.contains(protoLogGroup.getId())) { + throw new RuntimeException( + "Group with same id (" + protoLogGroup.getId() + ") registered twice. " + + "Potential duplicate or hash id collision."); + } + groupId.add(protoLogGroup.getId()); + } + } + /** * Responds to a shell command. */ diff --git a/core/java/com/android/internal/protolog/ProtoLog.java b/core/java/com/android/internal/protolog/ProtoLog.java index adf03fe5f775..60213b1830c6 100644 --- a/core/java/com/android/internal/protolog/ProtoLog.java +++ b/core/java/com/android/internal/protolog/ProtoLog.java @@ -22,8 +22,8 @@ import com.android.internal.protolog.common.IProtoLog; import com.android.internal.protolog.common.IProtoLogGroup; import com.android.internal.protolog.common.LogLevel; -import java.util.ArrayList; import java.util.Arrays; +import java.util.HashSet; /** * ProtoLog API - exposes static logging methods. Usage of this API is similar @@ -73,7 +73,7 @@ public class ProtoLog { if (sProtoLogInstance != null) { // The ProtoLog instance has already been initialized in this process final var alreadyRegisteredGroups = sProtoLogInstance.getRegisteredGroups(); - final var allGroups = new ArrayList<>(alreadyRegisteredGroups); + final var allGroups = new HashSet<>(alreadyRegisteredGroups); allGroups.addAll(Arrays.stream(groups).toList()); groups = allGroups.toArray(new IProtoLogGroup[0]); } diff --git a/core/java/com/android/internal/protolog/TEST_MAPPING b/core/java/com/android/internal/protolog/TEST_MAPPING index 37d57eed8cf4..b51d19da97a5 100644 --- a/core/java/com/android/internal/protolog/TEST_MAPPING +++ b/core/java/com/android/internal/protolog/TEST_MAPPING @@ -1,6 +1,9 @@ { "postsubmit": [ { + "name": "TracingTests" + }, + { "name": "ProtologPerfTests" } ] diff --git a/core/jni/jni_wrappers.h b/core/jni/jni_wrappers.h index 21b5b1308fcf..e3e17eed54d5 100644 --- a/core/jni/jni_wrappers.h +++ b/core/jni/jni_wrappers.h @@ -79,13 +79,14 @@ inline static void setJniMethodFormat(std::string value) { jniMethodFormat = value; } -// Potentially translates the given JNINativeMethods if setJniMethodFormat has been set. -// Has no effect otherwise -inline const JNINativeMethod* maybeRenameJniMethods(const JNINativeMethod* gMethods, - int numMethods) { +// Register the native methods, potenially applying the jniMethodFormat if it has been set. +static inline int jniRegisterMaybeRenamedNativeMethods(JNIEnv* env, const char* className, + const JNINativeMethod* gMethods, + int numMethods) { if (jniMethodFormat.empty()) { - return gMethods; + return jniRegisterNativeMethods(env, className, gMethods, numMethods); } + // Make a copy of gMethods with reformatted method names. JNINativeMethod* modifiedMethods = new JNINativeMethod[numMethods]; LOG_ALWAYS_FATAL_IF(!modifiedMethods, "Failed to allocate a copy of the JNI methods"); @@ -103,13 +104,17 @@ inline const JNINativeMethod* maybeRenameJniMethods(const JNINativeMethod* gMeth std::strcpy(modifiedNameChars, modifiedName.c_str()); modifiedMethods[i].name = modifiedNameChars; } - return modifiedMethods; + int res = jniRegisterNativeMethods(env, className, modifiedMethods, numMethods); + for (int i = 0; i < numMethods; i++) { + delete[] modifiedMethods[i].name; + } + delete[] modifiedMethods; + return res; } static inline int RegisterMethodsOrDie(JNIEnv* env, const char* className, const JNINativeMethod* gMethods, int numMethods) { - const JNINativeMethod* modifiedMethods = maybeRenameJniMethods(gMethods, numMethods); - int res = jniRegisterNativeMethods(env, className, modifiedMethods, numMethods); + int res = jniRegisterMaybeRenamedNativeMethods(env, className, gMethods, numMethods); LOG_ALWAYS_FATAL_IF(res < 0, "Unable to register native methods."); return res; } diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index d63421057939..7aca535ad277 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -5818,16 +5818,6 @@ <!-- Title for the notification channel notifying user of settings system changes. [CHAR LIMIT=NONE] --> <string name="notification_channel_system_changes">System changes</string> - <!-- Title for the notification channel notifying user of do not disturb system changes (i.e. Do Not Disturb has changed). [CHAR LIMIT=NONE] --> - <string name="notification_channel_do_not_disturb">Do Not Disturb</string> - <!-- Title of notification indicating do not disturb visual interruption settings have changed when upgrading to P --> - <string name="zen_upgrade_notification_visd_title">New: Do Not Disturb is hiding notifications</string> - <!-- Content of notification indicating users can tap on the notification to go to dnd behavior settings --> - <string name="zen_upgrade_notification_visd_content">Tap to learn more and change.</string> - <!-- Title of notification indicating do not disturb settings have changed when upgrading to P --> - <string name="zen_upgrade_notification_title">Do Not Disturb has changed</string> - <!-- Content of notification indicating users can tap on the notification to go to dnd behavior settings --> - <string name="zen_upgrade_notification_content">Tap to check what\'s blocked.</string> <!-- Notification permission informational notification text --> <!-- Title for notification inviting users to review their notification settings [CHAR LIMIT=NONE] --> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 0ccef9123e10..d5298acf0c27 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -3937,7 +3937,6 @@ <java-symbol type="string" name="notification_channel_usb" /> <java-symbol type="string" name="notification_channel_heavy_weight_app" /> <java-symbol type="string" name="notification_channel_system_changes" /> - <java-symbol type="string" name="notification_channel_do_not_disturb" /> <java-symbol type="string" name="notification_channel_accessibility_magnification" /> <java-symbol type="string" name="notification_channel_accessibility_security_policy" /> <java-symbol type="string" name="notification_channel_display" /> @@ -4164,11 +4163,6 @@ <!-- For Wear devices --> <java-symbol type="array" name="config_wearActivityModeRadios" /> - <java-symbol type="string" name="zen_upgrade_notification_title" /> - <java-symbol type="string" name="zen_upgrade_notification_content" /> - <java-symbol type="string" name="zen_upgrade_notification_visd_title" /> - <java-symbol type="string" name="zen_upgrade_notification_visd_content" /> - <java-symbol type="string" name="review_notification_settings_title" /> <java-symbol type="string" name="review_notification_settings_text" /> <java-symbol type="string" name="review_notification_settings_remind_me_action" /> diff --git a/core/tests/coretests/src/android/app/NotificationTest.java b/core/tests/coretests/src/android/app/NotificationTest.java index e9b137cd5477..48e26203fab4 100644 --- a/core/tests/coretests/src/android/app/NotificationTest.java +++ b/core/tests/coretests/src/android/app/NotificationTest.java @@ -2301,13 +2301,13 @@ public class NotificationTest { @Test @EnableFlags(Flags.FLAG_API_RICH_ONGOING) - public void progressStyle_onProgressStepChange_visiblyDifferent() { + public void progressStyle_onProgressPointChange_visiblyDifferent() { final Notification.Builder nProgress1 = new Notification.Builder(mContext, "test") .setStyle(new Notification.ProgressStyle() - .addProgressStep(new Notification.ProgressStyle.Step(10))); + .addProgressPoint(new Notification.ProgressStyle.Point(10))); final Notification.Builder nProgress2 = new Notification.Builder(mContext, "test") .setStyle(new Notification.ProgressStyle() - .addProgressStep(new Notification.ProgressStyle.Step(12))); + .addProgressPoint(new Notification.ProgressStyle.Point(12))); assertThat(Notification.areStyledNotificationsVisiblyDifferent(nProgress1, nProgress2)) .isTrue(); @@ -2315,13 +2315,13 @@ public class NotificationTest { @Test @EnableFlags(Flags.FLAG_API_RICH_ONGOING) - public void indeterminateProgressStyle_onProgressStepChange_visiblyNotDifferent() { + public void indeterminateProgressStyle_onProgressPointChange_visiblyNotDifferent() { final Notification.Builder nProgress1 = new Notification.Builder(mContext, "test") .setStyle(new Notification.ProgressStyle().setProgressIndeterminate(true) - .addProgressStep(new Notification.ProgressStyle.Step(10))); + .addProgressPoint(new Notification.ProgressStyle.Point(10))); final Notification.Builder nProgress2 = new Notification.Builder(mContext, "test") .setStyle(new Notification.ProgressStyle().setProgressIndeterminate(true) - .addProgressStep(new Notification.ProgressStyle.Step(12))); + .addProgressPoint(new Notification.ProgressStyle.Point(12))); assertThat(Notification.areStyledNotificationsVisiblyDifferent(nProgress1, nProgress2)) .isFalse(); diff --git a/core/tests/coretests/src/android/content/res/ResourcesManagerTest.java b/core/tests/coretests/src/android/content/res/ResourcesManagerTest.java index 3eefe044de90..b16c237252f6 100644 --- a/core/tests/coretests/src/android/content/res/ResourcesManagerTest.java +++ b/core/tests/coretests/src/android/content/res/ResourcesManagerTest.java @@ -119,7 +119,7 @@ public class ResourcesManagerTest { } @Override - protected DisplayMetrics getDisplayMetrics(int displayId, DisplayAdjustments daj) { + public DisplayMetrics getDisplayMetrics(int displayId, DisplayAdjustments daj) { return mDisplayMetricsMap.get(displayId); } }; @@ -470,6 +470,48 @@ public class ResourcesManagerTest { @Test @SmallTest + public void testResourceConfigurationAppliedWhenOverrideDoesNotExist() { + final int width = 240; + final int height = 360; + final float densityDpi = mDisplayMetricsMap.get(Display.DEFAULT_DISPLAY).densityDpi; + final int widthDp = (int) (width / densityDpi + 0.5f); + final int heightDp = (int) (height / densityDpi + 0.5f); + + final int overrideWidth = 480; + final int overrideHeight = 720; + final int overrideWidthDp = (int) (overrideWidth / densityDpi + 0.5f); + final int overrideHeightDp = (int) (height / densityDpi + 0.5f); + + // The method to be tested is overridden for other tests to provide a setup environment. + // Create a new one for this test only. + final ResourcesManager resourcesManager = new ResourcesManager(); + + Configuration newConfig = new Configuration(); + newConfig.windowConfiguration.setAppBounds(0, 0, width, height); + newConfig.screenWidthDp = widthDp; + newConfig.screenHeightDp = heightDp; + resourcesManager.applyConfigurationToResources(newConfig, null); + + assertEquals(width, resourcesManager.getDisplayMetrics(Display.DEFAULT_DISPLAY, + DisplayAdjustments.DEFAULT_DISPLAY_ADJUSTMENTS).widthPixels); + assertEquals(height, resourcesManager.getDisplayMetrics(Display.DEFAULT_DISPLAY, + DisplayAdjustments.DEFAULT_DISPLAY_ADJUSTMENTS).heightPixels); + + Configuration overrideConfig = new Configuration(); + overrideConfig.windowConfiguration.setAppBounds(0, 0, overrideWidth, overrideHeight); + overrideConfig.screenWidthDp = overrideWidthDp; + overrideConfig.screenHeightDp = overrideHeightDp; + + final DisplayAdjustments daj = new DisplayAdjustments(overrideConfig); + + assertEquals(overrideWidth, resourcesManager.getDisplayMetrics( + Display.DEFAULT_DISPLAY, daj).widthPixels); + assertEquals(overrideHeight, resourcesManager.getDisplayMetrics( + Display.DEFAULT_DISPLAY, daj).heightPixels); + } + + @Test + @SmallTest @RequiresFlagsEnabled(Flags.FLAG_REGISTER_RESOURCE_PATHS) @DisabledOnRavenwood(blockedBy = PackageManager.class) public void testNewResourcesWithOutdatedImplAfterResourcePathsRegistration() diff --git a/core/tests/coretests/src/com/android/internal/notification/SystemNotificationChannelsTest.java b/core/tests/coretests/src/com/android/internal/notification/SystemNotificationChannelsTest.java new file mode 100644 index 000000000000..0bf406c970f2 --- /dev/null +++ b/core/tests/coretests/src/com/android/internal/notification/SystemNotificationChannelsTest.java @@ -0,0 +1,107 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.internal.notification; + +import static com.android.internal.notification.SystemNotificationChannels.ABUSIVE_BACKGROUND_APPS; +import static com.android.internal.notification.SystemNotificationChannels.ACCESSIBILITY_MAGNIFICATION; +import static com.android.internal.notification.SystemNotificationChannels.ACCESSIBILITY_SECURITY_POLICY; +import static com.android.internal.notification.SystemNotificationChannels.ACCOUNT; +import static com.android.internal.notification.SystemNotificationChannels.ALERTS; +import static com.android.internal.notification.SystemNotificationChannels.CAR_MODE; +import static com.android.internal.notification.SystemNotificationChannels.DEVELOPER; +import static com.android.internal.notification.SystemNotificationChannels.DEVELOPER_IMPORTANT; +import static com.android.internal.notification.SystemNotificationChannels.DEVICE_ADMIN; +import static com.android.internal.notification.SystemNotificationChannels.FOREGROUND_SERVICE; +import static com.android.internal.notification.SystemNotificationChannels.HEAVY_WEIGHT_APP; +import static com.android.internal.notification.SystemNotificationChannels.NETWORK_ALERTS; +import static com.android.internal.notification.SystemNotificationChannels.NETWORK_AVAILABLE; +import static com.android.internal.notification.SystemNotificationChannels.NETWORK_STATUS; +import static com.android.internal.notification.SystemNotificationChannels.OBSOLETE_DO_NOT_DISTURB; +import static com.android.internal.notification.SystemNotificationChannels.PHYSICAL_KEYBOARD; +import static com.android.internal.notification.SystemNotificationChannels.RETAIL_MODE; +import static com.android.internal.notification.SystemNotificationChannels.SECURITY; +import static com.android.internal.notification.SystemNotificationChannels.SYSTEM_CHANGES; +import static com.android.internal.notification.SystemNotificationChannels.UPDATES; +import static com.android.internal.notification.SystemNotificationChannels.USB; +import static com.android.internal.notification.SystemNotificationChannels.VPN; + +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.Mockito.atLeastOnce; +import static org.mockito.Mockito.verify; + +import android.app.NotificationChannel; +import android.app.NotificationManager; +import android.testing.TestableContext; + +import androidx.test.core.app.ApplicationProvider; +import androidx.test.ext.junit.runners.AndroidJUnit4; + +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.ArgumentCaptor; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; + +import java.util.List; + +@RunWith(AndroidJUnit4.class) +public class SystemNotificationChannelsTest { + + @Rule public TestableContext mContext = new TestableContext( + ApplicationProvider.getApplicationContext()); + + @Mock private NotificationManager mNm; + + @Before + public void setUp() { + MockitoAnnotations.initMocks(this); + mContext.addMockSystemService(NotificationManager.class, mNm); + } + + @Test + @SuppressWarnings("unchecked") + public void createAll_createsExpectedChannels() { + ArgumentCaptor<List<NotificationChannel>> createdChannelsCaptor = + ArgumentCaptor.forClass(List.class); + + SystemNotificationChannels.createAll(mContext); + + verify(mNm).createNotificationChannels(createdChannelsCaptor.capture()); + List<NotificationChannel> createdChannels = createdChannelsCaptor.getValue(); + assertThat(createdChannels.stream().map(NotificationChannel::getId).toList()) + .containsExactly(PHYSICAL_KEYBOARD, SECURITY, CAR_MODE, ACCOUNT, DEVELOPER, + DEVELOPER_IMPORTANT, UPDATES, NETWORK_STATUS, NETWORK_ALERTS, + NETWORK_AVAILABLE, VPN, DEVICE_ADMIN, ALERTS, RETAIL_MODE, USB, + FOREGROUND_SERVICE, HEAVY_WEIGHT_APP, SYSTEM_CHANGES, + ACCESSIBILITY_MAGNIFICATION, ACCESSIBILITY_SECURITY_POLICY, + ABUSIVE_BACKGROUND_APPS); + } + + @Test + public void createAll_deletesObsoleteChannels() { + ArgumentCaptor<String> deletedChannelCaptor = ArgumentCaptor.forClass(String.class); + + SystemNotificationChannels.createAll(mContext); + + verify(mNm, atLeastOnce()).deleteNotificationChannel(deletedChannelCaptor.capture()); + List<String> deletedChannels = deletedChannelCaptor.getAllValues(); + assertThat(deletedChannels).containsExactly(OBSOLETE_DO_NOT_DISTURB); + } +} diff --git a/errorprone/java/com/google/errorprone/bugpatterns/android/RequiresPermissionChecker.java b/errorprone/java/com/google/errorprone/bugpatterns/android/RequiresPermissionChecker.java index 9887c272e7f8..af26bd0a3404 100644 --- a/errorprone/java/com/google/errorprone/bugpatterns/android/RequiresPermissionChecker.java +++ b/errorprone/java/com/google/errorprone/bugpatterns/android/RequiresPermissionChecker.java @@ -130,10 +130,6 @@ public final class RequiresPermissionChecker extends BugChecker .onDescendantOf("android.content.Context") .withNameMatching( Pattern.compile("^send(Ordered|Sticky)?Broadcast.*AsUser.*$"))); - private static final Matcher<ExpressionTree> SEND_PENDING_INTENT = methodInvocation( - instanceMethod() - .onDescendantOf("android.app.PendingIntent") - .named("send")); private static final Matcher<ExpressionTree> INTENT_SET_ACTION = methodInvocation( instanceMethod().onDescendantOf("android.content.Intent").named("setAction")); diff --git a/graphics/java/android/graphics/Canvas.java b/graphics/java/android/graphics/Canvas.java index 0b3e5456d81c..28c2ca36fd2e 100644 --- a/graphics/java/android/graphics/Canvas.java +++ b/graphics/java/android/graphics/Canvas.java @@ -155,7 +155,7 @@ public class Canvas extends BaseCanvas { /** * Indicates whether this Canvas is drawing high contrast text. * - * @see android.view.accessibility.AccessibilityManager#isHighTextContrastEnabled() + * @see android.view.accessibility.AccessibilityManager#isHighContrastTextEnabled() * @return True if high contrast text is enabled, false otherwise. * * @hide diff --git a/libs/WindowManager/Shell/Android.bp b/libs/WindowManager/Shell/Android.bp index a796eccd53ba..e493ed1110c8 100644 --- a/libs/WindowManager/Shell/Android.bp +++ b/libs/WindowManager/Shell/Android.bp @@ -197,6 +197,7 @@ java_library { android_library { name: "WindowManager-Shell", srcs: [ + "src/com/android/wm/shell/EventLogTags.logtags", ":wm_shell_protolog_src", // TODO(b/168581922) protologtool do not support kotlin(*.kt) ":wm_shell-sources-kt", diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/EventLogTags.logtags b/libs/WindowManager/Shell/src/com/android/wm/shell/EventLogTags.logtags new file mode 100644 index 000000000000..db960d15c526 --- /dev/null +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/EventLogTags.logtags @@ -0,0 +1,11 @@ +# See system/logging/logcat/event.logtags for a description of the format of this file. + +option java_package com.android.wm.shell + +# Do not change these names without updating the checkin_events setting in +# google3/googledata/wireless/android/provisioning/gservices.config !! +# + +38500 wm_shell_enter_desktop_mode (EnterReason|1|5),(SessionId|1|5) +38501 wm_shell_exit_desktop_mode (ExitReason|1|5),(SessionId|1|5) +38502 wm_shell_desktop_mode_task_update (TaskEvent|1|5),(InstanceId|1|5),(uid|1|5),(TaskHeight|1),(TaskWidth|1),(TaskX|1),(TaskY|1),(SessionId|1|5),(MinimiseReason|1|5),(UnminimiseReason|1|5),(VisibleTaskCount|1) diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java index af4a0c55f28d..03b7c8b7fe1b 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java @@ -2001,6 +2001,10 @@ public class BubbleController implements ConfigurationChangeListener, // in bubble bar mode, let the request to show the expanded view come from launcher. // only collapse here if we're collapsing. if (mLayerView != null && !isExpanded) { + if (mBubblePositioner.isImeVisible()) { + // If we're collapsing, hide the IME + hideCurrentInputMethod(); + } mLayerView.collapse(); } } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarExpandedView.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarExpandedView.java index ec235a5d84ab..2a9001728cc2 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarExpandedView.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarExpandedView.java @@ -353,6 +353,11 @@ public class BubbleBarExpandedView extends FrameLayout implements BubbleTaskView if (isDragging != mIsDragging) { mIsDragging = isDragging; updateSamplingState(); + + if (isDragging && mPositioner.isImeVisible()) { + // Hide the IME when dragging begins + mManager.hideCurrentInputMethod(); + } } } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellModule.java b/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellModule.java index 8ce3884d7477..72939565ac78 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellModule.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellModule.java @@ -851,10 +851,11 @@ public abstract class WMShellModule { static DesktopWindowingEducationTooltipController provideDesktopWindowingEducationTooltipController( Context context, - AdditionalSystemViewContainer.Factory additionalSystemViewContainerFactory + AdditionalSystemViewContainer.Factory additionalSystemViewContainerFactory, + DisplayController displayController ) { return new DesktopWindowingEducationTooltipController(context, - additionalSystemViewContainerFactory); + additionalSystemViewContainerFactory, displayController); } @OptIn(markerClass = ExperimentalCoroutinesApi.class) diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeEventLogger.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeEventLogger.kt index 02cbe01d0a03..5a277316ffd4 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeEventLogger.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeEventLogger.kt @@ -19,6 +19,8 @@ package com.android.wm.shell.desktopmode import com.android.internal.annotations.VisibleForTesting import com.android.internal.protolog.ProtoLog import com.android.internal.util.FrameworkStatsLog +import com.android.window.flags.Flags +import com.android.wm.shell.EventLogTags import com.android.wm.shell.protolog.ShellProtoLogGroup /** Event logger for logging desktop mode session events */ @@ -41,6 +43,7 @@ class DesktopModeEventLogger { /* exitReason */ 0, /* session_id */ sessionId ) + EventLogTags.writeWmShellEnterDesktopMode(enterReason.reason, sessionId) } /** @@ -61,6 +64,7 @@ class DesktopModeEventLogger { /* exitReason */ exitReason.reason, /* session_id */ sessionId ) + EventLogTags.writeWmShellExitDesktopMode(exitReason.reason, sessionId) } /** @@ -76,7 +80,8 @@ class DesktopModeEventLogger { ) logTaskUpdate( FrameworkStatsLog.DESKTOP_MODE_SESSION_TASK_UPDATE__TASK_EVENT__TASK_ADDED, - sessionId, taskUpdate) + sessionId, taskUpdate + ) } /** @@ -92,7 +97,8 @@ class DesktopModeEventLogger { ) logTaskUpdate( FrameworkStatsLog.DESKTOP_MODE_SESSION_TASK_UPDATE__TASK_EVENT__TASK_REMOVED, - sessionId, taskUpdate) + sessionId, taskUpdate + ) } /** @@ -108,7 +114,46 @@ class DesktopModeEventLogger { ) logTaskUpdate( FrameworkStatsLog.DESKTOP_MODE_SESSION_TASK_UPDATE__TASK_EVENT__TASK_INFO_CHANGED, - sessionId, taskUpdate) + sessionId, taskUpdate + ) + } + + /** + * Logs that a task resize event is starting with [taskSizeUpdate] within a + * Desktop mode [sessionId]. + */ + fun logTaskResizingStarted(sessionId: Int, taskSizeUpdate: TaskSizeUpdate) { + if (!Flags.enableResizingMetrics()) return + + ProtoLog.v( + ShellProtoLogGroup.WM_SHELL_DESKTOP_MODE, + "DesktopModeLogger: Logging task resize is starting, session: %s taskId: %s", + sessionId, + taskSizeUpdate.instanceId + ) + logTaskSizeUpdated( + FrameworkStatsLog.DESKTOP_MODE_TASK_SIZE_UPDATED__RESIZING_STAGE__START_RESIZING_STAGE, + sessionId, taskSizeUpdate + ) + } + + /** + * Logs that a task resize event is ending with [taskSizeUpdate] within a + * Desktop mode [sessionId]. + */ + fun logTaskResizingEnded(sessionId: Int, taskSizeUpdate: TaskSizeUpdate) { + if (!Flags.enableResizingMetrics()) return + + ProtoLog.v( + ShellProtoLogGroup.WM_SHELL_DESKTOP_MODE, + "DesktopModeLogger: Logging task resize is ending, session: %s taskId: %s", + sessionId, + taskSizeUpdate.instanceId + ) + logTaskSizeUpdated( + FrameworkStatsLog.DESKTOP_MODE_TASK_SIZE_UPDATED__RESIZING_STAGE__END_RESIZING_STAGE, + sessionId, taskSizeUpdate + ) } private fun logTaskUpdate(taskEvent: Int, sessionId: Int, taskUpdate: TaskUpdate) { @@ -135,6 +180,56 @@ class DesktopModeEventLogger { /* visible_task_count */ taskUpdate.visibleTaskCount ) + EventLogTags.writeWmShellDesktopModeTaskUpdate( + /* task_event */ + taskEvent, + /* instance_id */ + taskUpdate.instanceId, + /* uid */ + taskUpdate.uid, + /* task_height */ + taskUpdate.taskHeight, + /* task_width */ + taskUpdate.taskWidth, + /* task_x */ + taskUpdate.taskX, + /* task_y */ + taskUpdate.taskY, + /* session_id */ + sessionId, + taskUpdate.minimizeReason?.reason ?: UNSET_MINIMIZE_REASON, + taskUpdate.unminimizeReason?.reason ?: UNSET_UNMINIMIZE_REASON, + /* visible_task_count */ + taskUpdate.visibleTaskCount + ) + } + + private fun logTaskSizeUpdated( + resizingStage: Int, + sessionId: Int, + taskSizeUpdate: TaskSizeUpdate + ) { + FrameworkStatsLog.write( + DESKTOP_MODE_TASK_SIZE_UPDATED_ATOM_ID, + /* resize_trigger */ + taskSizeUpdate.resizeTrigger?.trigger ?: ResizeTrigger.UNKNOWN_RESIZE_TRIGGER.trigger, + /* resizing_stage */ + resizingStage, + /* input_method */ + taskSizeUpdate.inputMethod?.method ?: InputMethod.UNKNOWN_INPUT_METHOD.method, + /* desktop_mode_session_id */ + sessionId, + /* instance_id */ + taskSizeUpdate.instanceId, + /* uid */ + taskSizeUpdate.uid, + /* task_height */ + taskSizeUpdate.taskHeight, + /* task_width */ + taskSizeUpdate.taskWidth, + /* display_area */ + taskSizeUpdate.displayArea + ) } companion object { @@ -163,13 +258,35 @@ class DesktopModeEventLogger { val visibleTaskCount: Int, ) + /** + * Describes a task size update (resizing, snapping or maximizing to + * stable bounds). + * + * @property resizeTrigger the trigger for task resize + * @property inputMethod the input method for resizing this task + * @property instanceId instance id of the task + * @property uid uid of the app associated with the task + * @property taskHeight height of the task in dp + * @property taskWidth width of the task in dp + * @property displayArea the display size of the screen in dp + */ + data class TaskSizeUpdate( + val resizeTrigger: ResizeTrigger? = null, + val inputMethod: InputMethod? = null, + val instanceId: Int, + val uid: Int, + val taskHeight: Int, + val taskWidth: Int, + val displayArea: Int, + ) + // Default value used when the task was not minimized. @VisibleForTesting const val UNSET_MINIMIZE_REASON = FrameworkStatsLog.DESKTOP_MODE_SESSION_TASK_UPDATE__MINIMIZE_REASON__UNSET_MINIMIZE /** The reason a task was minimized. */ - enum class MinimizeReason (val reason: Int) { + enum class MinimizeReason(val reason: Int) { TASK_LIMIT( FrameworkStatsLog .DESKTOP_MODE_SESSION_TASK_UPDATE__MINIMIZE_REASON__MINIMIZE_TASK_LIMIT @@ -186,7 +303,7 @@ class DesktopModeEventLogger { FrameworkStatsLog.DESKTOP_MODE_SESSION_TASK_UPDATE__UNMINIMIZE_REASON__UNSET_UNMINIMIZE /** The reason a task was unminimized. */ - enum class UnminimizeReason (val reason: Int) { + enum class UnminimizeReason(val reason: Int) { UNKNOWN( FrameworkStatsLog .DESKTOP_MODE_SESSION_TASK_UPDATE__UNMINIMIZE_REASON__UNMINIMIZE_UNKNOWN @@ -250,8 +367,88 @@ class DesktopModeEventLogger { SCREEN_OFF(FrameworkStatsLog.DESKTOP_MODE_UICHANGED__EXIT_REASON__SCREEN_OFF) } + /** + * Enum ResizeTrigger mapped to the ResizeTrigger definition in + * stats/atoms/desktopmode/desktopmode_extensions_atoms.proto + */ + enum class ResizeTrigger(val trigger: Int) { + UNKNOWN_RESIZE_TRIGGER( + FrameworkStatsLog + .DESKTOP_MODE_TASK_SIZE_UPDATED__RESIZE_TRIGGER__UNKNOWN_RESIZE_TRIGGER + ), + CORNER( + FrameworkStatsLog + .DESKTOP_MODE_TASK_SIZE_UPDATED__RESIZE_TRIGGER__CORNER_RESIZE_TRIGGER + ), + EDGE( + FrameworkStatsLog + .DESKTOP_MODE_TASK_SIZE_UPDATED__RESIZE_TRIGGER__EDGE_RESIZE_TRIGGER + ), + TILING_DIVIDER( + FrameworkStatsLog + .DESKTOP_MODE_TASK_SIZE_UPDATED__RESIZE_TRIGGER__TILING_DIVIDER_RESIZE_TRIGGER + ), + MAXIMIZE_BUTTON( + FrameworkStatsLog + .DESKTOP_MODE_TASK_SIZE_UPDATED__RESIZE_TRIGGER__MAXIMIZE_BUTTON_RESIZE_TRIGGER + ), + DOUBLE_TAP_APP_HEADER( + FrameworkStatsLog + .DESKTOP_MODE_TASK_SIZE_UPDATED__RESIZE_TRIGGER__DOUBLE_TAP_APP_HEADER_RESIZE_TRIGGER + ), + DRAG_LEFT( + FrameworkStatsLog + .DESKTOP_MODE_TASK_SIZE_UPDATED__RESIZE_TRIGGER__DRAG_LEFT_RESIZE_TRIGGER + ), + DRAG_RIGHT( + FrameworkStatsLog + .DESKTOP_MODE_TASK_SIZE_UPDATED__RESIZE_TRIGGER__DRAG_RIGHT_RESIZE_TRIGGER + ), + SNAP_LEFT_MENU( + FrameworkStatsLog + .DESKTOP_MODE_TASK_SIZE_UPDATED__RESIZE_TRIGGER__SNAP_LEFT_MENU_RESIZE_TRIGGER + ), + SNAP_RIGHT_MENU( + FrameworkStatsLog + .DESKTOP_MODE_TASK_SIZE_UPDATED__RESIZE_TRIGGER__SNAP_RIGHT_MENU_RESIZE_TRIGGER + ), + } + + /** + * Enum InputMethod mapped to the InputMethod definition in + * stats/atoms/desktopmode/desktopmode_extensions_atoms.proto + */ + enum class InputMethod(val method: Int) { + UNKNOWN_INPUT_METHOD( + FrameworkStatsLog + .DESKTOP_MODE_TASK_SIZE_UPDATED__INPUT_METHOD__UNKNOWN_INPUT_METHOD + ), + TOUCH( + FrameworkStatsLog + .DESKTOP_MODE_TASK_SIZE_UPDATED__INPUT_METHOD__TOUCH_INPUT_METHOD + ), + STYLUS( + FrameworkStatsLog + .DESKTOP_MODE_TASK_SIZE_UPDATED__INPUT_METHOD__STYLUS_INPUT_METHOD + ), + MOUSE( + FrameworkStatsLog + .DESKTOP_MODE_TASK_SIZE_UPDATED__INPUT_METHOD__MOUSE_INPUT_METHOD + ), + TOUCHPAD( + FrameworkStatsLog + .DESKTOP_MODE_TASK_SIZE_UPDATED__INPUT_METHOD__TOUCHPAD_INPUT_METHOD + ), + KEYBOARD( + FrameworkStatsLog + .DESKTOP_MODE_TASK_SIZE_UPDATED__INPUT_METHOD__KEYBOARD_INPUT_METHOD + ), + } + private const val DESKTOP_MODE_ATOM_ID = FrameworkStatsLog.DESKTOP_MODE_UI_CHANGED private const val DESKTOP_MODE_TASK_UPDATE_ATOM_ID = FrameworkStatsLog.DESKTOP_MODE_SESSION_TASK_UPDATE + private const val DESKTOP_MODE_TASK_SIZE_UPDATED_ATOM_ID = + FrameworkStatsLog.DESKTOP_MODE_TASK_SIZE_UPDATED } } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt index b8bb73ba4148..fcd2f8ceaf49 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt @@ -406,7 +406,7 @@ class DesktopTasksController( interactionJankMonitor.begin(taskSurface, context, handler, CUJ_DESKTOP_MODE_ENTER_APP_HANDLE_DRAG_HOLD) dragToDesktopTransitionHandler.startDragToDesktopTransition( - taskInfo.taskId, + taskInfo, dragToDesktopValueAnimator ) } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksLimiter.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksLimiter.kt index 7e0741f1f859..37ad0c9f72c5 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksLimiter.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksLimiter.kt @@ -24,6 +24,7 @@ import android.view.SurfaceControl import android.view.WindowManager.TRANSIT_TO_BACK import android.window.TransitionInfo import android.window.WindowContainerTransaction +import android.window.flags.DesktopModeFlags import androidx.annotation.VisibleForTesting import com.android.internal.jank.Cuj.CUJ_DESKTOP_MODE_MINIMIZE_WINDOW import com.android.internal.jank.InteractionJankMonitor @@ -161,6 +162,8 @@ class DesktopTasksLimiter ( @VisibleForTesting inner class LeftoverMinimizedTasksRemover : DesktopModeTaskRepository.ActiveTasksListener { override fun onActiveTasksChanged(displayId: Int) { + // If back navigation is enabled, we shouldn't remove the leftover tasks + if (DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION.isTrue()) return val wct = WindowContainerTransaction() removeLeftoverMinimizedTasks(displayId, wct) shellTaskOrganizer.applyTransaction(wct) diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksTransitionObserver.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksTransitionObserver.kt index 4796c4d0655a..b20c9fc6e443 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksTransitionObserver.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksTransitionObserver.kt @@ -29,6 +29,7 @@ import android.window.flags.DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_WALLPAPER_ import com.android.internal.protolog.ProtoLog import com.android.wm.shell.ShellTaskOrganizer import com.android.wm.shell.protolog.ShellProtoLogGroup.WM_SHELL_DESKTOP_MODE +import com.android.wm.shell.shared.TransitionUtil import com.android.wm.shell.shared.desktopmode.DesktopModeStatus import com.android.wm.shell.sysui.ShellInit import com.android.wm.shell.transition.Transitions @@ -67,9 +68,29 @@ class DesktopTasksTransitionObserver( ) { // TODO: b/332682201 Update repository state updateWallpaperToken(info) - if (DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION.isTrue()) { handleBackNavigation(info) + removeTaskIfNeeded(info) + } + } + + private fun removeTaskIfNeeded(info: TransitionInfo) { + // Since we are no longer removing all the tasks [onTaskVanished], we need to remove them by + // checking the transitions. + if (!TransitionUtil.isOpeningType(info.type)) return + // Remove a task from the repository if the app is launched outside of desktop. + for (change in info.changes) { + val taskInfo = change.taskInfo + if (taskInfo == null || taskInfo.taskId == -1) continue + + if (desktopModeTaskRepository.isActiveTask(taskInfo.taskId) + && taskInfo.windowingMode != WINDOWING_MODE_FREEFORM + ) { + desktopModeTaskRepository.removeFreeformTask( + taskInfo.displayId, + taskInfo.taskId + ) + } } } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DragToDesktopTransitionHandler.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DragToDesktopTransitionHandler.kt index 2bc01b2f310e..8e264b2410f7 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DragToDesktopTransitionHandler.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DragToDesktopTransitionHandler.kt @@ -109,8 +109,8 @@ sealed class DragToDesktopTransitionHandler( * after one of the "end" or "cancel" transitions is merged into this transition. */ fun startDragToDesktopTransition( - taskId: Int, - dragToDesktopAnimator: MoveToDesktopAnimator, + taskInfo: RunningTaskInfo, + dragToDesktopAnimator: MoveToDesktopAnimator ) { if (inProgress) { ProtoLog.v( @@ -137,23 +137,26 @@ sealed class DragToDesktopTransitionHandler( ) val wct = WindowContainerTransaction() wct.sendPendingIntent(pendingIntent, launchHomeIntent, Bundle()) + // The home launch done above will result in an attempt to move the task to pip if + // applicable, resulting in a broken state. Prevent that here. + wct.setDoNotPip(taskInfo.token) val startTransitionToken = transitions.startTransition(TRANSIT_DESKTOP_MODE_START_DRAG_TO_DESKTOP, wct, this) transitionState = - if (isSplitTask(taskId)) { + if (isSplitTask(taskInfo.taskId)) { val otherTask = - getOtherSplitTask(taskId) + getOtherSplitTask(taskInfo.taskId) ?: throw IllegalStateException("Expected split task to have a counterpart.") TransitionState.FromSplit( - draggedTaskId = taskId, + draggedTaskId = taskInfo.taskId, dragAnimator = dragToDesktopAnimator, startTransitionToken = startTransitionToken, otherSplitTask = otherTask ) } else { TransitionState.FromFullscreen( - draggedTaskId = taskId, + draggedTaskId = taskInfo.taskId, dragAnimator = dragToDesktopAnimator, startTransitionToken = startTransitionToken ) diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentTasksController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentTasksController.java index 03ff1aac794c..c9c0873dae5e 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentTasksController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentTasksController.java @@ -32,6 +32,7 @@ import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.graphics.Color; +import android.graphics.Point; import android.os.Bundle; import android.os.RemoteException; import android.util.Slog; @@ -46,6 +47,7 @@ import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; import com.android.internal.protolog.ProtoLog; +import com.android.window.flags.Flags; import com.android.wm.shell.common.ExternalInterfaceBinder; import com.android.wm.shell.common.RemoteCallable; import com.android.wm.shell.common.ShellExecutor; @@ -421,6 +423,16 @@ public class RecentTasksController implements TaskStackListenerCallback, if (mostRecentFreeformTaskIndex == Integer.MAX_VALUE) { mostRecentFreeformTaskIndex = recentTasks.size(); } + // If task has their app bounds set to null which happens after reboot, set the + // app bounds to persisted lastFullscreenBounds. Also set the position in parent + // to the top left of the bounds. + if (Flags.enableDesktopWindowingPersistence() + && taskInfo.configuration.windowConfiguration.getAppBounds() == null) { + taskInfo.configuration.windowConfiguration.setAppBounds( + taskInfo.lastNonFullscreenBounds); + taskInfo.positionInParent = new Point(taskInfo.lastNonFullscreenBounds.left, + taskInfo.lastNonFullscreenBounds.top); + } freeformTasks.add(taskInfo); if (mDesktopModeTaskRepository.get().isMinimizedTask(taskInfo.taskId)) { minimizedFreeformTasks.add(taskInfo.taskId); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/MixedTransitionHelper.java b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/MixedTransitionHelper.java index 30d7245436be..e61929fef312 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/MixedTransitionHelper.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/MixedTransitionHelper.java @@ -141,10 +141,13 @@ public class MixedTransitionHelper { pipHandler.setEnterAnimationType(ANIM_TYPE_ALPHA); pipHandler.startEnterAnimation(pipChange, startTransaction, finishTransaction, finishCB); + // make a new finishTransaction because pip's startEnterAnimation "consumes" it so + // we need a separate one to send over to launcher. + SurfaceControl.Transaction otherFinishT = new SurfaceControl.Transaction(); // Dispatch the rest of the transition normally. This will most-likely be taken by // recents or default handler. mixed.mLeftoversHandler = player.dispatchTransition(mixed.mTransition, everythingElse, - otherStartT, finishTransaction, finishCB, mixedHandler); + otherStartT, otherFinishT, finishCB, mixedHandler); } else { ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, " Not leaving split, so just " + "forward animation to Pip-Handler."); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java index 5daa3eee340b..ada1e0b8b1d5 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java @@ -824,6 +824,7 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin WindowInsets.Type.systemBars() & ~WindowInsets.Type.captionBar(), false /* ignoreVisibility */); relayoutParams.mCaptionTopPadding = systemBarInsets.top; + relayoutParams.mIsInsetSource = false; } // Report occluding elements as bounding rects to the insets system so that apps can // draw in the empty space in the center: diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/WindowDecoration.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/WindowDecoration.java index 000beba125b0..f8aed412e3fb 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/WindowDecoration.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/WindowDecoration.java @@ -346,7 +346,7 @@ public abstract class WindowDecoration<T extends View & TaskFocusStateConsumer> private void updateCaptionInsets(RelayoutParams params, WindowContainerTransaction wct, RelayoutResult<T> outResult, Rect taskBounds) { - if (!mIsCaptionVisible) { + if (!mIsCaptionVisible || !params.mIsInsetSource) { if (mWindowDecorationInsets != null) { mWindowDecorationInsets.remove(wct); mWindowDecorationInsets = null; @@ -724,6 +724,7 @@ public abstract class WindowDecoration<T extends View & TaskFocusStateConsumer> int mCaptionWidthId; final List<OccludingCaptionElement> mOccludingCaptionElements = new ArrayList<>(); int mInputFeatures; + boolean mIsInsetSource = true; @InsetsSource.Flags int mInsetSourceFlags; int mShadowRadiusId; @@ -743,6 +744,7 @@ public abstract class WindowDecoration<T extends View & TaskFocusStateConsumer> mCaptionWidthId = Resources.ID_NULL; mOccludingCaptionElements.clear(); mInputFeatures = 0; + mIsInsetSource = true; mInsetSourceFlags = 0; mShadowRadiusId = Resources.ID_NULL; diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/education/DesktopWindowingEducationTooltipController.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/education/DesktopWindowingEducationTooltipController.kt index 98413ee96133..a9a16bc72779 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/education/DesktopWindowingEducationTooltipController.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/education/DesktopWindowingEducationTooltipController.kt @@ -30,9 +30,13 @@ import android.view.WindowManager import android.widget.ImageView import android.widget.LinearLayout import android.widget.TextView +import android.window.DisplayAreaInfo +import android.window.WindowContainerTransaction import androidx.dynamicanimation.animation.DynamicAnimation import androidx.dynamicanimation.animation.SpringForce import com.android.wm.shell.R +import com.android.wm.shell.common.DisplayChangeController.OnDisplayChangingListener +import com.android.wm.shell.common.DisplayController import com.android.wm.shell.shared.animation.PhysicsAnimator import com.android.wm.shell.windowdecor.WindowManagerWrapper import com.android.wm.shell.windowdecor.additionalviewcontainer.AdditionalSystemViewContainer @@ -44,7 +48,8 @@ import com.android.wm.shell.windowdecor.additionalviewcontainer.AdditionalSystem class DesktopWindowingEducationTooltipController( private val context: Context, private val additionalSystemViewContainerFactory: AdditionalSystemViewContainer.Factory, -) { + private val displayController: DisplayController, +) : OnDisplayChangingListener { // TODO: b/369384567 - Set tooltip color scheme to match LT/DT of app theme private var tooltipView: View? = null private var animator: PhysicsAnimator<View>? = null @@ -53,6 +58,20 @@ class DesktopWindowingEducationTooltipController( } private var popupWindow: AdditionalSystemViewContainer? = null + override fun onDisplayChange( + displayId: Int, + fromRotation: Int, + toRotation: Int, + newDisplayAreaInfo: DisplayAreaInfo?, + t: WindowContainerTransaction? + ) { + // Exit if the rotation hasn't changed or is changed by 180 degrees. [fromRotation] and + // [toRotation] can be one of the [@Surface.Rotation] values. + if ((fromRotation % 2 == toRotation % 2)) return + hideEducationTooltip() + // TODO: b/370820018 - Update tooltip position on orientation change instead of dismissing + } + /** * Shows education tooltip. * @@ -64,6 +83,7 @@ class DesktopWindowingEducationTooltipController( tooltipView = createEducationTooltipView(tooltipViewConfig, taskId) animator = createAnimator() animateShowTooltipTransition() + displayController.addDisplayChangingController(this) } /** Hide the current education view if visible */ @@ -145,6 +165,7 @@ class DesktopWindowingEducationTooltipController( animator = null popupWindow?.releaseView() popupWindow = null + displayController.removeDisplayChangingController(this) } private fun createTooltipPopupWindow( diff --git a/libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/FromSplitScreenEnterPipOnUserLeaveHintTest.kt b/libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/FromSplitScreenEnterPipOnUserLeaveHintTest.kt index d03d7799d675..d1bf6acf785d 100644 --- a/libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/FromSplitScreenEnterPipOnUserLeaveHintTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/FromSplitScreenEnterPipOnUserLeaveHintTest.kt @@ -183,12 +183,6 @@ class FromSplitScreenEnterPipOnUserLeaveHintTest(flicker: LegacyFlickerTest) : } /** {@inheritDoc} */ - @FlakyTest(bugId = 312446524) - @Test - override fun visibleLayersShownMoreThanOneConsecutiveEntry() = - super.visibleLayersShownMoreThanOneConsecutiveEntry() - - /** {@inheritDoc} */ @Test @FlakyTest(bugId = 336510055) override fun entireScreenCovered() { diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopModeEventLoggerTest.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopModeEventLoggerTest.kt index ca972296e8d4..d7a132dfa1be 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopModeEventLoggerTest.kt +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopModeEventLoggerTest.kt @@ -16,13 +16,22 @@ package com.android.wm.shell.desktopmode +import android.platform.test.annotations.DisableFlags +import android.platform.test.annotations.EnableFlags +import android.platform.test.flag.junit.SetFlagsRule import com.android.dx.mockito.inline.extended.ExtendedMockito.verify import com.android.internal.util.FrameworkStatsLog import com.android.modules.utils.testing.ExtendedMockitoRule +import com.android.window.flags.Flags +import com.android.wm.shell.EventLogTags +import com.android.wm.shell.ShellTestCase import com.android.wm.shell.desktopmode.DesktopModeEventLogger.Companion.EnterReason import com.android.wm.shell.desktopmode.DesktopModeEventLogger.Companion.ExitReason import com.android.wm.shell.desktopmode.DesktopModeEventLogger.Companion.MinimizeReason +import com.android.wm.shell.desktopmode.DesktopModeEventLogger.Companion.ResizeTrigger +import com.android.wm.shell.desktopmode.DesktopModeEventLogger.Companion.InputMethod import com.android.wm.shell.desktopmode.DesktopModeEventLogger.Companion.TaskUpdate +import com.android.wm.shell.desktopmode.DesktopModeEventLogger.Companion.TaskSizeUpdate import com.android.wm.shell.desktopmode.DesktopModeEventLogger.Companion.UnminimizeReason import com.android.wm.shell.desktopmode.DesktopModeEventLogger.Companion.UNSET_MINIMIZE_REASON import com.android.wm.shell.desktopmode.DesktopModeEventLogger.Companion.UNSET_UNMINIMIZE_REASON @@ -34,14 +43,19 @@ import org.mockito.kotlin.eq /** * Tests for [DesktopModeEventLogger]. */ -class DesktopModeEventLoggerTest { +class DesktopModeEventLoggerTest : ShellTestCase() { private val desktopModeEventLogger = DesktopModeEventLogger() @JvmField - @Rule + @Rule(order = 0) val extendedMockitoRule = ExtendedMockitoRule.Builder(this) - .mockStatic(FrameworkStatsLog::class.java).build()!! + .mockStatic(FrameworkStatsLog::class.java) + .mockStatic(EventLogTags::class.java).build()!! + + @JvmField + @Rule(order = 1) + val setFlagsRule = SetFlagsRule() @Test fun logSessionEnter_enterReason() = runBlocking { @@ -60,6 +74,11 @@ class DesktopModeEventLoggerTest { eq(SESSION_ID) ) } + verify { + EventLogTags.writeWmShellEnterDesktopMode( + eq(EnterReason.UNKNOWN_ENTER.reason), + eq(SESSION_ID)) + } } @Test @@ -79,6 +98,11 @@ class DesktopModeEventLoggerTest { eq(SESSION_ID) ) } + verify { + EventLogTags.writeWmShellExitDesktopMode( + eq(ExitReason.UNKNOWN_EXIT.reason), + eq(SESSION_ID)) + } } @Test @@ -108,6 +132,22 @@ class DesktopModeEventLoggerTest { /* visible_task_count */ eq(TASK_COUNT)) } + + verify { + EventLogTags.writeWmShellDesktopModeTaskUpdate( + eq(FrameworkStatsLog + .DESKTOP_MODE_SESSION_TASK_UPDATE__TASK_EVENT__TASK_ADDED), + eq(TASK_UPDATE.instanceId), + eq(TASK_UPDATE.uid), + eq(TASK_UPDATE.taskHeight), + eq(TASK_UPDATE.taskWidth), + eq(TASK_UPDATE.taskX), + eq(TASK_UPDATE.taskY), + eq(SESSION_ID), + eq(UNSET_MINIMIZE_REASON), + eq(UNSET_UNMINIMIZE_REASON), + eq(TASK_COUNT)) + } } @Test @@ -137,6 +177,22 @@ class DesktopModeEventLoggerTest { /* visible_task_count */ eq(TASK_COUNT)) } + + verify { + EventLogTags.writeWmShellDesktopModeTaskUpdate( + eq(FrameworkStatsLog + .DESKTOP_MODE_SESSION_TASK_UPDATE__TASK_EVENT__TASK_REMOVED), + eq(TASK_UPDATE.instanceId), + eq(TASK_UPDATE.uid), + eq(TASK_UPDATE.taskHeight), + eq(TASK_UPDATE.taskWidth), + eq(TASK_UPDATE.taskX), + eq(TASK_UPDATE.taskY), + eq(SESSION_ID), + eq(UNSET_MINIMIZE_REASON), + eq(UNSET_UNMINIMIZE_REASON), + eq(TASK_COUNT)) + } } @Test @@ -167,6 +223,22 @@ class DesktopModeEventLoggerTest { /* visible_task_count */ eq(TASK_COUNT)) } + + verify { + EventLogTags.writeWmShellDesktopModeTaskUpdate( + eq(FrameworkStatsLog + .DESKTOP_MODE_SESSION_TASK_UPDATE__TASK_EVENT__TASK_INFO_CHANGED), + eq(TASK_UPDATE.instanceId), + eq(TASK_UPDATE.uid), + eq(TASK_UPDATE.taskHeight), + eq(TASK_UPDATE.taskWidth), + eq(TASK_UPDATE.taskX), + eq(TASK_UPDATE.taskY), + eq(SESSION_ID), + eq(UNSET_MINIMIZE_REASON), + eq(UNSET_UNMINIMIZE_REASON), + eq(TASK_COUNT)) + } } @Test @@ -200,6 +272,22 @@ class DesktopModeEventLoggerTest { /* visible_task_count */ eq(TASK_COUNT)) } + + verify { + EventLogTags.writeWmShellDesktopModeTaskUpdate( + eq(FrameworkStatsLog + .DESKTOP_MODE_SESSION_TASK_UPDATE__TASK_EVENT__TASK_INFO_CHANGED), + eq(TASK_UPDATE.instanceId), + eq(TASK_UPDATE.uid), + eq(TASK_UPDATE.taskHeight), + eq(TASK_UPDATE.taskWidth), + eq(TASK_UPDATE.taskX), + eq(TASK_UPDATE.taskY), + eq(SESSION_ID), + eq(MinimizeReason.TASK_LIMIT.reason), + eq(UNSET_UNMINIMIZE_REASON), + eq(TASK_COUNT)) + } } @Test @@ -233,9 +321,83 @@ class DesktopModeEventLoggerTest { /* visible_task_count */ eq(TASK_COUNT)) } + + verify { + EventLogTags.writeWmShellDesktopModeTaskUpdate( + eq(FrameworkStatsLog + .DESKTOP_MODE_SESSION_TASK_UPDATE__TASK_EVENT__TASK_INFO_CHANGED), + eq(TASK_UPDATE.instanceId), + eq(TASK_UPDATE.uid), + eq(TASK_UPDATE.taskHeight), + eq(TASK_UPDATE.taskWidth), + eq(TASK_UPDATE.taskX), + eq(TASK_UPDATE.taskY), + eq(SESSION_ID), + eq(UNSET_MINIMIZE_REASON), + eq(UnminimizeReason.TASKBAR_TAP.reason), + eq(TASK_COUNT)) + } } - companion object { + @Test + @EnableFlags(Flags.FLAG_ENABLE_RESIZING_METRICS) + fun logTaskResizingStarted_logsTaskSizeUpdatedWithStartResizingStage() = runBlocking { + desktopModeEventLogger.logTaskResizingStarted(sessionId = SESSION_ID, createTaskSizeUpdate()) + + verify { + FrameworkStatsLog.write(eq(FrameworkStatsLog.DESKTOP_MODE_TASK_SIZE_UPDATED), + /* resize_trigger */ + eq(FrameworkStatsLog.DESKTOP_MODE_TASK_SIZE_UPDATED__RESIZE_TRIGGER__UNKNOWN_RESIZE_TRIGGER), + /* resizing_stage */ + eq(FrameworkStatsLog.DESKTOP_MODE_TASK_SIZE_UPDATED__RESIZING_STAGE__START_RESIZING_STAGE), + /* input_method */ + eq(FrameworkStatsLog.DESKTOP_MODE_TASK_SIZE_UPDATED__INPUT_METHOD__UNKNOWN_INPUT_METHOD), + /* desktop_mode_session_id */ + eq(SESSION_ID), + /* instance_id */ + eq(TASK_SIZE_UPDATE.instanceId), + /* uid */ + eq(TASK_SIZE_UPDATE.uid), + /* task_height */ + eq(TASK_SIZE_UPDATE.taskHeight), + /* task_width */ + eq(TASK_SIZE_UPDATE.taskWidth), + /* display_area */ + eq(TASK_SIZE_UPDATE.displayArea), + ) + } + } + + @Test + @EnableFlags(Flags.FLAG_ENABLE_RESIZING_METRICS) + fun logTaskResizingEnded_logsTaskSizeUpdatedWithEndResizingStage() = runBlocking { + desktopModeEventLogger.logTaskResizingEnded(sessionId = SESSION_ID, createTaskSizeUpdate()) + + verify { + FrameworkStatsLog.write(eq(FrameworkStatsLog.DESKTOP_MODE_TASK_SIZE_UPDATED), + /* resize_trigger */ + eq(FrameworkStatsLog.DESKTOP_MODE_TASK_SIZE_UPDATED__RESIZE_TRIGGER__UNKNOWN_RESIZE_TRIGGER), + /* resizing_stage */ + eq(FrameworkStatsLog.DESKTOP_MODE_TASK_SIZE_UPDATED__RESIZING_STAGE__END_RESIZING_STAGE), + /* input_method */ + eq(FrameworkStatsLog.DESKTOP_MODE_TASK_SIZE_UPDATED__INPUT_METHOD__UNKNOWN_INPUT_METHOD), + /* desktop_mode_session_id */ + eq(SESSION_ID), + /* instance_id */ + eq(TASK_SIZE_UPDATE.instanceId), + /* uid */ + eq(TASK_SIZE_UPDATE.uid), + /* task_height */ + eq(TASK_SIZE_UPDATE.taskHeight), + /* task_width */ + eq(TASK_SIZE_UPDATE.taskWidth), + /* display_area */ + eq(TASK_SIZE_UPDATE.displayArea), + ) + } + } + + private companion object { private const val SESSION_ID = 1 private const val TASK_ID = 1 private const val TASK_UID = 1 @@ -244,16 +406,40 @@ class DesktopModeEventLoggerTest { private const val TASK_HEIGHT = 100 private const val TASK_WIDTH = 100 private const val TASK_COUNT = 1 + private const val DISPLAY_AREA = 1000 private val TASK_UPDATE = TaskUpdate( TASK_ID, TASK_UID, TASK_HEIGHT, TASK_WIDTH, TASK_X, TASK_Y, visibleTaskCount = TASK_COUNT, ) + private val TASK_SIZE_UPDATE = TaskSizeUpdate( + resizeTrigger = ResizeTrigger.UNKNOWN_RESIZE_TRIGGER, + inputMethod = InputMethod.UNKNOWN_INPUT_METHOD, + TASK_ID, + TASK_UID, + TASK_HEIGHT, + TASK_WIDTH, + DISPLAY_AREA, + ) + + private fun createTaskSizeUpdate( + resizeTrigger: ResizeTrigger = ResizeTrigger.UNKNOWN_RESIZE_TRIGGER, + inputMethod: InputMethod = InputMethod.UNKNOWN_INPUT_METHOD, + ) = TaskSizeUpdate( + resizeTrigger, + inputMethod, + TASK_ID, + TASK_UID, + TASK_HEIGHT, + TASK_WIDTH, + DISPLAY_AREA, + ) + private fun createTaskUpdate( minimizeReason: MinimizeReason? = null, unminimizeReason: UnminimizeReason? = null, ) = TaskUpdate(TASK_ID, TASK_UID, TASK_HEIGHT, TASK_WIDTH, TASK_X, TASK_Y, minimizeReason, unminimizeReason, TASK_COUNT) } -}
\ No newline at end of file +} diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopTasksLimiterTest.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopTasksLimiterTest.kt index bc5ae97a55ea..bdcb459d9461 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopTasksLimiterTest.kt +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopTasksLimiterTest.kt @@ -19,6 +19,8 @@ package com.android.wm.shell.desktopmode import android.app.ActivityManager.RunningTaskInfo import android.os.Binder import android.os.Handler +import android.platform.test.annotations.DisableFlags +import android.platform.test.annotations.EnableFlags import android.platform.test.flag.junit.SetFlagsRule import android.testing.AndroidTestingRunner import android.view.Display.DEFAULT_DISPLAY @@ -33,6 +35,7 @@ import com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn import com.android.dx.mockito.inline.extended.StaticMockitoSession import com.android.internal.jank.Cuj.CUJ_DESKTOP_MODE_MINIMIZE_WINDOW import com.android.internal.jank.InteractionJankMonitor +import com.android.window.flags.Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION import com.android.wm.shell.ShellTaskOrganizer import com.android.wm.shell.ShellTestCase import com.android.wm.shell.common.ShellExecutor @@ -243,6 +246,7 @@ class DesktopTasksLimiterTest : ShellTestCase() { } @Test + @DisableFlags(FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION) fun removeLeftoverMinimizedTasks_activeNonMinimizedTasksStillAround_doesNothing() { desktopTaskRepo.addActiveTask(displayId = DEFAULT_DISPLAY, taskId = 1) desktopTaskRepo.addActiveTask(displayId = DEFAULT_DISPLAY, taskId = 2) @@ -256,6 +260,7 @@ class DesktopTasksLimiterTest : ShellTestCase() { } @Test + @DisableFlags(FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION) fun removeLeftoverMinimizedTasks_noMinimizedTasks_doesNothing() { val wct = WindowContainerTransaction() desktopTasksLimiter.leftoverMinimizedTasksRemover.removeLeftoverMinimizedTasks( @@ -265,6 +270,7 @@ class DesktopTasksLimiterTest : ShellTestCase() { } @Test + @DisableFlags(FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION) fun removeLeftoverMinimizedTasks_onlyMinimizedTasksLeft_removesAllMinimizedTasks() { val task1 = setUpFreeformTask(displayId = DEFAULT_DISPLAY) val task2 = setUpFreeformTask(displayId = DEFAULT_DISPLAY) @@ -283,6 +289,20 @@ class DesktopTasksLimiterTest : ShellTestCase() { } @Test + @EnableFlags(FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION) + fun removeLeftoverMinimizedTasks_onlyMinimizedTasksLeft_backNavEnabled_doesNothing() { + val task1 = setUpFreeformTask(displayId = DEFAULT_DISPLAY) + val task2 = setUpFreeformTask(displayId = DEFAULT_DISPLAY) + desktopTaskRepo.minimizeTask(displayId = DEFAULT_DISPLAY, taskId = task1.taskId) + desktopTaskRepo.minimizeTask(displayId = DEFAULT_DISPLAY, taskId = task2.taskId) + + val wct = WindowContainerTransaction() + desktopTasksLimiter.leftoverMinimizedTasksRemover.onActiveTasksChanged(DEFAULT_DISPLAY) + + assertThat(wct.hierarchyOps).isEmpty() + } + + @Test fun addAndGetMinimizeTaskChangesIfNeeded_tasksWithinLimit_noTaskMinimized() { (1..<MAX_TASK_LIMIT).forEach { _ -> setUpFreeformTask() } diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopTasksTransitionObserverTest.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopTasksTransitionObserverTest.kt index c989d1640f80..42fcc836bac3 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopTasksTransitionObserverTest.kt +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopTasksTransitionObserverTest.kt @@ -18,11 +18,13 @@ package com.android.wm.shell.desktopmode import android.app.ActivityManager.RunningTaskInfo import android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM +import android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN import android.content.ComponentName import android.content.Context import android.content.Intent import android.platform.test.annotations.EnableFlags import android.view.Display.DEFAULT_DISPLAY +import android.view.WindowManager.TRANSIT_OPEN import android.view.WindowManager.TRANSIT_TO_BACK import android.window.IWindowContainerToken import android.window.TransitionInfo @@ -110,6 +112,24 @@ class DesktopTasksTransitionObserverTest { verify(taskRepository, never()).minimizeTask(task.displayId, task.taskId) } + @Test + @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION) + fun removeTasks_onTaskFullscreenLaunch_taskRemovedFromRepo() { + val task = createTaskInfo(1, WINDOWING_MODE_FULLSCREEN) + whenever(taskRepository.getVisibleTaskCount(any())).thenReturn(1) + whenever(taskRepository.isActiveTask(task.taskId)).thenReturn(true) + + transitionObserver.onTransitionReady( + transition = mock(), + info = createOpenTransition(task), + startTransaction = mock(), + finishTransaction = mock(), + ) + + verify(taskRepository, never()).minimizeTask(task.displayId, task.taskId) + verify(taskRepository).removeFreeformTask(task.displayId, task.taskId) + } + private fun createBackNavigationTransition( task: RunningTaskInfo? ): TransitionInfo { @@ -125,11 +145,26 @@ class DesktopTasksTransitionObserverTest { } } - private fun createTaskInfo(id: Int) = + private fun createOpenTransition( + task: RunningTaskInfo? + ): TransitionInfo { + return TransitionInfo(TRANSIT_OPEN, 0 /* flags */).apply { + addChange( + Change(mock(), mock()).apply { + mode = TRANSIT_OPEN + parent = null + taskInfo = task + flags = flags + } + ) + } + } + + private fun createTaskInfo(id: Int, windowingMode: Int = WINDOWING_MODE_FREEFORM) = RunningTaskInfo().apply { taskId = id displayId = DEFAULT_DISPLAY - configuration.windowConfiguration.windowingMode = WINDOWING_MODE_FREEFORM + configuration.windowConfiguration.windowingMode = windowingMode token = WindowContainerToken(Mockito.mock(IWindowContainerToken::class.java)) baseIntent = Intent().apply { component = ComponentName("package", "component.name") diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DragToDesktopTransitionHandlerTest.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DragToDesktopTransitionHandlerTest.kt index d9387d2f08dd..230f7e6912ee 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DragToDesktopTransitionHandlerTest.kt +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DragToDesktopTransitionHandlerTest.kt @@ -581,7 +581,7 @@ class DragToDesktopTransitionHandlerTest : ShellTestCase() { ) ) .thenReturn(token) - handler.startDragToDesktopTransition(task.taskId, dragAnimator) + handler.startDragToDesktopTransition(task, dragAnimator) return token } diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/recents/RecentTasksControllerTest.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/recents/RecentTasksControllerTest.java index 753d4cd153ee..0364b51fee1c 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/recents/RecentTasksControllerTest.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/recents/RecentTasksControllerTest.java @@ -22,6 +22,7 @@ import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN; import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW; import static com.android.dx.mockito.inline.extended.ExtendedMockito.mockitoSession; +import static com.android.window.flags.Flags.FLAG_ENABLE_DESKTOP_WINDOWING_PERSISTENCE; import static com.android.wm.shell.shared.split.SplitScreenConstants.SNAP_TO_2_50_50; import static org.junit.Assert.assertEquals; @@ -50,6 +51,7 @@ import android.app.KeyguardManager; import android.content.ComponentName; import android.content.Context; import android.content.pm.PackageManager; +import android.graphics.Point; import android.graphics.Rect; import android.os.Bundle; import android.platform.test.annotations.DisableFlags; @@ -441,6 +443,40 @@ public class RecentTasksControllerTest extends ShellTestCase { } @Test + @EnableFlags(FLAG_ENABLE_DESKTOP_WINDOWING_PERSISTENCE) + public void testGetRecentTasks_hasDesktopTasks_persistenceEnabled_freeformTaskHaveBoundsSet() { + ActivityManager.RecentTaskInfo t1 = makeTaskInfo(1); + ActivityManager.RecentTaskInfo t2 = makeTaskInfo(2); + + t1.lastNonFullscreenBounds = new Rect(100, 200, 300, 400); + t2.lastNonFullscreenBounds = new Rect(150, 250, 350, 450); + setRawList(t1, t2); + + when(mDesktopModeTaskRepository.isActiveTask(1)).thenReturn(true); + when(mDesktopModeTaskRepository.isActiveTask(2)).thenReturn(true); + + ArrayList<GroupedRecentTaskInfo> recentTasks = mRecentTasksController.getRecentTasks( + MAX_VALUE, RECENT_IGNORE_UNAVAILABLE, 0); + + assertEquals(1, recentTasks.size()); + GroupedRecentTaskInfo freeformGroup = recentTasks.get(0); + + // Check bounds + assertEquals(t1.lastNonFullscreenBounds, freeformGroup.getTaskInfoList().get( + 0).configuration.windowConfiguration.getAppBounds()); + assertEquals(t2.lastNonFullscreenBounds, freeformGroup.getTaskInfoList().get( + 1).configuration.windowConfiguration.getAppBounds()); + + // Check position in parent + assertEquals(new Point(t1.lastNonFullscreenBounds.left, + t1.lastNonFullscreenBounds.top), + freeformGroup.getTaskInfoList().get(0).positionInParent); + assertEquals(new Point(t2.lastNonFullscreenBounds.left, + t2.lastNonFullscreenBounds.top), + freeformGroup.getTaskInfoList().get(1).positionInParent); + } + + @Test public void testRemovedTaskRemovesSplit() { ActivityManager.RecentTaskInfo t1 = makeTaskInfo(1); ActivityManager.RecentTaskInfo t2 = makeTaskInfo(2); @@ -623,6 +659,7 @@ public class RecentTasksControllerTest extends ShellTestCase { private ActivityManager.RecentTaskInfo makeTaskInfo(int taskId) { ActivityManager.RecentTaskInfo info = new ActivityManager.RecentTaskInfo(); info.taskId = taskId; + info.lastNonFullscreenBounds = new Rect(); return info; } diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorationTests.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorationTests.java index 3e7f3bdd72a2..ed752fdada77 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorationTests.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorationTests.java @@ -619,6 +619,27 @@ public class DesktopModeWindowDecorationTests extends ShellTestCase { } @Test + @EnableFlags(Flags.FLAG_ENABLE_FULLY_IMMERSIVE_IN_DESKTOP) + public void updateRelayoutParams_header_notAnInsetsSourceInFullyImmersive() { + final ActivityManager.RunningTaskInfo taskInfo = createTaskInfo(/* visible= */ true); + taskInfo.configuration.windowConfiguration.setWindowingMode(WINDOWING_MODE_FREEFORM); + final RelayoutParams relayoutParams = new RelayoutParams(); + + DesktopModeWindowDecoration.updateRelayoutParams( + relayoutParams, + mTestableContext, + taskInfo, + /* applyStartTransactionOnDraw= */ true, + /* shouldSetTaskPositionAndCrop */ false, + /* isStatusBarVisible */ true, + /* isKeyguardVisibleAndOccluded */ false, + /* inFullImmersiveMode */ true, + new InsetsState()); + + assertThat(relayoutParams.mIsInsetSource).isFalse(); + } + + @Test @DisableFlags(Flags.FLAG_ENABLE_FULLY_IMMERSIVE_IN_DESKTOP) public void updateRelayoutParams_header_statusBarInvisible_captionVisible() { final ActivityManager.RunningTaskInfo taskInfo = createTaskInfo(/* visible= */ true); diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/WindowDecorationTests.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/WindowDecorationTests.java index 94cabc492277..54dd15baa4c0 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/WindowDecorationTests.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/WindowDecorationTests.java @@ -650,6 +650,57 @@ public class WindowDecorationTests extends ShellTestCase { } @Test + public void testRelayout_notAnInsetsSource_doesNotAddInsets() { + final Display defaultDisplay = mock(Display.class); + doReturn(defaultDisplay).when(mMockDisplayController) + .getDisplay(Display.DEFAULT_DISPLAY); + + final ActivityManager.RunningTaskInfo taskInfo = new TestRunningTaskInfoBuilder() + .setDisplayId(Display.DEFAULT_DISPLAY) + .setVisible(true) + .setBounds(new Rect(0, 0, 1000, 1000)) + .build(); + final TestWindowDecoration windowDecor = createWindowDecoration(taskInfo); + + mRelayoutParams.mIsInsetSource = false; + windowDecor.relayout(taskInfo); + + // Never added. + verify(mMockWindowContainerTransaction, never()).addInsetsSource(eq(taskInfo.token), any(), + eq(0) /* index */, eq(captionBar()), any(), any(), anyInt()); + verify(mMockWindowContainerTransaction, never()).addInsetsSource(eq(taskInfo.token), any(), + eq(0) /* index */, eq(mandatorySystemGestures()), any(), any(), anyInt()); + } + + @Test + public void testRelayout_notAnInsetsSource_hadInsetsBefore_removesInsets() { + final Display defaultDisplay = mock(Display.class); + doReturn(defaultDisplay).when(mMockDisplayController) + .getDisplay(Display.DEFAULT_DISPLAY); + + final ActivityManager.RunningTaskInfo taskInfo = new TestRunningTaskInfoBuilder() + .setDisplayId(Display.DEFAULT_DISPLAY) + .setVisible(true) + .setBounds(new Rect(0, 0, 1000, 1000)) + .build(); + final TestWindowDecoration windowDecor = createWindowDecoration(taskInfo); + + mRelayoutParams.mIsCaptionVisible = true; + mRelayoutParams.mIsInsetSource = true; + windowDecor.relayout(taskInfo); + + mRelayoutParams.mIsCaptionVisible = true; + mRelayoutParams.mIsInsetSource = false; + windowDecor.relayout(taskInfo); + + // Insets should be removed. + verify(mMockWindowContainerTransaction).removeInsetsSource(eq(taskInfo.token), any(), + eq(0) /* index */, eq(captionBar())); + verify(mMockWindowContainerTransaction).removeInsetsSource(eq(taskInfo.token), any(), + eq(0) /* index */, eq(mandatorySystemGestures())); + } + + @Test public void testClose_withExistingInsets_insetsRemoved() { final Display defaultDisplay = mock(Display.class); doReturn(defaultDisplay).when(mMockDisplayController) diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/education/DesktopWindowingEducationTooltipControllerTest.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/education/DesktopWindowingEducationTooltipControllerTest.kt index 5594981135b1..67497764655b 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/education/DesktopWindowingEducationTooltipControllerTest.kt +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/education/DesktopWindowingEducationTooltipControllerTest.kt @@ -24,12 +24,16 @@ import android.testing.TestableContext import android.testing.TestableLooper import android.testing.TestableResources import android.view.MotionEvent +import android.view.Surface.ROTATION_180 +import android.view.Surface.ROTATION_90 import android.view.View import android.view.WindowManager import android.widget.TextView +import android.window.WindowContainerTransaction import androidx.test.filters.SmallTest import com.android.wm.shell.R import com.android.wm.shell.ShellTestCase +import com.android.wm.shell.common.DisplayController import com.android.wm.shell.windowdecor.additionalviewcontainer.AdditionalSystemViewContainer import com.android.wm.shell.windowdecor.education.DesktopWindowingEducationTooltipController.TooltipArrowDirection import com.google.common.truth.Truth.assertThat @@ -42,9 +46,11 @@ import org.mockito.MockitoAnnotations import org.mockito.kotlin.any import org.mockito.kotlin.anyOrNull import org.mockito.kotlin.argumentCaptor +import org.mockito.kotlin.atLeastOnce import org.mockito.kotlin.mock import org.mockito.kotlin.times import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever @SmallTest @TestableLooper.RunWithLooper(setAsMainLooper = true) @@ -52,6 +58,8 @@ import org.mockito.kotlin.verify class DesktopWindowingEducationTooltipControllerTest : ShellTestCase() { @Mock private lateinit var mockWindowManager: WindowManager @Mock private lateinit var mockViewContainerFactory: AdditionalSystemViewContainer.Factory + @Mock private lateinit var mockDisplayController: DisplayController + @Mock private lateinit var mockPopupWindow: AdditionalSystemViewContainer private lateinit var testableResources: TestableResources private lateinit var testableContext: TestableContext private lateinit var tooltipController: DesktopWindowingEducationTooltipController @@ -69,7 +77,8 @@ class DesktopWindowingEducationTooltipControllerTest : ShellTestCase() { Context.LAYOUT_INFLATER_SERVICE, context.getSystemService(Context.LAYOUT_INFLATER_SERVICE)) testableContext.addMockSystemService(WindowManager::class.java, mockWindowManager) tooltipController = - DesktopWindowingEducationTooltipController(testableContext, mockViewContainerFactory) + DesktopWindowingEducationTooltipController( + testableContext, mockViewContainerFactory, mockDisplayController) } @Test @@ -218,6 +227,25 @@ class DesktopWindowingEducationTooltipControllerTest : ShellTestCase() { verify(mockLambda).invoke() } + @Test + fun showEducationTooltip_displayRotationChanged_hidesTooltip() { + whenever( + mockViewContainerFactory.create(any(), any(), any(), any(), any(), any(), any(), any())) + .thenReturn(mockPopupWindow) + val tooltipViewConfig = createTooltipConfig() + + tooltipController.showEducationTooltip(tooltipViewConfig = tooltipViewConfig, taskId = 123) + tooltipController.onDisplayChange( + /* displayId= */ 123, + /* fromRotation= */ ROTATION_90, + /* toRotation= */ ROTATION_180, + /* newDisplayAreaInfo= */ null, + WindowContainerTransaction()) + + verify(mockPopupWindow, times(1)).releaseView() + verify(mockDisplayController, atLeastOnce()).removeDisplayChangingController(any()) + } + private fun createTooltipConfig( @LayoutRes tooltipViewLayout: Int = R.layout.desktop_windowing_education_top_arrow_tooltip, tooltipViewGlobalCoordinates: Point = Point(0, 0), diff --git a/libs/appfunctions/api/current.txt b/libs/appfunctions/api/current.txt index bb0fc41acd30..bc269fedddfe 100644 --- a/libs/appfunctions/api/current.txt +++ b/libs/appfunctions/api/current.txt @@ -16,7 +16,7 @@ package com.google.android.appfunctions.sidecar { ctor public AppFunctionService(); method @NonNull public final android.os.IBinder onBind(@Nullable android.content.Intent); method @MainThread public void onExecuteFunction(@NonNull com.google.android.appfunctions.sidecar.ExecuteAppFunctionRequest, @NonNull android.os.CancellationSignal, @NonNull java.util.function.Consumer<com.google.android.appfunctions.sidecar.ExecuteAppFunctionResponse>); - method @Deprecated @MainThread public abstract void onExecuteFunction(@NonNull com.google.android.appfunctions.sidecar.ExecuteAppFunctionRequest, @NonNull java.util.function.Consumer<com.google.android.appfunctions.sidecar.ExecuteAppFunctionResponse>); + method @Deprecated @MainThread public void onExecuteFunction(@NonNull com.google.android.appfunctions.sidecar.ExecuteAppFunctionRequest, @NonNull java.util.function.Consumer<com.google.android.appfunctions.sidecar.ExecuteAppFunctionResponse>); field @NonNull public static final String BIND_APP_FUNCTION_SERVICE = "android.permission.BIND_APP_FUNCTION_SERVICE"; field @NonNull public static final String SERVICE_INTERFACE = "android.app.appfunctions.AppFunctionService"; } @@ -45,12 +45,12 @@ package com.google.android.appfunctions.sidecar { method @NonNull public static com.google.android.appfunctions.sidecar.ExecuteAppFunctionResponse newSuccess(@NonNull android.app.appsearch.GenericDocument, @Nullable android.os.Bundle); field public static final String PROPERTY_RETURN_VALUE = "returnValue"; field public static final int RESULT_APP_UNKNOWN_ERROR = 2; // 0x2 + field public static final int RESULT_CANCELLED = 6; // 0x6 field public static final int RESULT_DENIED = 1; // 0x1 - field public static final int RESULT_DISABLED = 6; // 0x6 + field public static final int RESULT_DISABLED = 5; // 0x5 field public static final int RESULT_INTERNAL_ERROR = 3; // 0x3 field public static final int RESULT_INVALID_ARGUMENT = 4; // 0x4 field public static final int RESULT_OK = 0; // 0x0 - field public static final int RESULT_TIMED_OUT = 5; // 0x5 } } diff --git a/libs/appfunctions/java/com/google/android/appfunctions/sidecar/AppFunctionService.java b/libs/appfunctions/java/com/google/android/appfunctions/sidecar/AppFunctionService.java index 6023c977bd76..6e91de6bbcf2 100644 --- a/libs/appfunctions/java/com/google/android/appfunctions/sidecar/AppFunctionService.java +++ b/libs/appfunctions/java/com/google/android/appfunctions/sidecar/AppFunctionService.java @@ -26,6 +26,7 @@ import android.content.Intent; import android.os.Binder; import android.os.IBinder; import android.os.CancellationSignal; +import android.util.Log; import java.util.function.Consumer; @@ -143,7 +144,11 @@ public abstract class AppFunctionService extends Service { */ @MainThread @Deprecated - public abstract void onExecuteFunction( + public void onExecuteFunction( @NonNull ExecuteAppFunctionRequest request, - @NonNull Consumer<ExecuteAppFunctionResponse> callback); + @NonNull Consumer<ExecuteAppFunctionResponse> callback) { + Log.w( + "AppFunctionService", + "Calling deprecated default implementation of onExecuteFunction"); + } } diff --git a/libs/appfunctions/java/com/google/android/appfunctions/sidecar/ExecuteAppFunctionResponse.java b/libs/appfunctions/java/com/google/android/appfunctions/sidecar/ExecuteAppFunctionResponse.java index c7ce95bab7a5..d87fec7985e9 100644 --- a/libs/appfunctions/java/com/google/android/appfunctions/sidecar/ExecuteAppFunctionResponse.java +++ b/libs/appfunctions/java/com/google/android/appfunctions/sidecar/ExecuteAppFunctionResponse.java @@ -73,11 +73,14 @@ public final class ExecuteAppFunctionResponse { */ public static final int RESULT_INVALID_ARGUMENT = 4; - /** The operation was timed out. */ - public static final int RESULT_TIMED_OUT = 5; - /** The caller tried to execute a disabled app function. */ - public static final int RESULT_DISABLED = 6; + public static final int RESULT_DISABLED = 5; + + /** + * The operation was cancelled. Use this error code to report that a cancellation is done after + * receiving a cancellation signal. + */ + public static final int RESULT_CANCELLED = 6; /** The result code of the app function execution. */ @ResultCode private final int mResultCode; @@ -236,7 +239,6 @@ public final class ExecuteAppFunctionResponse { RESULT_APP_UNKNOWN_ERROR, RESULT_INTERNAL_ERROR, RESULT_INVALID_ARGUMENT, - RESULT_TIMED_OUT, RESULT_DISABLED }) @Retention(RetentionPolicy.SOURCE) diff --git a/libs/hwui/AutoBackendTextureRelease.cpp b/libs/hwui/AutoBackendTextureRelease.cpp index 27add3542c01..430519606d9b 100644 --- a/libs/hwui/AutoBackendTextureRelease.cpp +++ b/libs/hwui/AutoBackendTextureRelease.cpp @@ -141,6 +141,13 @@ void AutoBackendTextureRelease::releaseQueueOwnership(GrDirectContext* context) return; } + if (!RenderThread::isCurrent()) { + // releaseQueueOwnership needs to run on RenderThread to prevent multithread calling + // setBackendTextureState will operate skia resource cache which need single owner + RenderThread::getInstance().queue().post([this, context]() { releaseQueueOwnership(context); }); + return; + } + LOG_ALWAYS_FATAL_IF(Properties::getRenderPipelineType() != RenderPipelineType::SkiaVulkan); if (mBackendTexture.isValid()) { // Passing in VK_IMAGE_LAYOUT_UNDEFINED means we keep the old layout. diff --git a/libs/hwui/Gainmap.cpp b/libs/hwui/Gainmap.cpp index 30f401ef5f01..ea955e25dc2f 100644 --- a/libs/hwui/Gainmap.cpp +++ b/libs/hwui/Gainmap.cpp @@ -15,12 +15,37 @@ */ #include "Gainmap.h" +#include <SkBitmap.h> +#include <SkCanvas.h> +#include <SkColorFilter.h> +#include <SkImagePriv.h> +#include <SkPaint.h> + +#include "HardwareBitmapUploader.h" + namespace android::uirenderer { sp<Gainmap> Gainmap::allocateHardwareGainmap(const sp<Gainmap>& srcGainmap) { auto gainmap = sp<Gainmap>::make(); gainmap->info = srcGainmap->info; - const SkBitmap skSrcBitmap = srcGainmap->bitmap->getSkBitmap(); + SkBitmap skSrcBitmap = srcGainmap->bitmap->getSkBitmap(); + if (skSrcBitmap.info().colorType() == kAlpha_8_SkColorType && + !HardwareBitmapUploader::hasAlpha8Support()) { + // The regular Bitmap::allocateHardwareBitmap will do a conversion that preserves channels, + // so alpha8 maps to the alpha channel of rgba. However, for gainmaps we will interpret + // the data of an rgba buffer differently as we'll only look at the rgb channels + // So we need to map alpha8 to rgbx_8888 essentially + SkBitmap bitmap; + bitmap.allocPixels(skSrcBitmap.info().makeColorType(kN32_SkColorType)); + SkCanvas canvas(bitmap); + SkPaint paint; + const float alphaToOpaque[] = {0, 0, 0, 1, 0, 0, 0, 0, 1, 0, + 0, 0, 0, 1, 0, 0, 0, 0, 0, 255}; + paint.setColorFilter(SkColorFilters::Matrix(alphaToOpaque, SkColorFilters::Clamp::kNo)); + canvas.drawImage(SkMakeImageFromRasterBitmap(skSrcBitmap, kNever_SkCopyPixelsMode), 0, 0, + SkSamplingOptions{}, &paint); + skSrcBitmap = bitmap; + } sk_sp<Bitmap> skBitmap(Bitmap::allocateHardwareBitmap(skSrcBitmap)); if (!skBitmap.get()) { return nullptr; diff --git a/libs/hwui/hwui/ImageDecoder.cpp b/libs/hwui/hwui/ImageDecoder.cpp index 588463c49497..e074a27db38f 100644 --- a/libs/hwui/hwui/ImageDecoder.cpp +++ b/libs/hwui/hwui/ImageDecoder.cpp @@ -501,18 +501,13 @@ SkCodec::Result ImageDecoder::decode(void* pixels, size_t rowBytes) { SkCodec::Result ImageDecoder::extractGainmap(Bitmap* destination, bool isShared) { ATRACE_CALL(); SkGainmapInfo gainmapInfo; - std::unique_ptr<SkStream> gainmapStream; + std::unique_ptr<SkAndroidCodec> gainmapCodec; { - ATRACE_NAME("getAndroidGainmap"); - if (!mCodec->getAndroidGainmap(&gainmapInfo, &gainmapStream)) { + ATRACE_NAME("getGainmapAndroidCodec"); + if (!mCodec->getGainmapAndroidCodec(&gainmapInfo, &gainmapCodec)) { return SkCodec::kSuccess; } } - auto gainmapCodec = SkAndroidCodec::MakeFromStream(std::move(gainmapStream)); - if (!gainmapCodec) { - ALOGW("Failed to create codec for gainmap stream"); - return SkCodec::kInvalidInput; - } ImageDecoder decoder{std::move(gainmapCodec)}; // Gainmap inherits the origin of the containing image decoder.mOverrideOrigin.emplace(getOrigin()); diff --git a/libs/hwui/jni/BitmapFactory.cpp b/libs/hwui/jni/BitmapFactory.cpp index 785aef312072..49a7f73fb3a3 100644 --- a/libs/hwui/jni/BitmapFactory.cpp +++ b/libs/hwui/jni/BitmapFactory.cpp @@ -183,14 +183,8 @@ static bool needsFineScale(const SkISize fullSize, const SkISize decodedSize, needsFineScale(fullSize.height(), decodedSize.height(), sampleSize); } -static bool decodeGainmap(std::unique_ptr<SkStream> gainmapStream, const SkGainmapInfo& gainmapInfo, +static bool decodeGainmap(std::unique_ptr<SkAndroidCodec> codec, const SkGainmapInfo& gainmapInfo, sp<uirenderer::Gainmap>* outGainmap, const int sampleSize, float scale) { - std::unique_ptr<SkAndroidCodec> codec; - codec = SkAndroidCodec::MakeFromStream(std::move(gainmapStream), nullptr); - if (!codec) { - ALOGE("Can not create a codec for Gainmap."); - return false; - } SkColorType decodeColorType = kN32_SkColorType; if (codec->getInfo().colorType() == kGray_8_SkColorType) { decodeColorType = kGray_8_SkColorType; @@ -613,15 +607,15 @@ static jobject doDecode(JNIEnv* env, std::unique_ptr<SkStreamRewindable> stream, bool hasGainmap = false; SkGainmapInfo gainmapInfo; - std::unique_ptr<SkStream> gainmapStream = nullptr; + std::unique_ptr<SkAndroidCodec> gainmapCodec; sp<uirenderer::Gainmap> gainmap = nullptr; if (result == SkCodec::kSuccess) { - hasGainmap = codec->getAndroidGainmap(&gainmapInfo, &gainmapStream); + hasGainmap = codec->getGainmapAndroidCodec(&gainmapInfo, &gainmapCodec); } if (hasGainmap) { hasGainmap = - decodeGainmap(std::move(gainmapStream), gainmapInfo, &gainmap, sampleSize, scale); + decodeGainmap(std::move(gainmapCodec), gainmapInfo, &gainmap, sampleSize, scale); } if (!isMutable && javaBitmap == NULL) { diff --git a/libs/hwui/jni/BitmapRegionDecoder.cpp b/libs/hwui/jni/BitmapRegionDecoder.cpp index 6a65b8273194..f7e8e073a272 100644 --- a/libs/hwui/jni/BitmapRegionDecoder.cpp +++ b/libs/hwui/jni/BitmapRegionDecoder.cpp @@ -48,25 +48,14 @@ public: } SkGainmapInfo gainmapInfo; - std::unique_ptr<SkStream> gainmapStream; + std::unique_ptr<SkAndroidCodec> gainmapCodec; std::unique_ptr<skia::BitmapRegionDecoder> gainmapBRD = nullptr; - if (mainImageBRD->getAndroidGainmap(&gainmapInfo, &gainmapStream)) { - sk_sp<SkData> data = nullptr; - if (gainmapStream->getMemoryBase()) { - // It is safe to make without copy because we'll hold onto the stream. - data = SkData::MakeWithoutCopy(gainmapStream->getMemoryBase(), - gainmapStream->getLength()); - } else { - data = SkCopyStreamToData(gainmapStream.get()); - // We don't need to hold the stream anymore - gainmapStream = nullptr; - } - gainmapBRD = skia::BitmapRegionDecoder::Make(std::move(data)); + if (!mainImageBRD->getGainmapBitmapRegionDecoder(&gainmapInfo, &gainmapBRD)) { + gainmapBRD = nullptr; } - return std::unique_ptr<BitmapRegionDecoderWrapper>( - new BitmapRegionDecoderWrapper(std::move(mainImageBRD), std::move(gainmapBRD), - gainmapInfo, std::move(gainmapStream))); + return std::unique_ptr<BitmapRegionDecoderWrapper>(new BitmapRegionDecoderWrapper( + std::move(mainImageBRD), std::move(gainmapBRD), gainmapInfo)); } SkEncodedImageFormat getEncodedFormat() { return mMainImageBRD->getEncodedFormat(); } @@ -191,16 +180,14 @@ public: private: BitmapRegionDecoderWrapper(std::unique_ptr<skia::BitmapRegionDecoder> mainImageBRD, std::unique_ptr<skia::BitmapRegionDecoder> gainmapBRD, - SkGainmapInfo info, std::unique_ptr<SkStream> stream) + SkGainmapInfo info) : mMainImageBRD(std::move(mainImageBRD)) , mGainmapBRD(std::move(gainmapBRD)) - , mGainmapInfo(info) - , mGainmapStream(std::move(stream)) {} + , mGainmapInfo(info) {} std::unique_ptr<skia::BitmapRegionDecoder> mMainImageBRD; std::unique_ptr<skia::BitmapRegionDecoder> mGainmapBRD; SkGainmapInfo mGainmapInfo; - std::unique_ptr<SkStream> mGainmapStream; }; } // namespace android diff --git a/libs/hwui/jni/graphics_jni_helpers.h b/libs/hwui/jni/graphics_jni_helpers.h index 78db54acc9e5..91db134af18f 100644 --- a/libs/hwui/jni/graphics_jni_helpers.h +++ b/libs/hwui/jni/graphics_jni_helpers.h @@ -80,9 +80,52 @@ static inline T MakeGlobalRefOrDie(JNIEnv* env, T in) { return static_cast<T>(res); } +// Inline variable that specifies the method binding format. +// The expected format is 'XX${method}XX', where ${method} represents the original method name. +// This variable is shared across all translation units. This is treated as a global variable as +// per C++ 17. +inline std::string jniMethodFormat; + +inline static void setJniMethodFormat(std::string value) { + jniMethodFormat = value; +} + +// Register the native methods, potenially applying the jniMethodFormat if it has been set. +static inline int jniRegisterMaybeRenamedNativeMethods(JNIEnv* env, const char* className, + const JNINativeMethod* gMethods, + int numMethods) { + if (jniMethodFormat.empty()) { + return jniRegisterNativeMethods(env, className, gMethods, numMethods); + } + + // Make a copy of gMethods with reformatted method names. + JNINativeMethod* modifiedMethods = new JNINativeMethod[numMethods]; + LOG_ALWAYS_FATAL_IF(!modifiedMethods, "Failed to allocate a copy of the JNI methods"); + + size_t methodNamePos = jniMethodFormat.find("${method}"); + LOG_ALWAYS_FATAL_IF(methodNamePos == std::string::npos, + "Invalid jniMethodFormat: could not find '${method}' in pattern"); + + for (int i = 0; i < numMethods; i++) { + modifiedMethods[i] = gMethods[i]; + std::string modifiedName = jniMethodFormat; + modifiedName.replace(methodNamePos, 9, gMethods[i].name); + char* modifiedNameChars = new char[modifiedName.length() + 1]; + LOG_ALWAYS_FATAL_IF(!modifiedNameChars, "Failed to allocate the new method name"); + std::strcpy(modifiedNameChars, modifiedName.c_str()); + modifiedMethods[i].name = modifiedNameChars; + } + int res = jniRegisterNativeMethods(env, className, modifiedMethods, numMethods); + for (int i = 0; i < numMethods; i++) { + delete[] modifiedMethods[i].name; + } + delete[] modifiedMethods; + return res; +} + static inline int RegisterMethodsOrDie(JNIEnv* env, const char* className, const JNINativeMethod* gMethods, int numMethods) { - int res = jniRegisterNativeMethods(env, className, gMethods, numMethods); + int res = jniRegisterMaybeRenamedNativeMethods(env, className, gMethods, numMethods); LOG_ALWAYS_FATAL_IF(res < 0, "Unable to register native methods."); return res; } diff --git a/nfc/api/current.txt b/nfc/api/current.txt index e7cb76c370fd..96b7c1339190 100644 --- a/nfc/api/current.txt +++ b/nfc/api/current.txt @@ -223,6 +223,7 @@ package android.nfc.cardemulation { field public static final String CATEGORY_PAYMENT = "payment"; field public static final String EXTRA_CATEGORY = "category"; field public static final String EXTRA_SERVICE_COMPONENT = "component"; + field @FlaggedApi("android.nfc.nfc_override_recover_routing_table") public static final int PROTOCOL_AND_TECHNOLOGY_ROUTE_DEFAULT = 3; // 0x3 field @FlaggedApi("android.nfc.nfc_override_recover_routing_table") public static final int PROTOCOL_AND_TECHNOLOGY_ROUTE_DH = 0; // 0x0 field @FlaggedApi("android.nfc.nfc_override_recover_routing_table") public static final int PROTOCOL_AND_TECHNOLOGY_ROUTE_ESE = 1; // 0x1 field @FlaggedApi("android.nfc.nfc_override_recover_routing_table") public static final int PROTOCOL_AND_TECHNOLOGY_ROUTE_UICC = 2; // 0x2 diff --git a/nfc/api/system-current.txt b/nfc/api/system-current.txt index 94231b0facdb..4428adee818d 100644 --- a/nfc/api/system-current.txt +++ b/nfc/api/system-current.txt @@ -58,12 +58,16 @@ package android.nfc { @FlaggedApi("android.nfc.nfc_oem_extension") public final class NfcOemExtension { method @FlaggedApi("android.nfc.nfc_oem_extension") @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public void clearPreference(); method @FlaggedApi("android.nfc.nfc_oem_extension") @NonNull public java.util.List<java.lang.String> getActiveNfceeList(); + method @FlaggedApi("android.nfc.nfc_oem_extension") @NonNull @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public android.nfc.RoutingStatus getRoutingStatus(); method @FlaggedApi("android.nfc.nfc_oem_extension") @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public boolean hasUserEnabledNfc(); + method @FlaggedApi("android.nfc.nfc_oem_extension") @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public boolean isAutoChangeEnabled(); method @FlaggedApi("android.nfc.nfc_oem_extension") @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public boolean isTagPresent(); method @FlaggedApi("android.nfc.nfc_oem_extension") @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public void maybeTriggerFirmwareUpdate(); + method @FlaggedApi("android.nfc.nfc_oem_extension") @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public void overwriteRoutingTable(int, int, int); method @FlaggedApi("android.nfc.nfc_oem_extension") @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public void pausePolling(int); method @FlaggedApi("android.nfc.nfc_oem_extension") @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public void registerCallback(@NonNull java.util.concurrent.Executor, @NonNull android.nfc.NfcOemExtension.Callback); method @FlaggedApi("android.nfc.nfc_oem_extension") @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public void resumePolling(); + method @FlaggedApi("android.nfc.nfc_oem_extension") @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public void setAutoChangeEnabled(boolean); method @FlaggedApi("android.nfc.nfc_oem_extension") @RequiresPermission(android.Manifest.permission.NFC_SET_CONTROLLER_ALWAYS_ON) public void setControllerAlwaysOnMode(int); method @FlaggedApi("android.nfc.nfc_oem_extension") @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public void synchronizeScreenState(); method @FlaggedApi("android.nfc.nfc_oem_extension") @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public void triggerInitialization(); @@ -90,7 +94,11 @@ package android.nfc { method public void onEnable(@NonNull java.util.function.Consumer<java.lang.Boolean>); method public void onEnableFinished(int); method public void onEnableStarted(); + method public void onGetOemAppSearchIntent(@NonNull java.util.List<java.lang.String>, @NonNull java.util.function.Consumer<android.content.Intent>); method public void onHceEventReceived(int); + method public void onLaunchHceAppChooserActivity(@NonNull String, @NonNull java.util.List<android.nfc.cardemulation.ApduServiceInfo>, @NonNull android.content.ComponentName, @NonNull String); + method public void onLaunchHceTapAgainDialog(@NonNull android.nfc.cardemulation.ApduServiceInfo, @NonNull String); + method public void onNdefMessage(@NonNull android.nfc.Tag, @NonNull android.nfc.NdefMessage, @NonNull java.util.function.Consumer<java.lang.Boolean>); method public void onNdefRead(@NonNull java.util.function.Consumer<java.lang.Boolean>); method public void onReaderOptionChanged(boolean); method public void onRfDiscoveryStarted(boolean); @@ -101,6 +109,12 @@ package android.nfc { method public void onTagDispatch(@NonNull java.util.function.Consumer<java.lang.Boolean>); } + @FlaggedApi("android.nfc.nfc_oem_extension") public class RoutingStatus { + method @FlaggedApi("android.nfc.nfc_oem_extension") @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public int getDefaultIsoDepRoute(); + method @FlaggedApi("android.nfc.nfc_oem_extension") @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public int getDefaultOffHostRoute(); + method @FlaggedApi("android.nfc.nfc_oem_extension") @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public int getDefaultRoute(); + } + } package android.nfc.cardemulation { diff --git a/nfc/java/android/nfc/INfcCardEmulation.aidl b/nfc/java/android/nfc/INfcCardEmulation.aidl index 19b9e0f0b515..1eae3c6f30f1 100644 --- a/nfc/java/android/nfc/INfcCardEmulation.aidl +++ b/nfc/java/android/nfc/INfcCardEmulation.aidl @@ -51,4 +51,8 @@ interface INfcCardEmulation void overrideRoutingTable(int userHandle, String protocol, String technology, in String pkg); void recoverRoutingTable(int userHandle); boolean isEuiccSupported(); + void setAutoChangeStatus(boolean state); + boolean isAutoChangeEnabled(); + List<String> getRoutingStatus(); + void overwriteRoutingTable(int userHandle, String emptyAid, String protocol, String tech); } diff --git a/nfc/java/android/nfc/INfcOemExtensionCallback.aidl b/nfc/java/android/nfc/INfcOemExtensionCallback.aidl index e49ef7e80705..48c7ee659266 100644 --- a/nfc/java/android/nfc/INfcOemExtensionCallback.aidl +++ b/nfc/java/android/nfc/INfcOemExtensionCallback.aidl @@ -15,9 +15,14 @@ */ package android.nfc; +import android.content.ComponentName; +import android.nfc.cardemulation.ApduServiceInfo; +import android.nfc.NdefMessage; import android.nfc.Tag; import android.os.ResultReceiver; +import java.util.List; + /** * @hide */ @@ -41,4 +46,8 @@ interface INfcOemExtensionCallback { void onCardEmulationActivated(boolean isActivated); void onRfFieldActivated(boolean isActivated); void onRfDiscoveryStarted(boolean isDiscoveryStarted); + void onGetOemAppSearchIntent(in List<String> firstPackage, in ResultReceiver intentConsumer); + void onNdefMessage(in Tag tag, in NdefMessage message, in ResultReceiver hasOemExecutableContent); + void onLaunchHceAppChooserActivity(in String selectedAid, in List<ApduServiceInfo> services, in ComponentName failedComponent, in String category); + void onLaunchHceTapAgainActivity(in ApduServiceInfo service, in String category); } diff --git a/nfc/java/android/nfc/NfcOemExtension.java b/nfc/java/android/nfc/NfcOemExtension.java index 6d5c069bca3a..fb63b5c03d00 100644 --- a/nfc/java/android/nfc/NfcOemExtension.java +++ b/nfc/java/android/nfc/NfcOemExtension.java @@ -16,6 +16,12 @@ package android.nfc; +import static android.nfc.cardemulation.CardEmulation.PROTOCOL_AND_TECHNOLOGY_ROUTE_DH; +import static android.nfc.cardemulation.CardEmulation.PROTOCOL_AND_TECHNOLOGY_ROUTE_ESE; +import static android.nfc.cardemulation.CardEmulation.PROTOCOL_AND_TECHNOLOGY_ROUTE_UICC; +import static android.nfc.cardemulation.CardEmulation.routeIntToString; + +import android.Manifest; import android.annotation.CallbackExecutor; import android.annotation.FlaggedApi; import android.annotation.IntDef; @@ -23,8 +29,14 @@ import android.annotation.NonNull; import android.annotation.RequiresPermission; import android.annotation.SuppressLint; import android.annotation.SystemApi; +import android.content.ComponentName; import android.content.Context; +import android.content.Intent; +import android.nfc.cardemulation.ApduServiceInfo; +import android.nfc.cardemulation.CardEmulation; +import android.nfc.cardemulation.CardEmulation.ProtocolAndTechnologyRoute; import android.os.Binder; +import android.os.Bundle; import android.os.RemoteException; import android.os.ResultReceiver; import android.util.Log; @@ -306,6 +318,60 @@ public final class NfcOemExtension { * @param isDiscoveryStarted true, if RF discovery started, else RF state is Idle. */ void onRfDiscoveryStarted(boolean isDiscoveryStarted); + + /** + * Gets the intent to find the OEM package in the OEM App market. If the consumer returns + * {@code null} or a timeout occurs, the intent from the first available package will be + * used instead. + * + * @param packages the OEM packages name stored in the tag + * @param intentConsumer The {@link Consumer} to be completed. + * The {@link Consumer#accept(Object)} should be called with + * the Intent required. + * + */ + void onGetOemAppSearchIntent(@NonNull List<String> packages, + @NonNull Consumer<Intent> intentConsumer); + + /** + * Checks if the NDEF message contains any specific OEM package executable content + * + * @param tag the {@link android.nfc.Tag Tag} + * @param message NDEF Message to read from tag + * @param hasOemExecutableContent The {@link Consumer} to be completed. If there is + * OEM package executable content, the + * {@link Consumer#accept(Object)} should be called with + * {@link Boolean#TRUE}, otherwise call with + * {@link Boolean#FALSE}. + */ + void onNdefMessage(@NonNull Tag tag, @NonNull NdefMessage message, + @NonNull Consumer<Boolean> hasOemExecutableContent); + + /** + * Callback to indicate the app chooser activity should be launched for handling CE + * transaction. This is invoked for example when there are more than 1 app installed that + * can handle the HCE transaction. OEMs can launch the Activity based + * on their requirement. + * + * @param selectedAid the selected AID from APDU + * @param services {@link ApduServiceInfo} of the service triggering the activity + * @param failedComponent the component failed to be resolved + * @param category the category of the service + */ + void onLaunchHceAppChooserActivity(@NonNull String selectedAid, + @NonNull List<ApduServiceInfo> services, + @NonNull ComponentName failedComponent, + @NonNull String category); + + /** + * Callback to indicate tap again dialog should be launched for handling HCE transaction. + * This is invoked for example when a CE service needs the device to unlocked before + * handling the transaction. OEMs can launch the Activity based on their requirement. + * + * @param service {@link ApduServiceInfo} of the service triggering the dialog + * @param category the category of the service + */ + void onLaunchHceTapAgainDialog(@NonNull ApduServiceInfo service, @NonNull String category); } @@ -523,6 +589,85 @@ public final class NfcOemExtension { NfcAdapter.callService(() -> NfcAdapter.sService.resumePolling()); } + /** + * Set whether to enable auto routing change or not (enabled by default). + * If disabled, routing targets are limited to a single off-host destination. + * + * @param state status of auto routing change, true if enable, otherwise false + */ + @FlaggedApi(Flags.FLAG_NFC_OEM_EXTENSION) + @RequiresPermission(Manifest.permission.WRITE_SECURE_SETTINGS) + public void setAutoChangeEnabled(boolean state) { + NfcAdapter.callService(() -> + NfcAdapter.sCardEmulationService.setAutoChangeStatus(state)); + } + + /** + * Check if auto routing change is enabled or not. + * + * @return true if enabled, otherwise false + */ + @FlaggedApi(Flags.FLAG_NFC_OEM_EXTENSION) + @RequiresPermission(Manifest.permission.WRITE_SECURE_SETTINGS) + public boolean isAutoChangeEnabled() { + return NfcAdapter.callServiceReturn(() -> + NfcAdapter.sCardEmulationService.isAutoChangeEnabled(), false); + } + + /** + * Get current routing status + * + * @return {@link RoutingStatus} indicating the default route, default ISO-DEP + * route and default off-host route. + */ + @NonNull + @FlaggedApi(Flags.FLAG_NFC_OEM_EXTENSION) + @RequiresPermission(Manifest.permission.WRITE_SECURE_SETTINGS) + public RoutingStatus getRoutingStatus() { + List<String> status = NfcAdapter.callServiceReturn(() -> + NfcAdapter.sCardEmulationService.getRoutingStatus(), new ArrayList<>()); + return new RoutingStatus(routeStringToInt(status.get(0)), + routeStringToInt(status.get(1)), + routeStringToInt(status.get(2))); + } + + /** + * Overwrites NFC controller routing table, which includes Protocol Route, Technology Route, + * and Empty AID Route. + * + * The parameter set to + * {@link ProtocolAndTechnologyRoute#PROTOCOL_AND_TECHNOLOGY_ROUTE_UNSET} + * can be used to keep current values for that entry. At least one route should be overridden + * when calling this API, otherwise throw {@link IllegalArgumentException}. + * + * @param protocol ISO-DEP route destination, where the possible inputs are defined in + * {@link ProtocolAndTechnologyRoute}. + * @param technology Tech-A, Tech-B and Tech-F route destination, where the possible inputs + * are defined in + * {@link ProtocolAndTechnologyRoute} + * @param emptyAid Zero-length AID route destination, where the possible inputs are defined in + * {@link ProtocolAndTechnologyRoute} + */ + @RequiresPermission(Manifest.permission.WRITE_SECURE_SETTINGS) + @FlaggedApi(Flags.FLAG_NFC_OEM_EXTENSION) + public void overwriteRoutingTable( + @CardEmulation.ProtocolAndTechnologyRoute int protocol, + @CardEmulation.ProtocolAndTechnologyRoute int technology, + @CardEmulation.ProtocolAndTechnologyRoute int emptyAid) { + + String protocolRoute = routeIntToString(protocol); + String technologyRoute = routeIntToString(technology); + String emptyAidRoute = routeIntToString(emptyAid); + + NfcAdapter.callService(() -> + NfcAdapter.sCardEmulationService.overwriteRoutingTable( + mContext.getUser().getIdentifier(), + emptyAidRoute, + protocolRoute, + technologyRoute + )); + } + private final class NfcOemExtensionCallback extends INfcOemExtensionCallback.Stub { @Override @@ -562,25 +707,25 @@ public final class NfcOemExtension { public void onApplyRouting(ResultReceiver isSkipped) throws RemoteException { mCallbackMap.forEach((cb, ex) -> handleVoidCallback( - new ReceiverWrapper(isSkipped), cb::onApplyRouting, ex)); + new ReceiverWrapper<>(isSkipped), cb::onApplyRouting, ex)); } @Override public void onNdefRead(ResultReceiver isSkipped) throws RemoteException { mCallbackMap.forEach((cb, ex) -> handleVoidCallback( - new ReceiverWrapper(isSkipped), cb::onNdefRead, ex)); + new ReceiverWrapper<>(isSkipped), cb::onNdefRead, ex)); } @Override public void onEnable(ResultReceiver isAllowed) throws RemoteException { mCallbackMap.forEach((cb, ex) -> handleVoidCallback( - new ReceiverWrapper(isAllowed), cb::onEnable, ex)); + new ReceiverWrapper<>(isAllowed), cb::onEnable, ex)); } @Override public void onDisable(ResultReceiver isAllowed) throws RemoteException { mCallbackMap.forEach((cb, ex) -> handleVoidCallback( - new ReceiverWrapper(isAllowed), cb::onDisable, ex)); + new ReceiverWrapper<>(isAllowed), cb::onDisable, ex)); } @Override public void onBootStarted() throws RemoteException { @@ -616,7 +761,7 @@ public final class NfcOemExtension { public void onTagDispatch(ResultReceiver isSkipped) throws RemoteException { mCallbackMap.forEach((cb, ex) -> handleVoidCallback( - new ReceiverWrapper(isSkipped), cb::onTagDispatch, ex)); + new ReceiverWrapper<>(isSkipped), cb::onTagDispatch, ex)); } @Override public void onRoutingChanged() throws RemoteException { @@ -635,6 +780,59 @@ public final class NfcOemExtension { handleVoidCallback(enabled, cb::onReaderOptionChanged, ex)); } + @Override + public void onGetOemAppSearchIntent(List<String> packages, ResultReceiver intentConsumer) + throws RemoteException { + mCallbackMap.forEach((cb, ex) -> + handleVoid2ArgCallback(packages, new ReceiverWrapper<>(intentConsumer), + cb::onGetOemAppSearchIntent, ex)); + } + + @Override + public void onNdefMessage(Tag tag, NdefMessage message, + ResultReceiver hasOemExecutableContent) throws RemoteException { + mCallbackMap.forEach((cb, ex) -> { + synchronized (mLock) { + final long identity = Binder.clearCallingIdentity(); + try { + ex.execute(() -> cb.onNdefMessage( + tag, message, new ReceiverWrapper<>(hasOemExecutableContent))); + } catch (RuntimeException exception) { + throw exception; + } finally { + Binder.restoreCallingIdentity(identity); + } + } + }); + } + + @Override + public void onLaunchHceAppChooserActivity(String selectedAid, + List<ApduServiceInfo> services, + ComponentName failedComponent, String category) + throws RemoteException { + mCallbackMap.forEach((cb, ex) -> { + synchronized (mLock) { + final long identity = Binder.clearCallingIdentity(); + try { + ex.execute(() -> cb.onLaunchHceAppChooserActivity( + selectedAid, services, failedComponent, category)); + } catch (RuntimeException exception) { + throw exception; + } finally { + Binder.restoreCallingIdentity(identity); + } + } + }); + } + + @Override + public void onLaunchHceTapAgainActivity(ApduServiceInfo service, String category) + throws RemoteException { + mCallbackMap.forEach((cb, ex) -> + handleVoid2ArgCallback(service, category, cb::onLaunchHceTapAgainDialog, ex)); + } + private <T> void handleVoidCallback( T input, Consumer<T> callbackMethod, Executor executor) { synchronized (mLock) { @@ -718,7 +916,16 @@ public final class NfcOemExtension { } } - private class ReceiverWrapper implements Consumer<Boolean> { + private @CardEmulation.ProtocolAndTechnologyRoute int routeStringToInt(String route) { + return switch (route) { + case "DH" -> PROTOCOL_AND_TECHNOLOGY_ROUTE_DH; + case "eSE" -> PROTOCOL_AND_TECHNOLOGY_ROUTE_ESE; + case "SIM" -> PROTOCOL_AND_TECHNOLOGY_ROUTE_UICC; + default -> throw new IllegalStateException("Unexpected value: " + route); + }; + } + + private class ReceiverWrapper<T> implements Consumer<T> { private final ResultReceiver mResultReceiver; ReceiverWrapper(ResultReceiver resultReceiver) { @@ -726,12 +933,19 @@ public final class NfcOemExtension { } @Override - public void accept(Boolean result) { - mResultReceiver.send(result ? 1 : 0, null); + public void accept(T result) { + if (result instanceof Boolean) { + mResultReceiver.send((Boolean) result ? 1 : 0, null); + } else if (result instanceof Intent) { + Bundle bundle = new Bundle(); + bundle.putParcelable("intent", (Intent) result); + mResultReceiver.send(0, bundle); + } + } @Override - public Consumer<Boolean> andThen(Consumer<? super Boolean> after) { + public Consumer<T> andThen(Consumer<? super T> after) { return Consumer.super.andThen(after); } } diff --git a/nfc/java/android/nfc/RoutingStatus.java b/nfc/java/android/nfc/RoutingStatus.java new file mode 100644 index 000000000000..4a1b1f3cecbc --- /dev/null +++ b/nfc/java/android/nfc/RoutingStatus.java @@ -0,0 +1,79 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package android.nfc; + +import android.annotation.FlaggedApi; +import android.annotation.RequiresPermission; +import android.annotation.SystemApi; +import android.nfc.cardemulation.CardEmulation; + +/** + * A class indicating default route, ISO-DEP route and off-host route. + * + * @hide + */ +@SystemApi +@FlaggedApi(Flags.FLAG_NFC_OEM_EXTENSION) +public class RoutingStatus { + private final @CardEmulation.ProtocolAndTechnologyRoute int mDefaultRoute; + private final @CardEmulation.ProtocolAndTechnologyRoute int mDefaultIsoDepRoute; + private final @CardEmulation.ProtocolAndTechnologyRoute int mDefaultOffHostRoute; + + RoutingStatus(@CardEmulation.ProtocolAndTechnologyRoute int mDefaultRoute, + @CardEmulation.ProtocolAndTechnologyRoute int mDefaultIsoDepRoute, + @CardEmulation.ProtocolAndTechnologyRoute int mDefaultOffHostRoute) { + this.mDefaultRoute = mDefaultRoute; + this.mDefaultIsoDepRoute = mDefaultIsoDepRoute; + this.mDefaultOffHostRoute = mDefaultOffHostRoute; + } + + /** + * Getter of the default route. + * @return an integer defined in + * {@link android.nfc.cardemulation.CardEmulation.ProtocolAndTechnologyRoute} + */ + @FlaggedApi(Flags.FLAG_NFC_OEM_EXTENSION) + @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) + @CardEmulation.ProtocolAndTechnologyRoute + public int getDefaultRoute() { + return mDefaultRoute; + } + + /** + * Getter of the default ISO-DEP route. + * @return an integer defined in + * {@link android.nfc.cardemulation.CardEmulation.ProtocolAndTechnologyRoute} + */ + @FlaggedApi(Flags.FLAG_NFC_OEM_EXTENSION) + @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) + @CardEmulation.ProtocolAndTechnologyRoute + public int getDefaultIsoDepRoute() { + return mDefaultIsoDepRoute; + } + + /** + * Getter of the default off-host route. + * @return an integer defined in + * {@link android.nfc.cardemulation.CardEmulation.ProtocolAndTechnologyRoute} + */ + @FlaggedApi(Flags.FLAG_NFC_OEM_EXTENSION) + @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) + @CardEmulation.ProtocolAndTechnologyRoute + public int getDefaultOffHostRoute() { + return mDefaultOffHostRoute; + } + +} diff --git a/nfc/java/android/nfc/cardemulation/CardEmulation.java b/nfc/java/android/nfc/cardemulation/CardEmulation.java index 4be082ccc02f..d8f04c50b695 100644 --- a/nfc/java/android/nfc/cardemulation/CardEmulation.java +++ b/nfc/java/android/nfc/cardemulation/CardEmulation.java @@ -168,6 +168,12 @@ public final class CardEmulation { public static final int PROTOCOL_AND_TECHNOLOGY_ROUTE_UICC = 2; /** + * Route to the default value in config file. + */ + @FlaggedApi(Flags.FLAG_NFC_OVERRIDE_RECOVER_ROUTING_TABLE) + public static final int PROTOCOL_AND_TECHNOLOGY_ROUTE_DEFAULT = 3; + + /** * Route unset. */ @FlaggedApi(Flags.FLAG_NFC_OVERRIDE_RECOVER_ROUTING_TABLE) @@ -895,45 +901,47 @@ public final class CardEmulation { PROTOCOL_AND_TECHNOLOGY_ROUTE_DH, PROTOCOL_AND_TECHNOLOGY_ROUTE_ESE, PROTOCOL_AND_TECHNOLOGY_ROUTE_UICC, - PROTOCOL_AND_TECHNOLOGY_ROUTE_UNSET + PROTOCOL_AND_TECHNOLOGY_ROUTE_UNSET, + PROTOCOL_AND_TECHNOLOGY_ROUTE_DEFAULT }) @Retention(RetentionPolicy.SOURCE) public @interface ProtocolAndTechnologyRoute {} - /** - * Setting NFC controller routing table, which includes Protocol Route and Technology Route, - * while this Activity is in the foreground. - * - * The parameter set to {@link #PROTOCOL_AND_TECHNOLOGY_ROUTE_UNSET} - * can be used to keep current values for that entry. Either - * Protocol Route or Technology Route should be override when calling this API, otherwise - * throw {@link IllegalArgumentException}. - * <p> - * Example usage in an Activity that requires to set proto route to "ESE" and keep tech route: - * <pre> - * protected void onResume() { - * mNfcAdapter.overrideRoutingTable( - * this, {@link #PROTOCOL_AND_TECHNOLOGY_ROUTE_ESE}, null); - * }</pre> - * </p> - * Also activities must call {@link #recoverRoutingTable(Activity)} - * when it goes to the background. Only the package of the - * currently preferred service (the service set as preferred by the current foreground - * application via {@link CardEmulation#setPreferredService(Activity, ComponentName)} or the - * current Default Wallet Role Holder {@link RoleManager#ROLE_WALLET}), - * otherwise a call to this method will fail and throw {@link SecurityException}. - * @param activity The Activity that requests NFC controller routing table to be changed. - * @param protocol ISO-DEP route destination, where the possible inputs are defined - * in {@link ProtocolAndTechnologyRoute}. - * @param technology Tech-A, Tech-B and Tech-F route destination, where the possible inputs - * are defined in {@link ProtocolAndTechnologyRoute} - * @throws SecurityException if the caller is not the preferred NFC service - * @throws IllegalArgumentException if the activity is not resumed or the caller is not in the - * foreground. - * <p> - * This is a high risk API and only included to support mainline effort - * @hide - */ + /** + * Setting NFC controller routing table, which includes Protocol Route and Technology Route, + * while this Activity is in the foreground. + * + * The parameter set to {@link #PROTOCOL_AND_TECHNOLOGY_ROUTE_UNSET} + * can be used to keep current values for that entry. Either + * Protocol Route or Technology Route should be override when calling this API, otherwise + * throw {@link IllegalArgumentException}. + * <p> + * Example usage in an Activity that requires to set proto route to "ESE" and keep tech route: + * <pre> + * protected void onResume() { + * mNfcAdapter.overrideRoutingTable( + * this, {@link #PROTOCOL_AND_TECHNOLOGY_ROUTE_ESE}, + * {@link #PROTOCOL_AND_TECHNOLOGY_ROUTE_UNSET}); + * }</pre> + * </p> + * Also activities must call {@link #recoverRoutingTable(Activity)} + * when it goes to the background. Only the package of the + * currently preferred service (the service set as preferred by the current foreground + * application via {@link CardEmulation#setPreferredService(Activity, ComponentName)} or the + * current Default Wallet Role Holder {@link RoleManager#ROLE_WALLET}), + * otherwise a call to this method will fail and throw {@link SecurityException}. + * @param activity The Activity that requests NFC controller routing table to be changed. + * @param protocol ISO-DEP route destination, where the possible inputs are defined + * in {@link ProtocolAndTechnologyRoute}. + * @param technology Tech-A, Tech-B and Tech-F route destination, where the possible inputs + * are defined in {@link ProtocolAndTechnologyRoute} + * @throws SecurityException if the caller is not the preferred NFC service + * @throws IllegalArgumentException if the activity is not resumed or the caller is not in the + * foreground. + * <p> + * This is a high risk API and only included to support mainline effort + * @hide + */ @SystemApi @FlaggedApi(Flags.FLAG_NFC_OVERRIDE_RECOVER_ROUTING_TABLE) public void overrideRoutingTable( @@ -942,26 +950,14 @@ public final class CardEmulation { if (!activity.isResumed()) { throw new IllegalArgumentException("Activity must be resumed."); } - String protocolRoute = switch (protocol) { - case PROTOCOL_AND_TECHNOLOGY_ROUTE_DH -> "DH"; - case PROTOCOL_AND_TECHNOLOGY_ROUTE_ESE -> "ESE"; - case PROTOCOL_AND_TECHNOLOGY_ROUTE_UICC -> "UICC"; - case PROTOCOL_AND_TECHNOLOGY_ROUTE_UNSET -> null; - default -> throw new IllegalStateException("Unexpected value: " + protocol); - }; - String technologyRoute = switch (technology) { - case PROTOCOL_AND_TECHNOLOGY_ROUTE_DH -> "DH"; - case PROTOCOL_AND_TECHNOLOGY_ROUTE_ESE -> "ESE"; - case PROTOCOL_AND_TECHNOLOGY_ROUTE_UICC -> "UICC"; - case PROTOCOL_AND_TECHNOLOGY_ROUTE_UNSET -> null; - default -> throw new IllegalStateException("Unexpected value: " + protocol); - }; + String protocolRoute = routeIntToString(protocol); + String technologyRoute = routeIntToString(technology); callService(() -> sService.overrideRoutingTable( - mContext.getUser().getIdentifier(), - protocolRoute, - technologyRoute, - mContext.getPackageName())); + mContext.getUser().getIdentifier(), + protocolRoute, + technologyRoute, + mContext.getPackageName())); } /** @@ -1068,4 +1064,16 @@ public final class CardEmulation { } return defaultReturn; } + + /** @hide */ + public static String routeIntToString(@ProtocolAndTechnologyRoute int route) { + return switch (route) { + case PROTOCOL_AND_TECHNOLOGY_ROUTE_DH -> "DH"; + case PROTOCOL_AND_TECHNOLOGY_ROUTE_ESE -> "eSE"; + case PROTOCOL_AND_TECHNOLOGY_ROUTE_UICC -> "SIM"; + case PROTOCOL_AND_TECHNOLOGY_ROUTE_UNSET -> null; + case PROTOCOL_AND_TECHNOLOGY_ROUTE_DEFAULT -> "default"; + default -> throw new IllegalStateException("Unexpected value: " + route); + }; + } } diff --git a/nfc/java/android/nfc/flags.aconfig b/nfc/java/android/nfc/flags.aconfig index cc9a97cd52c9..6a7e6939e773 100644 --- a/nfc/java/android/nfc/flags.aconfig +++ b/nfc/java/android/nfc/flags.aconfig @@ -157,3 +157,11 @@ flag { description: "Enable EUICC card emulation" bug: "321314635" } + +flag { + name: "nfc_state_change_security_log_event_enabled" + is_exported: true + namespace: "nfc" + description: "Enabling security log for nfc state change" + bug: "319934052" +} diff --git a/packages/CompanionDeviceManager/res/values/strings.xml b/packages/CompanionDeviceManager/res/values/strings.xml index a57d6eb11927..b266912ca156 100644 --- a/packages/CompanionDeviceManager/res/values/strings.xml +++ b/packages/CompanionDeviceManager/res/values/strings.xml @@ -50,13 +50,13 @@ <!-- ================= DEVICE_PROFILE_APP_STREAMING ================= --> <!-- Confirmation for associating an application with a companion device of APP_STREAMING profile (type) [CHAR LIMIT=NONE] --> - <string name="title_app_streaming">Allow <strong><xliff:g id="app_name" example="Exo">%1$s</xliff:g></strong> to stream your <xliff:g id="device_type" example="phone">%2$s</xliff:g>\u2019s apps to <strong><xliff:g id="device_name" example="Chromebook">%3$s</xliff:g></strong>?</string> + <string name="title_app_streaming">Allow <strong><xliff:g id="app_name" example="Exo">%1$s</xliff:g></strong> to stream your <xliff:g id="device_type" example="phone">%2$s</xliff:g>\u2019s apps and system features to <strong><xliff:g id="device_name" example="Chromebook">%3$s</xliff:g></strong>?</string> <!-- Summary for associating an application with a companion device of APP_STREAMING profile [CHAR LIMIT=NONE] --> - <string name="summary_app_streaming"><xliff:g id="app_name" example="Exo">%1$s</xliff:g> will have access to anything that’s visible or played on the <xliff:g id="device_type" example="phone">%2$s</xliff:g>, including audio, photos, passwords, and messages.<br/><br/><xliff:g id="app_name" example="Exo">%1$s</xliff:g> will be able to stream apps to <xliff:g id="device_name" example="Chromebook">%3$s</xliff:g> until you remove access to this permission.</string> + <string name="summary_app_streaming"><xliff:g id="app_name" example="Exo">%1$s</xliff:g> will have access to anything that’s visible or played on your <xliff:g id="device_type" example="phone">%2$s</xliff:g>, including audio, photos, payment info, passwords, and messages.<br/><br/><xliff:g id="app_name" example="Exo">%1$s</xliff:g> will be able to stream apps to <xliff:g id="device_name" example="Chromebook">%3$s</xliff:g> until you remove access to this permission.</string> <!-- Description of the helper dialog for APP_STREAMING profile. [CHAR LIMIT=NONE] --> - <string name="helper_summary_app_streaming"><xliff:g id="app_name" example="GMS">%1$s</xliff:g> is requesting permission on behalf of your <xliff:g id="device_name" example="Chromebook">%2$s</xliff:g> to display and stream apps between your devices</string> + <string name="helper_summary_app_streaming"><xliff:g id="app_name" example="Exo">%1$s</xliff:g> is requesting permission on behalf of <xliff:g id="device_name" example="Chromebook">%2$s</xliff:g> to stream apps and system features from your <xliff:g id="device_type" example="phone">%3$s</xliff:g></string> <!-- ================= DEVICE_PROFILE_AUTOMOTIVE_PROJECTION ================= --> @@ -80,13 +80,13 @@ <!-- ================= DEVICE_PROFILE_NEARBY_DEVICE_STREAMING ================= --> <!-- Confirmation for associating an application with a companion device of NEARBY_DEVICE_STREAMING profile (type) [CHAR LIMIT=NONE] --> - <string name="title_nearby_device_streaming">Allow <strong><xliff:g id="device_name" example="NearbyStreamer">%1$s</xliff:g></strong> to stream your <xliff:g id="device_type" example="phone">%2$s</xliff:g>\u2019s apps and system features to <strong><xliff:g id="device_name" example="Chromebook">%3$s</xliff:g></strong>?</string> + <string name="title_nearby_device_streaming">Allow <strong><xliff:g id="app_name" example="Exo">%1$s</xliff:g></strong> to stream your <xliff:g id="device_type" example="phone">%2$s</xliff:g>\u2019s apps to <strong><xliff:g id="device_name" example="Chromebook">%3$s</xliff:g></strong>?</string> <!-- Summary for associating an application with a companion device of NEARBY_DEVICE_STREAMING profile [CHAR LIMIT=NONE] --> - <string name="summary_nearby_device_streaming"><xliff:g id="app_name" example="Exo">%1$s</xliff:g> will have access to anything that’s visible or played on your <xliff:g id="device_type" example="phone">%2$s</xliff:g>, including audio, photos, payment info, passwords, and messages.<br/><br/><xliff:g id="app_name" example="Exo">%1$s</xliff:g> will be able to stream apps and system features to <xliff:g id="device_name" example="Chromebook">%3$s</xliff:g> until you remove access to this permission.</string> + <string name="summary_nearby_device_streaming"><xliff:g id="app_name" example="Exo">%1$s</xliff:g> will have access to anything that’s visible or played on <xliff:g id="device_name" example="Chromebook">%3$s</xliff:g>, including audio, photos, payment info, passwords, and messages.<br/><br/><xliff:g id="app_name" example="Exo">%1$s</xliff:g> will be able to stream apps to <xliff:g id="device_name" example="Chromebook">%3$s</xliff:g> until you remove access to this permission.</string> <!-- Description of the helper dialog for NEARBY_DEVICE_STREAMING profile. [CHAR LIMIT=NONE] --> - <string name="helper_summary_nearby_device_streaming"><xliff:g id="app_name" example="NearbyStreamerApp">%1$s</xliff:g> is requesting permission on behalf of your <xliff:g id="device_name" example="NearbyDevice">%2$s</xliff:g> to stream apps and other system features between your devices</string> + <string name="helper_summary_nearby_device_streaming"><xliff:g id="app_name" example="Exo">%1$s</xliff:g> is requesting permission on behalf of <xliff:g id="device_name" example="Chromebook">%2$s</xliff:g> to stream apps from your <xliff:g id="device_type" example="phone">%3$s</xliff:g></string> <!-- ================= null profile ================= --> diff --git a/packages/SettingsLib/ButtonPreference/res/values-v35/attrs_expressive.xml b/packages/SettingsLib/ButtonPreference/res/values-v35/attrs_expressive.xml deleted file mode 100644 index a1761e55f1e0..000000000000 --- a/packages/SettingsLib/ButtonPreference/res/values-v35/attrs_expressive.xml +++ /dev/null @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2024 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<resources> - <declare-styleable name="ButtonPreference"> - <attr name="buttonType" format="enum"> - <enum name="filled" value="0"/> - <enum name="tonal" value="1"/> - <enum name="outline" value="2"/> - </attr> - <attr name="buttonSize" format="enum"> - <enum name="normal" value="0"/> - <enum name="large" value="1"/> - <enum name="extra" value="2"/> - </attr> - </declare-styleable> -</resources>
\ No newline at end of file diff --git a/packages/SettingsLib/ButtonPreference/res/values/attrs.xml b/packages/SettingsLib/ButtonPreference/res/values/attrs.xml index 9c1e503f1372..970eeb2bfa72 100644 --- a/packages/SettingsLib/ButtonPreference/res/values/attrs.xml +++ b/packages/SettingsLib/ButtonPreference/res/values/attrs.xml @@ -18,12 +18,12 @@ <resources> <declare-styleable name="ButtonPreference"> <attr name="android:gravity" /> - <attr name="buttonType" format="enum"> + <attr name="buttonPreferenceType" format="enum"> <enum name="filled" value="0"/> <enum name="tonal" value="1"/> <enum name="outline" value="2"/> </attr> - <attr name="buttonSize" format="enum"> + <attr name="buttonPreferenceSize" format="enum"> <enum name="normal" value="0"/> <enum name="large" value="1"/> <enum name="extra" value="2"/> diff --git a/packages/SettingsLib/ButtonPreference/src/com/android/settingslib/widget/ButtonPreference.java b/packages/SettingsLib/ButtonPreference/src/com/android/settingslib/widget/ButtonPreference.java index 0041eb2c7072..979ff96be3f7 100644 --- a/packages/SettingsLib/ButtonPreference/src/com/android/settingslib/widget/ButtonPreference.java +++ b/packages/SettingsLib/ButtonPreference/src/com/android/settingslib/widget/ButtonPreference.java @@ -137,8 +137,8 @@ public class ButtonPreference extends Preference { mGravity = a.getInt(R.styleable.ButtonPreference_android_gravity, Gravity.START); if (SettingsThemeHelper.isExpressiveTheme(context)) { - int type = a.getInt(R.styleable.ButtonPreference_buttonType, 0); - int size = a.getInt(R.styleable.ButtonPreference_buttonSize, 0); + int type = a.getInt(R.styleable.ButtonPreference_buttonPreferenceType, 0); + int size = a.getInt(R.styleable.ButtonPreference_buttonPreferenceSize, 0); resId = ButtonStyle.getLayoutId(type, size); } a.recycle(); diff --git a/packages/SettingsLib/src/com/android/settingslib/Utils.java b/packages/SettingsLib/src/com/android/settingslib/Utils.java index 9d56c77b097b..744e97e53fef 100644 --- a/packages/SettingsLib/src/com/android/settingslib/Utils.java +++ b/packages/SettingsLib/src/com/android/settingslib/Utils.java @@ -30,9 +30,10 @@ import android.hardware.usb.flags.Flags; import android.icu.text.NumberFormat; import android.location.LocationManager; import android.media.AudioManager; +import android.net.ConnectivityManager; import android.net.NetworkCapabilities; import android.net.TetheringManager; -import android.net.vcn.VcnTransportInfo; +import android.net.vcn.VcnUtils; import android.net.wifi.WifiInfo; import android.os.BatteryManager; import android.os.Build; @@ -737,14 +738,9 @@ public class Utils { * @param networkCapabilities NetworkCapabilities of the network. */ @Nullable - public static WifiInfo tryGetWifiInfoForVcn(NetworkCapabilities networkCapabilities) { - if (networkCapabilities.getTransportInfo() == null - || !(networkCapabilities.getTransportInfo() instanceof VcnTransportInfo)) { - return null; - } - VcnTransportInfo vcnTransportInfo = - (VcnTransportInfo) networkCapabilities.getTransportInfo(); - return vcnTransportInfo.getWifiInfo(); + public static WifiInfo tryGetWifiInfoForVcn( + ConnectivityManager connectivityMgr, NetworkCapabilities networkCapabilities) { + return VcnUtils.getWifiInfoFromVcnCaps(connectivityMgr, networkCapabilities); } /** Whether there is any incompatible chargers in the current UsbPort? */ diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiStatusTracker.java b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiStatusTracker.java index 015356e013b7..cea3d17f116d 100644 --- a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiStatusTracker.java +++ b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiStatusTracker.java @@ -30,6 +30,7 @@ import android.net.NetworkScoreManager; import android.net.ScoredNetwork; import android.net.TransportInfo; import android.net.vcn.VcnTransportInfo; +import android.net.vcn.VcnUtils; import android.net.wifi.WifiInfo; import android.net.wifi.WifiManager; import android.net.wifi.WifiNetworkScoreCache; @@ -394,10 +395,7 @@ public class WifiStatusTracker { TransportInfo transportInfo = networkCapabilities.getTransportInfo(); if (transportInfo instanceof VcnTransportInfo) { - // This VcnTransportInfo logic is copied from - // [com.android.settingslib.Utils.tryGetWifiInfoForVcn]. It's copied instead of - // re-used because it makes the logic here clearer. - return ((VcnTransportInfo) transportInfo).getWifiInfo(); + return VcnUtils.getWifiInfoFromVcnCaps(mConnectivityManager, networkCapabilities); } else if (transportInfo instanceof WifiInfo) { return (WifiInfo) transportInfo; } else { diff --git a/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java b/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java index 5e31da411e49..4dc84246afc0 100644 --- a/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java +++ b/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java @@ -168,10 +168,6 @@ public class SecureSettings { Settings.Secure.SHOW_NOTIFICATION_SNOOZE, Settings.Secure.NOTIFICATION_HISTORY_ENABLED, Settings.Secure.ZEN_DURATION, - Settings.Secure.SHOW_ZEN_UPGRADE_NOTIFICATION, - Settings.Secure.SHOW_ZEN_SETTINGS_SUGGESTION, - Settings.Secure.ZEN_SETTINGS_UPDATED, - Settings.Secure.ZEN_SETTINGS_SUGGESTION_VIEWED, Settings.Secure.CHARGING_SOUNDS_ENABLED, Settings.Secure.CHARGING_VIBRATION_ENABLED, Settings.Secure.ACCESSIBILITY_NON_INTERACTIVE_UI_TIMEOUT_MS, diff --git a/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java b/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java index b3f73749f393..688676dc4072 100644 --- a/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java +++ b/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java @@ -247,10 +247,6 @@ public class SecureSettingsValidators { VALIDATORS.put(Secure.SHOW_NOTIFICATION_SNOOZE, BOOLEAN_VALIDATOR); VALIDATORS.put(Secure.NOTIFICATION_HISTORY_ENABLED, BOOLEAN_VALIDATOR); VALIDATORS.put(Secure.ZEN_DURATION, ANY_INTEGER_VALIDATOR); - VALIDATORS.put(Secure.SHOW_ZEN_UPGRADE_NOTIFICATION, BOOLEAN_VALIDATOR); - VALIDATORS.put(Secure.SHOW_ZEN_SETTINGS_SUGGESTION, BOOLEAN_VALIDATOR); - VALIDATORS.put(Secure.ZEN_SETTINGS_UPDATED, BOOLEAN_VALIDATOR); - VALIDATORS.put(Secure.ZEN_SETTINGS_SUGGESTION_VIEWED, BOOLEAN_VALIDATOR); VALIDATORS.put(Secure.CHARGING_SOUNDS_ENABLED, BOOLEAN_VALIDATOR); VALIDATORS.put(Secure.CHARGING_VIBRATION_ENABLED, BOOLEAN_VALIDATOR); VALIDATORS.put( diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java index 3c24f5c56603..2034f36c558b 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java @@ -2734,18 +2734,6 @@ class SettingsProtoDumpUtil { Settings.Secure.ZEN_DURATION, SecureSettingsProto.Zen.DURATION); dumpSetting(s, p, - Settings.Secure.SHOW_ZEN_UPGRADE_NOTIFICATION, - SecureSettingsProto.Zen.SHOW_ZEN_UPGRADE_NOTIFICATION); - dumpSetting(s, p, - Settings.Secure.SHOW_ZEN_SETTINGS_SUGGESTION, - SecureSettingsProto.Zen.SHOW_ZEN_SETTINGS_SUGGESTION); - dumpSetting(s, p, - Settings.Secure.ZEN_SETTINGS_UPDATED, - SecureSettingsProto.Zen.SETTINGS_UPDATED); - dumpSetting(s, p, - Settings.Secure.ZEN_SETTINGS_SUGGESTION_VIEWED, - SecureSettingsProto.Zen.SETTINGS_SUGGESTION_VIEWED); - dumpSetting(s, p, Settings.Secure.CHARGE_OPTIMIZATION_MODE, SecureSettingsProto.CHARGE_OPTIMIZATION_MODE); p.end(zenToken); diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java index 749ad0a993b3..a8af43f5cb11 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java @@ -4771,9 +4771,9 @@ public class SettingsProvider extends ContentProvider { } if (currentVersion == 169) { - // Version 169: Set the default value for Secure Settings ZEN_DURATION, - // SHOW_ZEN_SETTINGS_SUGGESTION, ZEN_SETTINGS_UPDATE and - // ZEN_SETTINGS_SUGGESTION_VIEWED + // Version 169: Set the default value for Secure Settings ZEN_DURATION. + // Also used to update SHOW_ZEN_SETTINGS_SUGGESTION, ZEN_SETTINGS_UPDATE and + // ZEN_SETTINGS_SUGGESTION_VIEWED, but those properties are gone now. final SettingsState globalSettings = getGlobalSettingsLocked(); final Setting globalZenDuration = globalSettings.getSettingLocked( @@ -4801,33 +4801,6 @@ public class SettingsProvider extends ContentProvider { SettingsState.SYSTEM_PACKAGE_NAME); } - // SHOW_ZEN_SETTINGS_SUGGESTION - final Setting currentShowZenSettingSuggestion = secureSettings.getSettingLocked( - Secure.SHOW_ZEN_SETTINGS_SUGGESTION); - if (currentShowZenSettingSuggestion.isNull()) { - secureSettings.insertSettingOverrideableByRestoreLocked( - Secure.SHOW_ZEN_SETTINGS_SUGGESTION, "1", - null, true, SettingsState.SYSTEM_PACKAGE_NAME); - } - - // ZEN_SETTINGS_UPDATED - final Setting currentUpdatedSetting = secureSettings.getSettingLocked( - Secure.ZEN_SETTINGS_UPDATED); - if (currentUpdatedSetting.isNull()) { - secureSettings.insertSettingOverrideableByRestoreLocked( - Secure.ZEN_SETTINGS_UPDATED, "0", - null, true, SettingsState.SYSTEM_PACKAGE_NAME); - } - - // ZEN_SETTINGS_SUGGESTION_VIEWED - final Setting currentSettingSuggestionViewed = secureSettings.getSettingLocked( - Secure.ZEN_SETTINGS_SUGGESTION_VIEWED); - if (currentSettingSuggestionViewed.isNull()) { - secureSettings.insertSettingOverrideableByRestoreLocked( - Secure.ZEN_SETTINGS_SUGGESTION_VIEWED, "0", - null, true, SettingsState.SYSTEM_PACKAGE_NAME); - } - currentVersion = 170; } diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java index 3c634f067a0d..011ffbc97d19 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java @@ -610,7 +610,7 @@ final class SettingsState { flag.getPackageName(), flag.getFlagName(), flag.getServerFlagValue(), - false); + StorageRequestMessage.SERVER_ON_REBOOT); } if (flag.getHasLocalOverride()) { @@ -619,7 +619,7 @@ final class SettingsState { flag.getPackageName(), flag.getFlagName(), flag.getLocalFlagValue(), - true); + StorageRequestMessage.LOCAL_ON_REBOOT); } } diff --git a/packages/SettingsProvider/test/AndroidTest.xml b/packages/SettingsProvider/test/AndroidTest.xml index dccc2d398f12..541a29465b9a 100644 --- a/packages/SettingsProvider/test/AndroidTest.xml +++ b/packages/SettingsProvider/test/AndroidTest.xml @@ -32,7 +32,7 @@ <option name="package" value="com.android.providers.setting.test" /> <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" /> <option name="hidden-api-checks" value="false"/> - <option name="exclude-annotation" value="com.android.bedstead.harrier.annotations.RequireRunOnWorkProfile" /> - <option name="exclude-annotation" value="com.android.bedstead.harrier.annotations.RequireRunOnSecondaryUser" /> + <option name="exclude-annotation" value="com.android.bedstead.enterprise.annotations.RequireRunOnWorkProfile" /> + <option name="exclude-annotation" value="com.android.bedstead.multiuser.annotations.RequireRunOnSecondaryUser" /> </test> </configuration> diff --git a/packages/SettingsProvider/test/src/com/android/providers/settings/SettingsProviderMultiUsersTest.java b/packages/SettingsProvider/test/src/com/android/providers/settings/SettingsProviderMultiUsersTest.java index e4898daf3cbf..e86e72712b48 100644 --- a/packages/SettingsProvider/test/src/com/android/providers/settings/SettingsProviderMultiUsersTest.java +++ b/packages/SettingsProvider/test/src/com/android/providers/settings/SettingsProviderMultiUsersTest.java @@ -31,10 +31,10 @@ import com.android.bedstead.enterprise.annotations.EnsureHasNoWorkProfile; import com.android.bedstead.enterprise.annotations.EnsureHasWorkProfile; import com.android.bedstead.harrier.BedsteadJUnit4; import com.android.bedstead.harrier.DeviceState; -import com.android.bedstead.harrier.annotations.EnsureHasSecondaryUser; import com.android.bedstead.harrier.annotations.RequireFeature; import com.android.bedstead.harrier.annotations.RequireRunOnInitialUser; -import com.android.bedstead.harrier.annotations.RequireRunOnPrimaryUser; +import com.android.bedstead.multiuser.annotations.EnsureHasSecondaryUser; +import com.android.bedstead.multiuser.annotations.RequireRunOnPrimaryUser; import com.android.bedstead.nene.TestApis; import com.android.bedstead.nene.users.UserReference; import com.android.bedstead.nene.users.UserType; diff --git a/packages/SystemUI/aconfig/systemui.aconfig b/packages/SystemUI/aconfig/systemui.aconfig index d98b2da5a811..aaa527dead0a 100644 --- a/packages/SystemUI/aconfig/systemui.aconfig +++ b/packages/SystemUI/aconfig/systemui.aconfig @@ -637,6 +637,13 @@ flag { } flag { + name: "screenshot_policy_split_and_desktop_mode" + namespace: "systemui" + description: "Improves screenshot policy handling for split screen and desktop mode." + bug: "365597999" +} + +flag { name: "run_fingerprint_detect_on_dismissible_keyguard" namespace: "systemui" description: "Run fingerprint detect instead of authenticate if the keyguard is dismissible." @@ -1074,6 +1081,16 @@ flag { } flag { + name: "dream_overlay_updated_font" + namespace: "systemui" + description: "Flag to enable updated font settings for dream overlay" + bug: "349656117" + metadata { + purpose: PURPOSE_BUGFIX + } +} + +flag { name: "app_clips_backlinks" namespace: "systemui" description: "Enables Backlinks improvement feature in App Clips" @@ -1384,10 +1401,13 @@ flag { } flag { - name: "compose_haptic_sliders" + name: "haptics_for_compose_sliders" namespace: "systemui" description: "Adding haptic component infrastructure to sliders in Compose." bug: "341968766" + metadata { + purpose: PURPOSE_BUGFIX + } } flag { diff --git a/packages/SystemUI/animation/src/com/android/systemui/animation/DialogTransitionAnimator.kt b/packages/SystemUI/animation/src/com/android/systemui/animation/DialogTransitionAnimator.kt index f5d01d70e077..907c39d842ce 100644 --- a/packages/SystemUI/animation/src/com/android/systemui/animation/DialogTransitionAnimator.kt +++ b/packages/SystemUI/animation/src/com/android/systemui/animation/DialogTransitionAnimator.kt @@ -944,9 +944,26 @@ private class AnimatedDialog( } override fun onTransitionAnimationEnd(isExpandingFullyAbove: Boolean) { - startController.onTransitionAnimationEnd(isExpandingFullyAbove) - endController.onTransitionAnimationEnd(isExpandingFullyAbove) - onLaunchAnimationEnd() + // onLaunchAnimationEnd is called by an Animator at the end of the animation, + // on a Choreographer animation tick. The following calls will move the animated + // content from the dialog overlay back to its original position, and this + // change must be reflected in the next frame given that we then sync the next + // frame of both the content and dialog ViewRoots. However, in case that content + // is rendered by Compose, whose compositions are also scheduled on a + // Choreographer frame, any state change made *right now* won't be reflected in + // the next frame given that a Choreographer frame can't schedule another and + // have it happen in the same frame. So we post the forwarded calls to + // [Controller.onLaunchAnimationEnd], leaving this Choreographer frame, ensuring + // that the move of the content back to its original window will be reflected in + // the next frame right after [onLaunchAnimationEnd] is called. + // + // TODO(b/330672236): Move this to TransitionAnimator. + dialog.context.mainExecutor.execute { + startController.onTransitionAnimationEnd(isExpandingFullyAbove) + endController.onTransitionAnimationEnd(isExpandingFullyAbove) + + onLaunchAnimationEnd() + } } override fun onTransitionAnimationProgress( diff --git a/packages/SystemUI/animation/src/com/android/systemui/animation/TransitionAnimator.kt b/packages/SystemUI/animation/src/com/android/systemui/animation/TransitionAnimator.kt index 859fc4e09bb2..fc4cf1d1e21e 100644 --- a/packages/SystemUI/animation/src/com/android/systemui/animation/TransitionAnimator.kt +++ b/packages/SystemUI/animation/src/com/android/systemui/animation/TransitionAnimator.kt @@ -379,26 +379,13 @@ class TransitionAnimator( Log.d(TAG, "Animation ended") } - // onAnimationEnd is called at the end of the animation, on a Choreographer - // animation tick. During dialog launches, the following calls will move the - // animated content from the dialog overlay back to its original position, and - // this change must be reflected in the next frame given that we then sync the - // next frame of both the content and dialog ViewRoots. During SysUI activity - // launches, we will instantly collapse the shade at the end of the transition. - // However, if those are rendered by Compose, whose compositions are also - // scheduled on a Choreographer frame, any state change made *right now* won't - // be reflected in the next frame given that a Choreographer frame can't - // schedule another and have it happen in the same frame. So we post the - // forwarded calls to [Controller.onLaunchAnimationEnd] in the main executor, - // leaving this Choreographer frame, ensuring that any state change applied by - // onTransitionAnimationEnd() will be reflected in the same frame. - mainExecutor.execute { - controller.onTransitionAnimationEnd(isExpandingFullyAbove) - transitionContainerOverlay.remove(windowBackgroundLayer) - - if (moveBackgroundLayerWhenAppVisibilityChanges && controller.isLaunching) { - openingWindowSyncViewOverlay?.remove(windowBackgroundLayer) - } + // TODO(b/330672236): Post this to the main thread instead so that it does not + // flicker with Flexiglass enabled. + controller.onTransitionAnimationEnd(isExpandingFullyAbove) + transitionContainerOverlay.remove(windowBackgroundLayer) + + if (moveBackgroundLayerWhenAppVisibilityChanges && controller.isLaunching) { + openingWindowSyncViewOverlay?.remove(windowBackgroundLayer) } } } diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/notifications/ui/composable/Notifications.kt b/packages/SystemUI/compose/features/src/com/android/systemui/notifications/ui/composable/Notifications.kt index 2745f6ea6bb4..4c6834cf6bea 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/notifications/ui/composable/Notifications.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/notifications/ui/composable/Notifications.kt @@ -47,7 +47,6 @@ import androidx.compose.foundation.layout.windowInsetsBottomHeight import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.verticalScroll import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.DisposableEffect import androidx.compose.runtime.LaunchedEffect @@ -60,7 +59,6 @@ import androidx.compose.runtime.setValue import androidx.compose.runtime.snapshotFlow import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.draw.clip import androidx.compose.ui.draw.drawBehind import androidx.compose.ui.graphics.BlendMode import androidx.compose.ui.graphics.Color @@ -70,7 +68,6 @@ import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.layout.LayoutCoordinates import androidx.compose.ui.layout.boundsInWindow import androidx.compose.ui.layout.onGloballyPositioned -import androidx.compose.ui.layout.onPlaced import androidx.compose.ui.layout.onSizeChanged import androidx.compose.ui.layout.positionInWindow import androidx.compose.ui.platform.LocalConfiguration @@ -82,6 +79,7 @@ import androidx.compose.ui.unit.Velocity import androidx.compose.ui.unit.dp import androidx.compose.ui.util.lerp import androidx.lifecycle.compose.collectAsStateWithLifecycle +import com.android.compose.animation.scene.ContentKey import com.android.compose.animation.scene.ElementKey import com.android.compose.animation.scene.LowestZIndexContentPicker import com.android.compose.animation.scene.NestedScrollBehavior @@ -93,8 +91,9 @@ import com.android.systemui.common.ui.compose.windowinsets.LocalScreenCornerRadi import com.android.systemui.res.R import com.android.systemui.scene.session.ui.composable.SaveableSession import com.android.systemui.scene.session.ui.composable.rememberSession +import com.android.systemui.scene.shared.model.Overlays import com.android.systemui.scene.shared.model.Scenes -import com.android.systemui.shade.shared.model.ShadeMode +import com.android.systemui.shade.shared.flag.DualShade import com.android.systemui.shade.ui.composable.ShadeHeader import com.android.systemui.statusbar.notification.stack.shared.model.ShadeScrimBounds import com.android.systemui.statusbar.notification.stack.shared.model.ShadeScrimRounding @@ -112,18 +111,16 @@ object Notifications { val NotificationStackPlaceholder = ElementKey("NotificationStackPlaceholder") val HeadsUpNotificationPlaceholder = ElementKey("HeadsUpNotificationPlaceholder", contentPicker = LowestZIndexContentPicker) - val ShelfSpace = ElementKey("ShelfSpace") val NotificationStackCutoffGuideline = ElementKey("NotificationStackCutoffGuideline") } - - // Expansion fraction thresholds (between 0-1f) at which the corresponding value should be - // at its maximum, given they are at their minimum value at expansion = 0f. - object TransitionThresholds { - const val EXPANSION_FOR_MAX_CORNER_RADIUS = 0.1f - const val EXPANSION_FOR_MAX_SCRIM_ALPHA = 0.3f - } } +private val notificationsShadeContentKey: ContentKey + get() = if (DualShade.isEnabled) Overlays.NotificationsShade else Scenes.Shade + +private val quickSettingsShadeContentKey: ContentKey + get() = if (DualShade.isEnabled) Overlays.QuickSettingsShade else Scenes.QuickSettings + /** * Adds the space where heads up notifications can appear in the scene. This should generally be the * entire size of the scene. @@ -146,7 +143,7 @@ fun SceneScope.HeadsUpNotificationSpace( // This element is sometimes opted out of the shared element system, so there // can be multiple instances of it during a transition. Thus we need to // determine which instance should feed its bounds to NSSL to avoid providing - // conflicting values + // conflicting values. val useBounds = useHunBounds() if (useBounds) { val positionInWindow = coordinates.positionInWindow() @@ -157,8 +154,8 @@ fun SceneScope.HeadsUpNotificationSpace( " bounds=$boundsInWindow" } // Note: boundsInWindow doesn't scroll off the screen, so use - // positionInWindow - // for top bound, which can scroll off screen while snoozing + // positionInWindow for top bound, which can scroll off screen while + // snoozing. stackScrollView.setHeadsUpTop(positionInWindow.y) stackScrollView.setHeadsUpBottom(boundsInWindow.bottom) } @@ -285,7 +282,8 @@ fun SceneScope.NotificationScrollingStack( shouldFillMaxSize: Boolean = true, shouldReserveSpaceForNavBar: Boolean = true, shouldIncludeHeadsUpSpace: Boolean = true, - shadeMode: ShadeMode, + shouldShowScrim: Boolean = true, + supportNestedScrolling: Boolean, onEmptySpaceClick: (() -> Unit)? = null, modifier: Modifier = Modifier, ) { @@ -293,6 +291,7 @@ fun SceneScope.NotificationScrollingStack( val density = LocalDensity.current val screenCornerRadius = LocalScreenCornerRadius.current val scrimCornerRadius = dimensionResource(R.dimen.notification_scrim_corner_radius) + val scrimBackgroundColor = MaterialTheme.colorScheme.surface val scrollState = shadeSession.rememberSaveableSession(saver = ScrollState.Saver, key = null) { ScrollState(initial = 0) @@ -427,8 +426,14 @@ fun SceneScope.NotificationScrollingStack( // completes. if ( scrimOffset.value < 0 && - layoutState.isTransitioning(from = Scenes.Shade, to = Scenes.Gone) || - layoutState.isTransitioning(from = Scenes.Shade, to = Scenes.Lockscreen) + (layoutState.isTransitioning( + from = notificationsShadeContentKey, + to = Scenes.Gone, + ) || + layoutState.isTransitioning( + from = notificationsShadeContentKey, + to = Scenes.Lockscreen, + )) ) { IntOffset(x = 0, y = (scrimOffset.value * expansionFraction).roundToInt()) } else if ( @@ -498,7 +503,7 @@ fun SceneScope.NotificationScrollingStack( (expansionFraction / EXPANSION_FOR_MAX_SCRIM_ALPHA).coerceAtMost(1f) } else 1f } - .background(MaterialTheme.colorScheme.surface) + .thenIf(shouldShowScrim) { Modifier.background(scrimBackgroundColor) } .thenIf(shouldFillMaxSize) { Modifier.fillMaxSize() } .debugBackground(viewModel, DEBUG_BOX_COLOR) ) { @@ -508,7 +513,7 @@ fun SceneScope.NotificationScrollingStack( topBehavior = NestedScrollBehavior.EdgeWithPreview, isExternalOverscrollGesture = { isCurrentGestureOverscroll.value }, ) - .thenIf(shadeMode == ShadeMode.Single) { + .thenIf(supportNestedScrolling) { Modifier.nestedScroll(scrimNestedScrollConnection) } .stackVerticalOverscroll(coroutineScope) { scrollState.canScrollForward } @@ -550,38 +555,6 @@ fun SceneScope.NotificationScrollingStack( } /** - * This may be added to the lockscreen to provide a space to the start of the lock icon where the - * short shelf has room to flow vertically below the lock icon, but to its start, allowing more - * notifications to fit in the stack itself. (see: b/213934746) - * - * NOTE: this is totally unused for now; it is here to clarify the future plan - */ -@Composable -fun SceneScope.NotificationShelfSpace( - viewModel: NotificationsPlaceholderViewModel, - modifier: Modifier = Modifier, -) { - Text( - text = "Shelf Space", - modifier - .element(key = Notifications.Elements.ShelfSpace) - .fillMaxWidth() - .onPlaced { coordinates: LayoutCoordinates -> - debugLog(viewModel) { - ("SHELF onPlaced:" + - " size=${coordinates.size}" + - " bounds=${coordinates.boundsInWindow()}") - } - } - .clip(RoundedCornerShape(24.dp)) - .background(MaterialTheme.colorScheme.primaryContainer) - .padding(16.dp), - style = MaterialTheme.typography.titleLarge, - color = MaterialTheme.colorScheme.onPrimaryContainer, - ) -} - -/** * A 0 height horizontal spacer to be placed at the bottom-most position in the current scene, where * the notification contents (stack, footer, shelf) should be drawn. */ @@ -673,15 +646,19 @@ private suspend fun scrollNotificationStack( } } +private fun TransitionState.isOnLockscreen(): Boolean { + return currentScene == Scenes.Lockscreen && currentOverlays.isEmpty() +} + private fun shouldUseLockscreenStackBounds(state: TransitionState): Boolean { - return state is TransitionState.Idle && state.currentScene == Scenes.Lockscreen + return state is TransitionState.Idle && state.isOnLockscreen() } private fun shouldUseLockscreenHunBounds(state: TransitionState): Boolean { return when (state) { - is TransitionState.Idle -> state.currentScene == Scenes.Lockscreen + is TransitionState.Idle -> state.isOnLockscreen() is TransitionState.Transition -> - state.isTransitioning(from = Scenes.QuickSettings, to = Scenes.Lockscreen) + state.isTransitioning(from = quickSettingsShadeContentKey, to = Scenes.Lockscreen) } } @@ -690,7 +667,7 @@ private fun shouldAnimateScrimCornerRadius( shouldPunchHoleBehindScrim: Boolean, ): Boolean { return shouldPunchHoleBehindScrim || - state.isTransitioning(from = Scenes.Shade, to = Scenes.Lockscreen) + state.isTransitioning(from = notificationsShadeContentKey, to = Scenes.Lockscreen) } private fun calculateCornerRadius( diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/notifications/ui/composable/NotificationsShadeOverlay.kt b/packages/SystemUI/compose/features/src/com/android/systemui/notifications/ui/composable/NotificationsShadeOverlay.kt index a22beccf3448..5b996704eb12 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/notifications/ui/composable/NotificationsShadeOverlay.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/notifications/ui/composable/NotificationsShadeOverlay.kt @@ -33,7 +33,6 @@ import com.android.systemui.notifications.ui.viewmodel.NotificationsShadeOverlay import com.android.systemui.scene.session.ui.composable.SaveableSession import com.android.systemui.scene.shared.model.Overlays import com.android.systemui.scene.ui.composable.Overlay -import com.android.systemui.shade.shared.model.ShadeMode import com.android.systemui.shade.ui.composable.ExpandedShadeHeader import com.android.systemui.shade.ui.composable.OverlayShade import com.android.systemui.statusbar.notification.stack.ui.view.NotificationScrollView @@ -69,9 +68,7 @@ constructor( } @Composable - override fun ContentScope.Content( - modifier: Modifier, - ) { + override fun ContentScope.Content(modifier: Modifier) { val viewModel = rememberViewModel("NotificationsShadeOverlay-viewModel") { contentViewModelFactory.create() @@ -81,10 +78,7 @@ constructor( viewModel.notificationsPlaceholderViewModelFactory.create() } - OverlayShade( - modifier = modifier, - onScrimClicked = viewModel::onScrimClicked, - ) { + OverlayShade(modifier = modifier, onScrimClicked = viewModel::onScrimClicked) { Column { ExpandedShadeHeader( viewModelFactory = viewModel.shadeHeaderViewModelFactory, @@ -102,7 +96,8 @@ constructor( shouldPunchHoleBehindScrim = false, shouldFillMaxSize = false, shouldReserveSpaceForNavBar = false, - shadeMode = ShadeMode.Dual, + shouldShowScrim = false, + supportNestedScrolling = false, modifier = Modifier.fillMaxWidth(), ) diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettingsScene.kt b/packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettingsScene.kt index 630497998c3e..d75a776a2515 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettingsScene.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettingsScene.kt @@ -100,7 +100,6 @@ import com.android.systemui.res.R import com.android.systemui.scene.session.ui.composable.SaveableSession import com.android.systemui.scene.shared.model.Scenes import com.android.systemui.scene.ui.composable.Scene -import com.android.systemui.shade.shared.model.ShadeMode import com.android.systemui.shade.ui.composable.CollapsedShadeHeader import com.android.systemui.shade.ui.composable.ExpandedShadeHeader import com.android.systemui.shade.ui.composable.Shade @@ -114,11 +113,9 @@ import dagger.Lazy import javax.inject.Inject import javax.inject.Named import kotlin.math.roundToInt -import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.Flow /** The Quick Settings (AKA "QS") scene shows the quick setting tiles. */ -@OptIn(ExperimentalCoroutinesApi::class) @SysUISingleton class QuickSettingsScene @Inject @@ -420,17 +417,26 @@ private fun SceneScope.QuickSettingsScene( .navigationBarsPadding() .padding(horizontal = shadeHorizontalPadding), ) + + // The minimum possible value for the top of the notification stack. In other words: how + // high is the notification stack allowed to get when the scene is at rest. It may still be + // translated farther upwards by a transition animation but, at rest, the top edge of its + // bounds must be limited to be at or below this value. + // + // A 1 pixel is added to compensate for any kind of rounding errors to make sure 100% that + // the notification stack is entirely "below" the entire screen. + val minNotificationStackTop = screenHeight.roundToInt() + 1 NotificationScrollingStack( shadeSession = shadeSession, stackScrollView = notificationStackScrollView, viewModel = notificationsPlaceholderViewModel, - maxScrimTop = { screenHeight }, + maxScrimTop = { minNotificationStackTop.toFloat() }, shouldPunchHoleBehindScrim = shouldPunchHoleBehindScrim, shouldIncludeHeadsUpSpace = false, - shadeMode = ShadeMode.Single, + supportNestedScrolling = true, modifier = Modifier.fillMaxWidth() - .offset { IntOffset(x = 0, y = screenHeight.roundToInt()) } + .offset { IntOffset(x = 0, y = minNotificationStackTop) } .padding(horizontal = shadeHorizontalPadding), ) NotificationStackCutoffGuideline( @@ -439,7 +445,7 @@ private fun SceneScope.QuickSettingsScene( modifier = Modifier.align(Alignment.BottomCenter) .navigationBarsPadding() - .offset { IntOffset(x = 0, y = screenHeight.roundToInt()) } + .offset { IntOffset(x = 0, y = minNotificationStackTop) } .padding(horizontal = shadeHorizontalPadding), ) } diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/SceneContainerTransitions.kt b/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/SceneContainerTransitions.kt index ac58ab5296f6..340ac326bdeb 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/SceneContainerTransitions.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/SceneContainerTransitions.kt @@ -1,5 +1,6 @@ package com.android.systemui.scene.ui.composable +import androidx.compose.animation.core.spring import androidx.compose.foundation.gestures.Orientation import com.android.compose.animation.scene.ProgressConverter import com.android.compose.animation.scene.TransitionKey @@ -12,6 +13,8 @@ import com.android.systemui.scene.shared.model.TransitionKeys.SlightlyFasterShad import com.android.systemui.scene.shared.model.TransitionKeys.ToSplitShade import com.android.systemui.scene.ui.composable.transitions.bouncerToGoneTransition import com.android.systemui.scene.ui.composable.transitions.bouncerToLockscreenPreview +import com.android.systemui.scene.ui.composable.transitions.communalToBouncerTransition +import com.android.systemui.scene.ui.composable.transitions.communalToShadeTransition import com.android.systemui.scene.ui.composable.transitions.goneToQuickSettingsTransition import com.android.systemui.scene.ui.composable.transitions.goneToShadeTransition import com.android.systemui.scene.ui.composable.transitions.goneToSplitShadeTransition @@ -44,6 +47,7 @@ val SceneContainerTransitions = transitions { // Overscroll progress starts linearly with some resistance (3f) and slowly approaches 0.2f defaultOverscrollProgressConverter = ProgressConverter.tanh(maxProgress = 0.2f, tilt = 3f) + defaultSwipeSpec = spring(stiffness = 300f, dampingRatio = 0.8f, visibilityThreshold = 0.5f) // Scene transitions @@ -87,6 +91,8 @@ val SceneContainerTransitions = transitions { sharedElement(Notifications.Elements.NotificationStackPlaceholder, enabled = false) sharedElement(Notifications.Elements.HeadsUpNotificationPlaceholder, enabled = false) } + from(Scenes.Communal, to = Scenes.Shade) { communalToShadeTransition() } + from(Scenes.Communal, to = Scenes.Bouncer) { communalToBouncerTransition() } // Overlay transitions diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/scene/data/repository/SystemGestureExclusionRepositoryKosmos.kt b/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/FromCommunalToBouncerTransition.kt index 15ed1b372db4..d7173fd3cffb 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/scene/data/repository/SystemGestureExclusionRepositoryKosmos.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/FromCommunalToBouncerTransition.kt @@ -14,12 +14,10 @@ * limitations under the License. */ -package com.android.systemui.scene.data.repository +package com.android.systemui.scene.ui.composable.transitions -import android.view.windowManagerService -import com.android.systemui.kosmos.Kosmos -import com.android.systemui.kosmos.Kosmos.Fixture +import com.android.compose.animation.scene.TransitionBuilder -val Kosmos.systemGestureExclusionRepository by Fixture { - SystemGestureExclusionRepository(windowManager = windowManagerService) +fun TransitionBuilder.communalToBouncerTransition() { + toBouncerTransition() } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/scene/domain/interactor/SystemGestureExclusionInteractorKosmos.kt b/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/FromCommunalToShadeTransition.kt index 3e46c3f90b73..ba920acec0a5 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/scene/domain/interactor/SystemGestureExclusionInteractorKosmos.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/FromCommunalToShadeTransition.kt @@ -14,12 +14,10 @@ * limitations under the License. */ -package com.android.systemui.scene.domain.interactor +package com.android.systemui.scene.ui.composable.transitions -import com.android.systemui.kosmos.Kosmos -import com.android.systemui.kosmos.Kosmos.Fixture -import com.android.systemui.scene.data.repository.systemGestureExclusionRepository +import com.android.compose.animation.scene.TransitionBuilder -val Kosmos.systemGestureExclusionInteractor by Fixture { - SystemGestureExclusionInteractor(repository = systemGestureExclusionRepository) +fun TransitionBuilder.communalToShadeTransition() { + toShadeTransition() } diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/FromLockscreenToBouncerTransition.kt b/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/FromLockscreenToBouncerTransition.kt index 4c0efd2047ff..dd37b533ae4c 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/FromLockscreenToBouncerTransition.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/FromLockscreenToBouncerTransition.kt @@ -1,29 +1,11 @@ package com.android.systemui.scene.ui.composable.transitions import androidx.compose.animation.core.CubicBezierEasing -import androidx.compose.animation.core.tween -import androidx.compose.ui.unit.dp import com.android.compose.animation.scene.TransitionBuilder -import com.android.compose.animation.scene.UserActionDistance import com.android.systemui.bouncer.ui.composable.Bouncer -const val FROM_LOCK_SCREEN_TO_BOUNCER_FADE_FRACTION = 0.5f -const val FROM_LOCK_SCREEN_TO_BOUNCER_SWIPE_DISTANCE_FRACTION = 0.5f - fun TransitionBuilder.lockscreenToBouncerTransition() { - spec = tween(durationMillis = 500) - - distance = UserActionDistance { fromSceneSize, _ -> - fromSceneSize.height * FROM_LOCK_SCREEN_TO_BOUNCER_SWIPE_DISTANCE_FRACTION - } - - translate(Bouncer.Elements.Content, y = 300.dp) - fractionRange(end = FROM_LOCK_SCREEN_TO_BOUNCER_FADE_FRACTION) { - fade(Bouncer.Elements.Background) - } - fractionRange(start = FROM_LOCK_SCREEN_TO_BOUNCER_FADE_FRACTION) { - fade(Bouncer.Elements.Content) - } + toBouncerTransition() } fun TransitionBuilder.bouncerToLockscreenPreview() { diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/ToBouncerTransition.kt b/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/ToBouncerTransition.kt new file mode 100644 index 000000000000..de76f708c1c7 --- /dev/null +++ b/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/ToBouncerTransition.kt @@ -0,0 +1,38 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.scene.ui.composable.transitions + +import androidx.compose.animation.core.tween +import androidx.compose.ui.unit.dp +import com.android.compose.animation.scene.TransitionBuilder +import com.android.compose.animation.scene.UserActionDistance +import com.android.systemui.bouncer.ui.composable.Bouncer + +const val TO_BOUNCER_FADE_FRACTION = 0.5f +private const val TO_BOUNCER_SWIPE_DISTANCE_FRACTION = 0.5f + +fun TransitionBuilder.toBouncerTransition() { + spec = tween(durationMillis = 500) + + distance = UserActionDistance { fromSceneSize, _ -> + fromSceneSize.height * TO_BOUNCER_SWIPE_DISTANCE_FRACTION + } + + translate(Bouncer.Elements.Content, y = 300.dp) + fractionRange(end = TO_BOUNCER_FADE_FRACTION) { fade(Bouncer.Elements.Background) } + fractionRange(start = TO_BOUNCER_FADE_FRACTION) { fade(Bouncer.Elements.Content) } +} diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/ToNotificationsShadeTransition.kt b/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/ToNotificationsShadeTransition.kt index 337f53a58844..23c4f12cb0ae 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/ToNotificationsShadeTransition.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/ToNotificationsShadeTransition.kt @@ -21,26 +21,20 @@ import androidx.compose.animation.core.spring import androidx.compose.animation.core.tween import com.android.compose.animation.scene.Edge import com.android.compose.animation.scene.TransitionBuilder -import com.android.compose.animation.scene.UserActionDistance import com.android.systemui.notifications.ui.composable.Notifications import com.android.systemui.shade.ui.composable.OverlayShade import com.android.systemui.shade.ui.composable.Shade import com.android.systemui.shade.ui.composable.ShadeHeader import kotlin.time.Duration.Companion.milliseconds -fun TransitionBuilder.toNotificationsShadeTransition( - durationScale: Double = 1.0, -) { +fun TransitionBuilder.toNotificationsShadeTransition(durationScale: Double = 1.0) { spec = tween(durationMillis = (DefaultDuration * durationScale).inWholeMilliseconds.toInt()) swipeSpec = spring( stiffness = Spring.StiffnessMediumLow, visibilityThreshold = Shade.Dimensions.ScrimVisibilityThreshold, ) - distance = UserActionDistance { fromSceneSize, orientation -> - fromSceneSize.height.toFloat() * 2 / 3f - } - + scaleSize(OverlayShade.Elements.Panel, height = 0f) translate(OverlayShade.Elements.Panel, Edge.Top) fractionRange(end = .5f) { fade(OverlayShade.Elements.Scrim) } diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/shade/ui/composable/ShadeScene.kt b/packages/SystemUI/compose/features/src/com/android/systemui/shade/ui/composable/ShadeScene.kt index c6c42fce7553..3ec057becc18 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/shade/ui/composable/ShadeScene.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/shade/ui/composable/ShadeScene.kt @@ -40,7 +40,6 @@ import androidx.compose.foundation.layout.navigationBarsPadding import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.systemBars import androidx.compose.foundation.rememberScrollState -import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.verticalScroll import androidx.compose.runtime.Composable import androidx.compose.runtime.DisposableEffect @@ -89,7 +88,6 @@ import com.android.systemui.media.controls.ui.composable.shouldElevateMedia import com.android.systemui.media.controls.ui.controller.MediaCarouselController import com.android.systemui.media.controls.ui.controller.MediaHierarchyManager import com.android.systemui.media.controls.ui.view.MediaHost -import com.android.systemui.media.controls.ui.view.MediaHostState import com.android.systemui.media.controls.ui.view.MediaHostState.Companion.COLLAPSED import com.android.systemui.media.controls.ui.view.MediaHostState.Companion.EXPANDED import com.android.systemui.media.dagger.MediaModule.QS_PANEL @@ -117,7 +115,6 @@ import dagger.Lazy import javax.inject.Inject import javax.inject.Named import kotlin.math.roundToInt -import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.Flow object Shade { @@ -128,23 +125,13 @@ object Shade { } object Dimensions { - val ScrimCornerSize = 32.dp val HorizontalPadding = 16.dp val ScrimOverscrollLimit = 32.dp const val ScrimVisibilityThreshold = 5f } - - object Shapes { - val Scrim = - RoundedCornerShape( - topStart = Dimensions.ScrimCornerSize, - topEnd = Dimensions.ScrimCornerSize, - ) - } } /** The shade scene shows scrolling list of notifications and some of the quick setting tiles. */ -@OptIn(ExperimentalCoroutinesApi::class) @SysUISingleton class ShadeScene @Inject @@ -197,11 +184,11 @@ constructor( ) init { - qqsMediaHost.expansion = MediaHostState.EXPANDED + qqsMediaHost.expansion = EXPANDED qqsMediaHost.showsOnlyActiveMedia = true qqsMediaHost.init(MediaHierarchyManager.LOCATION_QQS) - qsMediaHost.expansion = MediaHostState.EXPANDED + qsMediaHost.expansion = EXPANDED qsMediaHost.showsOnlyActiveMedia = false qsMediaHost.init(MediaHierarchyManager.LOCATION_QS) } @@ -329,8 +316,7 @@ private fun SceneScope.SingleShade( modifier = modifier.thenIf(shouldPunchHoleBehindScrim) { // Render the scene to an offscreen buffer so that BlendMode.DstOut only clears this - // scene - // (and not the one under it) during a scene transition. + // scene (and not the one under it) during a scene transition. Modifier.graphicsLayer(compositingStrategy = CompositingStrategy.Offscreen) } ) { @@ -382,8 +368,8 @@ private fun SceneScope.SingleShade( stackScrollView = notificationStackScrollView, viewModel = notificationsPlaceholderViewModel, maxScrimTop = { maxNotifScrimTop.toFloat() }, - shadeMode = ShadeMode.Single, shouldPunchHoleBehindScrim = shouldPunchHoleBehindScrim, + supportNestedScrolling = true, onEmptySpaceClick = viewModel::onEmptySpaceClicked.takeIf { isEmptySpaceClickable }, modifier = @@ -601,7 +587,7 @@ private fun SceneScope.SplitShade( maxScrimTop = { 0f }, shouldPunchHoleBehindScrim = false, shouldReserveSpaceForNavBar = false, - shadeMode = ShadeMode.Split, + supportNestedScrolling = false, onEmptySpaceClick = viewModel::onEmptySpaceClicked.takeIf { isEmptySpaceClickable }, modifier = diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/DraggableHandler.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/DraggableHandler.kt index 5fa5db880cce..085157ac72b9 100644 --- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/DraggableHandler.kt +++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/DraggableHandler.kt @@ -226,7 +226,6 @@ internal class DraggableHandlerImpl( val fromSource = resolveSwipeSource(startedPosition) val upOrLeft = resolveSwipe(pointersDown, fromSource, isUpOrLeft = true) val downOrRight = resolveSwipe(pointersDown, fromSource, isUpOrLeft = false) - return if (fromSource == null) { Swipes( upOrLeft = null, @@ -366,10 +365,18 @@ private class DragControllerImpl( return 0f } + val currentTransitionIrreversible = + if (swipeAnimation.isUpOrLeft) { + swipes.upOrLeftResult?.isIrreversible ?: false + } else { + swipes.downOrRightResult?.isIrreversible ?: false + } + val needNewTransition = - hasReachedToContent || - result.toContent(layoutState.currentScene) != swipeAnimation.toContent || - result.transitionKey != swipeAnimation.contentTransition.key + !currentTransitionIrreversible && + (hasReachedToContent || + result.toContent(layoutState.currentScene) != swipeAnimation.toContent || + result.transitionKey != swipeAnimation.contentTransition.key) if (needNewTransition) { // Make sure the current transition will finish to the right current scene. diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/MultiPointerDraggable.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/MultiPointerDraggable.kt index 5ddc28485ac6..dc3135ddbf54 100644 --- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/MultiPointerDraggable.kt +++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/MultiPointerDraggable.kt @@ -42,8 +42,10 @@ import androidx.compose.ui.input.pointer.util.addPointerInputChange import androidx.compose.ui.node.CompositionLocalConsumerModifierNode import androidx.compose.ui.node.DelegatingNode import androidx.compose.ui.node.ModifierNodeElement +import androidx.compose.ui.node.ObserverModifierNode import androidx.compose.ui.node.PointerInputModifierNode import androidx.compose.ui.node.currentValueOf +import androidx.compose.ui.node.observeReads import androidx.compose.ui.platform.LocalViewConfiguration import androidx.compose.ui.unit.IntSize import androidx.compose.ui.unit.Velocity @@ -77,6 +79,7 @@ import kotlinx.coroutines.launch @Stable internal fun Modifier.multiPointerDraggable( orientation: Orientation, + enabled: () -> Boolean, startDragImmediately: (startedPosition: Offset) -> Boolean, onDragStarted: (startedPosition: Offset, overSlop: Float, pointersDown: Int) -> DragController, onFirstPointerDown: () -> Unit = {}, @@ -86,6 +89,7 @@ internal fun Modifier.multiPointerDraggable( this.then( MultiPointerDraggableElement( orientation, + enabled, startDragImmediately, onDragStarted, onFirstPointerDown, @@ -96,6 +100,7 @@ internal fun Modifier.multiPointerDraggable( private data class MultiPointerDraggableElement( private val orientation: Orientation, + private val enabled: () -> Boolean, private val startDragImmediately: (startedPosition: Offset) -> Boolean, private val onDragStarted: (startedPosition: Offset, overSlop: Float, pointersDown: Int) -> DragController, @@ -106,6 +111,7 @@ private data class MultiPointerDraggableElement( override fun create(): MultiPointerDraggableNode = MultiPointerDraggableNode( orientation = orientation, + enabled = enabled, startDragImmediately = startDragImmediately, onDragStarted = onDragStarted, onFirstPointerDown = onFirstPointerDown, @@ -115,6 +121,7 @@ private data class MultiPointerDraggableElement( override fun update(node: MultiPointerDraggableNode) { node.orientation = orientation + node.enabled = enabled node.startDragImmediately = startDragImmediately node.onDragStarted = onDragStarted node.onFirstPointerDown = onFirstPointerDown @@ -124,6 +131,7 @@ private data class MultiPointerDraggableElement( internal class MultiPointerDraggableNode( orientation: Orientation, + enabled: () -> Boolean, var startDragImmediately: (startedPosition: Offset) -> Boolean, var onDragStarted: (startedPosition: Offset, overSlop: Float, pointersDown: Int) -> DragController, @@ -134,10 +142,21 @@ internal class MultiPointerDraggableNode( DelegatingNode(), PointerInputModifierNode, CompositionLocalConsumerModifierNode, + ObserverModifierNode, SpaceVectorConverter { private val pointerTracker = delegate(SuspendingPointerInputModifierNode { pointerTracker() }) private val pointerInput = delegate(SuspendingPointerInputModifierNode { pointerInput() }) private val velocityTracker = VelocityTracker() + private var previousEnabled: Boolean = false + + var enabled: () -> Boolean = enabled + set(value) { + // Reset the pointer input whenever enabled changed. + if (value != field) { + field = value + pointerInput.resetPointerInputHandler() + } + } private var converter = SpaceVectorConverter(orientation) @@ -159,6 +178,21 @@ internal class MultiPointerDraggableNode( } } + override fun onAttach() { + previousEnabled = enabled() + onObservedReadsChanged() + } + + override fun onObservedReadsChanged() { + observeReads { + val newEnabled = enabled() + if (newEnabled != previousEnabled) { + pointerInput.resetPointerInputHandler() + } + previousEnabled = newEnabled + } + } + override fun onCancelPointerInput() { pointerTracker.onCancelPointerInput() pointerInput.onCancelPointerInput() @@ -220,7 +254,9 @@ internal class MultiPointerDraggableNode( velocityTracker.resetTracking() velocityTracker.addPointerInputChange(firstPointerDown) startedPosition = firstPointerDown.position - onFirstPointerDown() + if (enabled()) { + onFirstPointerDown() + } } // Changes with at least one pointer @@ -259,6 +295,10 @@ internal class MultiPointerDraggableNode( } private suspend fun PointerInputScope.pointerInput() { + if (!enabled()) { + return + } + val currentContext = currentCoroutineContext() awaitPointerEventScope { while (currentContext.isActive) { diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitionLayout.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitionLayout.kt index cec888380513..c9a4d5808cac 100644 --- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitionLayout.kt +++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitionLayout.kt @@ -498,6 +498,12 @@ sealed class UserActionResult( * bigger than 100% when the user released their finger. ` */ open val requiresFullDistanceSwipe: Boolean, + + /** + * Whether swiping back in the opposite direction past the origin point of the swipe can replace + * the action with the action for the opposite direction. + */ + open val isIrreversible: Boolean = false, ) { internal abstract fun toContent(currentScene: SceneKey): ContentKey @@ -507,6 +513,7 @@ sealed class UserActionResult( val toScene: SceneKey, override val transitionKey: TransitionKey? = null, override val requiresFullDistanceSwipe: Boolean = false, + override val isIrreversible: Boolean = false, ) : UserActionResult(transitionKey, requiresFullDistanceSwipe) { override fun toContent(currentScene: SceneKey): ContentKey = toScene } @@ -516,6 +523,7 @@ sealed class UserActionResult( val overlay: OverlayKey, override val transitionKey: TransitionKey? = null, override val requiresFullDistanceSwipe: Boolean = false, + override val isIrreversible: Boolean = false, ) : UserActionResult(transitionKey, requiresFullDistanceSwipe) { override fun toContent(currentScene: SceneKey): ContentKey = overlay } @@ -558,7 +566,14 @@ sealed class UserActionResult( * the user released their finger. */ requiresFullDistanceSwipe: Boolean = false, - ): UserActionResult = ChangeScene(toScene, transitionKey, requiresFullDistanceSwipe) + + /** + * Whether swiping back in the opposite direction past the origin point of the swipe can + * replace the action with the action for the opposite direction. + */ + isIrreversible: Boolean = false, + ): UserActionResult = + ChangeScene(toScene, transitionKey, requiresFullDistanceSwipe, isIrreversible) /** A [UserActionResult] that shows [toOverlay]. */ operator fun invoke( diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitions.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitions.kt index b358faf2c418..879dc542552c 100644 --- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitions.kt +++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitions.kt @@ -152,6 +152,7 @@ internal constructor( internal val DefaultSwipeSpec = spring( stiffness = Spring.StiffnessMediumLow, + dampingRatio = Spring.DampingRatioLowBouncy, visibilityThreshold = OffsetVisibilityThreshold, ) diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SwipeToScene.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SwipeToScene.kt index d201be9acc12..98d4aaa91458 100644 --- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SwipeToScene.kt +++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SwipeToScene.kt @@ -41,28 +41,7 @@ internal fun Modifier.swipeToScene( draggableHandler: DraggableHandlerImpl, swipeDetector: SwipeDetector, ): Modifier { - return if (draggableHandler.enabled()) { - this.then(SwipeToSceneElement(draggableHandler, swipeDetector)) - } else { - this - } -} - -private fun DraggableHandlerImpl.enabled(): Boolean { - return isDrivingTransition || contentForSwipes().shouldEnableSwipes(orientation) -} - -private fun DraggableHandlerImpl.contentForSwipes(): Content { - return layoutImpl.contentForUserActions() -} - -/** Whether swipe should be enabled in the given [orientation]. */ -private fun Content.shouldEnableSwipes(orientation: Orientation): Boolean { - if (userActions.isEmpty()) { - return false - } - - return userActions.keys.any { it is Swipe.Resolved && it.direction.orientation == orientation } + return this.then(SwipeToSceneElement(draggableHandler, swipeDetector)) } private data class SwipeToSceneElement( @@ -85,6 +64,7 @@ private class SwipeToSceneNode( delegate( MultiPointerDraggableNode( orientation = draggableHandler.orientation, + enabled = ::enabled, startDragImmediately = ::startDragImmediately, onDragStarted = draggableHandler::onDragStarted, onFirstPointerDown = ::onFirstPointerDown, @@ -144,6 +124,22 @@ private class SwipeToSceneNode( override fun onCancelPointerInput() = multiPointerDraggableNode.onCancelPointerInput() + private fun enabled(): Boolean { + return draggableHandler.isDrivingTransition || + contentForSwipes().shouldEnableSwipes(multiPointerDraggableNode.orientation) + } + + private fun contentForSwipes(): Content { + return draggableHandler.layoutImpl.contentForUserActions() + } + + /** Whether swipe should be enabled in the given [orientation]. */ + private fun Content.shouldEnableSwipes(orientation: Orientation): Boolean { + return userActions.keys.any { + it is Swipe.Resolved && it.direction.orientation == orientation + } + } + private fun startDragImmediately(startedPosition: Offset): Boolean { // Immediately start the drag if the user can't swipe in the other direction and the gesture // handler can intercept it. @@ -156,7 +152,7 @@ private class SwipeToSceneNode( Orientation.Vertical -> Orientation.Horizontal Orientation.Horizontal -> Orientation.Vertical } - return draggableHandler.contentForSwipes().shouldEnableSwipes(oppositeOrientation) + return contentForSwipes().shouldEnableSwipes(oppositeOrientation) } } diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/nestedscroll/PriorityNestedScrollConnection.kt b/packages/SystemUI/compose/scene/src/com/android/compose/nestedscroll/PriorityNestedScrollConnection.kt index a6ebb0e3ba56..a3641e6635e7 100644 --- a/packages/SystemUI/compose/scene/src/com/android/compose/nestedscroll/PriorityNestedScrollConnection.kt +++ b/packages/SystemUI/compose/scene/src/com/android/compose/nestedscroll/PriorityNestedScrollConnection.kt @@ -34,71 +34,76 @@ internal typealias SuspendedValue<T> = suspend () -> T * Note: Call [reset] before destroying this object to make sure you always get a call to [onStop] * after [onStart]. * - * @sample com.android.compose.animation.scene.rememberSwipeToSceneNestedScrollConnection + * @sample LargeTopAppBarNestedScrollConnection + * @sample com.android.compose.animation.scene.NestedScrollHandlerImpl.nestedScrollConnection */ class PriorityNestedScrollConnection( - private val canStartPreScroll: (offsetAvailable: Offset, offsetBeforeStart: Offset) -> Boolean, - private val canStartPostScroll: (offsetAvailable: Offset, offsetBeforeStart: Offset) -> Boolean, - private val canStartPostFling: (velocityAvailable: Velocity) -> Boolean, + orientation: Orientation, + private val canStartPreScroll: (offsetAvailable: Float, offsetBeforeStart: Float) -> Boolean, + private val canStartPostScroll: (offsetAvailable: Float, offsetBeforeStart: Float) -> Boolean, + private val canStartPostFling: (velocityAvailable: Float) -> Boolean, private val canContinueScroll: (source: NestedScrollSource) -> Boolean, private val canScrollOnFling: Boolean, - private val onStart: (offsetAvailable: Offset) -> Unit, - private val onScroll: (offsetAvailable: Offset) -> Offset, - private val onStop: (velocityAvailable: Velocity) -> SuspendedValue<Velocity>, -) : NestedScrollConnection { + private val onStart: (offsetAvailable: Float) -> Unit, + private val onScroll: (offsetAvailable: Float) -> Float, + private val onStop: (velocityAvailable: Float) -> SuspendedValue<Float>, +) : NestedScrollConnection, SpaceVectorConverter by SpaceVectorConverter(orientation) { /** In priority mode [onPreScroll] events are first consumed by the parent, via [onScroll]. */ private var isPriorityMode = false - private var offsetScrolledBeforePriorityMode = Offset.Zero + private var offsetScrolledBeforePriorityMode = 0f override fun onPostScroll( consumed: Offset, available: Offset, source: NestedScrollSource, ): Offset { + val availableFloat = available.toFloat() // The offset before the start takes into account the up and down movements, starting from // the beginning or from the last fling gesture. - val offsetBeforeStart = offsetScrolledBeforePriorityMode - available + val offsetBeforeStart = offsetScrolledBeforePriorityMode - availableFloat if ( isPriorityMode || (source == NestedScrollSource.SideEffect && !canScrollOnFling) || - !canStartPostScroll(available, offsetBeforeStart) + !canStartPostScroll(availableFloat, offsetBeforeStart) ) { // The priority mode cannot start so we won't consume the available offset. return Offset.Zero } - return onPriorityStart(available) + return onPriorityStart(availableFloat).toOffset() } override fun onPreScroll(available: Offset, source: NestedScrollSource): Offset { if (!isPriorityMode) { if (source == NestedScrollSource.UserInput || canScrollOnFling) { - if (canStartPreScroll(available, offsetScrolledBeforePriorityMode)) { - return onPriorityStart(available) + val availableFloat = available.toFloat() + if (canStartPreScroll(availableFloat, offsetScrolledBeforePriorityMode)) { + return onPriorityStart(availableFloat).toOffset() } // We want to track the amount of offset consumed before entering priority mode - offsetScrolledBeforePriorityMode += available + offsetScrolledBeforePriorityMode += availableFloat } return Offset.Zero } + val availableFloat = available.toFloat() if (!canContinueScroll(source)) { // Step 3a: We have lost priority and we no longer need to intercept scroll events. - onPriorityStop(velocity = Velocity.Zero) + onPriorityStop(velocity = 0f) - // We've just reset offsetScrolledBeforePriorityMode to Offset.Zero + // We've just reset offsetScrolledBeforePriorityMode to 0f // We want to track the amount of offset consumed before entering priority mode - offsetScrolledBeforePriorityMode += available + offsetScrolledBeforePriorityMode += availableFloat return Offset.Zero } // Step 2: We have the priority and can consume the scroll events. - return onScroll(available) + return onScroll(availableFloat).toOffset() } override suspend fun onPreFling(available: Velocity): Velocity { @@ -108,15 +113,16 @@ class PriorityNestedScrollConnection( } // Step 3b: The finger is lifted, we can stop intercepting scroll events and use the speed // of the fling gesture. - return onPriorityStop(velocity = available).invoke() + return onPriorityStop(velocity = available.toFloat()).invoke().toVelocity() } override suspend fun onPostFling(consumed: Velocity, available: Velocity): Velocity { + val availableFloat = available.toFloat() if (isPriorityMode) { - return onPriorityStop(velocity = available).invoke() + return onPriorityStop(velocity = availableFloat).invoke().toVelocity() } - if (!canStartPostFling(available)) { + if (!canStartPostFling(availableFloat)) { return Velocity.Zero } @@ -124,11 +130,11 @@ class PriorityNestedScrollConnection( // given the available velocity. // TODO(b/291053278): Remove canStartPostFling() and instead make it possible to define the // overscroll behavior on the Scene level. - val smallOffset = Offset(available.x.sign, available.y.sign) - onPriorityStart(available = smallOffset) + val smallOffset = availableFloat.sign + onPriorityStart(availableOffset = smallOffset) // This is the last event of a scroll gesture. - return onPriorityStop(available).invoke() + return onPriorityStop(availableFloat).invoke().toVelocity() } /** @@ -138,10 +144,10 @@ class PriorityNestedScrollConnection( */ fun reset() { // Step 3c: To ensure that an onStop is always called for every onStart. - onPriorityStop(velocity = Velocity.Zero) + onPriorityStop(velocity = 0f) } - private fun onPriorityStart(available: Offset): Offset { + private fun onPriorityStart(availableOffset: Float): Float { if (isPriorityMode) { error("This should never happen, onPriorityStart() was called when isPriorityMode") } @@ -152,17 +158,17 @@ class PriorityNestedScrollConnection( // Note: onStop will be called if we cannot continue to scroll (step 3a), or the finger is // lifted (step 3b), or this object has been destroyed (step 3c). - onStart(available) + onStart(availableOffset) - return onScroll(available) + return onScroll(availableOffset) } - private fun onPriorityStop(velocity: Velocity): SuspendedValue<Velocity> { + private fun onPriorityStop(velocity: Float): SuspendedValue<Float> { // We can restart tracking the consumed offsets from scratch. - offsetScrolledBeforePriorityMode = Offset.Zero + offsetScrolledBeforePriorityMode = 0f if (!isPriorityMode) { - return { Velocity.Zero } + return { 0f } } isPriorityMode = false @@ -170,38 +176,3 @@ class PriorityNestedScrollConnection( return onStop(velocity) } } - -fun PriorityNestedScrollConnection( - orientation: Orientation, - canStartPreScroll: (offsetAvailable: Float, offsetBeforeStart: Float) -> Boolean, - canStartPostScroll: (offsetAvailable: Float, offsetBeforeStart: Float) -> Boolean, - canStartPostFling: (velocityAvailable: Float) -> Boolean, - canContinueScroll: (source: NestedScrollSource) -> Boolean, - canScrollOnFling: Boolean, - onStart: (offsetAvailable: Float) -> Unit, - onScroll: (offsetAvailable: Float) -> Float, - onStop: (velocityAvailable: Float) -> SuspendedValue<Float>, -) = - with(SpaceVectorConverter(orientation)) { - PriorityNestedScrollConnection( - canStartPreScroll = { offsetAvailable: Offset, offsetBeforeStart: Offset -> - canStartPreScroll(offsetAvailable.toFloat(), offsetBeforeStart.toFloat()) - }, - canStartPostScroll = { offsetAvailable: Offset, offsetBeforeStart: Offset -> - canStartPostScroll(offsetAvailable.toFloat(), offsetBeforeStart.toFloat()) - }, - canStartPostFling = { velocityAvailable: Velocity -> - canStartPostFling(velocityAvailable.toFloat()) - }, - canContinueScroll = canContinueScroll, - canScrollOnFling = canScrollOnFling, - onStart = { offsetAvailable -> onStart(offsetAvailable.toFloat()) }, - onScroll = { offsetAvailable: Offset -> - onScroll(offsetAvailable.toFloat()).toOffset() - }, - onStop = { velocityAvailable: Velocity -> - val consumedVelocity = onStop(velocityAvailable.toFloat()) - suspend { consumedVelocity.invoke().toVelocity() } - }, - ) - } diff --git a/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/DraggableHandlerTest.kt b/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/DraggableHandlerTest.kt index dd4f99f5c64e..ecef6be49df8 100644 --- a/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/DraggableHandlerTest.kt +++ b/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/DraggableHandlerTest.kt @@ -507,6 +507,54 @@ class DraggableHandlerTest { } @Test + fun onDragWithActionsInBothDirections_dragToOppositeDirectionReplacesAction() = runGestureTest { + // We are on SceneA. UP -> B, DOWN-> C. + val dragController = onDragStarted(overSlop = up(fractionOfScreen = 0.2f)) + assertTransition( + currentScene = SceneA, + fromScene = SceneA, + toScene = SceneB, + progress = 0.2f, + ) + + // Reverse drag direction, it will replace the previous transition + dragController.onDragDelta(pixels = down(fractionOfScreen = 0.5f)) + assertTransition( + currentScene = SceneA, + fromScene = SceneA, + toScene = SceneC, + progress = 0.3f, + ) + } + + @Test + fun onDragWithActionsInBothDirections_dragToOppositeDirectionNotReplaceable() = runGestureTest { + // We are on SceneA. UP -> B, DOWN-> C. The up swipe is not replaceable though. + mutableUserActionsA = + mapOf(Swipe.Up to UserActionResult(SceneB, isIrreversible = true), Swipe.Down to SceneC) + val dragController = + onDragStarted( + startedPosition = Offset(SCREEN_SIZE * 0.5f, SCREEN_SIZE * 0.5f), + overSlop = up(fractionOfScreen = 0.2f), + ) + assertTransition( + currentScene = SceneA, + fromScene = SceneA, + toScene = SceneB, + progress = 0.2f, + ) + + // Reverse drag direction, it cannot replace the previous transition + dragController.onDragDelta(pixels = down(fractionOfScreen = 0.5f)) + assertTransition( + currentScene = SceneA, + fromScene = SceneA, + toScene = SceneB, + progress = -0.3f, + ) + } + + @Test fun onDragFromEdge_startTransitionToEdgeAction() = runGestureTest { navigateToSceneC() @@ -1241,7 +1289,8 @@ class DraggableHandlerTest { fun overscroll_releaseBetween0And100Percent_up() = runGestureTest { // Make scene B overscrollable. layoutState.transitions = transitions { - from(SceneA, to = SceneB) { spec = spring(dampingRatio = Spring.DampingRatioNoBouncy) } + defaultSwipeSpec = spring(dampingRatio = Spring.DampingRatioNoBouncy) + from(SceneA, to = SceneB) {} overscroll(SceneB, Orientation.Vertical) { fade(TestElements.Foo) } } @@ -1272,7 +1321,8 @@ class DraggableHandlerTest { fun overscroll_releaseBetween0And100Percent_down() = runGestureTest { // Make scene C overscrollable. layoutState.transitions = transitions { - from(SceneA, to = SceneC) { spec = spring(dampingRatio = Spring.DampingRatioNoBouncy) } + defaultSwipeSpec = spring(dampingRatio = Spring.DampingRatioNoBouncy) + from(SceneA, to = SceneC) {} overscroll(SceneC, Orientation.Vertical) { fade(TestElements.Foo) } } diff --git a/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/MultiPointerDraggableTest.kt b/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/MultiPointerDraggableTest.kt index c8f6e6d99933..493f3a1377cc 100644 --- a/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/MultiPointerDraggableTest.kt +++ b/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/MultiPointerDraggableTest.kt @@ -45,7 +45,6 @@ import androidx.compose.ui.test.performTouchInput import androidx.compose.ui.unit.Density import androidx.compose.ui.unit.Velocity import androidx.test.ext.junit.runners.AndroidJUnit4 -import com.android.compose.modifiers.thenIf import com.android.compose.nestedscroll.SuspendedValue import com.google.common.truth.Truth.assertThat import kotlin.properties.Delegates @@ -95,20 +94,19 @@ class MultiPointerDraggableTest { Box( Modifier.size(with(LocalDensity.current) { Size(size, size).toDpSize() }) .nestedScrollDispatcher() - .thenIf(enabled) { - Modifier.multiPointerDraggable( - orientation = Orientation.Vertical, - startDragImmediately = { false }, - onDragStarted = { _, _, _ -> - started = true - SimpleDragController( - onDrag = { dragged = true }, - onStop = { stopped = true }, - ) - }, - dispatcher = defaultDispatcher, - ) - } + .multiPointerDraggable( + orientation = Orientation.Vertical, + enabled = { enabled }, + startDragImmediately = { false }, + onDragStarted = { _, _, _ -> + started = true + SimpleDragController( + onDrag = { dragged = true }, + onStop = { stopped = true }, + ) + }, + dispatcher = defaultDispatcher, + ) ) } @@ -166,6 +164,7 @@ class MultiPointerDraggableTest { .nestedScrollDispatcher() .multiPointerDraggable( orientation = Orientation.Vertical, + enabled = { true }, // We want to start a drag gesture immediately startDragImmediately = { true }, onDragStarted = { _, _, _ -> @@ -239,6 +238,7 @@ class MultiPointerDraggableTest { .nestedScrollDispatcher() .multiPointerDraggable( orientation = Orientation.Vertical, + enabled = { true }, startDragImmediately = { false }, onDragStarted = { _, _, _ -> started = true @@ -358,6 +358,7 @@ class MultiPointerDraggableTest { .nestedScrollDispatcher() .multiPointerDraggable( orientation = Orientation.Vertical, + enabled = { true }, startDragImmediately = { false }, onDragStarted = { _, _, _ -> started = true @@ -463,6 +464,7 @@ class MultiPointerDraggableTest { .nestedScrollDispatcher() .multiPointerDraggable( orientation = Orientation.Vertical, + enabled = { true }, startDragImmediately = { false }, onDragStarted = { _, _, _ -> verticalStarted = true @@ -475,6 +477,7 @@ class MultiPointerDraggableTest { ) .multiPointerDraggable( orientation = Orientation.Horizontal, + enabled = { true }, startDragImmediately = { false }, onDragStarted = { _, _, _ -> horizontalStarted = true @@ -567,6 +570,7 @@ class MultiPointerDraggableTest { .nestedScrollDispatcher() .multiPointerDraggable( orientation = Orientation.Vertical, + enabled = { true }, startDragImmediately = { false }, swipeDetector = object : SwipeDetector { @@ -668,6 +672,7 @@ class MultiPointerDraggableTest { .nestedScrollDispatcher() .multiPointerDraggable( orientation = Orientation.Vertical, + enabled = { true }, startDragImmediately = { false }, onDragStarted = { _, _, _ -> SimpleDragController( @@ -739,6 +744,7 @@ class MultiPointerDraggableTest { .nestedScrollDispatcher() .multiPointerDraggable( orientation = Orientation.Vertical, + enabled = { true }, startDragImmediately = { false }, onDragStarted = { _, _, _ -> SimpleDragController( diff --git a/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/SwipeToSceneTest.kt b/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/SwipeToSceneTest.kt index ce64628a863c..25e87132eb0e 100644 --- a/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/SwipeToSceneTest.kt +++ b/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/SwipeToSceneTest.kt @@ -22,15 +22,11 @@ import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.offset import androidx.compose.foundation.layout.size -import androidx.compose.material3.Button -import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.remember import androidx.compose.runtime.setValue -import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.geometry.Offset import androidx.compose.ui.input.nestedscroll.NestedScrollConnection @@ -40,11 +36,8 @@ import androidx.compose.ui.platform.LocalLayoutDirection import androidx.compose.ui.platform.LocalViewConfiguration import androidx.compose.ui.platform.testTag import androidx.compose.ui.test.assertPositionInRootIsEqualTo -import androidx.compose.ui.test.assertTextEquals import androidx.compose.ui.test.junit4.createComposeRule -import androidx.compose.ui.test.onNodeWithTag import androidx.compose.ui.test.onRoot -import androidx.compose.ui.test.performClick import androidx.compose.ui.test.performTouchInput import androidx.compose.ui.test.swipeWithVelocity import androidx.compose.ui.unit.Density @@ -851,29 +844,4 @@ class SwipeToSceneTest { assertThat(transition.progress).isEqualTo(1f) assertThat(availableOnPostScroll).isEqualTo(ovescrollPx) } - - @Test - fun sceneWithoutSwipesDoesNotConsumeGestures() { - val buttonTag = "button" - - rule.setContent { - Box { - var count by remember { mutableStateOf(0) } - Button(onClick = { count++ }, Modifier.testTag(buttonTag).align(Alignment.Center)) { - Text("Count: $count") - } - - SceneTransitionLayout(remember { MutableSceneTransitionLayoutState(SceneA) }) { - scene(SceneA) { Box(Modifier.fillMaxSize()) } - } - } - } - - rule.onNodeWithTag(buttonTag).assertTextEquals("Count: 0") - - // Click on the root at its center, where the button is located. Clicks should go through - // the STL and reach the button given that there is no swipes for the current scene. - repeat(3) { rule.onRoot().performClick() } - rule.onNodeWithTag(buttonTag).assertTextEquals("Count: 3") - } } diff --git a/packages/SystemUI/compose/scene/tests/src/com/android/compose/nestedscroll/PriorityNestedScrollConnectionTest.kt b/packages/SystemUI/compose/scene/tests/src/com/android/compose/nestedscroll/PriorityNestedScrollConnectionTest.kt index bde769920676..badc43bd3e0f 100644 --- a/packages/SystemUI/compose/scene/tests/src/com/android/compose/nestedscroll/PriorityNestedScrollConnectionTest.kt +++ b/packages/SystemUI/compose/scene/tests/src/com/android/compose/nestedscroll/PriorityNestedScrollConnectionTest.kt @@ -18,8 +18,9 @@ package com.android.compose.nestedscroll +import androidx.compose.foundation.gestures.Orientation import androidx.compose.ui.geometry.Offset -import androidx.compose.ui.input.nestedscroll.NestedScrollSource +import androidx.compose.ui.input.nestedscroll.NestedScrollSource.Companion.UserInput import androidx.compose.ui.unit.Velocity import androidx.test.ext.junit.runners.AndroidJUnit4 import com.google.common.truth.Truth.assertThat @@ -35,13 +36,14 @@ class PriorityNestedScrollConnectionTest { private var canStartPostFling = false private var canContinueScroll = false private var isStarted = false - private var lastScroll: Offset? = null - private var returnOnScroll = Offset.Zero - private var lastStop: Velocity? = null - private var returnOnStop = Velocity.Zero + private var lastScroll: Float? = null + private var returnOnScroll = 0f + private var lastStop: Float? = null + private var returnOnStop = 0f private val scrollConnection = PriorityNestedScrollConnection( + orientation = Orientation.Vertical, canStartPreScroll = { _, _ -> canStartPreScroll }, canStartPostScroll = { _, _ -> canStartPostScroll }, canStartPostFling = { canStartPostFling }, @@ -58,11 +60,6 @@ class PriorityNestedScrollConnectionTest { }, ) - private val offset1 = Offset(1f, 1f) - private val offset2 = Offset(2f, 2f) - private val velocity1 = Velocity(1f, 1f) - private val velocity2 = Velocity(2f, 2f) - @Test fun step1_priorityModeShouldStartOnlyOnPreScroll() = runTest { canStartPreScroll = true @@ -70,7 +67,7 @@ class PriorityNestedScrollConnectionTest { scrollConnection.onPostScroll( consumed = Offset.Zero, available = Offset.Zero, - source = NestedScrollSource.Drag, + source = UserInput, ) assertThat(isStarted).isEqualTo(false) @@ -80,7 +77,7 @@ class PriorityNestedScrollConnectionTest { scrollConnection.onPostFling(consumed = Velocity.Zero, available = Velocity.Zero) assertThat(isStarted).isEqualTo(false) - scrollConnection.onPreScroll(available = Offset.Zero, source = NestedScrollSource.Drag) + scrollConnection.onPreScroll(available = Offset.Zero, source = UserInput) assertThat(isStarted).isEqualTo(true) } @@ -89,7 +86,7 @@ class PriorityNestedScrollConnectionTest { scrollConnection.onPostScroll( consumed = Offset.Zero, available = Offset.Zero, - source = NestedScrollSource.Drag, + source = UserInput, ) } @@ -97,7 +94,7 @@ class PriorityNestedScrollConnectionTest { fun step1_priorityModeShouldStartOnlyOnPostScroll() = runTest { canStartPostScroll = true - scrollConnection.onPreScroll(available = Offset.Zero, source = NestedScrollSource.Drag) + scrollConnection.onPreScroll(available = Offset.Zero, source = UserInput) assertThat(isStarted).isEqualTo(false) scrollConnection.onPreFling(available = Velocity.Zero) @@ -115,7 +112,7 @@ class PriorityNestedScrollConnectionTest { scrollConnection.onPostScroll( consumed = Offset.Zero, available = Offset.Zero, - source = NestedScrollSource.Drag, + source = UserInput, ) assertThat(isStarted).isEqualTo(false) @@ -128,12 +125,12 @@ class PriorityNestedScrollConnectionTest { canStartPostScroll = true scrollConnection.onPostScroll( - consumed = offset1, - available = offset2, - source = NestedScrollSource.Drag, + consumed = Offset(1f, 1f), + available = Offset(2f, 2f), + source = UserInput, ) - assertThat(lastScroll).isEqualTo(offset2) + assertThat(lastScroll).isEqualTo(2f) } @Test @@ -141,13 +138,13 @@ class PriorityNestedScrollConnectionTest { startPriorityModePostScroll() canContinueScroll = true - scrollConnection.onPreScroll(available = offset1, source = NestedScrollSource.Drag) - assertThat(lastScroll).isEqualTo(offset1) + scrollConnection.onPreScroll(available = Offset(1f, 1f), source = UserInput) + assertThat(lastScroll).isEqualTo(1f) canContinueScroll = false - scrollConnection.onPreScroll(available = offset2, source = NestedScrollSource.Drag) - assertThat(lastScroll).isNotEqualTo(offset2) - assertThat(lastScroll).isEqualTo(offset1) + scrollConnection.onPreScroll(available = Offset(2f, 2f), source = UserInput) + assertThat(lastScroll).isNotEqualTo(2f) + assertThat(lastScroll).isEqualTo(1f) } @Test @@ -155,7 +152,7 @@ class PriorityNestedScrollConnectionTest { startPriorityModePostScroll() canContinueScroll = false - scrollConnection.onPreScroll(available = Offset.Zero, source = NestedScrollSource.Drag) + scrollConnection.onPreScroll(available = Offset.Zero, source = UserInput) assertThat(lastStop).isNotNull() } @@ -184,22 +181,22 @@ class PriorityNestedScrollConnectionTest { fun receive_onPostFling() = runTest { canStartPostFling = true - scrollConnection.onPostFling(consumed = velocity1, available = velocity2) + scrollConnection.onPostFling(consumed = Velocity(1f, 1f), available = Velocity(2f, 2f)) - assertThat(lastStop).isEqualTo(velocity2) + assertThat(lastStop).isEqualTo(2f) } @Test fun step1_priorityModeShouldStartOnlyOnPostFling() = runTest { canStartPostFling = true - scrollConnection.onPreScroll(available = Offset.Zero, source = NestedScrollSource.Drag) + scrollConnection.onPreScroll(available = Offset.Zero, source = UserInput) assertThat(isStarted).isEqualTo(false) scrollConnection.onPostScroll( consumed = Offset.Zero, available = Offset.Zero, - source = NestedScrollSource.Drag, + source = UserInput, ) assertThat(isStarted).isEqualTo(false) diff --git a/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationFrameSizePrefsTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/WindowMagnificationFrameSizePrefsTest.java index 944066fa4954..944066fa4954 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationFrameSizePrefsTest.java +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/WindowMagnificationFrameSizePrefsTest.java diff --git a/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationFrameSpecTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/WindowMagnificationFrameSpecTest.kt index 791a26ed761d..6f43c2068fc4 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationFrameSpecTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/WindowMagnificationFrameSpecTest.kt @@ -16,9 +16,9 @@ package com.android.systemui.accessibility -import android.testing.AndroidTestingRunner import android.util.Size import androidx.test.filters.SmallTest +import androidx.test.ext.junit.runners.AndroidJUnit4 import com.android.systemui.SysuiTestCase import com.android.systemui.accessibility.WindowMagnificationSettings.MagnificationSize import com.google.common.truth.Truth.assertThat @@ -26,7 +26,7 @@ import org.junit.Test import org.junit.runner.RunWith @SmallTest -@RunWith(AndroidTestingRunner::class) +@RunWith(AndroidJUnit4::class) class WindowMagnificationFrameSpecTest : SysuiTestCase() { @Test diff --git a/packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/MenuInfoRepositoryTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/floatingmenu/MenuInfoRepositoryTest.java index 24f3a29e64ee..24f3a29e64ee 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/MenuInfoRepositoryTest.java +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/floatingmenu/MenuInfoRepositoryTest.java diff --git a/packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/MenuItemAccessibilityDelegateTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/floatingmenu/MenuItemAccessibilityDelegateTest.java index 157cccc3d62f..157cccc3d62f 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/MenuItemAccessibilityDelegateTest.java +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/floatingmenu/MenuItemAccessibilityDelegateTest.java diff --git a/packages/SystemUI/tests/src/com/android/systemui/accessibility/fontscaling/FontScalingDialogDelegateTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/fontscaling index 0bd00fb0a0e9..0bd00fb0a0e9 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/accessibility/fontscaling/FontScalingDialogDelegateTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/fontscaling diff --git a/packages/SystemUI/tests/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogDelegateTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogDelegateTest.java index 662815ee7cbe..662815ee7cbe 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogDelegateTest.java +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogDelegateTest.java diff --git a/packages/SystemUI/tests/src/com/android/systemui/animation/ViewHierarchyAnimatorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/animation/ViewHierarchyAnimatorTest.kt index a8c3af9488f0..a8c3af9488f0 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/animation/ViewHierarchyAnimatorTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/animation/ViewHierarchyAnimatorTest.kt diff --git a/packages/SystemUI/tests/src/com/android/systemui/authentication/data/repository/AuthenticationRepositoryTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/authentication/data/repository/AuthenticationRepositoryTest.kt index 72163e4d7710..72163e4d7710 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/authentication/data/repository/AuthenticationRepositoryTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/authentication/data/repository/AuthenticationRepositoryTest.kt diff --git a/packages/SystemUI/tests/src/com/android/systemui/battery/BatteryMeterViewTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/battery/BatteryMeterViewTest.kt index 2aa33a176ac9..2aa33a176ac9 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/battery/BatteryMeterViewTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/battery/BatteryMeterViewTest.kt diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthContainerViewTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/AuthContainerViewTest.kt index 7889b3cd6cc3..7889b3cd6cc3 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthContainerViewTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/AuthContainerViewTest.kt diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/AuthControllerTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/AuthControllerTest.java index 65825b2444af..2dcbdc80f695 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/AuthControllerTest.java +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/AuthControllerTest.java @@ -17,6 +17,7 @@ package com.android.systemui.biometrics; import static android.hardware.biometrics.BiometricAuthenticator.TYPE_FINGERPRINT; +import static android.view.Display.INVALID_DISPLAY; import static com.google.common.truth.Truth.assertThat; @@ -68,10 +69,12 @@ import android.hardware.fingerprint.FingerprintSensorPropertiesInternal; import android.hardware.fingerprint.IFingerprintAuthenticatorsRegisteredCallback; import android.os.Handler; import android.os.RemoteException; +import android.os.UserHandle; import android.os.UserManager; import android.testing.TestableContext; import android.testing.TestableLooper; import android.testing.TestableLooper.RunWithLooper; +import android.view.Display; import android.view.DisplayInfo; import android.view.Surface; import android.view.WindowManager; @@ -210,6 +213,7 @@ public class AuthControllerTest extends SysuiTestCase { .thenReturn(true); when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_FINGERPRINT)) .thenReturn(true); + when(mUserManager.isVisibleBackgroundUsersSupported()).thenReturn(false); when(mDialog1.getOpPackageName()).thenReturn("Dialog1"); when(mDialog2.getOpPackageName()).thenReturn("Dialog2"); @@ -462,7 +466,7 @@ public class AuthControllerTest extends SysuiTestCase { @Test public void testShowInvoked_whenSystemRequested() { showDialog(new int[] {1} /* sensorIds */, false /* credentialAllowed */); - verify(mDialog1).show(any()); + verify(mDialog1).show(mWindowManager); } @Test @@ -679,7 +683,7 @@ public class AuthControllerTest extends SysuiTestCase { // 2) Client cancels authentication showDialog(new int[0] /* sensorIds */, true /* credentialAllowed */); - verify(mDialog1).show(any()); + verify(mDialog1).show(mWindowManager); final byte[] credentialAttestation = generateRandomHAT(); @@ -695,7 +699,7 @@ public class AuthControllerTest extends SysuiTestCase { @Test public void testShowNewDialog_beforeOldDialogDismissed_SkipsAnimations() { showDialog(new int[] {1} /* sensorIds */, false /* credentialAllowed */); - verify(mDialog1).show(any()); + verify(mDialog1).show(mWindowManager); showDialog(new int[] {1} /* sensorIds */, false /* credentialAllowed */); @@ -703,7 +707,7 @@ public class AuthControllerTest extends SysuiTestCase { verify(mDialog1).dismissWithoutCallback(eq(false) /* animate */); // Second dialog should be shown without animation - verify(mDialog2).show(any()); + verify(mDialog2).show(mWindowManager); } @Test @@ -990,13 +994,97 @@ public class AuthControllerTest extends SysuiTestCase { verify(mDialog1, never()).show(any()); } + @Test + public void testShowDialog_visibleBackgroundUser() { + int backgroundUserId = 1001; + int backgroundDisplayId = 1001; + when(mUserManager.isVisibleBackgroundUsersSupported()).thenReturn(true); + WindowManager wm = mockBackgroundUser(backgroundUserId, backgroundDisplayId, + true /* isVisible */, true /* hasUserManager */, true /* hasDisplay */); + + showDialog(new int[]{1} /* sensorIds */, backgroundUserId /* userId */, + false /* credentialAllowed */); + + verify(mDialog1).show(wm); + } + + @Test + public void testShowDialog_invisibleBackgroundUser_defaultWM() { + int backgroundUserId = 1001; + when(mUserManager.isVisibleBackgroundUsersSupported()).thenReturn(true); + mockBackgroundUser(backgroundUserId, INVALID_DISPLAY, + false /* isVisible */, true /* hasUserManager */, true /* hasDisplay */); + + showDialog(new int[]{1} /* sensorIds */, backgroundUserId /* userId */, + false /* credentialAllowed */); + + verify(mDialog1).show(mWindowManager); + } + + @Test + public void testShowDialog_visibleBackgroundUser_noUserManager_dismissError() + throws RemoteException { + int backgroundUserId = 1001; + int backgroundDisplayId = 1001; + when(mUserManager.isVisibleBackgroundUsersSupported()).thenReturn(true); + mockBackgroundUser(backgroundUserId, backgroundDisplayId, + true /* isVisible */, false /* hasUserManager */, true /* hasDisplay */); + + showDialog(new int[]{1} /* sensorIds */, backgroundUserId /* userId */, + false /* credentialAllowed */); + + verify(mDialog1, never()).show(any()); + verify(mReceiver).onDialogDismissed( + eq(BiometricPrompt.DISMISSED_REASON_ERROR_NO_WM), + eq(null) /* credentialAttestation */); + } + + @Test + public void testShowDialog_visibleBackgroundUser_invalidDisplayId_dismissError() + throws RemoteException { + int backgroundUserId = 1001; + when(mUserManager.isVisibleBackgroundUsersSupported()).thenReturn(true); + mockBackgroundUser(backgroundUserId, INVALID_DISPLAY, + true /* isVisible */, true /* hasUserManager */, false /* hasDisplay */); + + showDialog(new int[]{1} /* sensorIds */, backgroundUserId /* userId */, + false /* credentialAllowed */); + + verify(mDialog1, never()).show(any()); + verify(mReceiver).onDialogDismissed( + eq(BiometricPrompt.DISMISSED_REASON_ERROR_NO_WM), + eq(null) /* credentialAttestation */); + } + + @Test + public void testShowDialog_visibleBackgroundUser_invalidDisplay_dismissError() + throws RemoteException { + int backgroundUserId = 1001; + int backgroundDisplayId = 1001; + when(mUserManager.isVisibleBackgroundUsersSupported()).thenReturn(true); + mockBackgroundUser(backgroundUserId, backgroundDisplayId, + true /* isVisible */, true /* hasUserManager */, false /* hasDisplay */); + + showDialog(new int[]{1} /* sensorIds */, backgroundUserId /* userId */, + false /* credentialAllowed */); + + verify(mDialog1, never()).show(any()); + verify(mReceiver).onDialogDismissed( + eq(BiometricPrompt.DISMISSED_REASON_ERROR_NO_WM), + eq(null) /* credentialAttestation */); + } + private void showDialog(int[] sensorIds, boolean credentialAllowed) { + showDialog(sensorIds, 0 /* userId */, credentialAllowed); + } + + private void showDialog(int[] sensorIds, int userId, boolean credentialAllowed) { mAuthController.showAuthenticationDialog(createTestPromptInfo(), mReceiver /* receiver */, sensorIds, credentialAllowed, true /* requireConfirmation */, - 0 /* userId */, + userId /* userId */, 0 /* operationId */, "testPackage", REQUEST_ID); @@ -1059,6 +1147,40 @@ public class AuthControllerTest extends SysuiTestCase { assertTrue(mAuthController.isFaceAuthEnrolled(userId)); } + /** + * Create mocks related to visible background users. + * + * @param userId the user id of the background user to mock + * @param displayId display id of the background user + * @param isVisible whether the background user is a visible background user or not + * @param hasUserManager simulate whether the background user's context will return a mock + * UserManager instance or null + * @param hasDisplay simulate whether the background user's context will return a mock Display + * instance or null + * @return mock WindowManager instance associated with the background user's display context + */ + private WindowManager mockBackgroundUser(int userId, int displayId, boolean isVisible, + boolean hasUserManager, boolean hasDisplay) { + Context mockUserContext = mock(Context.class); + Context mockDisplayContext = mock(Context.class); + UserManager mockUserManager = mock(UserManager.class); + Display mockDisplay = mock(Display.class); + WindowManager mockDisplayWM = mock(WindowManager.class); + doReturn(mockUserContext).when(mContextSpy).createContextAsUser(eq(UserHandle.of(userId)), + anyInt()); + if (hasUserManager) { + when(mockUserContext.getSystemService(UserManager.class)).thenReturn(mockUserManager); + } + when(mockUserManager.isUserVisible()).thenReturn(isVisible); + when(mockUserManager.getMainDisplayIdAssignedToUser()).thenReturn(displayId); + if (hasDisplay) { + when(mDisplayManager.getDisplay(displayId)).thenReturn(mockDisplay); + } + doReturn(mockDisplayContext).when(mContextSpy).createDisplayContext(mockDisplay); + when(mockDisplayContext.getSystemService(WindowManager.class)).thenReturn(mockDisplayWM); + return mockDisplayWM; + } + private final class TestableAuthController extends AuthController { private int mBuildCount = 0; diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsViewTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/UdfpsViewTest.kt index 9fbe09619ff1..9fbe09619ff1 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsViewTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/UdfpsViewTest.kt diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/domain/interactor/CredentialInteractorImplTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/domain/interactor/CredentialInteractorImplTest.kt index 4856f156c4c7..4856f156c4c7 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/domain/interactor/CredentialInteractorImplTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/domain/interactor/CredentialInteractorImplTest.kt diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/domain/interactor/LogContextInteractorImplTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/domain/interactor/LogContextInteractorImplTest.kt index 30207bb310ba..30207bb310ba 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/domain/interactor/LogContextInteractorImplTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/domain/interactor/LogContextInteractorImplTest.kt diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/domain/interactor/PromptCredentialInteractorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/domain/interactor/PromptCredentialInteractorTest.kt index 5a3637668cfe..5a3637668cfe 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/domain/interactor/PromptCredentialInteractorTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/domain/interactor/PromptCredentialInteractorTest.kt diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/domain/interactor/PromptSelectorInteractorImplTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/domain/interactor/PromptSelectorInteractorImplTest.kt index dc499cd2fe8d..dc499cd2fe8d 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/domain/interactor/PromptSelectorInteractorImplTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/domain/interactor/PromptSelectorInteractorImplTest.kt diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/domain/model/BiometricPromptRequestTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/domain/model index 08f139c6a3af..08f139c6a3af 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/domain/model/BiometricPromptRequestTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/domain/model diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/shared/model/BiometricModalitiesTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/shared/model/BiometricModalitiesTest.kt index 4d8fafc2111a..4d8fafc2111a 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/shared/model/BiometricModalitiesTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/shared/model/BiometricModalitiesTest.kt diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/ui/viewmodel/CredentialViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/ui/viewmodel/CredentialViewModelTest.kt index e4c5cd456f03..e4c5cd456f03 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/ui/viewmodel/CredentialViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/ui/viewmodel/CredentialViewModelTest.kt diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/ui/viewmodel/PromptViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/ui/viewmodel/PromptViewModelTest.kt index 55fd3440ea07..55fd3440ea07 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/ui/viewmodel/PromptViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/ui/viewmodel/PromptViewModelTest.kt diff --git a/packages/SystemUI/tests/src/com/android/systemui/bouncer/ui/composable/BouncerPredictiveBackTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/bouncer/ui/composable index 0d369a3ea80c..97f2e56e6eec 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/bouncer/ui/composable/BouncerPredictiveBackTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/bouncer/ui/composable @@ -67,7 +67,6 @@ import com.android.systemui.scene.shared.model.Scenes import com.android.systemui.scene.shared.model.sceneDataSourceDelegator import com.android.systemui.scene.ui.composable.Scene import com.android.systemui.scene.ui.composable.SceneContainer -import com.android.systemui.settings.displayTracker import com.android.systemui.testKosmos import kotlin.time.Duration.Companion.seconds import kotlinx.coroutines.awaitCancellation @@ -127,7 +126,7 @@ class BouncerPredictiveBackTest : SysuiTestCase() { private val sceneContainerViewModel by lazy { kosmos.sceneContainerViewModelFactory - .create(view, kosmos.displayTracker.defaultDisplayId, {}) + .create(view) {} .apply { setTransitionState(transitionState) } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/classifier/BrightLineClassifierTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/classifier/BrightLineClassifierTest.java index 637771790b28..637771790b28 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/classifier/BrightLineClassifierTest.java +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/classifier/BrightLineClassifierTest.java diff --git a/packages/SystemUI/tests/src/com/android/systemui/classifier/ZigZagClassifierTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/classifier/ZigZagClassifierTest.java index 1fe726863f7f..1fe726863f7f 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/classifier/ZigZagClassifierTest.java +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/classifier/ZigZagClassifierTest.java diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/communal/ui/viewmodel/CommunalUserActionsViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/communal/ui/viewmodel/CommunalUserActionsViewModelTest.kt index 58b59ffd8894..755c4ebf5016 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/communal/ui/viewmodel/CommunalUserActionsViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/communal/ui/viewmodel/CommunalUserActionsViewModelTest.kt @@ -85,7 +85,8 @@ class CommunalUserActionsViewModelTest : SysuiTestCase() { assertThat(actions).isNotEmpty() assertThat(actions?.get(Swipe.End)).isEqualTo(UserActionResult(SceneFamilies.Home)) assertThat(actions?.get(Swipe.Up)).isEqualTo(UserActionResult(Scenes.Bouncer)) - assertThat(actions?.get(Swipe.Down)).isEqualTo(UserActionResult(Scenes.Shade)) + assertThat(actions?.get(Swipe.Down)) + .isEqualTo(UserActionResult(Scenes.Shade, isIrreversible = true)) setUpState( isShadeTouchable = false, @@ -102,7 +103,8 @@ class CommunalUserActionsViewModelTest : SysuiTestCase() { assertThat(actions).isNotEmpty() assertThat(actions?.get(Swipe.End)).isEqualTo(UserActionResult(SceneFamilies.Home)) assertThat(actions?.get(Swipe.Up)).isEqualTo(UserActionResult(Scenes.Gone)) - assertThat(actions?.get(Swipe.Down)).isEqualTo(UserActionResult(Scenes.Shade)) + assertThat(actions?.get(Swipe.Down)) + .isEqualTo(UserActionResult(Scenes.Shade, isIrreversible = true)) } @Test @@ -120,7 +122,7 @@ class CommunalUserActionsViewModelTest : SysuiTestCase() { assertThat(actions?.get(Swipe.End)).isEqualTo(UserActionResult(SceneFamilies.Home)) assertThat(actions?.get(Swipe.Up)).isEqualTo(UserActionResult(Scenes.Bouncer)) assertThat(actions?.get(Swipe.Down)) - .isEqualTo(UserActionResult(Scenes.Shade, ToSplitShade)) + .isEqualTo(UserActionResult(Scenes.Shade, ToSplitShade, isIrreversible = true)) setUpState( isShadeTouchable = false, @@ -138,7 +140,7 @@ class CommunalUserActionsViewModelTest : SysuiTestCase() { assertThat(actions?.get(Swipe.End)).isEqualTo(UserActionResult(SceneFamilies.Home)) assertThat(actions?.get(Swipe.Up)).isEqualTo(UserActionResult(Scenes.Gone)) assertThat(actions?.get(Swipe.Down)) - .isEqualTo(UserActionResult(Scenes.Shade, ToSplitShade)) + .isEqualTo(UserActionResult(Scenes.Shade, ToSplitShade, isIrreversible = true)) } @Test @@ -156,7 +158,9 @@ class CommunalUserActionsViewModelTest : SysuiTestCase() { assertThat(actions?.get(Swipe.End)).isEqualTo(UserActionResult(SceneFamilies.Home)) assertThat(actions?.get(Swipe.Up)).isEqualTo(UserActionResult(Scenes.Bouncer)) assertThat(actions?.get(Swipe.Down)) - .isEqualTo(UserActionResult(Overlays.NotificationsShade)) + .isEqualTo( + UserActionResult.ShowOverlay(Overlays.NotificationsShade, isIrreversible = true) + ) setUpState( isShadeTouchable = false, @@ -170,7 +174,9 @@ class CommunalUserActionsViewModelTest : SysuiTestCase() { assertThat(actions?.get(Swipe.End)).isEqualTo(UserActionResult(SceneFamilies.Home)) assertThat(actions?.get(Swipe.Up)).isEqualTo(UserActionResult(Scenes.Gone)) assertThat(actions?.get(Swipe.Down)) - .isEqualTo(UserActionResult(Overlays.NotificationsShade)) + .isEqualTo( + UserActionResult.ShowOverlay(Overlays.NotificationsShade, isIrreversible = true) + ) } private fun TestScope.setUpState( diff --git a/packages/SystemUI/tests/src/com/android/systemui/deviceentry/domain/interactor/DeviceEntryFaceAuthInteractorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/deviceentry/domain/interactor/DeviceEntryFaceAuthInteractorTest.kt index 40b2a0864a8c..40b2a0864a8c 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/deviceentry/domain/interactor/DeviceEntryFaceAuthInteractorTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/deviceentry/domain/interactor/DeviceEntryFaceAuthInteractorTest.kt diff --git a/packages/SystemUI/tests/src/com/android/systemui/display/data/repository/DisplayRepositoryTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/display/data/repository/DisplayRepositoryTest.kt index 6c6de61c638a..6c6de61c638a 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/display/data/repository/DisplayRepositoryTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/display/data/repository/DisplayRepositoryTest.kt diff --git a/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayServiceTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/dreams/DreamOverlayServiceTest.kt index a3314e8900ce..a3314e8900ce 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayServiceTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/dreams/DreamOverlayServiceTest.kt diff --git a/packages/SystemUI/tests/src/com/android/systemui/dreams/touch/CommunalTouchHandlerTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/dreams/touch index c2c94a88603a..c2c94a88603a 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/dreams/touch/CommunalTouchHandlerTest.java +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/dreams/touch diff --git a/packages/SystemUI/tests/src/com/android/systemui/education/domain/interactor/KeyboardTouchpadStatsInteractorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/education/domain/interactor/KeyboardTouchpadStatsInteractorTest.kt index 98e09474d5f2..98e09474d5f2 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/education/domain/interactor/KeyboardTouchpadStatsInteractorTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/education/domain/interactor/KeyboardTouchpadStatsInteractorTest.kt diff --git a/packages/SystemUI/tests/src/com/android/systemui/haptics/slider/SliderHapticFeedbackProviderTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/haptics/slider/SliderHapticFeedbackProviderTest.kt index 4a80d7242e03..4a80d7242e03 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/haptics/slider/SliderHapticFeedbackProviderTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/haptics/slider/SliderHapticFeedbackProviderTest.kt diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyboard/shortcut/data/repository/ShortcutHelperCategoriesRepositoryTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyboard/shortcut/data/repository/ShortcutHelperCategoriesRepositoryTest.kt index 6e883c24b5d2..6e883c24b5d2 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyboard/shortcut/data/repository/ShortcutHelperCategoriesRepositoryTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyboard/shortcut/data/repository/ShortcutHelperCategoriesRepositoryTest.kt diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyboard/shortcut/domain/interactor/ShortcutHelperCategoriesInteractorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyboard/shortcut/domain/interactor/ShortcutHelperCategoriesInteractorTest.kt index 57c8b444b922..57c8b444b922 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyboard/shortcut/domain/interactor/ShortcutHelperCategoriesInteractorTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyboard/shortcut/domain/interactor/ShortcutHelperCategoriesInteractorTest.kt diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyboard/shortcut/ui/ShortcutHelperActivityStarterTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyboard/shortcut/ui index f8e2f47f939a..f8e2f47f939a 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyboard/shortcut/ui/ShortcutHelperActivityStarterTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyboard/shortcut/ui diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/KeyguardClockRepositoryTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/data/repository/KeyguardClockRepositoryTest.kt index 1e9db6466de6..1e9db6466de6 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/KeyguardClockRepositoryTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/data/repository/KeyguardClockRepositoryTest.kt diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/KeyguardSmartspaceRepositoryImplTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/data/repository/KeyguardSmartspaceRepositoryImplTest.kt index 5a597fe8e920..5a597fe8e920 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/KeyguardSmartspaceRepositoryImplTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/data/repository/KeyguardSmartspaceRepositoryImplTest.kt diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/LightRevealScrimInteractorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/LightRevealScrimInteractorTest.kt index 073ed61a949b..b6ec6a67b212 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/LightRevealScrimInteractorTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/LightRevealScrimInteractorTest.kt @@ -21,16 +21,23 @@ import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase import com.android.systemui.coroutines.collectValues import com.android.systemui.keyguard.data.fakeLightRevealScrimRepository +import com.android.systemui.keyguard.data.repository.DEFAULT_REVEAL_DURATION import com.android.systemui.keyguard.data.repository.DEFAULT_REVEAL_EFFECT import com.android.systemui.keyguard.data.repository.FakeLightRevealScrimRepository +import com.android.systemui.keyguard.data.repository.FakeLightRevealScrimRepository.RevealAnimatorRequest import com.android.systemui.keyguard.data.repository.fakeKeyguardTransitionRepository import com.android.systemui.keyguard.shared.model.KeyguardState import com.android.systemui.keyguard.shared.model.TransitionState import com.android.systemui.keyguard.shared.model.TransitionStep import com.android.systemui.kosmos.testScope +import com.android.systemui.power.data.repository.fakePowerRepository +import com.android.systemui.power.domain.interactor.powerInteractor +import com.android.systemui.power.shared.model.WakeSleepReason +import com.android.systemui.power.shared.model.WakefulnessState import com.android.systemui.statusbar.LightRevealEffect import com.android.systemui.statusbar.LightRevealScrim import com.android.systemui.testKosmos +import com.google.common.truth.Truth.assertThat import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.runCurrent import kotlinx.coroutines.test.runTest @@ -52,6 +59,8 @@ class LightRevealScrimInteractorTest : SysuiTestCase() { private val fakeKeyguardTransitionRepository = kosmos.fakeKeyguardTransitionRepository + private val fakePowerRepository = kosmos.fakePowerRepository + private val underTest = kosmos.lightRevealScrimInteractor private val reveal1 = @@ -107,4 +116,50 @@ class LightRevealScrimInteractorTest : SysuiTestCase() { runCurrent() assertEquals(listOf(DEFAULT_REVEAL_EFFECT, reveal1, reveal2), values) } + + @Test + fun transitionToAod_folding_doesNotAnimateTheScrim() = + kosmos.testScope.runTest { + updateWakefulness(goToSleepReason = WakeSleepReason.FOLD) + runCurrent() + + // Transition to AOD + fakeKeyguardTransitionRepository.sendTransitionStep( + TransitionStep(to = KeyguardState.AOD, transitionState = TransitionState.STARTED) + ) + runCurrent() + + assertThat(fakeLightRevealScrimRepository.revealAnimatorRequests.last()) + .isEqualTo(RevealAnimatorRequest(reveal = false, duration = 0)) + } + + @Test + fun transitionToAod_powerButton_animatesTheScrim() = + kosmos.testScope.runTest { + updateWakefulness(goToSleepReason = WakeSleepReason.POWER_BUTTON) + runCurrent() + + // Transition to AOD + fakeKeyguardTransitionRepository.sendTransitionStep( + TransitionStep(to = KeyguardState.AOD, transitionState = TransitionState.STARTED) + ) + runCurrent() + + assertThat(fakeLightRevealScrimRepository.revealAnimatorRequests.last()) + .isEqualTo( + RevealAnimatorRequest( + reveal = false, + duration = DEFAULT_REVEAL_DURATION + ) + ) + } + + private fun updateWakefulness(goToSleepReason: WakeSleepReason) { + fakePowerRepository.updateWakefulness( + rawState = WakefulnessState.STARTING_TO_SLEEP, + lastWakeReason = WakeSleepReason.POWER_BUTTON, + lastSleepReason = goToSleepReason, + powerButtonLaunchGestureTriggered = false + ) + } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/binder/WindowManagerLockscreenVisibilityManagerTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/binder/WindowManagerLockscreenVisibilityManagerTest.kt index 43c7ed6a769d..43c7ed6a769d 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/binder/WindowManagerLockscreenVisibilityManagerTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/binder/WindowManagerLockscreenVisibilityManagerTest.kt diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenUserActionsViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenUserActionsViewModelTest.kt index fb1bf281715d..6397979d9627 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenUserActionsViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenUserActionsViewModelTest.kt @@ -303,7 +303,8 @@ class LockscreenUserActionsViewModelTest : SysuiTestCase() { // Top edge is not applicable in dual shade, as well as two-finger swipe. assertThat(downDestination).isNull() } else { - assertThat(downDestination).isEqualTo(ShowOverlay(Overlays.NotificationsShade)) + assertThat(downDestination) + .isEqualTo(ShowOverlay(Overlays.NotificationsShade, isIrreversible = true)) assertThat(downDestination?.transitionKey).isNull() } @@ -320,7 +321,7 @@ class LockscreenUserActionsViewModelTest : SysuiTestCase() { downWithTwoPointers -> assertThat(downFromTopRightDestination).isNull() else -> { assertThat(downFromTopRightDestination) - .isEqualTo(ShowOverlay(Overlays.QuickSettingsShade)) + .isEqualTo(ShowOverlay(Overlays.QuickSettingsShade, isIrreversible = true)) assertThat(downFromTopRightDestination?.transitionKey).isNull() } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/log/table/LogDiffsForTableTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/log/table/LogDiffsForTableTest.kt index 030b1726bb73..030b1726bb73 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/log/table/LogDiffsForTableTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/log/table/LogDiffsForTableTest.kt diff --git a/packages/SystemUI/tests/src/com/android/systemui/log/table/TableLogBufferFactoryTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/log/table/TableLogBufferFactoryTest.kt index dfd964f0eaa7..dfd964f0eaa7 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/log/table/TableLogBufferFactoryTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/log/table/TableLogBufferFactoryTest.kt diff --git a/packages/SystemUI/tests/src/com/android/systemui/log/table/TableLogBufferTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/log/table/TableLogBufferTest.kt index 9c4c862cccf2..9c4c862cccf2 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/log/table/TableLogBufferTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/log/table/TableLogBufferTest.kt diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/controls/domain/interactor/MediaCarouselInteractorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/media/controls/domain/interactor/MediaCarouselInteractorTest.kt index 414974cc2941..414974cc2941 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/controls/domain/interactor/MediaCarouselInteractorTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/media/controls/domain/interactor/MediaCarouselInteractorTest.kt diff --git a/packages/SystemUI/tests/src/com/android/systemui/mediaprojection/taskswitcher/ui/viewmodel/TaskSwitcherNotificationViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/mediaprojection/taskswitcher/ui/viewmodel/TaskSwitcherNotificationViewModelTest.kt index 5bedc134a1ee..5bedc134a1ee 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/mediaprojection/taskswitcher/ui/viewmodel/TaskSwitcherNotificationViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/mediaprojection/taskswitcher/ui/viewmodel/TaskSwitcherNotificationViewModelTest.kt diff --git a/packages/SystemUI/tests/src/com/android/systemui/mediarouter/data/repository/MediaRouterRepositoryTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/mediarouter/data/repository/MediaRouterRepositoryTest.kt index 84ec1a5677aa..77be8c718b14 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/mediarouter/data/repository/MediaRouterRepositoryTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/mediarouter/data/repository/MediaRouterRepositoryTest.kt @@ -17,6 +17,7 @@ package com.android.systemui.mediarouter.data.repository import androidx.test.filters.SmallTest +import androidx.test.ext.junit.runners.AndroidJUnit4 import com.android.systemui.SysuiTestCase import com.android.systemui.coroutines.collectLastValue import com.android.systemui.kosmos.Kosmos @@ -28,9 +29,11 @@ import kotlin.test.Test import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.runCurrent import kotlinx.coroutines.test.runTest +import org.junit.runner.RunWith @SmallTest @OptIn(ExperimentalCoroutinesApi::class) +@RunWith(AndroidJUnit4::class) class MediaRouterRepositoryTest : SysuiTestCase() { val kosmos = Kosmos() val testScope = kosmos.testScope diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/composefragment/viewmodel/QSFragmentComposeViewModelForceQSTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/composefragment/viewmodel/QSFragmentComposeViewModelForceQSTest.kt index acd69af2736a..da166408b926 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/composefragment/viewmodel/QSFragmentComposeViewModelForceQSTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/composefragment/viewmodel/QSFragmentComposeViewModelForceQSTest.kt @@ -26,10 +26,11 @@ import com.android.systemui.statusbar.sysuiStatusBarStateController import com.google.common.truth.Truth.assertThat import org.junit.Test import org.junit.runner.RunWith -import org.junit.runners.Parameterized +import platform.test.runner.parameterized.ParameterizedAndroidJunit4 +import platform.test.runner.parameterized.Parameters @SmallTest -@RunWith(Parameterized::class) +@RunWith(ParameterizedAndroidJunit4::class) @RunWithLooper class QSFragmentComposeViewModelForceQSTest(private val testData: TestData) : AbstractQSFragmentComposeViewModelTest() { @@ -75,7 +76,7 @@ class QSFragmentComposeViewModelForceQSTest(private val testData: TestData) : companion object { private const val EXPANSION = 0.3f - @Parameterized.Parameters(name = "{0}") + @Parameters(name = "{0}") @JvmStatic fun createTestData(): List<TestData> { return statusBarStates.flatMap { statusBarState -> diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/scene/ui/viewmodel/GoneUserActionsViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/scene/ui/viewmodel/GoneUserActionsViewModelTest.kt index 5c47f552e400..47fae9f0629f 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/scene/ui/viewmodel/GoneUserActionsViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/scene/ui/viewmodel/GoneUserActionsViewModelTest.kt @@ -106,7 +106,7 @@ class GoneUserActionsViewModelTest : SysuiTestCase() { runCurrent() assertThat(userActions?.get(swipeDownFromTopWithTwoFingers())) - .isEqualTo(UserActionResult(Scenes.QuickSettings)) + .isEqualTo(UserActionResult(Scenes.QuickSettings, isIrreversible = true)) } @Test @@ -118,7 +118,7 @@ class GoneUserActionsViewModelTest : SysuiTestCase() { runCurrent() assertThat(userActions?.get(swipeDownFromTopWithTwoFingers())) - .isEqualTo(UserActionResult(Scenes.Shade, ToSplitShade)) + .isEqualTo(UserActionResult(Scenes.Shade, ToSplitShade, isIrreversible = true)) } @Test diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/scene/ui/viewmodel/SceneContainerGestureFilterTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/scene/ui/viewmodel/SceneContainerGestureFilterTest.kt deleted file mode 100644 index efde1ecec512..000000000000 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/scene/ui/viewmodel/SceneContainerGestureFilterTest.kt +++ /dev/null @@ -1,112 +0,0 @@ -/* - * Copyright (C) 2024 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -@file:OptIn(ExperimentalCoroutinesApi::class) - -package com.android.systemui.scene.ui.viewmodel - -import android.graphics.Region -import android.view.setSystemGestureExclusionRegion -import androidx.compose.ui.geometry.Offset -import androidx.test.ext.junit.runners.AndroidJUnit4 -import androidx.test.filters.SmallTest -import com.android.systemui.SysuiTestCase -import com.android.systemui.kosmos.testScope -import com.android.systemui.lifecycle.activateIn -import com.android.systemui.scene.sceneContainerGestureFilterFactory -import com.android.systemui.settings.displayTracker -import com.android.systemui.testKosmos -import com.google.common.truth.Truth.assertThat -import kotlinx.coroutines.ExperimentalCoroutinesApi -import kotlinx.coroutines.Job -import kotlinx.coroutines.test.TestScope -import kotlinx.coroutines.test.runCurrent -import kotlinx.coroutines.test.runTest -import org.junit.Test -import org.junit.runner.RunWith - -@SmallTest -@RunWith(AndroidJUnit4::class) -class SceneContainerGestureFilterTest : SysuiTestCase() { - - private val kosmos = testKosmos() - private val testScope = kosmos.testScope - private val displayId = kosmos.displayTracker.defaultDisplayId - - private val underTest = kosmos.sceneContainerGestureFilterFactory.create(displayId) - private val activationJob = Job() - - @Test - fun shouldFilterGesture_whenNoRegion_returnsFalse() = - testScope.runTest { - activate() - setSystemGestureExclusionRegion(displayId, null) - runCurrent() - - assertThat(underTest.shouldFilterGesture(Offset(100f, 100f))).isFalse() - } - - @Test - fun shouldFilterGesture_whenOutsideRegion_returnsFalse() = - testScope.runTest { - activate() - setSystemGestureExclusionRegion(displayId, Region(0, 0, 200, 200)) - runCurrent() - - assertThat(underTest.shouldFilterGesture(Offset(300f, 100f))).isFalse() - } - - @Test - fun shouldFilterGesture_whenInsideRegion_returnsTrue() = - testScope.runTest { - activate() - setSystemGestureExclusionRegion(displayId, Region(0, 0, 200, 200)) - runCurrent() - - assertThat(underTest.shouldFilterGesture(Offset(100f, 100f))).isTrue() - } - - @Test(expected = IllegalStateException::class) - fun shouldFilterGesture_beforeActivation_throws() = - testScope.runTest { - setSystemGestureExclusionRegion(displayId, Region(0, 0, 200, 200)) - runCurrent() - - underTest.shouldFilterGesture(Offset(100f, 100f)) - } - - @Test(expected = IllegalStateException::class) - fun shouldFilterGesture_afterCancellation_throws() = - testScope.runTest { - activate() - setSystemGestureExclusionRegion(displayId, Region(0, 0, 200, 200)) - runCurrent() - - cancel() - - underTest.shouldFilterGesture(Offset(100f, 100f)) - } - - private fun TestScope.activate() { - underTest.activateIn(testScope, activationJob) - runCurrent() - } - - private fun TestScope.cancel() { - activationJob.cancel() - runCurrent() - } -} diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/scene/ui/viewmodel/SceneContainerHapticsViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/scene/ui/viewmodel/SceneContainerHapticsViewModelTest.kt index 664315d19494..ca9500b5d74b 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/scene/ui/viewmodel/SceneContainerHapticsViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/scene/ui/viewmodel/SceneContainerHapticsViewModelTest.kt @@ -51,7 +51,7 @@ import org.junit.runner.RunWith import org.mockito.kotlin.eq import org.mockito.kotlin.mock import org.mockito.kotlin.verify -import org.mockito.kotlin.verifyZeroInteractions +import org.mockito.kotlin.verifyNoMoreInteractions @OptIn(ExperimentalCoroutinesApi::class) @SmallTest @@ -134,7 +134,7 @@ class SceneContainerHapticsViewModelTest() : SysuiTestCase() { runCurrent() // THEN the view does not play a haptic feedback constant - verifyZeroInteractions(view) + verifyNoMoreInteractions(view) } @EnableFlags(Flags.FLAG_MSDL_FEEDBACK, Flags.FLAG_DUAL_SHADE) @@ -202,7 +202,7 @@ class SceneContainerHapticsViewModelTest() : SysuiTestCase() { runCurrent() // THEN the view does not play a haptic feedback constant - verifyZeroInteractions(view) + verifyNoMoreInteractions(view) } private fun createTransitionState(from: SceneKey, to: ContentKey) = diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/scene/ui/viewmodel/SceneContainerViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/scene/ui/viewmodel/SceneContainerViewModelTest.kt index a37f511cef69..4ec08026e043 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/scene/ui/viewmodel/SceneContainerViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/scene/ui/viewmodel/SceneContainerViewModelTest.kt @@ -39,7 +39,6 @@ import com.android.systemui.scene.sceneContainerViewModelFactory import com.android.systemui.scene.shared.model.Overlays import com.android.systemui.scene.shared.model.Scenes import com.android.systemui.scene.shared.model.fakeSceneDataSource -import com.android.systemui.settings.displayTracker import com.android.systemui.shade.data.repository.fakeShadeRepository import com.android.systemui.shade.domain.interactor.shadeInteractor import com.android.systemui.shade.shared.flag.DualShade @@ -82,7 +81,6 @@ class SceneContainerViewModelTest : SysuiTestCase() { underTest = kosmos.sceneContainerViewModelFactory.create( view, - kosmos.displayTracker.defaultDisplayId, { motionEventHandler -> this@SceneContainerViewModelTest.motionEventHandler = motionEventHandler }, diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/ui/viewmodel/ShadeUserActionsViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/ui/viewmodel/ShadeUserActionsViewModelTest.kt index 15d68813808c..fcb366bfd8ee 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/ui/viewmodel/ShadeUserActionsViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/ui/viewmodel/ShadeUserActionsViewModelTest.kt @@ -29,6 +29,7 @@ import com.android.systemui.SysuiTestCase import com.android.systemui.authentication.data.repository.fakeAuthenticationRepository import com.android.systemui.authentication.shared.model.AuthenticationMethodModel import com.android.systemui.coroutines.collectLastValue +import com.android.systemui.coroutines.collectValues import com.android.systemui.deviceentry.data.repository.fakeDeviceEntryRepository import com.android.systemui.deviceentry.domain.interactor.deviceEntryInteractor import com.android.systemui.flags.EnableSceneContainer @@ -50,6 +51,7 @@ import com.android.systemui.shade.domain.startable.shadeStartable import com.android.systemui.shade.shared.flag.DualShade import com.android.systemui.testKosmos import com.google.common.truth.Truth.assertThat +import com.google.common.truth.Truth.assertWithMessage import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.test.TestScope @@ -248,6 +250,27 @@ class ShadeUserActionsViewModelTest : SysuiTestCase() { assertThat(actions?.get(Swipe.Up)).isEqualTo(UserActionResult(Scenes.Communal)) } + @Test + fun upTransitionSceneKey_neverGoesBackToShadeScene() = + testScope.runTest { + val actions by collectValues(underTest.actions) + val currentScene by collectLastValue(kosmos.sceneInteractor.currentScene) + assertThat(currentScene).isEqualTo(Scenes.Lockscreen) + kosmos.sceneInteractor.changeScene(Scenes.Shade, "") + assertThat(currentScene).isEqualTo(Scenes.Shade) + + kosmos.sceneInteractor.changeScene(Scenes.QuickSettings, "") + assertThat(currentScene).isEqualTo(Scenes.QuickSettings) + + actions.forEachIndexed { index, map -> + assertWithMessage( + "Actions on index $index is incorrectly mapping back to the Shade scene!" + ) + .that((map[Swipe.Up] as? UserActionResult.ChangeScene)?.toScene) + .isNotEqualTo(Scenes.Shade) + } + } + private fun TestScope.setDeviceEntered(isEntered: Boolean) { if (isEntered) { // Unlock the device marking the device has entered. diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationListViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationListViewModelTest.kt index f40bfbdeb54b..8d678ef00b4a 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationListViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationListViewModelTest.kt @@ -506,7 +506,7 @@ class NotificationListViewModelTest(flags: FlagsParameterization) : SysuiTestCas @EnableSceneContainer fun pinnedHeadsUpRows_filtersForPinnedItems() = testScope.runTest { - val pinnedHeadsUpRows by collectLastValue(underTest.pinnedHeadsUpRows) + val pinnedHeadsUpRows by collectLastValue(underTest.pinnedHeadsUpRowKeys) // WHEN there are no pinned rows val rows = diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/policy/ui/dialog/viewmodel/ModesDialogViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/policy/ui/dialog/viewmodel/ModesDialogViewModelTest.kt index a0f64314098c..9d93a9c7fe0b 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/policy/ui/dialog/viewmodel/ModesDialogViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/policy/ui/dialog/viewmodel/ModesDialogViewModelTest.kt @@ -61,7 +61,7 @@ class ModesDialogViewModelTest : SysuiTestCase() { interactor, kosmos.testDispatcher, mockDialogDelegate, - mockDialogEventLogger + mockDialogEventLogger, ) @Test @@ -97,7 +97,7 @@ class ModesDialogViewModelTest : SysuiTestCase() { assertThat(tiles?.size).isEqualTo(3) with(tiles?.elementAt(0)!!) { assertThat(this.text).isEqualTo("Disabled by other") - assertThat(this.subtext).isEqualTo("Set up") + assertThat(this.subtext).isEqualTo("Not set") assertThat(this.enabled).isEqualTo(false) } with(tiles?.elementAt(1)!!) { @@ -323,10 +323,10 @@ class ModesDialogViewModelTest : SysuiTestCase() { assertThat(tiles!!).hasSize(6) assertThat(tiles!![0].subtext).isEqualTo("When the going gets tough") assertThat(tiles!![1].subtext).isEqualTo("On • When in Rome") - assertThat(tiles!![2].subtext).isEqualTo("Set up") + assertThat(tiles!![2].subtext).isEqualTo("Not set") assertThat(tiles!![3].subtext).isEqualTo("Off") assertThat(tiles!![4].subtext).isEqualTo("On") - assertThat(tiles!![5].subtext).isEqualTo("Set up") + assertThat(tiles!![5].subtext).isEqualTo("Not set") } @Test @@ -387,7 +387,7 @@ class ModesDialogViewModelTest : SysuiTestCase() { } with(tiles?.elementAt(2)!!) { assertThat(this.stateDescription).isEqualTo("Off") - assertThat(this.subtextDescription).isEqualTo("Set up") + assertThat(this.subtextDescription).isEqualTo("Not set") } with(tiles?.elementAt(3)!!) { assertThat(this.stateDescription).isEqualTo("Off") @@ -399,7 +399,7 @@ class ModesDialogViewModelTest : SysuiTestCase() { } with(tiles?.elementAt(5)!!) { assertThat(this.stateDescription).isEqualTo("Off") - assertThat(this.subtextDescription).isEqualTo("Set up") + assertThat(this.subtextDescription).isEqualTo("Not set") } // All tiles have the same long click info @@ -451,7 +451,7 @@ class ModesDialogViewModelTest : SysuiTestCase() { .setName("Active without manual") .setActive(true) .setManualInvocationAllowed(false) - .build(), + .build() ) ) runCurrent() @@ -492,7 +492,7 @@ class ModesDialogViewModelTest : SysuiTestCase() { .setId("ID") .setName("Disabled by other") .setEnabled(false, /* byUser= */ false) - .build(), + .build() ) ) runCurrent() @@ -500,7 +500,7 @@ class ModesDialogViewModelTest : SysuiTestCase() { assertThat(tiles?.size).isEqualTo(1) with(tiles?.elementAt(0)!!) { assertThat(this.text).isEqualTo("Disabled by other") - assertThat(this.subtext).isEqualTo("Set up") + assertThat(this.subtext).isEqualTo("Not set") assertThat(this.enabled).isEqualTo(false) // Click the tile @@ -519,7 +519,7 @@ class ModesDialogViewModelTest : SysuiTestCase() { // Check that nothing happened to the tile with(tiles?.elementAt(0)!!) { assertThat(this.text).isEqualTo("Disabled by other") - assertThat(this.subtext).isEqualTo("Set up") + assertThat(this.subtext).isEqualTo("Not set") assertThat(this.enabled).isEqualTo(false) } } diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 7209c44f976d..2ddaa56bb686 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -1120,7 +1120,7 @@ <string name="zen_mode_off">Off</string> <!-- Modes: label for a mode that needs to be set up [CHAR LIMIT=35] --> - <string name="zen_mode_set_up">Set up</string> + <string name="zen_mode_set_up">Not set</string> <!-- Modes: label for a mode that cannot be manually turned on [CHAR LIMIT=35] --> <string name="zen_mode_no_manual_invocation">Manage in settings</string> diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogDelegate.java b/packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogDelegate.java index 60edaae21bc0..158623fa80af 100644 --- a/packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogDelegate.java +++ b/packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogDelegate.java @@ -280,6 +280,14 @@ public class HearingDevicesDialogDelegate implements SystemUIDialog.Delegate, if (mLocalBluetoothManager == null) { return; } + + // Remove the default padding of the system ui dialog + View container = dialog.findViewById(android.R.id.custom); + if (container != null && container.getParent() != null) { + View containerParent = (View) container.getParent(); + containerParent.setPadding(0, 0, 0, 0); + } + mUiEventLogger.log(HearingDevicesUiEvent.HEARING_DEVICES_DIALOG_SHOW, mLaunchSourceId); mPairButton = dialog.requireViewById(R.id.pair_new_device_button); mDeviceList = dialog.requireViewById(R.id.device_list); diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesListAdapter.java b/packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesListAdapter.java index 664f3f834f86..9367cb5c0198 100644 --- a/packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesListAdapter.java +++ b/packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesListAdapter.java @@ -108,6 +108,7 @@ public class HearingDevicesListAdapter extends RecyclerView.Adapter<RecyclerView private final ImageView mIconView; private final ImageView mGearIcon; private final View mGearView; + private final View mDividerView; DeviceItemViewHolder(@NonNull View itemView, Context context) { super(itemView); @@ -118,6 +119,7 @@ public class HearingDevicesListAdapter extends RecyclerView.Adapter<RecyclerView mIconView = itemView.requireViewById(R.id.bluetooth_device_icon); mGearIcon = itemView.requireViewById(R.id.gear_icon_image); mGearView = itemView.requireViewById(R.id.gear_icon); + mDividerView = itemView.requireViewById(R.id.divider); } public void bindView(DeviceItem item, HearingDeviceItemCallback callback) { @@ -153,6 +155,7 @@ public class HearingDevicesListAdapter extends RecyclerView.Adapter<RecyclerView mGearIcon.getDrawable().mutate().setTint(tintColor); mGearView.setOnClickListener(view -> callback.onDeviceItemGearClicked(item, view)); + mDividerView.setBackgroundColor(tintColor); } } } diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java b/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java index b39aae94ed4e..a5bd559dcbf2 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java @@ -19,6 +19,7 @@ package com.android.systemui.biometrics; import static android.hardware.biometrics.BiometricAuthenticator.TYPE_FACE; import static android.hardware.biometrics.BiometricAuthenticator.TYPE_FINGERPRINT; import static android.hardware.fingerprint.FingerprintSensorProperties.TYPE_REAR; +import static android.view.Display.INVALID_DISPLAY; import static com.android.systemui.util.ConvenienceExtensionsKt.toKotlinLazy; @@ -54,6 +55,7 @@ import android.hardware.fingerprint.IFingerprintAuthenticatorsRegisteredCallback import android.hardware.fingerprint.IUdfpsRefreshRateRequestCallback; import android.os.Handler; import android.os.RemoteException; +import android.os.UserHandle; import android.os.UserManager; import android.util.Log; import android.util.RotationUtils; @@ -211,9 +213,13 @@ public class AuthController implements } }; - private void closeDialog(String reason) { + private void closeDialog(String reasonString) { + closeDialog(BiometricPrompt.DISMISSED_REASON_USER_CANCEL, reasonString); + } + + private void closeDialog(@DismissedReason int reason, String reasonString) { if (isShowing()) { - Log.i(TAG, "Close BP, reason :" + reason); + Log.i(TAG, "Close BP, reason :" + reasonString); mCurrentDialog.dismissWithoutCallback(true /* animate */); mCurrentDialog = null; @@ -223,8 +229,7 @@ public class AuthController implements try { if (mReceiver != null) { - mReceiver.onDialogDismissed(BiometricPrompt.DISMISSED_REASON_USER_CANCEL, - null /* credentialAttestation */); + mReceiver.onDialogDismissed(reason, null /* credentialAttestation */); mReceiver = null; } } catch (RemoteException e) { @@ -251,25 +256,7 @@ public class AuthController implements private void cancelIfOwnerIsNotInForeground() { mExecution.assertIsMainThread(); - if (mCurrentDialog != null) { - try { - mCurrentDialog.dismissWithoutCallback(true /* animate */); - mCurrentDialog = null; - - for (Callback cb : mCallbacks) { - cb.onBiometricPromptDismissed(); - } - - if (mReceiver != null) { - mReceiver.onDialogDismissed( - BiometricPrompt.DISMISSED_REASON_USER_CANCEL, - null /* credentialAttestation */); - mReceiver = null; - } - } catch (RemoteException e) { - Log.e(TAG, "Remote exception", e); - } - } + closeDialog("owner not in foreground"); } /** @@ -1271,8 +1258,42 @@ public class AuthController implements if (!promptInfo.isAllowBackgroundAuthentication() && isOwnerInBackground()) { cancelIfOwnerIsNotInForeground(); } else { - mCurrentDialog.show(mWindowManager); + WindowManager wm = getWindowManagerForUser(userId); + if (wm != null) { + mCurrentDialog.show(wm); + } else { + closeDialog(BiometricPrompt.DISMISSED_REASON_ERROR_NO_WM, + "unable to get WM instance for user"); + } + } + } + + @Nullable + private WindowManager getWindowManagerForUser(int userId) { + if (!mUserManager.isVisibleBackgroundUsersSupported()) { + return mWindowManager; + } + UserManager um = mContext.createContextAsUser(UserHandle.of(userId), + 0 /* flags */).getSystemService(UserManager.class); + if (um == null) { + Log.e(TAG, "unable to get UserManager for user=" + userId); + return null; + } + if (!um.isUserVisible()) { + // not visible user - use default window manager + return mWindowManager; + } + int displayId = um.getMainDisplayIdAssignedToUser(); + if (displayId == INVALID_DISPLAY) { + Log.e(TAG, "unable to get display assigned to user=" + userId); + return null; + } + Display display = mDisplayManager.getDisplay(displayId); + if (display == null) { + Log.e(TAG, "unable to get Display for user=" + userId); + return null; } + return mContext.createDisplayContext(display).getSystemService(WindowManager.class); } private void onDialogDismissed(@DismissedReason int reason) { diff --git a/packages/SystemUI/src/com/android/systemui/complication/dagger/DreamClockTimeComplicationComponent.kt b/packages/SystemUI/src/com/android/systemui/complication/dagger/DreamClockTimeComplicationComponent.kt index 099e3fcf227d..4b9ac1d58b57 100644 --- a/packages/SystemUI/src/com/android/systemui/complication/dagger/DreamClockTimeComplicationComponent.kt +++ b/packages/SystemUI/src/com/android/systemui/complication/dagger/DreamClockTimeComplicationComponent.kt @@ -21,9 +21,10 @@ import android.view.LayoutInflater import android.view.View import android.widget.TextClock import com.android.internal.util.Preconditions -import com.android.systemui.res.R +import com.android.systemui.Flags import com.android.systemui.complication.DreamClockTimeComplication import com.android.systemui.complication.DreamClockTimeComplication.DreamClockTimeViewHolder +import com.android.systemui.res.R import dagger.Module import dagger.Provides import dagger.Subcomponent @@ -71,9 +72,13 @@ interface DreamClockTimeComplicationComponent { /* root = */ null, /* attachToRoot = */ false, ) as TextClock, - "R.layout.dream_overlay_complication_clock_time did not properly inflate" + "R.layout.dream_overlay_complication_clock_time did not properly inflate", ) - view.setFontVariationSettings(TAG_WEIGHT + WEIGHT) + if (Flags.dreamOverlayUpdatedFont()) { + view.setFontVariationSettings("'wght' 600, 'opsz' 96") + } else { + view.setFontVariationSettings(TAG_WEIGHT + WEIGHT) + } return view } } diff --git a/packages/SystemUI/src/com/android/systemui/display/data/repository/FocusedDisplayRepository.kt b/packages/SystemUI/src/com/android/systemui/display/data/repository/FocusedDisplayRepository.kt index dc07cca08d7b..3bfc7a1747ec 100644 --- a/packages/SystemUI/src/com/android/systemui/display/data/repository/FocusedDisplayRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/display/data/repository/FocusedDisplayRepository.kt @@ -19,8 +19,7 @@ package com.android.systemui.display.data.repository import android.annotation.MainThread import android.view.Display.DEFAULT_DISPLAY import com.android.systemui.dagger.SysUISingleton -import com.android.systemui.dagger.qualifiers.Application -import com.android.systemui.dagger.qualifiers.Main +import com.android.systemui.dagger.qualifiers.Background import com.android.systemui.log.LogBuffer import com.android.systemui.log.core.LogLevel import com.android.systemui.log.dagger.FocusedDisplayRepoLog @@ -43,15 +42,20 @@ import kotlinx.coroutines.flow.stateIn class FocusedDisplayRepository @Inject constructor( - @Application val scope: CoroutineScope, - @Main private val mainExecutor: Executor, + @Background val backgroundScope: CoroutineScope, + @Background private val backgroundExecutor: Executor, transitions: ShellTransitions, @FocusedDisplayRepoLog logBuffer: LogBuffer, ) { val focusedTask: Flow<Int> = - conflatedCallbackFlow { - val listener = FocusTransitionListener { displayId -> trySend(displayId) } - transitions.setFocusTransitionListener(listener, mainExecutor) + conflatedCallbackFlow<Int> { + val listener = + object : FocusTransitionListener { + override fun onFocusedDisplayChanged(displayId: Int) { + trySend(displayId) + } + } + transitions.setFocusTransitionListener(listener, backgroundExecutor) awaitClose { transitions.unsetFocusTransitionListener(listener) } } .onEach { @@ -65,5 +69,5 @@ constructor( /** Provides the currently focused display. */ val focusedDisplayId: StateFlow<Int> - get() = focusedTask.stateIn(scope, SharingStarted.Eagerly, DEFAULT_DISPLAY) + get() = focusedTask.stateIn(backgroundScope, SharingStarted.Eagerly, DEFAULT_DISPLAY) } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/LightRevealScrimInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/LightRevealScrimInteractor.kt index 9443570705c8..1497026b5750 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/LightRevealScrimInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/LightRevealScrimInteractor.kt @@ -19,10 +19,12 @@ package com.android.systemui.keyguard.domain.interactor import com.android.keyguard.logging.ScrimLogger import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application +import com.android.systemui.keyguard.data.repository.DEFAULT_REVEAL_DURATION import com.android.systemui.keyguard.data.repository.LightRevealScrimRepository import com.android.systemui.keyguard.shared.model.KeyguardState import com.android.systemui.power.domain.interactor.PowerInteractor import com.android.systemui.power.shared.model.ScreenPowerState +import com.android.systemui.power.shared.model.WakeSleepReason import com.android.systemui.statusbar.LightRevealEffect import com.android.systemui.util.kotlin.sample import dagger.Lazy @@ -50,11 +52,29 @@ constructor( scope.launch { transitionInteractor.startedKeyguardTransitionStep.collect { scrimLogger.d(TAG, "listenForStartedKeyguardTransitionStep", it) - lightRevealScrimRepository.startRevealAmountAnimator(willBeRevealedInState(it.to)) + val animationDuration = + if (it.to == KeyguardState.AOD && isLastSleepDueToFold) { + // Do not animate the scrim when folding as we want to cover the screen + // with the scrim immediately while displays are switching. + // This is needed to play the fold to AOD animation which starts with + // fully black screen (see FoldAodAnimationController) + 0L + } else { + DEFAULT_REVEAL_DURATION + } + + lightRevealScrimRepository.startRevealAmountAnimator( + willBeRevealedInState(it.to), + duration = animationDuration + ) } } } + private val isLastSleepDueToFold: Boolean + get() = powerInteractor.get().detailedWakefulness.value + .lastSleepReason == WakeSleepReason.FOLD + /** * Whenever a keyguard transition starts, sample the latest reveal effect from the repository * and use that for the starting transition. diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardPreviewClockViewBinder.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardPreviewClockViewBinder.kt index 8386628f4c83..57cb10ff9367 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardPreviewClockViewBinder.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardPreviewClockViewBinder.kt @@ -121,7 +121,10 @@ object KeyguardPreviewClockViewBinder { private fun applyClockDefaultConstraints(context: Context, constraints: ConstraintSet) { constraints.apply { constrainWidth(R.id.lockscreen_clock_view_large, ConstraintSet.WRAP_CONTENT) - constrainHeight(R.id.lockscreen_clock_view_large, ConstraintSet.MATCH_CONSTRAINT) + // The following two lines make lockscreen_clock_view_large is constrained to available + // height when it goes beyond constraints; otherwise, it use WRAP_CONTENT + constrainHeight(R.id.lockscreen_clock_view_large, WRAP_CONTENT) + constrainMaxHeight(R.id.lockscreen_clock_view_large, 0) val largeClockTopMargin = SystemBarUtils.getStatusBarHeight(context) + context.resources.getDimensionPixelSize( @@ -138,7 +141,7 @@ object KeyguardPreviewClockViewBinder { R.id.lockscreen_clock_view_large, ConstraintSet.END, PARENT_ID, - ConstraintSet.END + ConstraintSet.END, ) // In preview, we'll show UDFPS icon for UDFPS devices @@ -160,14 +163,14 @@ object KeyguardPreviewClockViewBinder { BOTTOM, PARENT_ID, BOTTOM, - clockBottomMargin + clockBottomMargin, ) } constrainWidth(R.id.lockscreen_clock_view, WRAP_CONTENT) constrainHeight( R.id.lockscreen_clock_view, - context.resources.getDimensionPixelSize(customizationR.dimen.small_clock_height) + context.resources.getDimensionPixelSize(customizationR.dimen.small_clock_height), ) connect( R.id.lockscreen_clock_view, @@ -175,7 +178,7 @@ object KeyguardPreviewClockViewBinder { PARENT_ID, START, context.resources.getDimensionPixelSize(customizationR.dimen.clock_padding_start) + - context.resources.getDimensionPixelSize(R.dimen.status_view_margin_horizontal) + context.resources.getDimensionPixelSize(R.dimen.status_view_margin_horizontal), ) val smallClockTopMargin = context.resources.getDimensionPixelSize(R.dimen.keyguard_clock_top_margin) + @@ -188,7 +191,7 @@ object KeyguardPreviewClockViewBinder { context: Context, rootView: ConstraintLayout, previewClock: ClockController, - viewModel: KeyguardPreviewClockViewModel + viewModel: KeyguardPreviewClockViewModel, ) { val cs = ConstraintSet().apply { clone(rootView) } applyClockDefaultConstraints(context, cs) diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToPrimaryBouncerTransitionViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToPrimaryBouncerTransitionViewModel.kt index c0b9efaaec01..914730e1ea4a 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToPrimaryBouncerTransitionViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToPrimaryBouncerTransitionViewModel.kt @@ -25,7 +25,7 @@ import com.android.systemui.keyguard.ui.KeyguardTransitionAnimationFlow import com.android.systemui.keyguard.ui.transitions.DeviceEntryIconTransition import com.android.systemui.scene.shared.flag.SceneContainerFlag import com.android.systemui.scene.shared.model.Scenes -import com.android.systemui.scene.ui.composable.transitions.FROM_LOCK_SCREEN_TO_BOUNCER_FADE_FRACTION +import com.android.systemui.scene.ui.composable.transitions.TO_BOUNCER_FADE_FRACTION import javax.inject.Inject import kotlin.time.Duration.Companion.milliseconds import kotlinx.coroutines.ExperimentalCoroutinesApi @@ -49,14 +49,12 @@ constructor( duration = FromLockscreenTransitionInteractor.TO_PRIMARY_BOUNCER_DURATION, edge = Edge.create(from = LOCKSCREEN, to = Scenes.Bouncer), ) - .setupWithoutSceneContainer( - edge = Edge.create(from = LOCKSCREEN, to = PRIMARY_BOUNCER), - ) + .setupWithoutSceneContainer(edge = Edge.create(from = LOCKSCREEN, to = PRIMARY_BOUNCER)) private val alphaForAnimationStep: (Float) -> Float = when { SceneContainerFlag.isEnabled -> { step -> - 1f - Math.min((step / FROM_LOCK_SCREEN_TO_BOUNCER_FADE_FRACTION), 1f) + 1f - Math.min((step / TO_BOUNCER_FADE_FRACTION), 1f) } else -> { step -> 1f - step } } @@ -64,7 +62,7 @@ constructor( val shortcutsAlpha: Flow<Float> = transitionAnimation.sharedFlow( duration = FromLockscreenTransitionInteractor.TO_PRIMARY_BOUNCER_DURATION, - onStep = alphaForAnimationStep + onStep = alphaForAnimationStep, ) val lockscreenAlpha: Flow<Float> = shortcutsAlpha @@ -76,8 +74,8 @@ constructor( duration = 250.milliseconds, onStep = { 1f - it }, onCancel = { 0f }, - onFinish = { 0f } + onFinish = { 0f }, ), - flowWhenShadeIsExpanded = transitionAnimation.immediatelyTransitionTo(0f) + flowWhenShadeIsExpanded = transitionAnimation.immediatelyTransitionTo(0f), ) } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java index a4fe4e3e1243..ad76b4f21bfb 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java @@ -169,50 +169,34 @@ public class DndTile extends QSTileImpl<BooleanState> { private void enableZenMode(@Nullable Expandable expandable) { int zenDuration = mSettingZenDuration.getValue(); - boolean showOnboarding = Settings.Secure.getInt(mContext.getContentResolver(), - Settings.Secure.SHOW_ZEN_UPGRADE_NOTIFICATION, 0) != 0 - && Settings.Secure.getInt(mContext.getContentResolver(), - Settings.Secure.ZEN_SETTINGS_UPDATED, 0) != 1; - if (showOnboarding) { - // don't show on-boarding again or notification ever - Settings.Secure.putInt(mContext.getContentResolver(), - Settings.Secure.SHOW_ZEN_UPGRADE_NOTIFICATION, 0); - // turn on DND - mController.setZen(Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS, null, TAG); - // show on-boarding screen - Intent intent = new Intent(Settings.ZEN_MODE_ONBOARDING); - intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); - mActivityStarter.postStartActivityDismissingKeyguard(intent, 0); - } else { - switch (zenDuration) { - case Settings.Secure.ZEN_DURATION_PROMPT: - mUiHandler.post(() -> { - Dialog dialog = makeZenModeDialog(); - if (expandable != null) { - DialogTransitionAnimator.Controller controller = - expandable.dialogTransitionController(new DialogCuj( - InteractionJankMonitor.CUJ_SHADE_DIALOG_OPEN, - INTERACTION_JANK_TAG)); - if (controller != null) { - mDialogTransitionAnimator.show(dialog, - controller, /* animateBackgroundBoundsChange= */ false); - } else { - dialog.show(); - } + switch (zenDuration) { + case Settings.Secure.ZEN_DURATION_PROMPT: + mUiHandler.post(() -> { + Dialog dialog = makeZenModeDialog(); + if (expandable != null) { + DialogTransitionAnimator.Controller controller = + expandable.dialogTransitionController(new DialogCuj( + InteractionJankMonitor.CUJ_SHADE_DIALOG_OPEN, + INTERACTION_JANK_TAG)); + if (controller != null) { + mDialogTransitionAnimator.show(dialog, + controller, /* animateBackgroundBoundsChange= */ false); } else { dialog.show(); } - }); - break; - case Settings.Secure.ZEN_DURATION_FOREVER: - mController.setZen(Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS, null, TAG); - break; - default: - Uri conditionId = ZenModeConfig.toTimeCondition(mContext, zenDuration, - mHost.getUserId(), true).id; - mController.setZen(Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS, - conditionId, TAG); - } + } else { + dialog.show(); + } + }); + break; + case Settings.Secure.ZEN_DURATION_FOREVER: + mController.setZen(Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS, null, TAG); + break; + default: + Uri conditionId = ZenModeConfig.toTimeCondition(mContext, zenDuration, + mHost.getUserId(), true).id; + mController.setZen(Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS, + conditionId, TAG); } } diff --git a/packages/SystemUI/src/com/android/systemui/scene/data/repository/SystemGestureExclusionRepository.kt b/packages/SystemUI/src/com/android/systemui/scene/data/repository/SystemGestureExclusionRepository.kt deleted file mode 100644 index a8d077777121..000000000000 --- a/packages/SystemUI/src/com/android/systemui/scene/data/repository/SystemGestureExclusionRepository.kt +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (C) 2024 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.systemui.scene.data.repository - -import android.graphics.Region -import android.view.ISystemGestureExclusionListener -import android.view.IWindowManager -import com.android.systemui.dagger.SysUISingleton -import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow -import javax.inject.Inject -import kotlinx.coroutines.channels.awaitClose -import kotlinx.coroutines.flow.Flow - -@SysUISingleton -class SystemGestureExclusionRepository -@Inject -constructor(private val windowManager: IWindowManager) { - - /** - * Returns [Flow] of the [Region] in which system gestures should be excluded on the display - * identified with [displayId]. - */ - fun exclusionRegion(displayId: Int): Flow<Region?> { - return conflatedCallbackFlow { - val listener = - object : ISystemGestureExclusionListener.Stub() { - override fun onSystemGestureExclusionChanged( - displayId: Int, - restrictedRegion: Region?, - unrestrictedRegion: Region?, - ) { - trySend(restrictedRegion) - } - } - windowManager.registerSystemGestureExclusionListener(listener, displayId) - - awaitClose { - windowManager.unregisterSystemGestureExclusionListener(listener, displayId) - } - } - } -} diff --git a/packages/SystemUI/src/com/android/systemui/scene/ui/view/SceneWindowRootViewBinder.kt b/packages/SystemUI/src/com/android/systemui/scene/ui/view/SceneWindowRootViewBinder.kt index a8be5804d04a..38f4e73d3234 100644 --- a/packages/SystemUI/src/com/android/systemui/scene/ui/view/SceneWindowRootViewBinder.kt +++ b/packages/SystemUI/src/com/android/systemui/scene/ui/view/SceneWindowRootViewBinder.kt @@ -107,13 +107,7 @@ object SceneWindowRootViewBinder { view.viewModel( traceName = "SceneWindowRootViewBinder", minWindowLifecycleState = WindowLifecycleState.ATTACHED, - factory = { - viewModelFactory.create( - view, - view.context.displayId, - motionEventHandlerReceiver, - ) - }, + factory = { viewModelFactory.create(view, motionEventHandlerReceiver) }, ) { viewModel -> try { view.setViewTreeOnBackPressedDispatcherOwner( diff --git a/packages/SystemUI/src/com/android/systemui/scene/ui/viewmodel/SceneContainerGestureFilter.kt b/packages/SystemUI/src/com/android/systemui/scene/ui/viewmodel/SceneContainerGestureFilter.kt deleted file mode 100644 index a1d915a658ec..000000000000 --- a/packages/SystemUI/src/com/android/systemui/scene/ui/viewmodel/SceneContainerGestureFilter.kt +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (C) 2024 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.systemui.scene.ui.viewmodel - -import androidx.compose.runtime.getValue -import androidx.compose.ui.geometry.Offset -import com.android.systemui.lifecycle.ExclusiveActivatable -import com.android.systemui.lifecycle.Hydrator -import com.android.systemui.scene.domain.interactor.SystemGestureExclusionInteractor -import dagger.assisted.Assisted -import dagger.assisted.AssistedFactory -import dagger.assisted.AssistedInject -import kotlin.math.roundToInt - -/** Decides whether drag gestures should be filtered out in the scene container framework. */ -class SceneContainerGestureFilter -@AssistedInject -constructor(interactor: SystemGestureExclusionInteractor, @Assisted displayId: Int) : - ExclusiveActivatable() { - - private val hydrator = Hydrator("SceneContainerGestureFilter.hydrator") - private val exclusionRegion by - hydrator.hydratedStateOf( - traceName = "exclusionRegion", - initialValue = null, - source = interactor.exclusionRegion(displayId), - ) - - override suspend fun onActivated(): Nothing { - hydrator.activate() - } - - /** - * Returns `true` if a drag gesture starting at [startPosition] should be filtered out (e.g. - * ignored, `false` otherwise. - * - * Invoke this and pass in the position of the `ACTION_DOWN` pointer event that began the - * gesture. - */ - fun shouldFilterGesture(startPosition: Offset): Boolean { - check(isActive) { "Must be activated to use!" } - - return exclusionRegion?.contains(startPosition.x.roundToInt(), startPosition.y.roundToInt()) - ?: false - } - - @AssistedFactory - interface Factory { - fun create(displayId: Int): SceneContainerGestureFilter - } -} diff --git a/packages/SystemUI/src/com/android/systemui/scene/ui/viewmodel/SceneContainerViewModel.kt b/packages/SystemUI/src/com/android/systemui/scene/ui/viewmodel/SceneContainerViewModel.kt index f5053853846c..889380a4ddbf 100644 --- a/packages/SystemUI/src/com/android/systemui/scene/ui/viewmodel/SceneContainerViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/scene/ui/viewmodel/SceneContainerViewModel.kt @@ -19,7 +19,6 @@ package com.android.systemui.scene.ui.viewmodel import android.view.MotionEvent import android.view.View import androidx.compose.runtime.getValue -import androidx.compose.ui.geometry.Offset import com.android.app.tracing.coroutines.launch import com.android.compose.animation.scene.ContentKey import com.android.compose.animation.scene.DefaultEdgeDetector @@ -61,10 +60,8 @@ constructor( shadeInteractor: ShadeInteractor, private val splitEdgeDetector: SplitEdgeDetector, private val logger: SceneLogger, - gestureFilterFactory: SceneContainerGestureFilter.Factory, hapticsViewModelFactory: SceneContainerHapticsViewModel.Factory, @Assisted view: View, - @Assisted displayId: Int, @Assisted private val motionEventHandlerReceiver: (MotionEventHandler?) -> Unit, ) : ExclusiveActivatable() { @@ -92,8 +89,6 @@ constructor( }, ) - private val gestureFilter: SceneContainerGestureFilter = gestureFilterFactory.create(displayId) - override suspend fun onActivated(): Nothing { try { // Sends a MotionEventHandler to the owner of the view-model so they can report @@ -112,7 +107,6 @@ constructor( coroutineScope { launch { hydrator.activate() } - launch { gestureFilter.activate() } launch("SceneContainerHapticsViewModel") { hapticsViewModel.activate() } } awaitCancellation() @@ -262,17 +256,6 @@ constructor( } } - /** - * Returns `true` if a drag gesture starting at [startPosition] should be filtered out (e.g. - * ignored, `false` otherwise. - * - * Invoke this and pass in the position of the `ACTION_DOWN` pointer event that began the - * gesture. - */ - fun shouldFilterGesture(startPosition: Offset): Boolean { - return gestureFilter.shouldFilterGesture(startPosition) - } - /** Defines interface for classes that can handle externally-reported [MotionEvent]s. */ interface MotionEventHandler { /** Notifies that a [MotionEvent] has occurred. */ @@ -289,7 +272,6 @@ constructor( interface Factory { fun create( view: View, - displayId: Int, motionEventHandlerReceiver: (MotionEventHandler?) -> Unit, ): SceneContainerViewModel } diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotData.kt b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotData.kt index b5d45a488997..fb7c34fb4487 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotData.kt +++ b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotData.kt @@ -15,17 +15,17 @@ import com.android.internal.util.ScreenshotRequest /** [ScreenshotData] represents the current state of a single screenshot being acquired. */ data class ScreenshotData( - @ScreenshotType var type: Int, - @ScreenshotSource var source: Int, + @ScreenshotType val type: Int, + @ScreenshotSource val source: Int, /** UserHandle for the owner of the app being screenshotted, if known. */ - var userHandle: UserHandle?, + val userHandle: UserHandle?, /** ComponentName of the top-most app in the screenshot. */ - var topComponent: ComponentName?, + val topComponent: ComponentName?, var screenBounds: Rect?, - var taskId: Int, + val taskId: Int, var insets: Insets, var bitmap: Bitmap?, - var displayId: Int, + val displayId: Int, ) { val packageNameString get() = topComponent?.packageName ?: "" @@ -50,16 +50,21 @@ data class ScreenshotData( ) @VisibleForTesting - fun forTesting() = + fun forTesting( + userHandle: UserHandle? = null, + source: Int = ScreenshotSource.SCREENSHOT_KEY_CHORD, + topComponent: ComponentName? = null, + bitmap: Bitmap? = null, + ) = ScreenshotData( type = WindowManager.TAKE_SCREENSHOT_FULLSCREEN, - source = ScreenshotSource.SCREENSHOT_KEY_CHORD, - userHandle = null, - topComponent = null, + source = source, + userHandle = userHandle, + topComponent = topComponent, screenBounds = null, taskId = 0, insets = Insets.NONE, - bitmap = null, + bitmap = bitmap, displayId = Display.DEFAULT_DISPLAY, ) } diff --git a/packages/SystemUI/src/com/android/systemui/shade/ui/viewmodel/ShadeUserActions.kt b/packages/SystemUI/src/com/android/systemui/shade/ui/viewmodel/ShadeUserActions.kt index 65b6231705d4..e5f684635ac7 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/ui/viewmodel/ShadeUserActions.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/ui/viewmodel/ShadeUserActions.kt @@ -30,41 +30,47 @@ import com.android.systemui.scene.ui.viewmodel.SceneContainerEdge fun singleShadeActions( requireTwoPointersForTopEdgeForQs: Boolean = false ): Array<Pair<UserAction, UserActionResult>> { + val shadeUserActionResult = UserActionResult(Scenes.Shade, isIrreversible = true) + val qsSceneUserActionResult = UserActionResult(Scenes.QuickSettings, isIrreversible = true) return arrayOf( // Swiping down, not from the edge, always goes to shade. - Swipe.Down to Scenes.Shade, - swipeDown(pointerCount = 2) to Scenes.Shade, + Swipe.Down to shadeUserActionResult, + swipeDown(pointerCount = 2) to shadeUserActionResult, // Swiping down from the top edge. swipeDownFromTop(pointerCount = 1) to if (requireTwoPointersForTopEdgeForQs) { - Scenes.Shade + shadeUserActionResult } else { - Scenes.QuickSettings + qsSceneUserActionResult }, - swipeDownFromTop(pointerCount = 2) to Scenes.QuickSettings, + swipeDownFromTop(pointerCount = 2) to qsSceneUserActionResult, ) } /** Returns collection of [UserAction] to [UserActionResult] pairs for opening the split shade. */ fun splitShadeActions(): Array<Pair<UserAction, UserActionResult>> { - val splitShadeSceneKey = UserActionResult(Scenes.Shade, ToSplitShade) + val shadeUserActionResult = UserActionResult(Scenes.Shade, ToSplitShade, isIrreversible = true) return arrayOf( // Swiping down, not from the edge, always goes to shade. - Swipe.Down to splitShadeSceneKey, - swipeDown(pointerCount = 2) to splitShadeSceneKey, + Swipe.Down to shadeUserActionResult, + swipeDown(pointerCount = 2) to shadeUserActionResult, // Swiping down from the top edge goes to QS. - swipeDownFromTop(pointerCount = 1) to splitShadeSceneKey, - swipeDownFromTop(pointerCount = 2) to splitShadeSceneKey, + swipeDownFromTop(pointerCount = 1) to shadeUserActionResult, + swipeDownFromTop(pointerCount = 2) to shadeUserActionResult, ) } /** Returns collection of [UserAction] to [UserActionResult] pairs for opening the dual shade. */ fun dualShadeActions(): Array<Pair<UserAction, UserActionResult>> { + val notifShadeUserActionResult = + UserActionResult.ShowOverlay(Overlays.NotificationsShade, isIrreversible = true) + val qsShadeuserActionResult = + UserActionResult.ShowOverlay(Overlays.QuickSettingsShade, isIrreversible = true) return arrayOf( - Swipe.Down to Overlays.NotificationsShade, + Swipe.Down to notifShadeUserActionResult, Swipe(direction = SwipeDirection.Down, fromSource = SceneContainerEdge.TopRight) to - Overlays.QuickSettingsShade, + qsShadeuserActionResult, ) } diff --git a/packages/SystemUI/src/com/android/systemui/shade/ui/viewmodel/ShadeUserActionsViewModel.kt b/packages/SystemUI/src/com/android/systemui/shade/ui/viewmodel/ShadeUserActionsViewModel.kt index cc6e8c246ff7..3113dc462e6a 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/ui/viewmodel/ShadeUserActionsViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/ui/viewmodel/ShadeUserActionsViewModel.kt @@ -32,6 +32,7 @@ import com.android.systemui.shade.shared.model.ShadeMode import dagger.assisted.AssistedFactory import dagger.assisted.AssistedInject import kotlinx.coroutines.flow.combine +import kotlinx.coroutines.flow.filter /** * Models the UI state for the user actions that the user can perform to navigate to other scenes. @@ -50,7 +51,9 @@ constructor( combine( shadeInteractor.shadeMode, qsSceneAdapter.isCustomizerShowing, - sceneBackInteractor.backScene.map { it ?: SceneFamilies.Home }, + sceneBackInteractor.backScene + .filter { it != Scenes.Shade } + .map { it ?: SceneFamilies.Home }, ) { shadeMode, isCustomizerShowing, backScene -> buildMap<UserAction, UserActionResult> { if (!isCustomizerShowing) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/NetworkControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/NetworkControllerImpl.java index e3c47a43aad4..321593b6ada4 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/NetworkControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/NetworkControllerImpl.java @@ -596,7 +596,8 @@ public class NetworkControllerImpl extends BroadcastReceiver // NetworkCapabilities, but we need to convert it into TRANSPORT_WIFI in order to // distinguish it from VCN over Cellular. if (transportTypes[i] == NetworkCapabilities.TRANSPORT_CELLULAR - && Utils.tryGetWifiInfoForVcn(networkCapabilities) != null) { + && Utils.tryGetWifiInfoForVcn(mConnectivityManager, networkCapabilities) + != null) { transportTypes[i] = NetworkCapabilities.TRANSPORT_WIFI; break; } @@ -1112,7 +1113,9 @@ public class NetworkControllerImpl extends BroadcastReceiver continue; } if (transportType == NetworkCapabilities.TRANSPORT_CELLULAR - && Utils.tryGetWifiInfoForVcn(mLastDefaultNetworkCapabilities) != null) { + && Utils.tryGetWifiInfoForVcn( + mConnectivityManager, mLastDefaultNetworkCapabilities) + != null) { mConnectedTransports.set(NetworkCapabilities.TRANSPORT_WIFI); if (mLastDefaultNetworkCapabilities.hasCapability(NET_CAPABILITY_VALIDATED)) { mValidatedTransports.set(NetworkCapabilities.TRANSPORT_WIFI); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/domain/interactor/HeadsUpNotificationInteractor.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/domain/interactor/HeadsUpNotificationInteractor.kt index aa203d7c0aa9..e25127e3e0d6 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/domain/interactor/HeadsUpNotificationInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/domain/interactor/HeadsUpNotificationInteractor.kt @@ -39,10 +39,10 @@ class HeadsUpNotificationInteractor @Inject constructor( private val headsUpRepository: HeadsUpRepository, - private val faceAuthInteractor: DeviceEntryFaceAuthInteractor, - private val keyguardTransitionInteractor: KeyguardTransitionInteractor, - private val notificationsKeyguardInteractor: NotificationsKeyguardInteractor, - private val shadeInteractor: ShadeInteractor, + faceAuthInteractor: DeviceEntryFaceAuthInteractor, + keyguardTransitionInteractor: KeyguardTransitionInteractor, + notificationsKeyguardInteractor: NotificationsKeyguardInteractor, + shadeInteractor: ShadeInteractor, ) { /** The top-ranked heads up row, regardless of pinned state */ @@ -56,8 +56,7 @@ constructor( } .distinctUntilChanged() - /** Set of currently pinned top-level heads up rows to be displayed. */ - val pinnedHeadsUpRows: Flow<Set<HeadsUpRowKey>> by lazy { + private val activeHeadsUpRows: Flow<Set<Pair<HeadsUpRowKey, Boolean>>> by lazy { if (SceneContainerFlag.isUnexpectedlyInLegacyMode()) { flowOf(emptySet()) } else { @@ -67,9 +66,7 @@ constructor( repositories.map { repo -> repo.isPinned.map { isPinned -> repo to isPinned } } - combine(toCombine) { pairs -> - pairs.filter { (_, isPinned) -> isPinned }.map { (repo, _) -> repo }.toSet() - } + combine(toCombine) { pairs -> pairs.toSet() } } else { // if the set is empty, there are no flows to combine flowOf(emptySet()) @@ -78,6 +75,26 @@ constructor( } } + /** Set of currently active top-level heads up rows to be displayed. */ + val activeHeadsUpRowKeys: Flow<Set<HeadsUpRowKey>> by lazy { + if (SceneContainerFlag.isUnexpectedlyInLegacyMode()) { + flowOf(emptySet()) + } else { + activeHeadsUpRows.map { it.map { (repo, _) -> repo }.toSet() } + } + } + + /** Set of currently pinned top-level heads up rows to be displayed. */ + val pinnedHeadsUpRowKeys: Flow<Set<HeadsUpRowKey>> by lazy { + if (SceneContainerFlag.isUnexpectedlyInLegacyMode()) { + flowOf(emptySet()) + } else { + activeHeadsUpRows.map { + it.filter { (_, isPinned) -> isPinned }.map { (repo, _) -> repo }.toSet() + } + } + } + /** Are there any pinned heads up rows to display? */ val hasPinnedRows: Flow<Boolean> by lazy { if (SceneContainerFlag.isUnexpectedlyInLegacyMode()) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentInflater.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentInflater.java index 8c80fd400360..36e3e92e4063 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentInflater.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentInflater.java @@ -203,13 +203,16 @@ public class NotificationContentInflater implements NotificationRowContentBinder messagingStyle = mConversationProcessor .processNotification(entry, builder, mLogger); } - result.mInflatedSingleLineViewModel = SingleLineViewInflater + SingleLineViewModel viewModel = SingleLineViewInflater .inflateSingleLineViewModel( entry.getSbn().getNotification(), messagingStyle, builder, row.getContext() ); + // If the messagingStyle is null, we want to inflate the normal view + isConversation = viewModel.isConversation(); + result.mInflatedSingleLineViewModel = viewModel; result.mInflatedSingleLineView = SingleLineViewInflater.inflatePrivateSingleLineView( isConversation, diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ui/viewbinder/SingleLineViewBinder.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ui/viewbinder/SingleLineViewBinder.kt index 3b0f1ee22be3..a17197c1f8ea 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ui/viewbinder/SingleLineViewBinder.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ui/viewbinder/SingleLineViewBinder.kt @@ -24,14 +24,14 @@ import com.android.systemui.statusbar.notification.row.ui.viewmodel.SingleLineVi object SingleLineViewBinder { @JvmStatic fun bind(viewModel: SingleLineViewModel?, view: HybridNotificationView?) { - if (viewModel?.isConversation() == true && view is HybridConversationNotificationView) { + if (view is HybridConversationNotificationView) { if (AsyncHybridViewInflation.isUnexpectedlyInLegacyMode()) return - viewModel.conversationData?.avatar?.let { view.setAvatar(it) } + viewModel?.conversationData?.avatar?.let { view.setAvatar(it) } view.setText( - viewModel.titleText, - viewModel.contentText, - viewModel.conversationData?.conversationSenderName + viewModel?.titleText, + viewModel?.contentText, + viewModel?.conversationData?.conversationSenderName, ) } else { // bind the title and content text views @@ -39,7 +39,7 @@ object SingleLineViewBinder { bind( /* title = */ viewModel?.titleText, /* text = */ viewModel?.contentText, - /* contentView = */ null + /* contentView = */ null, ) } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationListViewModel.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationListViewModel.kt index 935e2a37b13c..38390e7bdb39 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationListViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationListViewModel.kt @@ -356,11 +356,23 @@ constructor( } } - val pinnedHeadsUpRows: Flow<Set<HeadsUpRowKey>> by lazy { + val activeHeadsUpRowKeys: Flow<Set<HeadsUpRowKey>> by lazy { if (SceneContainerFlag.isUnexpectedlyInLegacyMode()) { flowOf(emptySet()) } else { - headsUpNotificationInteractor.pinnedHeadsUpRows.dumpWhileCollecting("pinnedHeadsUpRows") + headsUpNotificationInteractor.activeHeadsUpRowKeys.dumpWhileCollecting( + "pinnedHeadsUpRows" + ) + } + } + + val pinnedHeadsUpRowKeys: Flow<Set<HeadsUpRowKey>> by lazy { + if (SceneContainerFlag.isUnexpectedlyInLegacyMode()) { + flowOf(emptySet()) + } else { + headsUpNotificationInteractor.pinnedHeadsUpRowKeys.dumpWhileCollecting( + "pinnedHeadsUpRows" + ) } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationScrollViewModel.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationScrollViewModel.kt index c9eaec7c5b85..aec81b0241a2 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationScrollViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationScrollViewModel.kt @@ -84,9 +84,9 @@ constructor( private fun fullyExpandedDuringSceneChange(change: ChangeScene): Boolean { // The lockscreen stack is visible during all transitions away from the lockscreen, so keep // the stack expanded until those transitions finish. - return if (change.isFrom({ it == Scenes.Lockscreen }, to = { true })) { + return if (change.isTransitioning(from = Scenes.Lockscreen)) { true - } else if (change.isFrom({ it == Scenes.Shade }, to = { it == Scenes.Lockscreen })) { + } else if (change.isTransitioning(from = Scenes.Shade, to = Scenes.Lockscreen)) { false } else { (expandedInScene(change.fromScene) && expandedInScene(change.toScene)) @@ -101,11 +101,11 @@ constructor( return if (fullyExpandedDuringSceneChange(change)) { 1f } else if ( - change.isBetween({ it == Scenes.Gone }, { it == Scenes.Shade }) || - change.isFrom({ it == Scenes.Shade }, to = { it == Scenes.Lockscreen }) + change.isTransitioningBetween(Scenes.Gone, Scenes.Shade) || + change.isTransitioning(from = Scenes.Gone, to = Scenes.Lockscreen) ) { shadeExpansion - } else if (change.isBetween({ it == Scenes.Gone }, { it == Scenes.QuickSettings })) { + } else if (change.isTransitioningBetween(Scenes.Gone, Scenes.QuickSettings)) { // during QS expansion, increase fraction at same rate as scrim alpha, // but start when scrim alpha is at EXPANSION_FOR_DELAYED_STACK_FADE_IN. (qsExpansion / EXPANSION_FOR_MAX_SCRIM_ALPHA - EXPANSION_FOR_DELAYED_STACK_FADE_IN) @@ -213,7 +213,11 @@ constructor( private val qsAllowsClipping: Flow<Boolean> = combine(shadeInteractor.shadeMode, shadeInteractor.qsExpansion) { shadeMode, qsExpansion -> - qsExpansion < 0.5f || shadeMode != ShadeMode.Single + when (shadeMode) { + is ShadeMode.Dual -> false + is ShadeMode.Split -> true + is ShadeMode.Single -> qsExpansion < 0.5f + } } .distinctUntilChanged() @@ -325,9 +329,3 @@ constructor( fun create(): NotificationScrollViewModel } } - -private fun ChangeScene.isBetween(a: (SceneKey) -> Boolean, b: (SceneKey) -> Boolean): Boolean = - (a(fromScene) && b(toScene)) || (b(fromScene) && a(toScene)) - -private fun ChangeScene.isFrom(from: (SceneKey) -> Boolean, to: (SceneKey) -> Boolean): Boolean = - from(fromScene) && to(toScene) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/ui/viewbinder/HeadsUpNotificationViewBinder.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/ui/viewbinder/HeadsUpNotificationViewBinder.kt index dc15970b318b..e2e5c5970ff5 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/ui/viewbinder/HeadsUpNotificationViewBinder.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/ui/viewbinder/HeadsUpNotificationViewBinder.kt @@ -26,6 +26,7 @@ import javax.inject.Inject import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.coroutineScope import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.combine import kotlinx.coroutines.launch class HeadsUpNotificationViewBinder @@ -35,18 +36,21 @@ constructor(private val viewModel: NotificationListViewModel) { coroutineScope { launch { var previousKeys = emptySet<HeadsUpRowKey>() - viewModel.pinnedHeadsUpRows + combine(viewModel.pinnedHeadsUpRowKeys, viewModel.activeHeadsUpRowKeys, ::Pair) .sample(viewModel.headsUpAnimationsEnabled, ::Pair) .collect { (newKeys, animationsEnabled) -> - val added = newKeys - previousKeys - val removed = previousKeys - newKeys - previousKeys = newKeys + val pinned = newKeys.first + val all = newKeys.second + val added = all.union(pinned) - previousKeys + val removed = previousKeys - pinned + previousKeys = pinned + Pair(added, removed) if (animationsEnabled) { added.forEach { key -> parentView.generateHeadsUpAnimation( obtainView(key), - /* isHeadsUp = */ true + /* isHeadsUp = */ true, ) } removed.forEach { key -> diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/ui/dialog/viewmodel/ModesDialogViewModel.kt b/packages/SystemUI/src/com/android/systemui/statusbar/policy/ui/dialog/viewmodel/ModesDialogViewModel.kt index 6764839c32d3..4f595ed152e4 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/ui/dialog/viewmodel/ModesDialogViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/ui/dialog/viewmodel/ModesDialogViewModel.kt @@ -76,7 +76,7 @@ constructor( // can be manually toggled on mode.rule.isEnabled -> mode.isActive || mode.rule.isManualInvocationAllowed // Mode was created as disabled, or disabled by the app that owns it -> - // will be shown with a "Set up" text + // will be shown with a "Not set" text !mode.rule.isEnabled -> mode.status == ZenMode.Status.DISABLED_BY_OTHER else -> false } @@ -120,7 +120,7 @@ constructor( }, onLongClick = { openSettings(mode) }, onLongClickLabel = - context.resources.getString(R.string.accessibility_long_click_tile) + context.resources.getString(R.string.accessibility_long_click_tile), ) } } @@ -137,10 +137,10 @@ constructor( /** * Returns a description of the mode, which is: - * * a prompt to set up the mode if it is not enabled - * * if it cannot be manually activated, text that says so - * * otherwise, the trigger description of the mode if it exists... - * * ...or null if it doesn't + * * a prompt to set up the mode if it is not enabled + * * if it cannot be manually activated, text that says so + * * otherwise, the trigger description of the mode if it exists... + * * ...or null if it doesn't * * This description is used directly for the content description of a mode tile for screen * readers, and for the tile subtext will be augmented with the current status of the mode. @@ -174,7 +174,7 @@ constructor( context, R.style.Theme_SystemUI_Dialog, /* cancelIsNeutral= */ true, - zenDialogMetricsLogger + zenDialogMetricsLogger, ) .createDialog() SystemUIDialog.applyFlags(dialog) diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogDelegateControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogDelegateControllerTest.java index 2f8f45cb0197..0b9c06f2dbe2 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogDelegateControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogDelegateControllerTest.java @@ -901,7 +901,7 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase { // 1st time is onStart(), 2nd time is getActiveAutoSwitchNonDdsSubId() verify(mTelephonyManager, times(2)).registerTelephonyCallback(any(), any()); - assertThat(mInternetDialogController.mSubIdTelephonyCallbackMap.size() == 2); + assertThat(mInternetDialogController.mSubIdTelephonyCallbackMap.size()).isEqualTo(2); // Adds non DDS subId again doReturn(SUB_ID2).when(info).getSubscriptionId(); @@ -912,7 +912,7 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase { // Does not add due to cached subInfo in mSubIdTelephonyCallbackMap. verify(mTelephonyManager, times(2)).registerTelephonyCallback(any(), any()); - assertThat(mInternetDialogController.mSubIdTelephonyCallbackMap.size() == 2); + assertThat(mInternetDialogController.mSubIdTelephonyCallbackMap.size()).isEqualTo(2); } @Test diff --git a/packages/SystemUI/tests/src/com/android/systemui/screenshot/DefaultScreenshotActionsProviderTest.kt b/packages/SystemUI/tests/src/com/android/systemui/screenshot/DefaultScreenshotActionsProviderTest.kt index 148a2e56f2a5..52266eee24e8 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/screenshot/DefaultScreenshotActionsProviderTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/screenshot/DefaultScreenshotActionsProviderTest.kt @@ -29,7 +29,6 @@ import com.google.common.truth.Truth.assertThat import java.util.UUID import kotlin.test.Test import kotlinx.coroutines.test.runTest -import org.junit.Before import org.junit.runner.RunWith import org.mockito.Mockito.verifyNoMoreInteractions import org.mockito.kotlin.any @@ -47,16 +46,11 @@ class DefaultScreenshotActionsProviderTest : SysuiTestCase() { private val uiEventLogger = mock<UiEventLogger>() private val actionsCallback = mock<ScreenshotActionsController.ActionsCallback>() - private val request = ScreenshotData.forTesting() + private val request = ScreenshotData.forTesting(userHandle = UserHandle.OWNER) private val validResult = ScreenshotSavedResult(Uri.EMPTY, Process.myUserHandle(), 0) private lateinit var actionsProvider: ScreenshotActionsProvider - @Before - fun setUp() { - request.userHandle = UserHandle.OWNER - } - @Test fun previewActionAccessed_beforeScreenshotCompleted_doesNothing() { actionsProvider = createActionsProvider() diff --git a/packages/SystemUI/tests/src/com/android/systemui/screenshot/MessageContainerControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/screenshot/MessageContainerControllerTest.kt index 15da77dfe33d..4000d6cde2fd 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/screenshot/MessageContainerControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/screenshot/MessageContainerControllerTest.kt @@ -47,7 +47,7 @@ class MessageContainerControllerTest : SysuiTestCase() { lateinit var screenshotView: ViewGroup val userHandle = UserHandle.of(5) - val screenshotData = ScreenshotData.forTesting() + val screenshotData = ScreenshotData.forTesting(userHandle = userHandle) val appName = "app name" lateinit var workProfileData: WorkProfileMessageController.WorkProfileFirstRunData @@ -61,7 +61,7 @@ class MessageContainerControllerTest : SysuiTestCase() { workProfileMessageController, profileMessageController, screenshotDetectionController, - TestScope(UnconfinedTestDispatcher()) + TestScope(UnconfinedTestDispatcher()), ) screenshotView = ConstraintLayout(mContext) workProfileData = WorkProfileMessageController.WorkProfileFirstRunData(appName, icon) @@ -83,8 +83,6 @@ class MessageContainerControllerTest : SysuiTestCase() { container.addView(detectionNoticeView) messageContainer.setView(screenshotView) - - screenshotData.userHandle = userHandle } @Test @@ -92,7 +90,7 @@ class MessageContainerControllerTest : SysuiTestCase() { val profileData = ProfileMessageController.ProfileFirstRunData( LabeledIcon(appName, icon), - ProfileMessageController.FirstRunProfile.PRIVATE + ProfileMessageController.FirstRunProfile.PRIVATE, ) whenever(profileMessageController.onScreenshotTaken(eq(userHandle))).thenReturn(profileData) messageContainer.onScreenshotTaken(screenshotData) diff --git a/packages/SystemUI/tests/src/com/android/systemui/screenshot/ScreenshotDetectionControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/screenshot/ScreenshotDetectionControllerTest.kt index 1538c72f8df8..c50702868025 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/screenshot/ScreenshotDetectionControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/screenshot/ScreenshotDetectionControllerTest.kt @@ -61,8 +61,8 @@ class ScreenshotDetectionControllerTest { @Test fun testMaybeNotifyOfScreenshot_ignoresOverview() { - val data = ScreenshotData.forTesting() - data.source = WindowManager.ScreenshotSource.SCREENSHOT_OVERVIEW + val data = + ScreenshotData.forTesting(source = WindowManager.ScreenshotSource.SCREENSHOT_OVERVIEW) val list = controller.maybeNotifyOfScreenshot(data) @@ -72,8 +72,8 @@ class ScreenshotDetectionControllerTest { @Test fun testMaybeNotifyOfScreenshot_emptySet() { - val data = ScreenshotData.forTesting() - data.source = WindowManager.ScreenshotSource.SCREENSHOT_KEY_CHORD + val data = + ScreenshotData.forTesting(source = WindowManager.ScreenshotSource.SCREENSHOT_KEY_CHORD) whenever(windowManager.notifyScreenshotListeners(eq(Display.DEFAULT_DISPLAY))) .thenReturn(listOf()) @@ -85,8 +85,8 @@ class ScreenshotDetectionControllerTest { @Test fun testMaybeNotifyOfScreenshot_oneApp() { - val data = ScreenshotData.forTesting() - data.source = WindowManager.ScreenshotSource.SCREENSHOT_KEY_CHORD + val data = + ScreenshotData.forTesting(source = WindowManager.ScreenshotSource.SCREENSHOT_KEY_CHORD) val component = ComponentName("package1", "class1") val appName = "app name" @@ -95,7 +95,7 @@ class ScreenshotDetectionControllerTest { whenever( packageManager.getActivityInfo( eq(component), - any(PackageManager.ComponentInfoFlags::class.java) + any(PackageManager.ComponentInfoFlags::class.java), ) ) .thenReturn(activityInfo) @@ -112,8 +112,8 @@ class ScreenshotDetectionControllerTest { @Test fun testMaybeNotifyOfScreenshot_multipleApps() { - val data = ScreenshotData.forTesting() - data.source = WindowManager.ScreenshotSource.SCREENSHOT_KEY_CHORD + val data = + ScreenshotData.forTesting(source = WindowManager.ScreenshotSource.SCREENSHOT_KEY_CHORD) val component1 = ComponentName("package1", "class1") val component2 = ComponentName("package2", "class2") @@ -129,21 +129,21 @@ class ScreenshotDetectionControllerTest { whenever( packageManager.getActivityInfo( eq(component1), - any(PackageManager.ComponentInfoFlags::class.java) + any(PackageManager.ComponentInfoFlags::class.java), ) ) .thenReturn(activityInfo1) whenever( packageManager.getActivityInfo( eq(component2), - any(PackageManager.ComponentInfoFlags::class.java) + any(PackageManager.ComponentInfoFlags::class.java), ) ) .thenReturn(activityInfo2) whenever( packageManager.getActivityInfo( eq(component3), - any(PackageManager.ComponentInfoFlags::class.java) + any(PackageManager.ComponentInfoFlags::class.java), ) ) .thenReturn(activityInfo3) @@ -165,11 +165,13 @@ class ScreenshotDetectionControllerTest { private fun includesFlagBits(@PackageManager.ComponentInfoFlagsBits mask: Int) = ComponentInfoFlagMatcher(mask, mask) + private fun excludesFlagBits(@PackageManager.ComponentInfoFlagsBits mask: Int) = ComponentInfoFlagMatcher(mask, 0) private class ComponentInfoFlagMatcher( - @PackageManager.ComponentInfoFlagsBits val mask: Int, val value: Int + @PackageManager.ComponentInfoFlagsBits val mask: Int, + val value: Int, ) : ArgumentMatcher<PackageManager.ComponentInfoFlags> { override fun matches(flags: PackageManager.ComponentInfoFlags?): Boolean { return flags != null && (mask.toLong() and flags.value) == value.toLong() @@ -182,26 +184,28 @@ class ScreenshotDetectionControllerTest { @Test fun testMaybeNotifyOfScreenshot_disabledApp() { - val data = ScreenshotData.forTesting() - data.source = WindowManager.ScreenshotSource.SCREENSHOT_KEY_CHORD + val data = + ScreenshotData.forTesting(source = WindowManager.ScreenshotSource.SCREENSHOT_KEY_CHORD) val component = ComponentName("package1", "class1") val appName = "app name" val activityInfo = mock(ActivityInfo::class.java) whenever( - packageManager.getActivityInfo( - eq(component), - argThat(includesFlagBits(MATCH_DISABLED_COMPONENTS or MATCH_ANY_USER)) + packageManager.getActivityInfo( + eq(component), + argThat(includesFlagBits(MATCH_DISABLED_COMPONENTS or MATCH_ANY_USER)), + ) ) - ).thenReturn(activityInfo) + .thenReturn(activityInfo) whenever( - packageManager.getActivityInfo( - eq(component), - argThat(excludesFlagBits(MATCH_DISABLED_COMPONENTS)) + packageManager.getActivityInfo( + eq(component), + argThat(excludesFlagBits(MATCH_DISABLED_COMPONENTS)), + ) ) - ).thenThrow(PackageManager.NameNotFoundException::class.java) + .thenThrow(PackageManager.NameNotFoundException::class.java) whenever(windowManager.notifyScreenshotListeners(eq(Display.DEFAULT_DISPLAY))) .thenReturn(listOf(component)) diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/connectivity/NetworkControllerBaseTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/connectivity/NetworkControllerBaseTest.java index 98315d0ca3c9..83dbfa0682ad 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/connectivity/NetworkControllerBaseTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/connectivity/NetworkControllerBaseTest.java @@ -95,6 +95,7 @@ import org.mockito.MockitoSession; import java.io.PrintWriter; import java.io.StringWriter; import java.util.ArrayList; +import java.util.Collections; import java.util.List; public class NetworkControllerBaseTest extends SysuiTestCase { @@ -332,10 +333,15 @@ public class NetworkControllerBaseTest extends SysuiTestCase { } public void setConnectivityViaCallbackInNetworkControllerForVcn( - int networkType, boolean validated, boolean isConnected, VcnTransportInfo info) { + int networkType, + boolean validated, + boolean isConnected, + VcnTransportInfo info, + Network underlyingNetwork) { final NetworkCapabilities.Builder builder = new NetworkCapabilities.Builder(mNetCapabilities); - builder.setTransportInfo(info); + builder.setTransportInfo(info) + .setUnderlyingNetworks(Collections.singletonList(underlyingNetwork)); setConnectivityCommon(builder, networkType, validated, isConnected); mDefaultCallbackInNetworkController.onCapabilitiesChanged( mock(Network.class), builder.build()); @@ -385,10 +391,15 @@ public class NetworkControllerBaseTest extends SysuiTestCase { } public void setConnectivityViaCallbackInWifiTrackerForVcn( - int networkType, boolean validated, boolean isConnected, VcnTransportInfo info) { + int networkType, + boolean validated, + boolean isConnected, + VcnTransportInfo info, + Network underlyingNetwork) { final NetworkCapabilities.Builder builder = new NetworkCapabilities.Builder(mNetCapabilities); - builder.setTransportInfo(info); + builder.setTransportInfo(info) + .setUnderlyingNetworks(Collections.singletonList(underlyingNetwork)); setConnectivityCommon(builder, networkType, validated, isConnected); if (networkType == NetworkCapabilities.TRANSPORT_CELLULAR) { if (isConnected) { diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/connectivity/NetworkControllerWifiTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/connectivity/NetworkControllerWifiTest.java index 6c80a97625a7..6febb91db992 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/connectivity/NetworkControllerWifiTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/connectivity/NetworkControllerWifiTest.java @@ -18,6 +18,7 @@ package com.android.systemui.statusbar.connectivity; import static android.net.NetworkCapabilities.NET_CAPABILITY_VALIDATED; import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR; +import static android.net.NetworkCapabilities.TRANSPORT_WIFI; import static junit.framework.Assert.assertEquals; @@ -250,6 +251,17 @@ public class NetworkControllerWifiTest extends NetworkControllerBaseTest { assertEquals(testSsid, mNetworkController.mWifiSignalController.mCurrentState.ssid); } + private Network newWifiNetwork(WifiInfo wifiInfo) { + final Network network = mock(Network.class); + final NetworkCapabilities wifiCaps = + new NetworkCapabilities.Builder() + .addTransportType(TRANSPORT_WIFI) + .setTransportInfo(wifiInfo) + .build(); + when(mMockCm.getNetworkCapabilities(network)).thenReturn(wifiCaps); + return network; + } + @Test public void testVcnWithUnderlyingWifi() { String testSsid = "Test VCN SSID"; @@ -266,11 +278,19 @@ public class NetworkControllerWifiTest extends NetworkControllerBaseTest { setWifiLevelForVcn(testLevel); setConnectivityViaCallbackInNetworkControllerForVcn( - NetworkCapabilities.TRANSPORT_CELLULAR, true, true, mVcnTransportInfo); + NetworkCapabilities.TRANSPORT_CELLULAR, + true, + true, + mVcnTransportInfo, + newWifiNetwork(mWifiInfo)); verifyLastMobileDataIndicatorsForVcn(true, testLevel, TelephonyIcons.ICON_CWF, true); setConnectivityViaCallbackInNetworkControllerForVcn( - NetworkCapabilities.TRANSPORT_CELLULAR, false, true, mVcnTransportInfo); + NetworkCapabilities.TRANSPORT_CELLULAR, + false, + true, + mVcnTransportInfo, + newWifiNetwork(mWifiInfo)); verifyLastMobileDataIndicatorsForVcn(true, testLevel, TelephonyIcons.ICON_CWF, false); } } @@ -391,13 +411,15 @@ public class NetworkControllerWifiTest extends NetworkControllerBaseTest { } protected void setWifiLevelForVcn(int level) { - when(mVcnTransportInfo.getWifiInfo()).thenReturn(mWifiInfo); - when(mVcnTransportInfo.makeCopy(anyLong())).thenReturn(mVcnTransportInfo); when(mWifiInfo.getRssi()).thenReturn(calculateRssiForLevel(level)); when(mWifiInfo.isCarrierMerged()).thenReturn(true); when(mWifiInfo.getSubscriptionId()).thenReturn(1); setConnectivityViaCallbackInWifiTrackerForVcn( - NetworkCapabilities.TRANSPORT_CELLULAR, false, true, mVcnTransportInfo); + NetworkCapabilities.TRANSPORT_CELLULAR, + false, + true, + mVcnTransportInfo, + newWifiNetwork(mWifiInfo)); } private int calculateRssiForLevel(int level) { @@ -409,13 +431,15 @@ public class NetworkControllerWifiTest extends NetworkControllerBaseTest { } protected void setWifiStateForVcn(boolean connected, String ssid) { - when(mVcnTransportInfo.getWifiInfo()).thenReturn(mWifiInfo); - when(mVcnTransportInfo.makeCopy(anyLong())).thenReturn(mVcnTransportInfo); when(mWifiInfo.getSSID()).thenReturn(ssid); when(mWifiInfo.isCarrierMerged()).thenReturn(true); when(mWifiInfo.getSubscriptionId()).thenReturn(1); setConnectivityViaCallbackInWifiTrackerForVcn( - NetworkCapabilities.TRANSPORT_CELLULAR, false, connected, mVcnTransportInfo); + NetworkCapabilities.TRANSPORT_CELLULAR, + false, + connected, + mVcnTransportInfo, + newWifiNetwork(mWifiInfo)); } protected void verifyLastQsDataDirection(boolean in, boolean out) { diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/domain/interactor/HeadsUpNotificationInteractorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/domain/interactor/HeadsUpNotificationInteractorTest.kt index 7d5278ed1601..eb1bcc7fe147 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/domain/interactor/HeadsUpNotificationInteractorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/domain/interactor/HeadsUpNotificationInteractorTest.kt @@ -146,9 +146,17 @@ class HeadsUpNotificationInteractorTest : SysuiTestCase() { } @Test + fun activeRows_noRows_isEmpty() = + testScope.runTest { + val activeHeadsUpRows by collectLastValue(underTest.activeHeadsUpRowKeys) + + assertThat(activeHeadsUpRows).isEmpty() + } + + @Test fun pinnedRows_noRows_isEmpty() = testScope.runTest { - val pinnedHeadsUpRows by collectLastValue(underTest.pinnedHeadsUpRows) + val pinnedHeadsUpRows by collectLastValue(underTest.pinnedHeadsUpRowKeys) assertThat(pinnedHeadsUpRows).isEmpty() } @@ -156,7 +164,7 @@ class HeadsUpNotificationInteractorTest : SysuiTestCase() { @Test fun pinnedRows_noPinnedRows_isEmpty() = testScope.runTest { - val pinnedHeadsUpRows by collectLastValue(underTest.pinnedHeadsUpRows) + val pinnedHeadsUpRows by collectLastValue(underTest.pinnedHeadsUpRowKeys) // WHEN no rows are pinned headsUpRepository.setNotifications( fakeHeadsUpRowRepository("key 0"), @@ -170,9 +178,27 @@ class HeadsUpNotificationInteractorTest : SysuiTestCase() { } @Test + fun activeRows_noPinnedRows_containsAllRows() = + testScope.runTest { + val activeHeadsUpRows by collectLastValue(underTest.activeHeadsUpRowKeys) + // WHEN no rows are pinned + val rows = + arrayListOf( + fakeHeadsUpRowRepository("key 0"), + fakeHeadsUpRowRepository("key 1"), + fakeHeadsUpRowRepository("key 2"), + ) + headsUpRepository.setNotifications(rows) + runCurrent() + + // THEN all rows are present + assertThat(activeHeadsUpRows).containsExactly(rows[0], rows[1], rows[2]) + } + + @Test fun pinnedRows_hasPinnedRows_containsPinnedRows() = testScope.runTest { - val pinnedHeadsUpRows by collectLastValue(underTest.pinnedHeadsUpRows) + val pinnedHeadsUpRows by collectLastValue(underTest.pinnedHeadsUpRowKeys) // WHEN some rows are pinned val rows = arrayListOf( @@ -188,9 +214,27 @@ class HeadsUpNotificationInteractorTest : SysuiTestCase() { } @Test + fun pinnedRows_hasPinnedRows_containsAllRows() = + testScope.runTest { + val activeHeadsUpRows by collectLastValue(underTest.activeHeadsUpRowKeys) + // WHEN no rows are pinned + val rows = + arrayListOf( + fakeHeadsUpRowRepository("key 0", isPinned = true), + fakeHeadsUpRowRepository("key 1", isPinned = true), + fakeHeadsUpRowRepository("key 2"), + ) + headsUpRepository.setNotifications(rows) + runCurrent() + + // THEN all rows are present + assertThat(activeHeadsUpRows).containsExactly(rows[0], rows[1], rows[2]) + } + + @Test fun pinnedRows_rowGetsPinned_containsPinnedRows() = testScope.runTest { - val pinnedHeadsUpRows by collectLastValue(underTest.pinnedHeadsUpRows) + val pinnedHeadsUpRows by collectLastValue(underTest.pinnedHeadsUpRowKeys) // GIVEN some rows are pinned val rows = arrayListOf( @@ -210,9 +254,34 @@ class HeadsUpNotificationInteractorTest : SysuiTestCase() { } @Test + fun activeRows_rowGetsPinned_containsAllRows() = + testScope.runTest { + val activeHeadsUpRows by collectLastValue(underTest.activeHeadsUpRowKeys) + // GIVEN some rows are pinned + val rows = + arrayListOf( + fakeHeadsUpRowRepository("key 0", isPinned = true), + fakeHeadsUpRowRepository("key 1", isPinned = true), + fakeHeadsUpRowRepository("key 2"), + ) + headsUpRepository.setNotifications(rows) + runCurrent() + + // THEN all rows are present + assertThat(activeHeadsUpRows).containsExactly(rows[0], rows[1], rows[2]) + + // WHEN all rows gets pinned + rows[2].isPinned.value = true + runCurrent() + + // THEN no change + assertThat(activeHeadsUpRows).containsExactly(rows[0], rows[1], rows[2]) + } + + @Test fun pinnedRows_allRowsPinned_containsAllRows() = testScope.runTest { - val pinnedHeadsUpRows by collectLastValue(underTest.pinnedHeadsUpRows) + val pinnedHeadsUpRows by collectLastValue(underTest.pinnedHeadsUpRowKeys) // WHEN all rows are pinned val rows = arrayListOf( @@ -228,9 +297,27 @@ class HeadsUpNotificationInteractorTest : SysuiTestCase() { } @Test + fun activeRows_allRowsPinned_containsAllRows() = + testScope.runTest { + val activeHeadsUpRows by collectLastValue(underTest.activeHeadsUpRowKeys) + // WHEN all rows are pinned + val rows = + arrayListOf( + fakeHeadsUpRowRepository("key 0", isPinned = true), + fakeHeadsUpRowRepository("key 1", isPinned = true), + fakeHeadsUpRowRepository("key 2", isPinned = true), + ) + headsUpRepository.setNotifications(rows) + runCurrent() + + // THEN no rows are filtered + assertThat(activeHeadsUpRows).containsExactly(rows[0], rows[1], rows[2]) + } + + @Test fun pinnedRows_rowGetsUnPinned_containsPinnedRows() = testScope.runTest { - val pinnedHeadsUpRows by collectLastValue(underTest.pinnedHeadsUpRows) + val pinnedHeadsUpRows by collectLastValue(underTest.pinnedHeadsUpRowKeys) // GIVEN all rows are pinned val rows = arrayListOf( @@ -250,9 +337,31 @@ class HeadsUpNotificationInteractorTest : SysuiTestCase() { } @Test + fun activeRows_rowGetsUnPinned_containsAllRows() = + testScope.runTest { + val activeHeadsUpRows by collectLastValue(underTest.activeHeadsUpRowKeys) + // GIVEN all rows are pinned + val rows = + arrayListOf( + fakeHeadsUpRowRepository("key 0", isPinned = true), + fakeHeadsUpRowRepository("key 1", isPinned = true), + fakeHeadsUpRowRepository("key 2", isPinned = true), + ) + headsUpRepository.setNotifications(rows) + runCurrent() + + // WHEN a row gets unpinned + rows[0].isPinned.value = false + runCurrent() + + // THEN all rows are still present + assertThat(activeHeadsUpRows).containsExactly(rows[0], rows[1], rows[2]) + } + + @Test fun pinnedRows_rowGetsPinnedAndUnPinned_containsTheSameInstance() = testScope.runTest { - val pinnedHeadsUpRows by collectLastValue(underTest.pinnedHeadsUpRows) + val pinnedHeadsUpRows by collectLastValue(underTest.pinnedHeadsUpRowKeys) val rows = arrayListOf( diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/SingleLineViewBinderTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/SingleLineViewBinderTest.kt index 6b3fb5b4a2eb..503fa789cb80 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/SingleLineViewBinderTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/SingleLineViewBinderTest.kt @@ -29,12 +29,13 @@ import com.android.systemui.statusbar.notification.row.SingleLineViewInflater.in import com.android.systemui.statusbar.notification.row.SingleLineViewInflater.inflatePublicSingleLineView import com.android.systemui.statusbar.notification.row.shared.AsyncHybridViewInflation import com.android.systemui.statusbar.notification.row.ui.viewbinder.SingleLineViewBinder -import com.android.systemui.util.mockito.mock import kotlin.test.assertEquals import kotlin.test.assertNotNull +import kotlin.test.assertNull import org.junit.Before import org.junit.Test import org.junit.runner.RunWith +import org.mockito.kotlin.mock @SmallTest @RunWith(AndroidJUnit4::class) @@ -69,7 +70,7 @@ class SingleLineViewBinderTest : SysuiTestCase() { reinflateFlags = FLAG_CONTENT_VIEW_SINGLE_LINE, entry = row.entry, context = context, - logger = mock() + logger = mock(), ) val publicView = @@ -78,7 +79,7 @@ class SingleLineViewBinderTest : SysuiTestCase() { reinflateFlags = FLAG_CONTENT_VIEW_PUBLIC_SINGLE_LINE, entry = row.entry, context = context, - logger = mock() + logger = mock(), ) assertNotNull(publicView) @@ -114,7 +115,7 @@ class SingleLineViewBinderTest : SysuiTestCase() { .addMessage( "How about lunch?", System.currentTimeMillis(), - Person.Builder().setName("user2").build() + Person.Builder().setName("user2").build(), ) .setGroupConversation(true) notificationBuilder.setStyle(style).setShortcutId(SHORTCUT_ID) @@ -127,7 +128,7 @@ class SingleLineViewBinderTest : SysuiTestCase() { reinflateFlags = FLAG_CONTENT_VIEW_SINGLE_LINE, entry = row.entry, context = context, - logger = mock() + logger = mock(), ) as HybridConversationNotificationView @@ -137,7 +138,7 @@ class SingleLineViewBinderTest : SysuiTestCase() { reinflateFlags = FLAG_CONTENT_VIEW_PUBLIC_SINGLE_LINE, entry = row.entry, context = context, - logger = mock() + logger = mock(), ) as HybridConversationNotificationView assertNotNull(publicView) @@ -150,10 +151,7 @@ class SingleLineViewBinderTest : SysuiTestCase() { systemUiContext = context, ) // WHEN: binds the view - SingleLineViewBinder.bind( - viewModel, - view, - ) + SingleLineViewBinder.bind(viewModel, view) // THEN: the single-line conversation view should be bound with view model's corresponding // fields @@ -161,10 +159,55 @@ class SingleLineViewBinderTest : SysuiTestCase() { assertEquals(viewModel.contentText, view.textView.text) assertEquals( viewModel.conversationData?.conversationSenderName, - view.conversationSenderNameView.text + view.conversationSenderNameView.text, ) } + @Test + @EnableFlags(AsyncHybridViewInflation.FLAG_NAME) + fun bindConversationSingleLineView_nonConversationViewModel() { + // GIVEN: a ConversationSingleLineView, and a nonConversationViewModel + val style = Notification.BigTextStyle().bigText(CONTENT_TEXT) + notificationBuilder.setStyle(style) + val notification = notificationBuilder.build() + val row: ExpandableNotificationRow = helper.createRow(notification) + + val view = + inflatePrivateSingleLineView( + isConversation = true, + reinflateFlags = FLAG_CONTENT_VIEW_SINGLE_LINE, + entry = row.entry, + context = context, + logger = mock(), + ) + + val publicView = + inflatePublicSingleLineView( + isConversation = true, + reinflateFlags = FLAG_CONTENT_VIEW_PUBLIC_SINGLE_LINE, + entry = row.entry, + context = context, + logger = mock(), + ) + assertNotNull(publicView) + + val viewModel = + SingleLineViewInflater.inflateSingleLineViewModel( + notification = notification, + messagingStyle = null, + builder = notificationBuilder, + systemUiContext = context, + ) + // WHEN: binds the view with the view model + SingleLineViewBinder.bind(viewModel, view) + + // THEN: the single-line view should be bound with view model's corresponding + // fields as a normal non-conversation single-line view + assertEquals(viewModel.titleText, view?.titleView?.text) + assertEquals(viewModel.contentText, view?.textView?.text) + assertNull(viewModel.conversationData) + } + private companion object { const val CHANNEL_ID = "CHANNEL_ID" const val CONTENT_TITLE = "A Cool New Feature" diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/data/repository/FakeLightRevealScrimRepository.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/data/repository/FakeLightRevealScrimRepository.kt index f26bb83ed3f0..805a710a2cf3 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/data/repository/FakeLightRevealScrimRepository.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/data/repository/FakeLightRevealScrimRepository.kt @@ -35,6 +35,8 @@ class FakeLightRevealScrimRepository : LightRevealScrimRepository { private val _revealAmount: MutableStateFlow<Float> = MutableStateFlow(0.0f) override val revealAmount: Flow<Float> = _revealAmount + val revealAnimatorRequests: MutableList<RevealAnimatorRequest> = arrayListOf() + override val isAnimating: Boolean get() = false @@ -44,5 +46,12 @@ class FakeLightRevealScrimRepository : LightRevealScrimRepository { } else { _revealAmount.value = 0.0f } + + revealAnimatorRequests.add(RevealAnimatorRequest(reveal, duration)) } + + data class RevealAnimatorRequest( + val reveal: Boolean, + val duration: Long + ) } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/scene/SceneKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/scene/SceneKosmos.kt index f842db4c0026..020f0a66c816 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/scene/SceneKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/scene/SceneKosmos.kt @@ -8,17 +8,14 @@ import com.android.systemui.kosmos.Kosmos import com.android.systemui.kosmos.Kosmos.Fixture import com.android.systemui.power.domain.interactor.powerInteractor import com.android.systemui.scene.domain.interactor.sceneInteractor -import com.android.systemui.scene.domain.interactor.systemGestureExclusionInteractor import com.android.systemui.scene.shared.logger.sceneLogger import com.android.systemui.scene.shared.model.Overlays import com.android.systemui.scene.shared.model.SceneContainerConfig import com.android.systemui.scene.shared.model.Scenes import com.android.systemui.scene.ui.FakeOverlay -import com.android.systemui.scene.ui.viewmodel.SceneContainerGestureFilter import com.android.systemui.scene.ui.viewmodel.SceneContainerHapticsViewModel import com.android.systemui.scene.ui.viewmodel.SceneContainerViewModel import com.android.systemui.scene.ui.viewmodel.splitEdgeDetector -import com.android.systemui.settings.displayTracker import com.android.systemui.shade.domain.interactor.shadeInteractor import kotlinx.coroutines.flow.MutableStateFlow import org.mockito.kotlin.mock @@ -72,16 +69,15 @@ val Kosmos.transitionState by Fixture { } val Kosmos.sceneContainerViewModel by Fixture { - sceneContainerViewModelFactory.create(mock<View>(), displayTracker.defaultDisplayId, {}).apply { - setTransitionState(transitionState) - } + sceneContainerViewModelFactory + .create(mock<View>()) {} + .apply { setTransitionState(transitionState) } } val Kosmos.sceneContainerViewModelFactory by Fixture { object : SceneContainerViewModel.Factory { override fun create( view: View, - displayId: Int, motionEventHandlerReceiver: (SceneContainerViewModel.MotionEventHandler?) -> Unit, ): SceneContainerViewModel = SceneContainerViewModel( @@ -91,26 +87,13 @@ val Kosmos.sceneContainerViewModelFactory by Fixture { shadeInteractor = shadeInteractor, splitEdgeDetector = splitEdgeDetector, logger = sceneLogger, - gestureFilterFactory = sceneContainerGestureFilterFactory, hapticsViewModelFactory = sceneContainerHapticsViewModelFactory, view = view, - displayId = displayId, motionEventHandlerReceiver = motionEventHandlerReceiver, ) } } -val Kosmos.sceneContainerGestureFilterFactory by Fixture { - object : SceneContainerGestureFilter.Factory { - override fun create(displayId: Int): SceneContainerGestureFilter { - return SceneContainerGestureFilter( - interactor = systemGestureExclusionInteractor, - displayId = displayId, - ) - } - } -} - val Kosmos.sceneContainerHapticsViewModelFactory by Fixture { object : SceneContainerHapticsViewModel.Factory { override fun create(view: View): SceneContainerHapticsViewModel { diff --git a/packages/SystemUI/frp/Android.bp b/packages/SystemUI/utils/kairos/Android.bp index c3381db7a0e3..1442591eab99 100644 --- a/packages/SystemUI/frp/Android.bp +++ b/packages/SystemUI/utils/kairos/Android.bp @@ -20,9 +20,9 @@ package { } java_library { - name: "kt-frp", + name: "kairos", host_supported: true, - kotlincflags: ["-opt-in=com.android.systemui.experimental.frp.ExperimentalFrpApi"], + kotlincflags: ["-opt-in=com.android.systemui.kairos.ExperimentalFrpApi"], srcs: ["src/**/*.kt"], static_libs: [ "kotlin-stdlib", @@ -31,7 +31,7 @@ java_library { } java_test { - name: "kt-frp-test", + name: "kairos-test", optimize: { enabled: false, }, @@ -39,7 +39,7 @@ java_test { "test/**/*.kt", ], static_libs: [ - "kt-frp", + "kairos", "junit", "kotlin-stdlib", "kotlin-test", diff --git a/packages/SystemUI/frp/OWNERS b/packages/SystemUI/utils/kairos/OWNERS index 8876ad6f6224..8876ad6f6224 100644 --- a/packages/SystemUI/frp/OWNERS +++ b/packages/SystemUI/utils/kairos/OWNERS diff --git a/packages/SystemUI/frp/README.md b/packages/SystemUI/utils/kairos/README.md index 9c5bdb036c45..85f622ca05f3 100644 --- a/packages/SystemUI/frp/README.md +++ b/packages/SystemUI/utils/kairos/README.md @@ -1,4 +1,4 @@ -# kt-frp +# Kairos A functional reactive programming (FRP) library for Kotlin. @@ -13,12 +13,12 @@ FRP exposes an API that should be familiar to those versed in Kotlin `Flow`. ### Details for nerds -`kt-frp` implements an applicative / monadic flavor of FRP, using a push-pull +`Kairos` implements an applicative / monadic flavor of FRP, using a push-pull methodology to allow for efficient updates. "Real" functional reactive programming should be specified with denotational semantics ([wikipedia](https://en.wikipedia.org/wiki/Denotational_semantics)): -you can view the semantics for `kt-frp` [here](docs/semantics.md). +you can view the semantics for `Kairos` [here](docs/semantics.md). ## Usage @@ -61,4 +61,4 @@ will tear-down all effects and obervers running within the lambda. ## Resources -- [Cheatsheet for those coming from Kotlin Flow](docs/flow-to-frp-cheatsheet.md) +- [Cheatsheet for those coming from Kotlin Flow](docs/flow-to-kairos-cheatsheet.md) diff --git a/packages/SystemUI/frp/docs/flow-to-frp-cheatsheet.md b/packages/SystemUI/utils/kairos/docs/flow-to-kairos-cheatsheet.md index e20f3e6c7461..9f7fd022f019 100644 --- a/packages/SystemUI/frp/docs/flow-to-frp-cheatsheet.md +++ b/packages/SystemUI/utils/kairos/docs/flow-to-kairos-cheatsheet.md @@ -1,27 +1,27 @@ -# From Flows to FRP +# From Flows to Kairos ## Key differences -* FRP evaluates all events (`TFlow` emissions + observers) in a transaction. +* Kairos evaluates all events (`TFlow` emissions + observers) in a transaction. -* FRP splits `Flow` APIs into two distinct types: `TFlow` and `TState` +* Kairos splits `Flow` APIs into two distinct types: `TFlow` and `TState` * `TFlow` is roughly equivalent to `SharedFlow` w/ a replay cache that - exists for the duration of the current FRP transaction and shared with + exists for the duration of the current Kairos transaction and shared with `SharingStarted.WhileSubscribed()` * `TState` is roughly equivalent to `StateFlow` shared with `SharingStarted.Eagerly`, but the current value can only be queried within - a FRP transaction, and the value is only updated at the end of the + a Kairos transaction, and the value is only updated at the end of the transaction -* FRP further divides `Flow` APIs based on how they internally use state: +* Kairos further divides `Flow` APIs based on how they internally use state: * **FrpTransactionScope:** APIs that internally query some state need to be - performed within an FRP transaction + performed within an Kairos transaction * this scope is available from the other scopes, and from most lambdas - passed to other FRP APIs + passed to other Kairos APIs * **FrpStateScope:** APIs that internally accumulate state in reaction to events need to be performed within an FRP State scope (akin to a @@ -126,8 +126,8 @@ has emitted at least once. This often bites developers. As a workaround, developers generally append `.onStart { emit(initialValue) }` to the `Flows` that don't immediately emit. -FRP avoids this gotcha by forcing usage of `TState` for `combine`, thus ensuring -that there is always a current value to be combined for each input. +Kairos avoids this gotcha by forcing usage of `TState` for `combine`, thus +ensuring that there is always a current value to be combined for each input. ## collect { … } @@ -158,8 +158,8 @@ tFlow.map { tState.sample() } #### Explanation To keep all state-reads consistent, the current value of a TState can only be -queried within an FRP transaction, modeled with `FrpTransactionScope`. Note that -both `FrpStateScope` and `FrpBuildScope` extend `FrpTransactionScope`. +queried within a Kairos transaction, modeled with `FrpTransactionScope`. Note +that both `FrpStateScope` and `FrpBuildScope` extend `FrpTransactionScope`. ### I want to sample a TFlow @@ -198,7 +198,7 @@ simultaneous emissions within the same transaction. #### Explanation -Under FRP's rules, a `TFlow` may only emit up to once per transaction. This +Under Kairos's rules, a `TFlow` may only emit up to once per transaction. This means that if we are merging two or more `TFlows` that are emitting at the same time (within the same transaction), the resulting merged `TFlow` must emit a single value. The lambda argument allows the developer to decide what to do in diff --git a/packages/SystemUI/frp/docs/semantics.md b/packages/SystemUI/utils/kairos/docs/semantics.md index b533190e687d..d43bb4447061 100644 --- a/packages/SystemUI/frp/docs/semantics.md +++ b/packages/SystemUI/utils/kairos/docs/semantics.md @@ -1,11 +1,11 @@ # FRP Semantics -`kt-frp`'s pure API is based off of the following denotational semantics +`Kairos`'s pure API is based off of the following denotational semantics ([wikipedia](https://en.wikipedia.org/wiki/Denotational_semantics)). -The semantics model `kt-frp` types as time-varying values; by making `Time` a +The semantics model `Kairos` types as time-varying values; by making `Time` a first-class value, we can define a referentially-transparent API that allows us -to reason about the behavior of the pure FRP combinators. This is +to reason about the behavior of the pure `Kairos` combinators. This is implementation-agnostic; we can compare the behavior of any implementation with expected behavior denoted by these semantics to identify bugs. diff --git a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/Combinators.kt b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/Combinators.kt index 298c071a4229..8bf3a43765ae 100644 --- a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/Combinators.kt +++ b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/Combinators.kt @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.android.systemui.experimental.frp +package com.android.systemui.kairos -import com.android.systemui.experimental.frp.util.These -import com.android.systemui.experimental.frp.util.just -import com.android.systemui.experimental.frp.util.none +import com.android.systemui.kairos.util.These +import com.android.systemui.kairos.util.just +import com.android.systemui.kairos.util.none import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.channelFlow import kotlinx.coroutines.flow.conflate diff --git a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/FrpBuildScope.kt b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/FrpBuildScope.kt index 6e4c9eba90bf..4de6deb3dc53 100644 --- a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/FrpBuildScope.kt +++ b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/FrpBuildScope.kt @@ -16,11 +16,11 @@ @file:OptIn(ExperimentalCoroutinesApi::class) -package com.android.systemui.experimental.frp +package com.android.systemui.kairos -import com.android.systemui.experimental.frp.util.Maybe -import com.android.systemui.experimental.frp.util.just -import com.android.systemui.experimental.frp.util.map +import com.android.systemui.kairos.util.Maybe +import com.android.systemui.kairos.util.just +import com.android.systemui.kairos.util.map import kotlin.coroutines.CoroutineContext import kotlin.coroutines.EmptyCoroutineContext import kotlin.coroutines.RestrictsSuspension diff --git a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/FrpEffectScope.kt b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/FrpEffectScope.kt index a8ec98fdc6c9..be2eb4312476 100644 --- a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/FrpEffectScope.kt +++ b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/FrpEffectScope.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.experimental.frp +package com.android.systemui.kairos import kotlin.coroutines.RestrictsSuspension import kotlinx.coroutines.CoroutineScope diff --git a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/FrpNetwork.kt b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/FrpNetwork.kt index acc76d93f928..b688eafe12e9 100644 --- a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/FrpNetwork.kt +++ b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/FrpNetwork.kt @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.android.systemui.experimental.frp +package com.android.systemui.kairos -import com.android.systemui.experimental.frp.internal.BuildScopeImpl -import com.android.systemui.experimental.frp.internal.Network -import com.android.systemui.experimental.frp.internal.StateScopeImpl -import com.android.systemui.experimental.frp.internal.util.awaitCancellationAndThen -import com.android.systemui.experimental.frp.internal.util.childScope +import com.android.systemui.kairos.internal.BuildScopeImpl +import com.android.systemui.kairos.internal.Network +import com.android.systemui.kairos.internal.StateScopeImpl +import com.android.systemui.kairos.internal.util.awaitCancellationAndThen +import com.android.systemui.kairos.internal.util.childScope import kotlin.coroutines.CoroutineContext import kotlin.coroutines.EmptyCoroutineContext import kotlin.coroutines.coroutineContext diff --git a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/FrpScope.kt b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/FrpScope.kt index a5a7977f2177..ad6b2c8d04eb 100644 --- a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/FrpScope.kt +++ b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/FrpScope.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.experimental.frp +package com.android.systemui.kairos import kotlin.coroutines.RestrictsSuspension import kotlin.coroutines.resume diff --git a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/FrpStateScope.kt b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/FrpStateScope.kt index 61336f4f4608..c7ea6808a53e 100644 --- a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/FrpStateScope.kt +++ b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/FrpStateScope.kt @@ -14,20 +14,20 @@ * limitations under the License. */ -package com.android.systemui.experimental.frp - -import com.android.systemui.experimental.frp.combine as combinePure -import com.android.systemui.experimental.frp.map as mapPure -import com.android.systemui.experimental.frp.util.Just -import com.android.systemui.experimental.frp.util.Left -import com.android.systemui.experimental.frp.util.Maybe -import com.android.systemui.experimental.frp.util.Right -import com.android.systemui.experimental.frp.util.WithPrev -import com.android.systemui.experimental.frp.util.just -import com.android.systemui.experimental.frp.util.map -import com.android.systemui.experimental.frp.util.none -import com.android.systemui.experimental.frp.util.partitionEithers -import com.android.systemui.experimental.frp.util.zipWith +package com.android.systemui.kairos + +import com.android.systemui.kairos.combine as combinePure +import com.android.systemui.kairos.map as mapPure +import com.android.systemui.kairos.util.Just +import com.android.systemui.kairos.util.Left +import com.android.systemui.kairos.util.Maybe +import com.android.systemui.kairos.util.Right +import com.android.systemui.kairos.util.WithPrev +import com.android.systemui.kairos.util.just +import com.android.systemui.kairos.util.map +import com.android.systemui.kairos.util.none +import com.android.systemui.kairos.util.partitionEithers +import com.android.systemui.kairos.util.zipWith import kotlin.coroutines.RestrictsSuspension typealias FrpStateful<R> = suspend FrpStateScope.() -> R @@ -715,7 +715,7 @@ interface FrpStateScope : FrpTransactionScope { stateB: TState<B>, transform: suspend FrpTransactionScope.(A, B) -> Z, ): TState<Z> = - com.android.systemui.experimental.frp + com.android.systemui.kairos .combine(stateA, stateB) { a, b -> transactionally { transform(a, b) } } .sampleTransactionals() @@ -733,7 +733,7 @@ interface FrpStateScope : FrpTransactionScope { stateD: TState<D>, transform: suspend FrpTransactionScope.(A, B, C, D) -> Z, ): TState<Z> = - com.android.systemui.experimental.frp + com.android.systemui.kairos .combine(stateA, stateB, stateC, stateD) { a, b, c, d -> transactionally { transform(a, b, c, d) } } diff --git a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/FrpTransactionScope.kt b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/FrpTransactionScope.kt index b0b9dbcbe8c1..a7ae1d9646b3 100644 --- a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/FrpTransactionScope.kt +++ b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/FrpTransactionScope.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.experimental.frp +package com.android.systemui.kairos import kotlin.coroutines.RestrictsSuspension diff --git a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/TFlow.kt b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/TFlow.kt index cca6c9a623f2..7ba1aca31eae 100644 --- a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/TFlow.kt +++ b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/TFlow.kt @@ -14,36 +14,36 @@ * limitations under the License. */ -package com.android.systemui.experimental.frp - -import com.android.systemui.experimental.frp.internal.DemuxImpl -import com.android.systemui.experimental.frp.internal.Init -import com.android.systemui.experimental.frp.internal.InitScope -import com.android.systemui.experimental.frp.internal.InputNode -import com.android.systemui.experimental.frp.internal.Network -import com.android.systemui.experimental.frp.internal.NoScope -import com.android.systemui.experimental.frp.internal.TFlowImpl -import com.android.systemui.experimental.frp.internal.activated -import com.android.systemui.experimental.frp.internal.cached -import com.android.systemui.experimental.frp.internal.constInit -import com.android.systemui.experimental.frp.internal.filterNode -import com.android.systemui.experimental.frp.internal.init -import com.android.systemui.experimental.frp.internal.map -import com.android.systemui.experimental.frp.internal.mapImpl -import com.android.systemui.experimental.frp.internal.mapMaybeNode -import com.android.systemui.experimental.frp.internal.mergeNodes -import com.android.systemui.experimental.frp.internal.mergeNodesLeft -import com.android.systemui.experimental.frp.internal.neverImpl -import com.android.systemui.experimental.frp.internal.switchDeferredImplSingle -import com.android.systemui.experimental.frp.internal.switchPromptImpl -import com.android.systemui.experimental.frp.internal.util.hashString -import com.android.systemui.experimental.frp.util.Either -import com.android.systemui.experimental.frp.util.Left -import com.android.systemui.experimental.frp.util.Maybe -import com.android.systemui.experimental.frp.util.Right -import com.android.systemui.experimental.frp.util.just -import com.android.systemui.experimental.frp.util.map -import com.android.systemui.experimental.frp.util.toMaybe +package com.android.systemui.kairos + +import com.android.systemui.kairos.internal.DemuxImpl +import com.android.systemui.kairos.internal.Init +import com.android.systemui.kairos.internal.InitScope +import com.android.systemui.kairos.internal.InputNode +import com.android.systemui.kairos.internal.Network +import com.android.systemui.kairos.internal.NoScope +import com.android.systemui.kairos.internal.TFlowImpl +import com.android.systemui.kairos.internal.activated +import com.android.systemui.kairos.internal.cached +import com.android.systemui.kairos.internal.constInit +import com.android.systemui.kairos.internal.filterNode +import com.android.systemui.kairos.internal.init +import com.android.systemui.kairos.internal.map +import com.android.systemui.kairos.internal.mapImpl +import com.android.systemui.kairos.internal.mapMaybeNode +import com.android.systemui.kairos.internal.mergeNodes +import com.android.systemui.kairos.internal.mergeNodesLeft +import com.android.systemui.kairos.internal.neverImpl +import com.android.systemui.kairos.internal.switchDeferredImplSingle +import com.android.systemui.kairos.internal.switchPromptImpl +import com.android.systemui.kairos.internal.util.hashString +import com.android.systemui.kairos.util.Either +import com.android.systemui.kairos.util.Left +import com.android.systemui.kairos.util.Maybe +import com.android.systemui.kairos.util.Right +import com.android.systemui.kairos.util.just +import com.android.systemui.kairos.util.map +import com.android.systemui.kairos.util.toMaybe import java.util.concurrent.atomic.AtomicReference import kotlin.reflect.KProperty import kotlinx.coroutines.CompletableDeferred diff --git a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/TState.kt b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/TState.kt index a5ec503e5c8d..a4c695657f8d 100644 --- a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/TState.kt +++ b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/TState.kt @@ -14,29 +14,29 @@ * limitations under the License. */ -package com.android.systemui.experimental.frp - -import com.android.systemui.experimental.frp.internal.DerivedMapCheap -import com.android.systemui.experimental.frp.internal.Init -import com.android.systemui.experimental.frp.internal.InitScope -import com.android.systemui.experimental.frp.internal.Network -import com.android.systemui.experimental.frp.internal.NoScope -import com.android.systemui.experimental.frp.internal.Schedulable -import com.android.systemui.experimental.frp.internal.TFlowImpl -import com.android.systemui.experimental.frp.internal.TStateImpl -import com.android.systemui.experimental.frp.internal.TStateSource -import com.android.systemui.experimental.frp.internal.activated -import com.android.systemui.experimental.frp.internal.cached -import com.android.systemui.experimental.frp.internal.constInit -import com.android.systemui.experimental.frp.internal.constS -import com.android.systemui.experimental.frp.internal.filterNode -import com.android.systemui.experimental.frp.internal.flatMap -import com.android.systemui.experimental.frp.internal.init -import com.android.systemui.experimental.frp.internal.map -import com.android.systemui.experimental.frp.internal.mapCheap -import com.android.systemui.experimental.frp.internal.mapImpl -import com.android.systemui.experimental.frp.internal.util.hashString -import com.android.systemui.experimental.frp.internal.zipStates +package com.android.systemui.kairos + +import com.android.systemui.kairos.internal.DerivedMapCheap +import com.android.systemui.kairos.internal.Init +import com.android.systemui.kairos.internal.InitScope +import com.android.systemui.kairos.internal.Network +import com.android.systemui.kairos.internal.NoScope +import com.android.systemui.kairos.internal.Schedulable +import com.android.systemui.kairos.internal.TFlowImpl +import com.android.systemui.kairos.internal.TStateImpl +import com.android.systemui.kairos.internal.TStateSource +import com.android.systemui.kairos.internal.activated +import com.android.systemui.kairos.internal.cached +import com.android.systemui.kairos.internal.constInit +import com.android.systemui.kairos.internal.constS +import com.android.systemui.kairos.internal.filterNode +import com.android.systemui.kairos.internal.flatMap +import com.android.systemui.kairos.internal.init +import com.android.systemui.kairos.internal.map +import com.android.systemui.kairos.internal.mapCheap +import com.android.systemui.kairos.internal.mapImpl +import com.android.systemui.kairos.internal.util.hashString +import com.android.systemui.kairos.internal.zipStates import kotlin.reflect.KProperty import kotlinx.coroutines.CompletableDeferred import kotlinx.coroutines.Deferred diff --git a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/Transactional.kt b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/Transactional.kt index 0e7b420afd51..6b1c8c8fc3e5 100644 --- a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/Transactional.kt +++ b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/Transactional.kt @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.android.systemui.experimental.frp +package com.android.systemui.kairos -import com.android.systemui.experimental.frp.internal.InitScope -import com.android.systemui.experimental.frp.internal.NoScope -import com.android.systemui.experimental.frp.internal.TransactionalImpl -import com.android.systemui.experimental.frp.internal.init -import com.android.systemui.experimental.frp.internal.transactionalImpl -import com.android.systemui.experimental.frp.internal.util.hashString +import com.android.systemui.kairos.internal.InitScope +import com.android.systemui.kairos.internal.NoScope +import com.android.systemui.kairos.internal.TransactionalImpl +import com.android.systemui.kairos.internal.init +import com.android.systemui.kairos.internal.transactionalImpl +import com.android.systemui.kairos.internal.util.hashString import kotlinx.coroutines.CompletableDeferred /** diff --git a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/debug/Debug.kt b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/debug/Debug.kt index 806234184d81..4f302a14ff00 100644 --- a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/debug/Debug.kt +++ b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/debug/Debug.kt @@ -14,25 +14,25 @@ * limitations under the License. */ -package com.android.systemui.experimental.frp.debug - -import com.android.systemui.experimental.frp.MutableTState -import com.android.systemui.experimental.frp.TState -import com.android.systemui.experimental.frp.TStateInit -import com.android.systemui.experimental.frp.TStateLoop -import com.android.systemui.experimental.frp.internal.DerivedFlatten -import com.android.systemui.experimental.frp.internal.DerivedMap -import com.android.systemui.experimental.frp.internal.DerivedMapCheap -import com.android.systemui.experimental.frp.internal.DerivedZipped -import com.android.systemui.experimental.frp.internal.Init -import com.android.systemui.experimental.frp.internal.TStateDerived -import com.android.systemui.experimental.frp.internal.TStateImpl -import com.android.systemui.experimental.frp.internal.TStateSource -import com.android.systemui.experimental.frp.util.Just -import com.android.systemui.experimental.frp.util.Maybe -import com.android.systemui.experimental.frp.util.None -import com.android.systemui.experimental.frp.util.none -import com.android.systemui.experimental.frp.util.orElseGet +package com.android.systemui.kairos.debug + +import com.android.systemui.kairos.MutableTState +import com.android.systemui.kairos.TState +import com.android.systemui.kairos.TStateInit +import com.android.systemui.kairos.TStateLoop +import com.android.systemui.kairos.internal.DerivedFlatten +import com.android.systemui.kairos.internal.DerivedMap +import com.android.systemui.kairos.internal.DerivedMapCheap +import com.android.systemui.kairos.internal.DerivedZipped +import com.android.systemui.kairos.internal.Init +import com.android.systemui.kairos.internal.TStateDerived +import com.android.systemui.kairos.internal.TStateImpl +import com.android.systemui.kairos.internal.TStateSource +import com.android.systemui.kairos.util.Just +import com.android.systemui.kairos.util.Maybe +import com.android.systemui.kairos.util.None +import com.android.systemui.kairos.util.none +import com.android.systemui.kairos.util.orElseGet // object IdGen { // private val counter = AtomicLong() diff --git a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/internal/BuildScopeImpl.kt b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/internal/BuildScopeImpl.kt index 127abd857fb3..90f1aea3e42f 100644 --- a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/internal/BuildScopeImpl.kt +++ b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/internal/BuildScopeImpl.kt @@ -14,34 +14,34 @@ * limitations under the License. */ -package com.android.systemui.experimental.frp.internal +package com.android.systemui.kairos.internal -import com.android.systemui.experimental.frp.CoalescingMutableTFlow -import com.android.systemui.experimental.frp.FrpBuildScope -import com.android.systemui.experimental.frp.FrpCoalescingProducerScope -import com.android.systemui.experimental.frp.FrpDeferredValue -import com.android.systemui.experimental.frp.FrpEffectScope -import com.android.systemui.experimental.frp.FrpNetwork -import com.android.systemui.experimental.frp.FrpProducerScope -import com.android.systemui.experimental.frp.FrpSpec -import com.android.systemui.experimental.frp.FrpStateScope -import com.android.systemui.experimental.frp.FrpTransactionScope -import com.android.systemui.experimental.frp.GroupedTFlow -import com.android.systemui.experimental.frp.LocalFrpNetwork -import com.android.systemui.experimental.frp.MutableTFlow -import com.android.systemui.experimental.frp.TFlow -import com.android.systemui.experimental.frp.TFlowInit -import com.android.systemui.experimental.frp.groupByKey -import com.android.systemui.experimental.frp.init -import com.android.systemui.experimental.frp.internal.util.childScope -import com.android.systemui.experimental.frp.internal.util.launchOnCancel -import com.android.systemui.experimental.frp.internal.util.mapValuesParallel -import com.android.systemui.experimental.frp.launchEffect -import com.android.systemui.experimental.frp.util.Just -import com.android.systemui.experimental.frp.util.Maybe -import com.android.systemui.experimental.frp.util.None -import com.android.systemui.experimental.frp.util.just -import com.android.systemui.experimental.frp.util.map +import com.android.systemui.kairos.CoalescingMutableTFlow +import com.android.systemui.kairos.FrpBuildScope +import com.android.systemui.kairos.FrpCoalescingProducerScope +import com.android.systemui.kairos.FrpDeferredValue +import com.android.systemui.kairos.FrpEffectScope +import com.android.systemui.kairos.FrpNetwork +import com.android.systemui.kairos.FrpProducerScope +import com.android.systemui.kairos.FrpSpec +import com.android.systemui.kairos.FrpStateScope +import com.android.systemui.kairos.FrpTransactionScope +import com.android.systemui.kairos.GroupedTFlow +import com.android.systemui.kairos.LocalFrpNetwork +import com.android.systemui.kairos.MutableTFlow +import com.android.systemui.kairos.TFlow +import com.android.systemui.kairos.TFlowInit +import com.android.systemui.kairos.groupByKey +import com.android.systemui.kairos.init +import com.android.systemui.kairos.internal.util.childScope +import com.android.systemui.kairos.internal.util.launchOnCancel +import com.android.systemui.kairos.internal.util.mapValuesParallel +import com.android.systemui.kairos.launchEffect +import com.android.systemui.kairos.util.Just +import com.android.systemui.kairos.util.Maybe +import com.android.systemui.kairos.util.None +import com.android.systemui.kairos.util.just +import com.android.systemui.kairos.util.map import java.util.concurrent.atomic.AtomicReference import kotlin.coroutines.Continuation import kotlin.coroutines.CoroutineContext diff --git a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/internal/DeferScope.kt b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/internal/DeferScope.kt index f72ba5fdfc6f..f65307c6106f 100644 --- a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/internal/DeferScope.kt +++ b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/internal/DeferScope.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.android.systemui.experimental.frp.internal +package com.android.systemui.kairos.internal -import com.android.systemui.experimental.frp.internal.util.asyncImmediate -import com.android.systemui.experimental.frp.internal.util.launchImmediate +import com.android.systemui.kairos.internal.util.asyncImmediate +import com.android.systemui.kairos.internal.util.launchImmediate import kotlinx.coroutines.CoroutineName import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineStart diff --git a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/internal/Demux.kt b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/internal/Demux.kt index 418220f2da4d..e7b99528fdfc 100644 --- a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/internal/Demux.kt +++ b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/internal/Demux.kt @@ -16,13 +16,13 @@ @file:Suppress("NOTHING_TO_INLINE") -package com.android.systemui.experimental.frp.internal +package com.android.systemui.kairos.internal -import com.android.systemui.experimental.frp.internal.util.hashString -import com.android.systemui.experimental.frp.util.Just -import com.android.systemui.experimental.frp.util.Maybe -import com.android.systemui.experimental.frp.util.flatMap -import com.android.systemui.experimental.frp.util.getMaybe +import com.android.systemui.kairos.internal.util.hashString +import com.android.systemui.kairos.util.Just +import com.android.systemui.kairos.util.Maybe +import com.android.systemui.kairos.util.flatMap +import com.android.systemui.kairos.util.getMaybe import java.util.concurrent.ConcurrentHashMap import kotlinx.coroutines.CompletableDeferred import kotlinx.coroutines.async diff --git a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/internal/EvalScopeImpl.kt b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/internal/EvalScopeImpl.kt index 38bc22f1df80..815473fe900f 100644 --- a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/internal/EvalScopeImpl.kt +++ b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/internal/EvalScopeImpl.kt @@ -14,20 +14,20 @@ * limitations under the License. */ -package com.android.systemui.experimental.frp.internal - -import com.android.systemui.experimental.frp.FrpDeferredValue -import com.android.systemui.experimental.frp.FrpTransactionScope -import com.android.systemui.experimental.frp.TFlow -import com.android.systemui.experimental.frp.TFlowInit -import com.android.systemui.experimental.frp.TFlowLoop -import com.android.systemui.experimental.frp.TState -import com.android.systemui.experimental.frp.TStateInit -import com.android.systemui.experimental.frp.Transactional -import com.android.systemui.experimental.frp.emptyTFlow -import com.android.systemui.experimental.frp.init -import com.android.systemui.experimental.frp.mapCheap -import com.android.systemui.experimental.frp.switch +package com.android.systemui.kairos.internal + +import com.android.systemui.kairos.FrpDeferredValue +import com.android.systemui.kairos.FrpTransactionScope +import com.android.systemui.kairos.TFlow +import com.android.systemui.kairos.TFlowInit +import com.android.systemui.kairos.TFlowLoop +import com.android.systemui.kairos.TState +import com.android.systemui.kairos.TStateInit +import com.android.systemui.kairos.Transactional +import com.android.systemui.kairos.emptyTFlow +import com.android.systemui.kairos.init +import com.android.systemui.kairos.mapCheap +import com.android.systemui.kairos.switch import kotlin.coroutines.Continuation import kotlin.coroutines.CoroutineContext import kotlin.coroutines.EmptyCoroutineContext diff --git a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/internal/FilterNode.kt b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/internal/FilterNode.kt index 4f2a76999bb6..bc06a3679d5c 100644 --- a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/internal/FilterNode.kt +++ b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/internal/FilterNode.kt @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.android.systemui.experimental.frp.internal +package com.android.systemui.kairos.internal -import com.android.systemui.experimental.frp.util.Just -import com.android.systemui.experimental.frp.util.Maybe -import com.android.systemui.experimental.frp.util.just -import com.android.systemui.experimental.frp.util.none +import com.android.systemui.kairos.util.Just +import com.android.systemui.kairos.util.Maybe +import com.android.systemui.kairos.util.just +import com.android.systemui.kairos.util.none internal inline fun <A, B> mapMaybeNode( crossinline getPulse: suspend EvalScope.() -> TFlowImpl<A>, diff --git a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/internal/Graph.kt b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/internal/Graph.kt index 9425870738fc..3aec319881d0 100644 --- a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/internal/Graph.kt +++ b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/internal/Graph.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.android.systemui.experimental.frp.internal +package com.android.systemui.kairos.internal -import com.android.systemui.experimental.frp.internal.util.Bag +import com.android.systemui.kairos.internal.util.Bag import java.util.TreeMap import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch diff --git a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/internal/Init.kt b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/internal/Init.kt index efb7a0951737..57db9a493e21 100644 --- a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/internal/Init.kt +++ b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/internal/Init.kt @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.android.systemui.experimental.frp.internal +package com.android.systemui.kairos.internal -import com.android.systemui.experimental.frp.util.Maybe -import com.android.systemui.experimental.frp.util.just -import com.android.systemui.experimental.frp.util.none +import com.android.systemui.kairos.util.Maybe +import com.android.systemui.kairos.util.just +import com.android.systemui.kairos.util.none import java.util.concurrent.atomic.AtomicBoolean import kotlinx.coroutines.CompletableDeferred import kotlinx.coroutines.ExperimentalCoroutinesApi diff --git a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/internal/Inputs.kt b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/internal/Inputs.kt index 85c87fea299b..8efaf79b18b2 100644 --- a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/internal/Inputs.kt +++ b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/internal/Inputs.kt @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.android.systemui.experimental.frp.internal +package com.android.systemui.kairos.internal -import com.android.systemui.experimental.frp.internal.util.Key -import com.android.systemui.experimental.frp.util.Maybe -import com.android.systemui.experimental.frp.util.just +import com.android.systemui.kairos.internal.util.Key +import com.android.systemui.kairos.util.Maybe +import com.android.systemui.kairos.util.just import java.util.concurrent.atomic.AtomicBoolean import kotlinx.coroutines.coroutineScope import kotlinx.coroutines.sync.Mutex diff --git a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/internal/InternalScopes.kt b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/internal/InternalScopes.kt index b6cd9063622b..af864e6c3496 100644 --- a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/internal/InternalScopes.kt +++ b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/internal/InternalScopes.kt @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.android.systemui.experimental.frp.internal - -import com.android.systemui.experimental.frp.FrpBuildScope -import com.android.systemui.experimental.frp.FrpStateScope -import com.android.systemui.experimental.frp.FrpTransactionScope -import com.android.systemui.experimental.frp.TFlow -import com.android.systemui.experimental.frp.internal.util.HeteroMap -import com.android.systemui.experimental.frp.internal.util.Key -import com.android.systemui.experimental.frp.util.Maybe +package com.android.systemui.kairos.internal + +import com.android.systemui.kairos.FrpBuildScope +import com.android.systemui.kairos.FrpStateScope +import com.android.systemui.kairos.FrpTransactionScope +import com.android.systemui.kairos.TFlow +import com.android.systemui.kairos.internal.util.HeteroMap +import com.android.systemui.kairos.internal.util.Key +import com.android.systemui.kairos.util.Maybe internal interface InitScope { val networkId: Any diff --git a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/internal/Mux.kt b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/internal/Mux.kt index e616d625dd1c..f7ff15f0507b 100644 --- a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/internal/Mux.kt +++ b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/internal/Mux.kt @@ -16,11 +16,11 @@ @file:Suppress("NOTHING_TO_INLINE") -package com.android.systemui.experimental.frp.internal +package com.android.systemui.kairos.internal -import com.android.systemui.experimental.frp.internal.util.ConcurrentNullableHashMap -import com.android.systemui.experimental.frp.internal.util.hashString -import com.android.systemui.experimental.frp.util.Just +import com.android.systemui.kairos.internal.util.ConcurrentNullableHashMap +import com.android.systemui.kairos.internal.util.hashString +import com.android.systemui.kairos.util.Just import java.util.concurrent.ConcurrentHashMap import kotlinx.coroutines.coroutineScope import kotlinx.coroutines.sync.Mutex diff --git a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/internal/MuxDeferred.kt b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/internal/MuxDeferred.kt index 6d43285c9ef5..08bee855831a 100644 --- a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/internal/MuxDeferred.kt +++ b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/internal/MuxDeferred.kt @@ -14,28 +14,28 @@ * limitations under the License. */ -package com.android.systemui.experimental.frp.internal - -import com.android.systemui.experimental.frp.internal.util.Key -import com.android.systemui.experimental.frp.internal.util.associateByIndexTo -import com.android.systemui.experimental.frp.internal.util.hashString -import com.android.systemui.experimental.frp.internal.util.mapParallel -import com.android.systemui.experimental.frp.internal.util.mapValuesNotNullParallelTo -import com.android.systemui.experimental.frp.util.Just -import com.android.systemui.experimental.frp.util.Left -import com.android.systemui.experimental.frp.util.Maybe -import com.android.systemui.experimental.frp.util.None -import com.android.systemui.experimental.frp.util.Right -import com.android.systemui.experimental.frp.util.These -import com.android.systemui.experimental.frp.util.flatMap -import com.android.systemui.experimental.frp.util.getMaybe -import com.android.systemui.experimental.frp.util.just -import com.android.systemui.experimental.frp.util.maybeThat -import com.android.systemui.experimental.frp.util.maybeThis -import com.android.systemui.experimental.frp.util.merge -import com.android.systemui.experimental.frp.util.orElseGet -import com.android.systemui.experimental.frp.util.partitionEithers -import com.android.systemui.experimental.frp.util.these +package com.android.systemui.kairos.internal + +import com.android.systemui.kairos.internal.util.Key +import com.android.systemui.kairos.internal.util.associateByIndexTo +import com.android.systemui.kairos.internal.util.hashString +import com.android.systemui.kairos.internal.util.mapParallel +import com.android.systemui.kairos.internal.util.mapValuesNotNullParallelTo +import com.android.systemui.kairos.util.Just +import com.android.systemui.kairos.util.Left +import com.android.systemui.kairos.util.Maybe +import com.android.systemui.kairos.util.None +import com.android.systemui.kairos.util.Right +import com.android.systemui.kairos.util.These +import com.android.systemui.kairos.util.flatMap +import com.android.systemui.kairos.util.getMaybe +import com.android.systemui.kairos.util.just +import com.android.systemui.kairos.util.maybeThat +import com.android.systemui.kairos.util.maybeThis +import com.android.systemui.kairos.util.merge +import com.android.systemui.kairos.util.orElseGet +import com.android.systemui.kairos.util.partitionEithers +import com.android.systemui.kairos.util.these import java.util.TreeMap import kotlinx.coroutines.coroutineScope import kotlinx.coroutines.launch diff --git a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/internal/MuxPrompt.kt b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/internal/MuxPrompt.kt index ea0c1501f6a4..cdfafa943121 100644 --- a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/internal/MuxPrompt.kt +++ b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/internal/MuxPrompt.kt @@ -14,20 +14,20 @@ * limitations under the License. */ -package com.android.systemui.experimental.frp.internal - -import com.android.systemui.experimental.frp.internal.util.Key -import com.android.systemui.experimental.frp.internal.util.launchImmediate -import com.android.systemui.experimental.frp.internal.util.mapParallel -import com.android.systemui.experimental.frp.internal.util.mapValuesNotNullParallelTo -import com.android.systemui.experimental.frp.util.Just -import com.android.systemui.experimental.frp.util.Left -import com.android.systemui.experimental.frp.util.Maybe -import com.android.systemui.experimental.frp.util.None -import com.android.systemui.experimental.frp.util.Right -import com.android.systemui.experimental.frp.util.filterJust -import com.android.systemui.experimental.frp.util.map -import com.android.systemui.experimental.frp.util.partitionEithers +package com.android.systemui.kairos.internal + +import com.android.systemui.kairos.internal.util.Key +import com.android.systemui.kairos.internal.util.launchImmediate +import com.android.systemui.kairos.internal.util.mapParallel +import com.android.systemui.kairos.internal.util.mapValuesNotNullParallelTo +import com.android.systemui.kairos.util.Just +import com.android.systemui.kairos.util.Left +import com.android.systemui.kairos.util.Maybe +import com.android.systemui.kairos.util.None +import com.android.systemui.kairos.util.Right +import com.android.systemui.kairos.util.filterJust +import com.android.systemui.kairos.util.map +import com.android.systemui.kairos.util.partitionEithers import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.async import kotlinx.coroutines.awaitAll diff --git a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/internal/Network.kt b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/internal/Network.kt index b5ffe75eb9f4..f0df89d780c9 100644 --- a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/internal/Network.kt +++ b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/internal/Network.kt @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.android.systemui.experimental.frp.internal - -import com.android.systemui.experimental.frp.TState -import com.android.systemui.experimental.frp.internal.util.HeteroMap -import com.android.systemui.experimental.frp.util.Just -import com.android.systemui.experimental.frp.util.Maybe -import com.android.systemui.experimental.frp.util.just -import com.android.systemui.experimental.frp.util.none +package com.android.systemui.kairos.internal + +import com.android.systemui.kairos.TState +import com.android.systemui.kairos.internal.util.HeteroMap +import com.android.systemui.kairos.util.Just +import com.android.systemui.kairos.util.Maybe +import com.android.systemui.kairos.util.just +import com.android.systemui.kairos.util.none import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.ConcurrentLinkedDeque import java.util.concurrent.ConcurrentLinkedQueue diff --git a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/internal/NoScope.kt b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/internal/NoScope.kt index 6375918f35cd..fbd9689eb1d0 100644 --- a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/internal/NoScope.kt +++ b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/internal/NoScope.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.android.systemui.experimental.frp.internal +package com.android.systemui.kairos.internal -import com.android.systemui.experimental.frp.FrpScope +import com.android.systemui.kairos.FrpScope import kotlin.coroutines.Continuation import kotlin.coroutines.CoroutineContext import kotlin.coroutines.EmptyCoroutineContext diff --git a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/internal/NodeTypes.kt b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/internal/NodeTypes.kt index e7f76a08b638..000240796a82 100644 --- a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/internal/NodeTypes.kt +++ b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/internal/NodeTypes.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.android.systemui.experimental.frp.internal +package com.android.systemui.kairos.internal -import com.android.systemui.experimental.frp.util.Maybe +import com.android.systemui.kairos.util.Maybe /* Dmux diff --git a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/internal/Output.kt b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/internal/Output.kt index e60dccaac392..a3af2d304f7f 100644 --- a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/internal/Output.kt +++ b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/internal/Output.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.android.systemui.experimental.frp.internal +package com.android.systemui.kairos.internal -import com.android.systemui.experimental.frp.util.Just +import com.android.systemui.kairos.util.Just import kotlin.coroutines.CoroutineContext import kotlin.coroutines.EmptyCoroutineContext diff --git a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/internal/PullNodes.kt b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/internal/PullNodes.kt index b4656e0aee3a..dac98e0e807c 100644 --- a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/internal/PullNodes.kt +++ b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/internal/PullNodes.kt @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.android.systemui.experimental.frp.internal +package com.android.systemui.kairos.internal -import com.android.systemui.experimental.frp.internal.util.Key -import com.android.systemui.experimental.frp.util.Maybe -import com.android.systemui.experimental.frp.util.map +import com.android.systemui.kairos.internal.util.Key +import com.android.systemui.kairos.util.Maybe +import com.android.systemui.kairos.util.map import kotlinx.coroutines.CoroutineStart import kotlinx.coroutines.Deferred diff --git a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/internal/Scheduler.kt b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/internal/Scheduler.kt index 4fef865e87e7..872fb7a6cb74 100644 --- a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/internal/Scheduler.kt +++ b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/internal/Scheduler.kt @@ -16,7 +16,7 @@ @file:OptIn(ExperimentalCoroutinesApi::class) -package com.android.systemui.experimental.frp.internal +package com.android.systemui.kairos.internal import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.PriorityBlockingQueue diff --git a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/internal/StateScopeImpl.kt b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/internal/StateScopeImpl.kt index c1d10760978a..baf4101d52ef 100644 --- a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/internal/StateScopeImpl.kt +++ b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/internal/StateScopeImpl.kt @@ -14,27 +14,27 @@ * limitations under the License. */ -package com.android.systemui.experimental.frp.internal +package com.android.systemui.kairos.internal -import com.android.systemui.experimental.frp.FrpDeferredValue -import com.android.systemui.experimental.frp.FrpStateScope -import com.android.systemui.experimental.frp.FrpStateful -import com.android.systemui.experimental.frp.FrpTransactionScope -import com.android.systemui.experimental.frp.GroupedTFlow -import com.android.systemui.experimental.frp.TFlow -import com.android.systemui.experimental.frp.TFlowInit -import com.android.systemui.experimental.frp.TFlowLoop -import com.android.systemui.experimental.frp.TState -import com.android.systemui.experimental.frp.TStateInit -import com.android.systemui.experimental.frp.emptyTFlow -import com.android.systemui.experimental.frp.groupByKey -import com.android.systemui.experimental.frp.init -import com.android.systemui.experimental.frp.internal.util.mapValuesParallel -import com.android.systemui.experimental.frp.mapCheap -import com.android.systemui.experimental.frp.merge -import com.android.systemui.experimental.frp.switch -import com.android.systemui.experimental.frp.util.Maybe -import com.android.systemui.experimental.frp.util.map +import com.android.systemui.kairos.FrpDeferredValue +import com.android.systemui.kairos.FrpStateScope +import com.android.systemui.kairos.FrpStateful +import com.android.systemui.kairos.FrpTransactionScope +import com.android.systemui.kairos.GroupedTFlow +import com.android.systemui.kairos.TFlow +import com.android.systemui.kairos.TFlowInit +import com.android.systemui.kairos.TFlowLoop +import com.android.systemui.kairos.TState +import com.android.systemui.kairos.TStateInit +import com.android.systemui.kairos.emptyTFlow +import com.android.systemui.kairos.groupByKey +import com.android.systemui.kairos.init +import com.android.systemui.kairos.internal.util.mapValuesParallel +import com.android.systemui.kairos.mapCheap +import com.android.systemui.kairos.merge +import com.android.systemui.kairos.switch +import com.android.systemui.kairos.util.Maybe +import com.android.systemui.kairos.util.map import kotlin.coroutines.Continuation import kotlin.coroutines.CoroutineContext import kotlin.coroutines.EmptyCoroutineContext diff --git a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/internal/TFlowImpl.kt b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/internal/TFlowImpl.kt index 79978640d5a8..b904b48f7f9c 100644 --- a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/internal/TFlowImpl.kt +++ b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/internal/TFlowImpl.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.android.systemui.experimental.frp.internal +package com.android.systemui.kairos.internal -import com.android.systemui.experimental.frp.util.Maybe +import com.android.systemui.kairos.util.Maybe /* Initialized TFlow */ internal fun interface TFlowImpl<out A> { diff --git a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/internal/TStateImpl.kt b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/internal/TStateImpl.kt index d8b6dac000bb..5cec05c8ef2d 100644 --- a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/internal/TStateImpl.kt +++ b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/internal/TStateImpl.kt @@ -14,16 +14,16 @@ * limitations under the License. */ -package com.android.systemui.experimental.frp.internal - -import com.android.systemui.experimental.frp.internal.util.Key -import com.android.systemui.experimental.frp.internal.util.associateByIndex -import com.android.systemui.experimental.frp.internal.util.hashString -import com.android.systemui.experimental.frp.internal.util.mapValuesParallel -import com.android.systemui.experimental.frp.util.Just -import com.android.systemui.experimental.frp.util.Maybe -import com.android.systemui.experimental.frp.util.just -import com.android.systemui.experimental.frp.util.none +package com.android.systemui.kairos.internal + +import com.android.systemui.kairos.internal.util.Key +import com.android.systemui.kairos.internal.util.associateByIndex +import com.android.systemui.kairos.internal.util.hashString +import com.android.systemui.kairos.internal.util.mapValuesParallel +import com.android.systemui.kairos.util.Just +import com.android.systemui.kairos.util.Maybe +import com.android.systemui.kairos.util.just +import com.android.systemui.kairos.util.none import java.util.concurrent.atomic.AtomicLong import kotlinx.coroutines.CompletableDeferred import kotlinx.coroutines.CoroutineStart diff --git a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/internal/TransactionalImpl.kt b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/internal/TransactionalImpl.kt index c3f80a179684..8647bdd5b7b1 100644 --- a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/internal/TransactionalImpl.kt +++ b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/internal/TransactionalImpl.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.android.systemui.experimental.frp.internal +package com.android.systemui.kairos.internal -import com.android.systemui.experimental.frp.internal.util.Key -import com.android.systemui.experimental.frp.internal.util.hashString +import com.android.systemui.kairos.internal.util.Key +import com.android.systemui.kairos.internal.util.hashString import kotlinx.coroutines.CoroutineStart import kotlinx.coroutines.Deferred diff --git a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/internal/util/Bag.kt b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/internal/util/Bag.kt index cc5538e5c87c..47185195a2bb 100644 --- a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/internal/util/Bag.kt +++ b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/internal/util/Bag.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.experimental.frp.internal.util +package com.android.systemui.kairos.internal.util internal class Bag<T> private constructor(private val intMap: MutableMap<T, Int>) : Set<T> by intMap.keys { diff --git a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/internal/util/ConcurrentNullableHashMap.kt b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/internal/util/ConcurrentNullableHashMap.kt index 449aa19be635..6c8ae7cf6436 100644 --- a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/internal/util/ConcurrentNullableHashMap.kt +++ b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/internal/util/ConcurrentNullableHashMap.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.experimental.frp.internal.util +package com.android.systemui.kairos.internal.util import java.util.concurrent.ConcurrentHashMap diff --git a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/internal/util/HeteroMap.kt b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/internal/util/HeteroMap.kt index 14a567ca67c8..5cee2dd5880a 100644 --- a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/internal/util/HeteroMap.kt +++ b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/internal/util/HeteroMap.kt @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.android.systemui.experimental.frp.internal.util +package com.android.systemui.kairos.internal.util -import com.android.systemui.experimental.frp.util.Maybe -import com.android.systemui.experimental.frp.util.None -import com.android.systemui.experimental.frp.util.just +import com.android.systemui.kairos.util.Maybe +import com.android.systemui.kairos.util.None +import com.android.systemui.kairos.util.just import java.util.concurrent.ConcurrentHashMap internal interface Key<A> diff --git a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/internal/util/MapUtils.kt b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/internal/util/MapUtils.kt index 6f19a76f8900..ebf9a66be0ae 100644 --- a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/internal/util/MapUtils.kt +++ b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/internal/util/MapUtils.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.experimental.frp.internal.util +package com.android.systemui.kairos.internal.util import kotlinx.coroutines.CoroutineStart import kotlinx.coroutines.async diff --git a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/internal/util/Util.kt b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/internal/util/Util.kt index 0a47429d4113..6bb7f9f593aa 100644 --- a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/internal/util/Util.kt +++ b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/internal/util/Util.kt @@ -16,7 +16,7 @@ @file:OptIn(ExperimentalCoroutinesApi::class) -package com.android.systemui.experimental.frp.internal.util +package com.android.systemui.kairos.internal.util import kotlin.coroutines.CoroutineContext import kotlin.coroutines.EmptyCoroutineContext diff --git a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/util/Either.kt b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/util/Either.kt index dca8364ed8ef..ad9f7d715156 100644 --- a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/util/Either.kt +++ b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/util/Either.kt @@ -16,7 +16,7 @@ @file:Suppress("NOTHING_TO_INLINE") -package com.android.systemui.experimental.frp.util +package com.android.systemui.kairos.util /** * Contains a value of two possibilities: `Left<A>` or `Right<B>` diff --git a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/util/Maybe.kt b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/util/Maybe.kt index 59c680e91a52..c3cae3885bd3 100644 --- a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/util/Maybe.kt +++ b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/util/Maybe.kt @@ -16,7 +16,7 @@ @file:Suppress("NOTHING_TO_INLINE", "SuspendCoroutine") -package com.android.systemui.experimental.frp.util +package com.android.systemui.kairos.util import kotlin.coroutines.Continuation import kotlin.coroutines.CoroutineContext diff --git a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/util/These.kt b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/util/These.kt index 5404c0795af8..aa95e0d2dc1b 100644 --- a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/util/These.kt +++ b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/util/These.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.experimental.frp.util +package com.android.systemui.kairos.util /** Contains at least one of two potential values. */ sealed class These<A, B> { diff --git a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/util/WithPrev.kt b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/util/WithPrev.kt index e52a6e166ec5..5cfaa3ea2801 100644 --- a/packages/SystemUI/frp/src/com/android/systemui/experimental/frp/util/WithPrev.kt +++ b/packages/SystemUI/utils/kairos/src/com/android/systemui/kairos/util/WithPrev.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.experimental.frp.util +package com.android.systemui.kairos.util /** Holds a [newValue] emitted from a `TFlow`, along with the [previousValue] emitted value. */ data class WithPrev<out S, out T : S>(val previousValue: S, val newValue: T) diff --git a/packages/SystemUI/frp/test/com/android/systemui/experimental/frp/FrpTests.kt b/packages/SystemUI/utils/kairos/test/com/android/systemui/kairos/KairosTests.kt index a58f4995138a..165230b2aeaf 100644 --- a/packages/SystemUI/frp/test/com/android/systemui/experimental/frp/FrpTests.kt +++ b/packages/SystemUI/utils/kairos/test/com/android/systemui/kairos/KairosTests.kt @@ -16,17 +16,17 @@ @file:OptIn(ExperimentalCoroutinesApi::class, ExperimentalFrpApi::class) -package com.android.systemui.experimental.frp - -import com.android.systemui.experimental.frp.util.Either -import com.android.systemui.experimental.frp.util.Left -import com.android.systemui.experimental.frp.util.Maybe -import com.android.systemui.experimental.frp.util.None -import com.android.systemui.experimental.frp.util.Right -import com.android.systemui.experimental.frp.util.just -import com.android.systemui.experimental.frp.util.map -import com.android.systemui.experimental.frp.util.maybe -import com.android.systemui.experimental.frp.util.none +package com.android.systemui.kairos + +import com.android.systemui.kairos.util.Either +import com.android.systemui.kairos.util.Left +import com.android.systemui.kairos.util.Maybe +import com.android.systemui.kairos.util.None +import com.android.systemui.kairos.util.Right +import com.android.systemui.kairos.util.just +import com.android.systemui.kairos.util.map +import com.android.systemui.kairos.util.maybe +import com.android.systemui.kairos.util.none import kotlin.time.Duration import kotlin.time.Duration.Companion.seconds import kotlin.time.DurationUnit @@ -55,7 +55,7 @@ import org.junit.Assert.assertNull import org.junit.Assert.assertTrue import org.junit.Test -class FrpTests { +class KairosTests { @Test fun basic() = runFrpTest { network -> diff --git a/proto/src/system_messages.proto b/proto/src/system_messages.proto index 994bdb58f543..648990588d29 100644 --- a/proto/src/system_messages.proto +++ b/proto/src/system_messages.proto @@ -206,7 +206,7 @@ message SystemMessage { // Inform that DND settings have changed on OS upgrade // Package: android - NOTE_ZEN_UPGRADE = 48; + NOTE_ZEN_UPGRADE = 48 [deprecated = true]; // Notification to suggest automatic battery saver. // Package: android diff --git a/ravenwood/runtime-common-src/com/android/ravenwood/common/RavenwoodCommonUtils.java b/ravenwood/runtime-common-src/com/android/ravenwood/common/RavenwoodCommonUtils.java index ef795c63880e..520f050f0655 100644 --- a/ravenwood/runtime-common-src/com/android/ravenwood/common/RavenwoodCommonUtils.java +++ b/ravenwood/runtime-common-src/com/android/ravenwood/common/RavenwoodCommonUtils.java @@ -37,8 +37,6 @@ public class RavenwoodCommonUtils { private RavenwoodCommonUtils() { } - private static final Object sLock = new Object(); - /** * If set to "1", we enable the verbose logging. * @@ -68,9 +66,6 @@ public class RavenwoodCommonUtils { public static final String RAVENWOOD_VERSION_JAVA_SYSPROP = "android.ravenwood.version"; - // @GuardedBy("sLock") - private static boolean sIntegrityChecked = false; - /** * @return if we're running on Ravenwood. */ diff --git a/ravenwood/runtime-helper-src/libcore-fake/libcore/util/NativeAllocationRegistry.java b/ravenwood/runtime-helper-src/libcore-fake/libcore/util/NativeAllocationRegistry.java index 4e7dc5d6264f..ad86135de32e 100644 --- a/ravenwood/runtime-helper-src/libcore-fake/libcore/util/NativeAllocationRegistry.java +++ b/ravenwood/runtime-helper-src/libcore-fake/libcore/util/NativeAllocationRegistry.java @@ -32,25 +32,20 @@ public class NativeAllocationRegistry { public static NativeAllocationRegistry createNonmalloced( ClassLoader classLoader, long freeFunction, long size) { - return new NativeAllocationRegistry(classLoader, freeFunction, size, false); + return new NativeAllocationRegistry(classLoader, freeFunction, size); } public static NativeAllocationRegistry createMalloced( ClassLoader classLoader, long freeFunction, long size) { - return new NativeAllocationRegistry(classLoader, freeFunction, size, true); + return new NativeAllocationRegistry(classLoader, freeFunction, size); } public static NativeAllocationRegistry createMalloced( ClassLoader classLoader, long freeFunction) { - return new NativeAllocationRegistry(classLoader, freeFunction, 0, true); + return new NativeAllocationRegistry(classLoader, freeFunction, 0); } public NativeAllocationRegistry(ClassLoader classLoader, long freeFunction, long size) { - this(classLoader, freeFunction, size, size == 0); - } - - private NativeAllocationRegistry(ClassLoader classLoader, long freeFunction, long size, - boolean mallocAllocation) { if (size < 0) { throw new IllegalArgumentException("Invalid native allocation size: " + size); } diff --git a/ravenwood/bivalenttest/Android.bp b/ravenwood/tests/bivalenttest/Android.bp index e897735493a3..ac499b966afe 100644 --- a/ravenwood/bivalenttest/Android.bp +++ b/ravenwood/tests/bivalenttest/Android.bp @@ -54,32 +54,34 @@ android_ravenwood_test { auto_gen_config: true, } -android_test { - name: "RavenwoodBivalentTest_device", +// TODO(b/371215487): migrate bivalenttest.ravenizer tests to another architecture - srcs: [ - "test/**/*.java", - ], - static_libs: [ - "junit", - "truth", - - "androidx.annotation_annotation", - "androidx.test.ext.junit", - "androidx.test.rules", - - "junit-params", - "platform-parametric-runner-lib", - - "ravenwood-junit", - ], - jni_libs: [ - "libravenwoodbivalenttest_jni", - ], - test_suites: [ - "device-tests", - ], - optimize: { - enabled: false, - }, -} +// android_test { +// name: "RavenwoodBivalentTest_device", +// +// srcs: [ +// "test/**/*.java", +// ], +// static_libs: [ +// "junit", +// "truth", +// +// "androidx.annotation_annotation", +// "androidx.test.ext.junit", +// "androidx.test.rules", +// +// "junit-params", +// "platform-parametric-runner-lib", +// +// "ravenwood-junit", +// ], +// jni_libs: [ +// "libravenwoodbivalenttest_jni", +// ], +// test_suites: [ +// "device-tests", +// ], +// optimize: { +// enabled: false, +// }, +// } diff --git a/ravenwood/bivalenttest/AndroidManifest.xml b/ravenwood/tests/bivalenttest/AndroidManifest.xml index 474c03f4f3c9..474c03f4f3c9 100644 --- a/ravenwood/bivalenttest/AndroidManifest.xml +++ b/ravenwood/tests/bivalenttest/AndroidManifest.xml diff --git a/ravenwood/bivalenttest/AndroidTest.xml b/ravenwood/tests/bivalenttest/AndroidTest.xml index 9e5dd11b60cb..9e5dd11b60cb 100644 --- a/ravenwood/bivalenttest/AndroidTest.xml +++ b/ravenwood/tests/bivalenttest/AndroidTest.xml diff --git a/ravenwood/bivalenttest/README.md b/ravenwood/tests/bivalenttest/README.md index 71535556ec75..71535556ec75 100644 --- a/ravenwood/bivalenttest/README.md +++ b/ravenwood/tests/bivalenttest/README.md diff --git a/ravenwood/bivalenttest/jni/ravenwood_core_test_jni.cpp b/ravenwood/tests/bivalenttest/jni/ravenwood_core_test_jni.cpp index 956d79c0d25f..956d79c0d25f 100644 --- a/ravenwood/bivalenttest/jni/ravenwood_core_test_jni.cpp +++ b/ravenwood/tests/bivalenttest/jni/ravenwood_core_test_jni.cpp diff --git a/ravenwood/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/RavenwoodAndroidApiTest.java b/ravenwood/tests/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/RavenwoodAndroidApiTest.java index d91e73438fa3..d91e73438fa3 100644 --- a/ravenwood/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/RavenwoodAndroidApiTest.java +++ b/ravenwood/tests/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/RavenwoodAndroidApiTest.java diff --git a/ravenwood/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/RavenwoodClassRuleDeviceOnlyTest.java b/ravenwood/tests/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/RavenwoodClassRuleDeviceOnlyTest.java index e8f59db86901..e8f59db86901 100644 --- a/ravenwood/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/RavenwoodClassRuleDeviceOnlyTest.java +++ b/ravenwood/tests/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/RavenwoodClassRuleDeviceOnlyTest.java diff --git a/ravenwood/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/RavenwoodConfigTest.java b/ravenwood/tests/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/RavenwoodConfigTest.java index a5a16c14600b..a5a16c14600b 100644 --- a/ravenwood/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/RavenwoodConfigTest.java +++ b/ravenwood/tests/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/RavenwoodConfigTest.java diff --git a/ravenwood/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/RavenwoodJniTest.java b/ravenwood/tests/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/RavenwoodJniTest.java index 0cc2adc6b26b..0cc2adc6b26b 100644 --- a/ravenwood/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/RavenwoodJniTest.java +++ b/ravenwood/tests/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/RavenwoodJniTest.java diff --git a/ravenwood/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/RavenwoodMultipleRuleTest.java b/ravenwood/tests/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/RavenwoodMultipleRuleTest.java index c25d2b4cbc4d..c25d2b4cbc4d 100644 --- a/ravenwood/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/RavenwoodMultipleRuleTest.java +++ b/ravenwood/tests/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/RavenwoodMultipleRuleTest.java diff --git a/ravenwood/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/RavenwoodNativeAllocationRegistryTest.java b/ravenwood/tests/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/RavenwoodNativeAllocationRegistryTest.java index 415b4676f46b..415b4676f46b 100644 --- a/ravenwood/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/RavenwoodNativeAllocationRegistryTest.java +++ b/ravenwood/tests/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/RavenwoodNativeAllocationRegistryTest.java diff --git a/ravenwood/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/RavenwoodNoConfigNoRuleTest.java b/ravenwood/tests/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/RavenwoodNoConfigNoRuleTest.java index d47330568828..d47330568828 100644 --- a/ravenwood/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/RavenwoodNoConfigNoRuleTest.java +++ b/ravenwood/tests/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/RavenwoodNoConfigNoRuleTest.java diff --git a/ravenwood/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/RavenwoodRuleTest.java b/ravenwood/tests/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/RavenwoodRuleTest.java index 3de372e48e3a..3de372e48e3a 100644 --- a/ravenwood/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/RavenwoodRuleTest.java +++ b/ravenwood/tests/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/RavenwoodRuleTest.java diff --git a/ravenwood/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/ravenizer/CallTracker.java b/ravenwood/tests/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/ravenizer/CallTracker.java index 09a0aa8dbaa2..09a0aa8dbaa2 100644 --- a/ravenwood/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/ravenizer/CallTracker.java +++ b/ravenwood/tests/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/ravenizer/CallTracker.java diff --git a/ravenwood/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/ravenizer/RavenwoodAwareTestRunnerTest.java b/ravenwood/tests/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/ravenizer/RavenwoodAwareTestRunnerTest.java index d7c2c6cd73a8..d7c2c6cd73a8 100644 --- a/ravenwood/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/ravenizer/RavenwoodAwareTestRunnerTest.java +++ b/ravenwood/tests/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/ravenizer/RavenwoodAwareTestRunnerTest.java diff --git a/ravenwood/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/ravenizer/RavenwoodImplicitClassRuleDeviceOnlyTest.java b/ravenwood/tests/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/ravenizer/RavenwoodImplicitClassRuleDeviceOnlyTest.java index 7ef672e80bee..7ef672e80bee 100644 --- a/ravenwood/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/ravenizer/RavenwoodImplicitClassRuleDeviceOnlyTest.java +++ b/ravenwood/tests/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/ravenizer/RavenwoodImplicitClassRuleDeviceOnlyTest.java diff --git a/ravenwood/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/ravenizer/RavenwoodImplicitRuleOrderRewriteTest.java b/ravenwood/tests/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/ravenizer/RavenwoodImplicitRuleOrderRewriteTest.java index 7ef40dc49e1a..7ef40dc49e1a 100644 --- a/ravenwood/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/ravenizer/RavenwoodImplicitRuleOrderRewriteTest.java +++ b/ravenwood/tests/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/ravenizer/RavenwoodImplicitRuleOrderRewriteTest.java diff --git a/ravenwood/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/ravenizer/RavenwoodImplicitRuleShadowingTest.java b/ravenwood/tests/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/ravenizer/RavenwoodImplicitRuleShadowingTest.java index ae596b10848b..ae596b10848b 100644 --- a/ravenwood/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/ravenizer/RavenwoodImplicitRuleShadowingTest.java +++ b/ravenwood/tests/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/ravenizer/RavenwoodImplicitRuleShadowingTest.java diff --git a/ravenwood/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/ravenizer/RavenwoodImplicitRuleShadowingTestBase.java b/ravenwood/tests/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/ravenizer/RavenwoodImplicitRuleShadowingTestBase.java index 1ca97af632dd..1ca97af632dd 100644 --- a/ravenwood/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/ravenizer/RavenwoodImplicitRuleShadowingTestBase.java +++ b/ravenwood/tests/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/ravenizer/RavenwoodImplicitRuleShadowingTestBase.java diff --git a/ravenwood/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/ravenizer/RavenwoodNoRavenizerTest.java b/ravenwood/tests/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/ravenizer/RavenwoodNoRavenizerTest.java index 9d878f444e5e..9d878f444e5e 100644 --- a/ravenwood/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/ravenizer/RavenwoodNoRavenizerTest.java +++ b/ravenwood/tests/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/ravenizer/RavenwoodNoRavenizerTest.java diff --git a/ravenwood/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/ravenizer/RavenwoodRunDisabledTestsReallyDisabledTest.java b/ravenwood/tests/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/ravenizer/RavenwoodRunDisabledTestsReallyDisabledTest.java index c77841b1b55a..c77841b1b55a 100644 --- a/ravenwood/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/ravenizer/RavenwoodRunDisabledTestsReallyDisabledTest.java +++ b/ravenwood/tests/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/ravenizer/RavenwoodRunDisabledTestsReallyDisabledTest.java diff --git a/ravenwood/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/ravenizer/RavenwoodRunDisabledTestsTest.java b/ravenwood/tests/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/ravenizer/RavenwoodRunDisabledTestsTest.java index ea1a29d57482..ea1a29d57482 100644 --- a/ravenwood/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/ravenizer/RavenwoodRunDisabledTestsTest.java +++ b/ravenwood/tests/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/ravenizer/RavenwoodRunDisabledTestsTest.java diff --git a/ravenwood/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/ravenizer/RavenwoodRunnerWithAndroidXRunnerTest.java b/ravenwood/tests/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/ravenizer/RavenwoodRunnerWithAndroidXRunnerTest.java index c042eb010558..c042eb010558 100644 --- a/ravenwood/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/ravenizer/RavenwoodRunnerWithAndroidXRunnerTest.java +++ b/ravenwood/tests/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/ravenizer/RavenwoodRunnerWithAndroidXRunnerTest.java diff --git a/ravenwood/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/ravenizer/RavenwoodRunnerWithJUnitParamsRunnerTest.java b/ravenwood/tests/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/ravenizer/RavenwoodRunnerWithJUnitParamsRunnerTest.java index 2feb5ba9aa01..2feb5ba9aa01 100644 --- a/ravenwood/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/ravenizer/RavenwoodRunnerWithJUnitParamsRunnerTest.java +++ b/ravenwood/tests/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/ravenizer/RavenwoodRunnerWithJUnitParamsRunnerTest.java diff --git a/ravenwood/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/ravenizer/RavenwoodRunnerWithParameterizedAndroidJunit4Test.java b/ravenwood/tests/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/ravenizer/RavenwoodRunnerWithParameterizedAndroidJunit4Test.java index 7e3bc0fccd7f..7e3bc0fccd7f 100644 --- a/ravenwood/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/ravenizer/RavenwoodRunnerWithParameterizedAndroidJunit4Test.java +++ b/ravenwood/tests/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/ravenizer/RavenwoodRunnerWithParameterizedAndroidJunit4Test.java diff --git a/ravenwood/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/ravenizer/RavenwoodSuiteTest.java b/ravenwood/tests/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/ravenizer/RavenwoodSuiteTest.java index 7e396c2080eb..7e396c2080eb 100644 --- a/ravenwood/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/ravenizer/RavenwoodSuiteTest.java +++ b/ravenwood/tests/bivalenttest/test/com/android/ravenwoodtest/bivalenttest/ravenizer/RavenwoodSuiteTest.java diff --git a/ravenwood/tests/coretest/Android.bp b/ravenwood/tests/coretest/Android.bp index d94475c00240..85f1baf1cab9 100644 --- a/ravenwood/tests/coretest/Android.bp +++ b/ravenwood/tests/coretest/Android.bp @@ -17,9 +17,15 @@ android_ravenwood_test { "junit-params", "platform-parametric-runner-lib", "truth", + + // This library should be removed by Ravenizer + "mockito-target-minus-junit4", ], srcs: [ "test/**/*.java", ], + ravenizer: { + strip_mockito: true, + }, auto_gen_config: true, } diff --git a/packages/SystemUI/src/com/android/systemui/scene/domain/interactor/SystemGestureExclusionInteractor.kt b/ravenwood/tests/coretest/test/com/android/ravenwoodtest/coretest/RavenwoodMockitoTest.java index 4cee874f5f8e..dd6d259d5a34 100644 --- a/packages/SystemUI/src/com/android/systemui/scene/domain/interactor/SystemGestureExclusionInteractor.kt +++ b/ravenwood/tests/coretest/test/com/android/ravenwoodtest/coretest/RavenwoodMockitoTest.java @@ -13,23 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +package com.android.ravenwoodtest.coretest; -package com.android.systemui.scene.domain.interactor +import static org.junit.Assert.assertThrows; -import android.graphics.Region -import com.android.systemui.scene.data.repository.SystemGestureExclusionRepository -import javax.inject.Inject -import kotlinx.coroutines.flow.Flow +import org.junit.Test; -class SystemGestureExclusionInteractor -@Inject -constructor(private val repository: SystemGestureExclusionRepository) { +public class RavenwoodMockitoTest { - /** - * Returns [Flow] of the [Region] in which system gestures should be excluded on the display - * identified with [displayId]. - */ - fun exclusionRegion(displayId: Int): Flow<Region?> { - return repository.exclusionRegion(displayId) + @Test + public void checkMockitoClasses() { + // DexMaker should not exist + assertThrows( + ClassNotFoundException.class, + () -> Class.forName("com.android.dx.DexMaker")); + // Mockito 2 should not exist + assertThrows( + ClassNotFoundException.class, + () -> Class.forName("org.mockito.Matchers")); } } diff --git a/ravenwood/tools/ravenizer/src/com/android/platform/test/ravenwood/ravenizer/Ravenizer.kt b/ravenwood/tools/ravenizer/src/com/android/platform/test/ravenwood/ravenizer/Ravenizer.kt index f7f9a8563656..49f0b599762f 100644 --- a/ravenwood/tools/ravenizer/src/com/android/platform/test/ravenwood/ravenizer/Ravenizer.kt +++ b/ravenwood/tools/ravenizer/src/com/android/platform/test/ravenwood/ravenizer/Ravenizer.kt @@ -85,18 +85,17 @@ data class RavenizerStats( /** * Main class. */ -class Ravenizer(val options: RavenizerOptions) { - fun run() { +class Ravenizer { + fun run(options: RavenizerOptions) { val stats = RavenizerStats() - val fatalValidation = options.fatalValidation.get - stats.totalTime = log.nTime { process( options.inJar.get, options.outJar.get, options.enableValidation.get, - fatalValidation, + options.fatalValidation.get, + options.stripMockito.get, stats, ) } @@ -108,6 +107,7 @@ class Ravenizer(val options: RavenizerOptions) { outJar: String, enableValidation: Boolean, fatalValidation: Boolean, + stripMockito: Boolean, stats: RavenizerStats, ) { var allClasses = ClassNodes.loadClassStructures(inJar) { @@ -126,6 +126,9 @@ class Ravenizer(val options: RavenizerOptions) { } } } + if (includeUnsupportedMockito(allClasses)) { + log.w("Unsupported Mockito detected in $inJar}!") + } stats.totalProcessTime = log.vTime("$executableName processing $inJar") { ZipFile(inJar).use { inZip -> @@ -145,6 +148,11 @@ class Ravenizer(val options: RavenizerOptions) { ) } + if (stripMockito && entry.name.isMockitoFile()) { + // Skip this entry + continue + } + val className = zipEntryNameToClassName(entry.name) if (className != null) { diff --git a/ravenwood/tools/ravenizer/src/com/android/platform/test/ravenwood/ravenizer/RavenizerMain.kt b/ravenwood/tools/ravenizer/src/com/android/platform/test/ravenwood/ravenizer/RavenizerMain.kt index ff41818cd370..aee453020fb4 100644 --- a/ravenwood/tools/ravenizer/src/com/android/platform/test/ravenwood/ravenizer/RavenizerMain.kt +++ b/ravenwood/tools/ravenizer/src/com/android/platform/test/ravenwood/ravenizer/RavenizerMain.kt @@ -36,6 +36,6 @@ fun main(args: Array<String>) { log.v("Options: $options") // Run. - Ravenizer(options).run() + Ravenizer().run(options) } } diff --git a/ravenwood/tools/ravenizer/src/com/android/platform/test/ravenwood/ravenizer/RavenizerOptions.kt b/ravenwood/tools/ravenizer/src/com/android/platform/test/ravenwood/ravenizer/RavenizerOptions.kt index 10fe0a3b5a93..32dcbe546f3c 100644 --- a/ravenwood/tools/ravenizer/src/com/android/platform/test/ravenwood/ravenizer/RavenizerOptions.kt +++ b/ravenwood/tools/ravenizer/src/com/android/platform/test/ravenwood/ravenizer/RavenizerOptions.kt @@ -47,6 +47,9 @@ class RavenizerOptions( /** Whether the validation failure is fatal or not. */ var fatalValidation: SetOnce<Boolean> = SetOnce(false), + + /** Whether to remove mockito and dexmaker classes. */ + var stripMockito: SetOnce<Boolean> = SetOnce(false), ) { companion object { @@ -85,6 +88,9 @@ class RavenizerOptions( "--fatal-validation" -> ret.fatalValidation.set(true) "--no-fatal-validation" -> ret.fatalValidation.set(false) + "--strip-mockito" -> ret.stripMockito.set(true) + "--no-strip-mockito" -> ret.stripMockito.set(false) + else -> throw ArgumentsException("Unknown option: $arg") } } catch (e: SetOnce.SetMoreThanOnceException) { diff --git a/ravenwood/tools/ravenizer/src/com/android/platform/test/ravenwood/ravenizer/Utils.kt b/ravenwood/tools/ravenizer/src/com/android/platform/test/ravenwood/ravenizer/Utils.kt index 1aa70c08c254..37a797528e13 100644 --- a/ravenwood/tools/ravenizer/src/com/android/platform/test/ravenwood/ravenizer/Utils.kt +++ b/ravenwood/tools/ravenizer/src/com/android/platform/test/ravenwood/ravenizer/Utils.kt @@ -100,3 +100,19 @@ fun String.shouldByBypassed(): Boolean { // TODO -- anything else? ) } + +/** + * Files that should be removed when "--strip-mockito" is set. + */ +fun String.isMockitoFile(): Boolean { + return this.startsWithAny( + "org/mockito/", // Mockito + "com/android/dx/", // DexMaker + "mockito-extensions/", // DexMaker overrides + ) +} + +fun includeUnsupportedMockito(classes: ClassNodes): Boolean { + return classes.findClass("com/android/dx/DexMaker") != null + || classes.findClass("org/mockito/Matchers") != null +} diff --git a/services/accessibility/java/com/android/server/accessibility/magnification/FullScreenMagnificationController.java b/services/accessibility/java/com/android/server/accessibility/magnification/FullScreenMagnificationController.java index 6b6b39df24d7..a77ba624a68f 100644 --- a/services/accessibility/java/com/android/server/accessibility/magnification/FullScreenMagnificationController.java +++ b/services/accessibility/java/com/android/server/accessibility/magnification/FullScreenMagnificationController.java @@ -47,7 +47,6 @@ import android.util.MathUtils; import android.util.Slog; import android.util.SparseArray; import android.util.TypedValue; -import android.view.Display; import android.view.DisplayInfo; import android.view.MagnificationSpec; import android.view.View; @@ -1637,9 +1636,10 @@ public class FullScreenMagnificationController implements * <strong>if scale is >= {@link MagnificationConstants.PERSISTED_SCALE_MIN_VALUE}</strong>. * We assume if the scale is < {@link MagnificationConstants.PERSISTED_SCALE_MIN_VALUE}, there * will be no obvious magnification effect. + * Only the value of the default display is persisted in user's settings. */ public void persistScale(int displayId) { - final float scale = getScale(Display.DEFAULT_DISPLAY); + final float scale = getScale(displayId); if (scale < MagnificationConstants.PERSISTED_SCALE_MIN_VALUE) { return; } diff --git a/services/appfunctions/TEST_MAPPING b/services/appfunctions/TEST_MAPPING index 91cfa064d9fc..1a9bdb6a804a 100644 --- a/services/appfunctions/TEST_MAPPING +++ b/services/appfunctions/TEST_MAPPING @@ -2,6 +2,9 @@ "presubmit": [ { "name": "FrameworksAppFunctionsTests" + }, + { + "name": "CtsAppFunctionTestCases" } ], "postsubmit": [ diff --git a/services/appfunctions/java/com/android/server/appfunctions/AppFunctionManagerServiceImpl.java b/services/appfunctions/java/com/android/server/appfunctions/AppFunctionManagerServiceImpl.java index 517d3afbc2d5..d31ced3f2ce3 100644 --- a/services/appfunctions/java/com/android/server/appfunctions/AppFunctionManagerServiceImpl.java +++ b/services/appfunctions/java/com/android/server/appfunctions/AppFunctionManagerServiceImpl.java @@ -424,62 +424,17 @@ public class AppFunctionManagerServiceImpl extends IAppFunctionManager.Stub { targetUser, mServiceConfig.getExecuteAppFunctionCancellationTimeoutMillis(), cancellationSignal, - new RunServiceCallCallback<IAppFunctionService>() { - @Override - public void onServiceConnected( - @NonNull IAppFunctionService service, - @NonNull - ServiceUsageCompleteListener - serviceUsageCompleteListener) { - try { - service.executeAppFunction( - requestInternal.getClientRequest(), - cancellationCallback, - new IExecuteAppFunctionCallback.Stub() { - @Override - public void onResult( - ExecuteAppFunctionResponse response) { - safeExecuteAppFunctionCallback.onResult( - response); - serviceUsageCompleteListener.onCompleted(); - } - }); - } catch (Exception e) { - safeExecuteAppFunctionCallback.onResult( - ExecuteAppFunctionResponse.newFailure( - ExecuteAppFunctionResponse - .RESULT_APP_UNKNOWN_ERROR, - e.getMessage(), - /* extras= */ null)); - serviceUsageCompleteListener.onCompleted(); - } - } - - @Override - public void onFailedToConnect() { - Slog.e(TAG, "Failed to connect to service"); - safeExecuteAppFunctionCallback.onResult( - ExecuteAppFunctionResponse.newFailure( - ExecuteAppFunctionResponse.RESULT_APP_UNKNOWN_ERROR, - "Failed to connect to AppFunctionService", - /* extras= */ null)); - } - - @Override - public void onCancelled() { - // Do not forward the result back to the caller once it has been - // canceled. The caller does not need a notification and should - // proceed after initiating a cancellation. - safeExecuteAppFunctionCallback.disable(); - } - }, + RunAppFunctionServiceCallback.create( + requestInternal, + cancellationCallback, + safeExecuteAppFunctionCallback), callerBinder); if (!bindServiceResult) { Slog.e(TAG, "Failed to bind to the AppFunctionService"); safeExecuteAppFunctionCallback.onResult( ExecuteAppFunctionResponse.newFailure( - ExecuteAppFunctionResponse.RESULT_TIMED_OUT, + ExecuteAppFunctionResponse.RESULT_INTERNAL_ERROR, "Failed to bind the AppFunctionService.", /* extras= */ null)); } diff --git a/services/appfunctions/java/com/android/server/appfunctions/RunAppFunctionServiceCallback.java b/services/appfunctions/java/com/android/server/appfunctions/RunAppFunctionServiceCallback.java new file mode 100644 index 000000000000..7820390dd544 --- /dev/null +++ b/services/appfunctions/java/com/android/server/appfunctions/RunAppFunctionServiceCallback.java @@ -0,0 +1,103 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.server.appfunctions; + +import android.annotation.NonNull; +import android.app.appfunctions.ExecuteAppFunctionAidlRequest; +import android.app.appfunctions.ExecuteAppFunctionResponse; +import android.app.appfunctions.IAppFunctionService; +import android.app.appfunctions.ICancellationCallback; +import android.app.appfunctions.IExecuteAppFunctionCallback; +import android.app.appfunctions.SafeOneTimeExecuteAppFunctionCallback; +import android.util.Slog; + +import com.android.server.appfunctions.RemoteServiceCaller.RunServiceCallCallback; +import com.android.server.appfunctions.RemoteServiceCaller.ServiceUsageCompleteListener; + + +/** + * A callback to forward a request to the {@link IAppFunctionService} and report back the result. + */ +public class RunAppFunctionServiceCallback implements RunServiceCallCallback<IAppFunctionService> { + + private final ExecuteAppFunctionAidlRequest mRequestInternal; + private final SafeOneTimeExecuteAppFunctionCallback mSafeExecuteAppFunctionCallback; + private final ICancellationCallback mCancellationCallback; + + private RunAppFunctionServiceCallback( + ExecuteAppFunctionAidlRequest requestInternal, + ICancellationCallback cancellationCallback, + SafeOneTimeExecuteAppFunctionCallback safeExecuteAppFunctionCallback) { + this.mRequestInternal = requestInternal; + this.mSafeExecuteAppFunctionCallback = safeExecuteAppFunctionCallback; + this.mCancellationCallback = cancellationCallback; + } + + /** + * Creates a new instance of {@link RunAppFunctionServiceCallback}. + * + * @param requestInternal a request to send to the service. + * @param cancellationCallback a callback to forward cancellation signal to the service. + * @param safeExecuteAppFunctionCallback a callback to report back the result of the operation. + */ + public static RunAppFunctionServiceCallback create( + ExecuteAppFunctionAidlRequest requestInternal, + ICancellationCallback cancellationCallback, + SafeOneTimeExecuteAppFunctionCallback safeExecuteAppFunctionCallback) { + return new RunAppFunctionServiceCallback( + requestInternal, cancellationCallback, safeExecuteAppFunctionCallback); + } + + @Override + public void onServiceConnected( + @NonNull IAppFunctionService service, + @NonNull ServiceUsageCompleteListener serviceUsageCompleteListener) { + try { + service.executeAppFunction( + mRequestInternal.getClientRequest(), + mCancellationCallback, + new IExecuteAppFunctionCallback.Stub() { + @Override + public void onResult(ExecuteAppFunctionResponse response) { + mSafeExecuteAppFunctionCallback.onResult(response); + serviceUsageCompleteListener.onCompleted(); + } + }); + } catch (Exception e) { + mSafeExecuteAppFunctionCallback.onResult( + ExecuteAppFunctionResponse.newFailure( + ExecuteAppFunctionResponse.RESULT_APP_UNKNOWN_ERROR, + e.getMessage(), + /* extras= */ null)); + serviceUsageCompleteListener.onCompleted(); + } + } + + @Override + public void onFailedToConnect() { + Slog.e("AppFunctionManagerServiceImpl", "Failed to connect to service"); + mSafeExecuteAppFunctionCallback.onResult( + ExecuteAppFunctionResponse.newFailure( + ExecuteAppFunctionResponse.RESULT_APP_UNKNOWN_ERROR, + "Failed to connect to AppFunctionService", + /* extras= */ null)); + } + + @Override + public void onCancelled() { + mSafeExecuteAppFunctionCallback.disable(); + } +} diff --git a/services/companion/java/com/android/server/companion/virtual/VirtualDeviceImpl.java b/services/companion/java/com/android/server/companion/virtual/VirtualDeviceImpl.java index cd2dd3a27c9a..81ae717ca959 100644 --- a/services/companion/java/com/android/server/companion/virtual/VirtualDeviceImpl.java +++ b/services/companion/java/com/android/server/companion/virtual/VirtualDeviceImpl.java @@ -42,6 +42,7 @@ import android.app.PendingIntent; import android.app.admin.DevicePolicyManager; import android.app.compat.CompatChanges; import android.companion.AssociationInfo; +import android.companion.AssociationRequest; import android.companion.virtual.ActivityPolicyExemption; import android.companion.virtual.IVirtualDevice; import android.companion.virtual.IVirtualDeviceActivityListener; @@ -153,6 +154,9 @@ final class VirtualDeviceImpl extends IVirtualDevice.Stub private static final String PERSISTENT_ID_PREFIX_CDM_ASSOCIATION = "companion:"; + private static final List<String> DEVICE_PROFILES_ALLOWING_MIRROR_DISPLAYS = List.of( + AssociationRequest.DEVICE_PROFILE_APP_STREAMING); + /** * Timeout until {@link #launchPendingIntent} stops waiting for an activity to be launched. */ @@ -498,6 +502,10 @@ final class VirtualDeviceImpl extends IVirtualDevice.Stub return mAssociationInfo == null ? mParams.getName() : mAssociationInfo.getDisplayName(); } + String getDeviceProfile() { + return mAssociationInfo == null ? null : mAssociationInfo.getDeviceProfile(); + } + /** Returns the public representation of the device. */ VirtualDevice getPublicVirtualDeviceObject() { return mPublicVirtualDeviceObject; @@ -1294,6 +1302,11 @@ final class VirtualDeviceImpl extends IVirtualDevice.Stub return hasCustomAudioInputSupportInternal(); } + @Override + public boolean canCreateMirrorDisplays() { + return DEVICE_PROFILES_ALLOWING_MIRROR_DISPLAYS.contains(getDeviceProfile()); + } + private boolean hasCustomAudioInputSupportInternal() { if (!Flags.vdmPublicApis()) { return false; diff --git a/services/core/java/com/android/server/PackageWatchdog.java b/services/core/java/com/android/server/PackageWatchdog.java index 9060250d9869..2acedd56e505 100644 --- a/services/core/java/com/android/server/PackageWatchdog.java +++ b/services/core/java/com/android/server/PackageWatchdog.java @@ -47,6 +47,7 @@ import android.text.TextUtils; import android.util.ArrayMap; import android.util.ArraySet; import android.util.AtomicFile; +import android.util.EventLog; import android.util.IndentingPrintWriter; import android.util.LongArrayQueue; import android.util.Slog; @@ -200,6 +201,13 @@ public class PackageWatchdog { // aborted. private static final String METADATA_FILE = "/metadata/watchdog/mitigation_count.txt"; + /** + * EventLog tags used when logging into the event log. Note the values must be sync with + * frameworks/base/services/core/java/com/android/server/EventLogTags.logtags to get correct + * name translation. + */ + private static final int LOG_TAG_RESCUE_NOTE = 2900; + private static final Object sPackageWatchdogLock = new Object(); @GuardedBy("sPackageWatchdogLock") private static PackageWatchdog sPackageWatchdog; @@ -2024,7 +2032,7 @@ public class PackageWatchdog { } else { int count = getCount() + 1; setCount(count); - EventLogTags.writeRescueNote(Process.ROOT_UID, count, window); + EventLog.writeEvent(LOG_TAG_RESCUE_NOTE, Process.ROOT_UID, count, window); if (Flags.recoverabilityDetection()) { // After a reboot (e.g. by WARM_REBOOT or mainline rollback) we apply // mitigations without waiting for DEFAULT_BOOT_LOOP_TRIGGER_COUNT. diff --git a/services/core/java/com/android/server/RescueParty.java b/services/core/java/com/android/server/RescueParty.java index ada19530abfb..feb5775e5aac 100644 --- a/services/core/java/com/android/server/RescueParty.java +++ b/services/core/java/com/android/server/RescueParty.java @@ -42,6 +42,7 @@ import android.provider.Settings; import android.sysprop.CrashRecoveryProperties; import android.text.TextUtils; import android.util.ArraySet; +import android.util.EventLog; import android.util.Log; import android.util.Slog; @@ -154,6 +155,14 @@ public class RescueParty { private static final int PERSISTENT_MASK = ApplicationInfo.FLAG_PERSISTENT | ApplicationInfo.FLAG_SYSTEM; + /** + * EventLog tags used when logging into the event log. Note the values must be sync with + * frameworks/base/services/core/java/com/android/server/EventLogTags.logtags to get correct + * name translation. + */ + private static final int LOG_TAG_RESCUE_SUCCESS = 2902; + private static final int LOG_TAG_RESCUE_FAILURE = 2903; + /** Register the Rescue Party observer as a Package Watchdog health observer */ public static void registerHealthObserver(Context context) { PackageWatchdog.getInstance(context).registerHealthObserver( @@ -523,7 +532,7 @@ public class RescueParty { Slog.w(TAG, "Attempting rescue level " + levelToString(level)); try { executeRescueLevelInternal(context, level, failedPackage); - EventLogTags.writeRescueSuccess(level); + EventLog.writeEvent(LOG_TAG_RESCUE_SUCCESS, level); String successMsg = "Finished rescue level " + levelToString(level); if (!TextUtils.isEmpty(failedPackage)) { successMsg += " for package " + failedPackage; @@ -704,7 +713,7 @@ public class RescueParty { private static void logRescueException(int level, @Nullable String failedPackageName, Throwable t) { final String msg = getCompleteMessage(t); - EventLogTags.writeRescueFailure(level, msg); + EventLog.writeEvent(LOG_TAG_RESCUE_FAILURE, level, msg); String failureMsg = "Failed rescue level " + levelToString(level); if (!TextUtils.isEmpty(failedPackageName)) { failureMsg += " for package " + failedPackageName; diff --git a/services/core/java/com/android/server/TEST_MAPPING b/services/core/java/com/android/server/TEST_MAPPING index a459ea944008..ce66dc3c76cb 100644 --- a/services/core/java/com/android/server/TEST_MAPPING +++ b/services/core/java/com/android/server/TEST_MAPPING @@ -114,6 +114,9 @@ "options": [ { "include-filter": "android.os.storage.cts.StorageManagerTest" + }, + { + "include-filter": "android.os.storage.cts.StorageStatsManagerTest" } ] } @@ -173,15 +176,6 @@ "include-filter": "com.android.server.wm.BackgroundActivityStart*" } ] - }, - { - "name": "CtsOsTestCases", - "file_patterns": ["StorageManagerService\\.java"], - "options": [ - { - "include-filter": "android.os.storage.cts.StorageStatsManagerTest" - } - ] } ] } diff --git a/services/core/java/com/android/server/UiModeManagerService.java b/services/core/java/com/android/server/UiModeManagerService.java index f32031dec43c..7daf15821047 100644 --- a/services/core/java/com/android/server/UiModeManagerService.java +++ b/services/core/java/com/android/server/UiModeManagerService.java @@ -17,6 +17,7 @@ package com.android.server; import static android.app.Flags.modesApi; +import static android.app.Flags.enableCurrentModeTypeBinderCache; import static android.app.Flags.enableNightModeBinderCache; import static android.app.UiModeManager.ContrastUtils.CONTRAST_DEFAULT_VALUE; import static android.app.UiModeManager.DEFAULT_PRIORITY; @@ -138,7 +139,7 @@ final class UiModeManagerService extends SystemService { private int mLastBroadcastState = Intent.EXTRA_DOCK_STATE_UNDOCKED; - private final NightMode mNightMode = new NightMode(){ + private final IntProperty mNightMode = new IntProperty(){ private int mNightModeValue = UiModeManager.MODE_NIGHT_NO; @Override @@ -192,7 +193,22 @@ final class UiModeManagerService extends SystemService { // flag set by resource, whether to night mode change for normal all or not. private boolean mNightModeLocked = false; - int mCurUiMode = 0; + private final IntProperty mCurUiMode = new IntProperty(){ + private int mCurrentModeTypeValue = 0; + + @Override + public int get() { + return mCurrentModeTypeValue; + } + + @Override + public void set(int mode) { + mCurrentModeTypeValue = mode; + if (enableCurrentModeTypeBinderCache()) { + UiModeManager.invalidateCurrentModeTypeCache(); + } + } + }; private int mSetUiMode = 0; private boolean mHoldingConfiguration = false; private int mCurrentUser; @@ -810,7 +826,7 @@ final class UiModeManagerService extends SystemService { final long ident = Binder.clearCallingIdentity(); try { synchronized (mLock) { - return mCurUiMode & Configuration.UI_MODE_TYPE_MASK; + return mCurUiMode.get() & Configuration.UI_MODE_TYPE_MASK; } } finally { Binder.restoreCallingIdentity(ident); @@ -1492,7 +1508,7 @@ final class UiModeManagerService extends SystemService { pw.print(" mCarModeEnableFlags="); pw.print(mCarModeEnableFlags); pw.print(" mEnableCarDockLaunch="); pw.println(mEnableCarDockLaunch); - pw.print(" mCurUiMode=0x"); pw.print(Integer.toHexString(mCurUiMode)); + pw.print(" mCurUiMode=0x"); pw.print(Integer.toHexString(mCurUiMode.get())); pw.print(" mUiModeLocked="); pw.print(mUiModeLocked); pw.print(" mSetUiMode=0x"); pw.println(Integer.toHexString(mSetUiMode)); @@ -1745,7 +1761,7 @@ final class UiModeManagerService extends SystemService { + "; uiMode=" + uiMode); } - mCurUiMode = uiMode; + mCurUiMode.set(uiMode); if (!mHoldingConfiguration && (!mWaitForDeviceInactive || mPowerSave)) { mConfiguration.uiMode = uiMode; } @@ -1892,7 +1908,7 @@ final class UiModeManagerService extends SystemService { boolean keepScreenOn = mCharging && ((mCarModeEnabled && mCarModeKeepsScreenOn && (mCarModeEnableFlags & UiModeManager.ENABLE_CAR_MODE_ALLOW_SLEEP) == 0) || - (mCurUiMode == Configuration.UI_MODE_TYPE_DESK && mDeskModeKeepsScreenOn)); + (mCurUiMode.get() == Configuration.UI_MODE_TYPE_DESK && mDeskModeKeepsScreenOn)); if (keepScreenOn != mWakeLock.isHeld()) { if (keepScreenOn) { mWakeLock.acquire(); @@ -2319,11 +2335,12 @@ final class UiModeManagerService extends SystemService { } /** - * Interface to contain the value for system night mode. We make the night mode accessible - * through this class to ensure that the reassignment of this value invalidates the cache. + * Interface to contain the value for an integral property. We make the property + * accessible through this class to ensure that the reassignment of this value invalidates the + * cache. */ - private interface NightMode { + private interface IntProperty { int get(); - void set(int mode); + void set(int value); } } diff --git a/services/core/java/com/android/server/am/AppStartInfoTracker.java b/services/core/java/com/android/server/am/AppStartInfoTracker.java index 71b64567d062..aca6d0b0b967 100644 --- a/services/core/java/com/android/server/am/AppStartInfoTracker.java +++ b/services/core/java/com/android/server/am/AppStartInfoTracker.java @@ -1005,7 +1005,8 @@ public final class AppStartInfoTracker { case (int) AppsStartInfoProto.Package.USERS: AppStartInfoContainer container = new AppStartInfoContainer(mAppStartInfoHistoryListSize); - int uid = container.readFromProto(proto, AppsStartInfoProto.Package.USERS); + int uid = container.readFromProto(proto, AppsStartInfoProto.Package.USERS, + pkgName); synchronized (mLock) { mData.put(pkgName, uid, container); } @@ -1403,7 +1404,7 @@ public final class AppStartInfoTracker { proto.end(token); } - int readFromProto(ProtoInputStream proto, long fieldId) + int readFromProto(ProtoInputStream proto, long fieldId, String packageName) throws IOException, WireTypeMismatchException, ClassNotFoundException { long token = proto.start(fieldId); for (int next = proto.nextField(); @@ -1418,6 +1419,7 @@ public final class AppStartInfoTracker { // have a create time. ApplicationStartInfo info = new ApplicationStartInfo(0); info.readFromProto(proto, AppsStartInfoProto.Package.User.APP_START_INFO); + info.setPackageName(packageName); mInfos.add(info); break; case (int) AppsStartInfoProto.Package.User.MONITORING_ENABLED: diff --git a/services/core/java/com/android/server/am/OomAdjuster.java b/services/core/java/com/android/server/am/OomAdjuster.java index 78a0a117fe6f..796de1982fe5 100644 --- a/services/core/java/com/android/server/am/OomAdjuster.java +++ b/services/core/java/com/android/server/am/OomAdjuster.java @@ -458,7 +458,13 @@ public class OomAdjuster { } void setThreadPriority(int tid, int priority) { - Process.setThreadPriority(tid, priority); + if (Flags.resetOnForkEnabled()) { + Process.setThreadScheduler(tid, + Process.SCHED_OTHER | Process.SCHED_RESET_ON_FORK, + priority); + } else { + Process.setThreadPriority(tid, priority); + } } } diff --git a/services/core/java/com/android/server/am/flags.aconfig b/services/core/java/com/android/server/am/flags.aconfig index 4f6da3baca12..7873d34e9047 100644 --- a/services/core/java/com/android/server/am/flags.aconfig +++ b/services/core/java/com/android/server/am/flags.aconfig @@ -198,13 +198,10 @@ flag { flag { name: "logcat_longer_timeout" - namespace: "backstage_power" + namespace: "stability" description: "Wait longer during the logcat gathering operation" bug: "292533246" is_fixed_read_only: true - metadata { - purpose: PURPOSE_BUGFIX - } } flag { @@ -214,3 +211,10 @@ flag { description: "Defer submitting display events to frozen processes." bug: "326315985" } + +flag { + name: "reset_on_fork_enabled" + namespace: "system_performance" + description: "Set reset_on_fork flag." + bug: "370988407" +} diff --git a/services/core/java/com/android/server/audio/AudioDeviceBroker.java b/services/core/java/com/android/server/audio/AudioDeviceBroker.java index 875041540f40..0475b94c784a 100644 --- a/services/core/java/com/android/server/audio/AudioDeviceBroker.java +++ b/services/core/java/com/android/server/audio/AudioDeviceBroker.java @@ -384,11 +384,12 @@ public class AudioDeviceBroker { /** * Indicates if a Bluetooth SCO activation request owner is controlling * the SCO audio state itself or not. - * @param uid the UI of the SOC request owner app + * @param uid the UID of the SOC request owner app * @return true if we should control SCO audio state, false otherwise */ private boolean shouldStartScoForUid(int uid) { - return !(uid == Process.BLUETOOTH_UID || uid == Process.PHONE_UID); + return !(UserHandle.isSameApp(uid, Process.BLUETOOTH_UID) + || UserHandle.isSameApp(uid, Process.PHONE_UID)); } @GuardedBy("mDeviceStateLock") diff --git a/services/core/java/com/android/server/audio/AudioDeviceInventory.java b/services/core/java/com/android/server/audio/AudioDeviceInventory.java index 5fd12c29d2f8..09de89445122 100644 --- a/services/core/java/com/android/server/audio/AudioDeviceInventory.java +++ b/services/core/java/com/android/server/audio/AudioDeviceInventory.java @@ -385,11 +385,6 @@ public class AudioDeviceInventory { || !updatedDevice.getDeviceAddress().equals(ads.getDeviceAddress())) { continue; } - if (mDeviceBroker.isSADevice(updatedDevice) == mDeviceBroker.isSADevice(ads)) { - ads.setHasHeadTracker(updatedDevice.hasHeadTracker()); - ads.setHeadTrackerEnabled(updatedDevice.isHeadTrackerEnabled()); - ads.setSAEnabled(updatedDevice.isSAEnabled()); - } ads.setAudioDeviceCategory(updatedDevice.getAudioDeviceCategory()); mDeviceBroker.postUpdatedAdiDeviceState(ads, false /*initSA*/); diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java index 561030e77e61..c37d47149ef5 100644 --- a/services/core/java/com/android/server/audio/AudioService.java +++ b/services/core/java/com/android/server/audio/AudioService.java @@ -1583,8 +1583,11 @@ public class AudioService extends IAudioService.Stub synchronized (mCachedAbsVolDrivingStreamsLock) { mCachedAbsVolDrivingStreams.forEach((dev, stream) -> { - mAudioSystem.setDeviceAbsoluteVolumeEnabled(dev, /*address=*/"", /*enabled=*/true, - stream); + boolean enabled = true; + if (dev == AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP) { + enabled = mAvrcpAbsVolSupported; + } + mAudioSystem.setDeviceAbsoluteVolumeEnabled(dev, /*address=*/"", enabled, stream); }); } } @@ -4881,7 +4884,7 @@ public class AudioService extends IAudioService.Stub if (absDev == AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP) { enabled = mAvrcpAbsVolSupported; } - if (stream != streamType) { + if (stream != streamType || !enabled) { mAudioSystem.setDeviceAbsoluteVolumeEnabled(absDev, /*address=*/"", enabled, streamType); } @@ -10097,9 +10100,6 @@ public class AudioService extends IAudioService.Stub case MSG_INIT_SPATIALIZER: onInitSpatializer(); - // the device inventory can only be synchronized after the - // spatializer has been initialized - mDeviceBroker.postSynchronizeAdiDevicesInInventory(null); mAudioEventWakeLock.release(); break; @@ -10383,10 +10383,10 @@ public class AudioService extends IAudioService.Stub } /*package*/ void setAvrcpAbsoluteVolumeSupported(boolean support) { - mAvrcpAbsVolSupported = support; - if (absVolumeIndexFix()) { - int a2dpDev = AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP; - synchronized (mCachedAbsVolDrivingStreamsLock) { + synchronized (mCachedAbsVolDrivingStreamsLock) { + mAvrcpAbsVolSupported = support; + if (absVolumeIndexFix()) { + int a2dpDev = AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP; mCachedAbsVolDrivingStreams.compute(a2dpDev, (dev, stream) -> { if (!mAvrcpAbsVolSupported) { mAudioSystem.setDeviceAbsoluteVolumeEnabled(a2dpDev, /*address=*/ @@ -12499,6 +12499,12 @@ public class AudioService extends IAudioService.Stub pw.println("\nLoudness alignment:"); mLoudnessCodecHelper.dump(pw); + pw.println("\nAbsolute voume devices:"); + synchronized (mCachedAbsVolDrivingStreamsLock) { + mCachedAbsVolDrivingStreams.forEach((dev, stream) -> pw.println( + "Device type: 0x" + Integer.toHexString(dev) + ", driving stream " + stream)); + } + mAudioSystem.dump(pw); } diff --git a/services/core/java/com/android/server/biometrics/AuthSession.java b/services/core/java/com/android/server/biometrics/AuthSession.java index abfbddc18e24..3afecf1d8bbf 100644 --- a/services/core/java/com/android/server/biometrics/AuthSession.java +++ b/services/core/java/com/android/server/biometrics/AuthSession.java @@ -879,6 +879,14 @@ public final class AuthSession implements IBinder.DeathRecipient { ); break; + case BiometricPrompt.DISMISSED_REASON_ERROR_NO_WM: + mClientReceiver.onError( + getEligibleModalities(), + BiometricConstants.BIOMETRIC_ERROR_HW_UNAVAILABLE, + 0 /* vendorCode */ + ); + break; + default: Slog.w(TAG, "Unhandled reason: " + reason); break; diff --git a/services/core/java/com/android/server/biometrics/Utils.java b/services/core/java/com/android/server/biometrics/Utils.java index de7bce78587b..87341365355b 100644 --- a/services/core/java/com/android/server/biometrics/Utils.java +++ b/services/core/java/com/android/server/biometrics/Utils.java @@ -253,9 +253,15 @@ public class Utils { // Check if any of the non-biometric and non-credential bits are set. If so, this is // invalid. - final int testBits = ~(Authenticators.DEVICE_CREDENTIAL - | Authenticators.BIOMETRIC_MIN_STRENGTH - | Authenticators.MANDATORY_BIOMETRICS); + final int testBits; + if (Flags.mandatoryBiometrics()) { + testBits = ~(Authenticators.DEVICE_CREDENTIAL + | Authenticators.BIOMETRIC_MIN_STRENGTH + | Authenticators.MANDATORY_BIOMETRICS); + } else { + testBits = ~(Authenticators.DEVICE_CREDENTIAL + | Authenticators.BIOMETRIC_MIN_STRENGTH); + } if ((authenticators & testBits) != 0) { Slog.e(BiometricService.TAG, "Non-biometric, non-credential bits found." + " Authenticators: " + authenticators); diff --git a/services/core/java/com/android/server/display/DisplayDeviceConfig.java b/services/core/java/com/android/server/display/DisplayDeviceConfig.java index af9c9accb635..8d96ba93530b 100644 --- a/services/core/java/com/android/server/display/DisplayDeviceConfig.java +++ b/services/core/java/com/android/server/display/DisplayDeviceConfig.java @@ -377,6 +377,7 @@ import javax.xml.datatype.DatatypeConfigurationException; * </point> * </map> * </luxToBrightnessMapping> + * <idleStylusTimeoutMillis>10000</idleStylusTimeoutMillis> * </autoBrightness> * * <screenBrightnessRampFastDecrease>0.01</screenBrightnessRampFastDecrease> @@ -708,6 +709,10 @@ public class DisplayDeviceConfig { private static final int KEEP_CURRENT_BRIGHTNESS = -1; + // The default value to 0 which will signify that the stylus usage immediately stopped + // after it was started. This will make the system behave as if the stylus was never used + private static final int DEFAULT_IDLE_STYLUS_TIMEOUT_MILLIS = 0; + private final Context mContext; // The details of the ambient light sensor associated with this display. @@ -754,6 +759,9 @@ public class DisplayDeviceConfig { @Nullable private DisplayBrightnessMappingConfig mDisplayBrightnessMapping; + private int mIdleStylusTimeoutMillis = + DEFAULT_IDLE_STYLUS_TIMEOUT_MILLIS; + private float mBacklightMinimum = Float.NaN; private float mBacklightMaximum = Float.NaN; private float mBrightnessDefault = Float.NaN; @@ -1730,6 +1738,7 @@ public class DisplayDeviceConfig { + ", mDisplayBrightnessMapping= " + mDisplayBrightnessMapping + ", mDdcAutoBrightnessAvailable= " + mDdcAutoBrightnessAvailable + ", mAutoBrightnessAvailable= " + mAutoBrightnessAvailable + + ", mIdleStylusTimeoutMillis= " + mIdleStylusTimeoutMillis + "\n" + "mDefaultLowBlockingZoneRefreshRate= " + mDefaultLowBlockingZoneRefreshRate + ", mDefaultHighBlockingZoneRefreshRate= " + mDefaultHighBlockingZoneRefreshRate @@ -2389,10 +2398,19 @@ public class DisplayDeviceConfig { loadAutoBrightnessDarkeningLightDebounceIdle(autoBrightness); mDisplayBrightnessMapping = new DisplayBrightnessMappingConfig(mContext, mFlags, autoBrightness, getBacklightToBrightnessSpline()); + loadIdleStylusTimeoutMillis(autoBrightness); loadEnableAutoBrightness(autoBrightness); } /** + * Gets the timeout post the stylus usage after which the automatic brightness will be enabled + * again + */ + public int getIdleStylusTimeoutMillis() { + return mIdleStylusTimeoutMillis; + } + + /** * Loads the auto-brightness brightening light debounce. Internally, this takes care of loading * the value from the display config, and if not present, falls back to config.xml. */ @@ -2923,6 +2941,16 @@ public class DisplayDeviceConfig { return levels; } + private void loadIdleStylusTimeoutMillis(AutoBrightness autoBrightness) { + if (autoBrightness == null) { + return; + } + BigInteger idleStylusTimeoutMillis = autoBrightness.getIdleStylusTimeoutMillis(); + if (idleStylusTimeoutMillis != null) { + mIdleStylusTimeoutMillis = idleStylusTimeoutMillis.intValue(); + } + } + private void loadEnableAutoBrightness(AutoBrightness autobrightness) { // mDdcAutoBrightnessAvailable is initialised to true, so that we fallback to using the // config.xml values if the autobrightness tag is not defined in the ddc file. diff --git a/services/core/java/com/android/server/display/DisplayManagerService.java b/services/core/java/com/android/server/display/DisplayManagerService.java index 4152ec9e26e3..bb503aaab471 100644 --- a/services/core/java/com/android/server/display/DisplayManagerService.java +++ b/services/core/java/com/android/server/display/DisplayManagerService.java @@ -1661,33 +1661,49 @@ public final class DisplayManagerService extends SystemService { return false; } + private boolean hasVideoOutputPermission(String func) { + return checkCallingPermission(CAPTURE_VIDEO_OUTPUT, func) + || hasSecureVideoOutputPermission(func); + } + + private boolean hasSecureVideoOutputPermission(String func) { + return checkCallingPermission(CAPTURE_SECURE_VIDEO_OUTPUT, func); + } + + private boolean canCreateMirrorDisplays(IVirtualDevice virtualDevice) { + if (virtualDevice == null) { + return false; + } + try { + return virtualDevice.canCreateMirrorDisplays(); + } catch (RemoteException e) { + Slog.e(TAG, "Unable to query virtual device for permissions", e); + return false; + } + } + private boolean canProjectVideo(IMediaProjection projection) { - if (projection != null) { - try { - if (projection.canProjectVideo()) { - return true; - } - } catch (RemoteException e) { - Slog.e(TAG, "Unable to query projection service for permissions", e); - } + if (projection == null) { + return false; } - if (checkCallingPermission(CAPTURE_VIDEO_OUTPUT, "canProjectVideo()")) { - return true; + try { + return projection.canProjectVideo(); + } catch (RemoteException e) { + Slog.e(TAG, "Unable to query projection service for permissions", e); + return false; } - return canProjectSecureVideo(projection); } private boolean canProjectSecureVideo(IMediaProjection projection) { - if (projection != null) { - try { - if (projection.canProjectSecureVideo()) { - return true; - } - } catch (RemoteException e) { - Slog.e(TAG, "Unable to query projection service for permissions", e); - } + if (projection == null) { + return false; + } + try { + return projection.canProjectSecureVideo(); + } catch (RemoteException e) { + Slog.e(TAG, "Unable to query projection service for permissions", e); + return false; } - return checkCallingPermission(CAPTURE_SECURE_VIDEO_OUTPUT, "canProjectSecureVideo()"); } private boolean checkCallingPermission(String permission, String func) { @@ -1793,7 +1809,8 @@ public final class DisplayManagerService extends SystemService { && (flags & VIRTUAL_DISPLAY_FLAG_AUTO_MIRROR) != 0) { // Only a valid media projection or a virtual device can create a mirror virtual // display. - if (!canProjectVideo(projection) && virtualDevice == null) { + if (!canProjectVideo(projection) && !canCreateMirrorDisplays(virtualDevice) + && !hasVideoOutputPermission("createVirtualDisplayInternal")) { throw new SecurityException("Requires CAPTURE_VIDEO_OUTPUT or " + "CAPTURE_SECURE_VIDEO_OUTPUT permission, or an appropriate " + "MediaProjection token in order to create a screen sharing virtual " @@ -1803,7 +1820,8 @@ public final class DisplayManagerService extends SystemService { } } if (callingUid != Process.SYSTEM_UID && (flags & VIRTUAL_DISPLAY_FLAG_SECURE) != 0) { - if (!canProjectSecureVideo(projection)) { + if (!canProjectSecureVideo(projection) + && !hasSecureVideoOutputPermission("createVirtualDisplayInternal")) { throw new SecurityException("Requires CAPTURE_SECURE_VIDEO_OUTPUT " + "or an appropriate MediaProjection token to create a " + "secure virtual display."); @@ -2093,16 +2111,6 @@ public final class DisplayManagerService extends SystemService { } } - private void setVirtualDisplayStateInternal(IBinder appToken, boolean isOn) { - synchronized (mSyncRoot) { - if (mVirtualDisplayAdapter == null) { - return; - } - - mVirtualDisplayAdapter.setVirtualDisplayStateLocked(appToken, isOn); - } - } - private void setVirtualDisplayRotationInternal(IBinder appToken, @Surface.Rotation int rotation) { int displayId; @@ -4615,16 +4623,6 @@ public final class DisplayManagerService extends SystemService { } @Override // Binder call - public void setVirtualDisplayState(IVirtualDisplayCallback callback, boolean isOn) { - final long token = Binder.clearCallingIdentity(); - try { - setVirtualDisplayStateInternal(callback.asBinder(), isOn); - } finally { - Binder.restoreCallingIdentity(token); - } - } - - @Override // Binder call public void setVirtualDisplayRotation(IVirtualDisplayCallback callback, @Surface.Rotation int rotation) { if (!android.companion.virtualdevice.flags.Flags.virtualDisplayRotationApi()) { @@ -5648,6 +5646,21 @@ public final class DisplayManagerService extends SystemService { public void onPresentation(int displayId, boolean isShown) { mExternalDisplayPolicy.onPresentation(displayId, isShown); } + + @Override + public void stylusGestureStarted(long eventTime) { + if (mFlags.isBlockAutobrightnessChangesOnStylusUsage()) { + DisplayPowerController displayPowerController; + synchronized (mSyncRoot) { + displayPowerController = mDisplayPowerControllers.get( + Display.DEFAULT_DISPLAY); + } + // We assume that the stylus is being used on the default display. This should + // be changed to the displayId on which it is being used once we start getting this + // information from the input manager service + displayPowerController.stylusGestureStarted(eventTime); + } + } } class DesiredDisplayModeSpecsObserver diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java index 03fec0115613..8f07bb37e2ff 100644 --- a/services/core/java/com/android/server/display/DisplayPowerController.java +++ b/services/core/java/com/android/server/display/DisplayPowerController.java @@ -167,12 +167,11 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call private static final int MSG_SET_DWBC_LOGGING_ENABLED = 16; private static final int MSG_SET_BRIGHTNESS_FROM_OFFLOAD = 17; private static final int MSG_OFFLOADING_SCREEN_ON_UNBLOCKED = 18; - - + private static final int MSG_SET_STYLUS_BEING_USED = 19; + private static final int MSG_SET_STYLUS_USE_ENDED = 20; private static final int BRIGHTNESS_CHANGE_STATSD_REPORT_INTERVAL_MS = 500; - // State machine constants for tracking initial brightness ramp skipping when enabled. private static final int RAMP_STATE_SKIP_NONE = 0; private static final int RAMP_STATE_SKIP_INITIAL = 1; @@ -191,6 +190,10 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 200, 300, 400, 500, 600, 700, 800, 900, 1000, 1200, 1400, 1600, 1800, 2000, 2250, 2500, 2750, 3000}; + + private static final int STYLUS_USAGE_DEBOUNCE_TIME = 1000; + private static final int NANO_SECONDS_TO_MILLI_SECONDS_RATIO = 1_000_000; + private static final int[] BRIGHTNESS_RANGE_INDEX = { FrameworkStatsLog.DISPLAY_BRIGHTNESS_CHANGED__BUCKET_INDEX__RANGE_UNKNOWN, FrameworkStatsLog.DISPLAY_BRIGHTNESS_CHANGED__BUCKET_INDEX__RANGE_0_1, @@ -498,6 +501,11 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call @GuardedBy("mLock") private int mPendingOverrideDozeScreenStateLocked; + private long mLastStylusUsageEventTime = -1; + + // The time of inactivity after which the stylus can be assumed to be no longer in use. + private long mIdleStylusTimeoutMillisConfig = 0; + /** * Creates the display power controller. */ @@ -518,6 +526,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call mSensorManager = sensorManager; mHandler = new DisplayControllerHandler(handler.getLooper()); mDisplayDeviceConfig = mDisplayDevice.getDisplayDeviceConfig(); + mIdleStylusTimeoutMillisConfig = mDisplayDeviceConfig.getIdleStylusTimeoutMillis(); mIsEnabled = logicalDisplay.isEnabledLocked(); mIsInTransition = logicalDisplay.isInTransitionLocked(); mIsDisplayInternal = displayDeviceInfo.type == Display.TYPE_INTERNAL; @@ -893,6 +902,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call mPhysicalDisplayName = displayName; mDisplayStatsId = mUniqueDisplayId.hashCode(); mDisplayDeviceConfig = config; + mIdleStylusTimeoutMillisConfig = mDisplayDeviceConfig.getIdleStylusTimeoutMillis(); mThermalBrightnessThrottlingDataId = thermalBrightnessThrottlingDataId; loadFromDisplayDeviceConfig(token, info, hbmMetadata); mDisplayPowerProximityStateController.notifyDisplayDeviceChanged(config); @@ -2971,6 +2981,18 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call return mDisplayId == Display.DEFAULT_DISPLAY || mBootCompleted; } + public void stylusGestureStarted(long eventTimeNanoSeconds) { + long eventTimeMs = eventTimeNanoSeconds / NANO_SECONDS_TO_MILLI_SECONDS_RATIO; + if (mLastStylusUsageEventTime == -1 + || eventTimeMs > mLastStylusUsageEventTime + STYLUS_USAGE_DEBOUNCE_TIME) { + synchronized (mLock) { + // Add a message to notify the stylus usage has started + mHandler.sendEmptyMessageAtTime(MSG_SET_STYLUS_BEING_USED, mClock.uptimeMillis()); + } + mLastStylusUsageEventTime = eventTimeMs; + } + } + private final class DisplayControllerHandler extends Handler { DisplayControllerHandler(Looper looper) { super(looper, null, true /*async*/); @@ -3087,6 +3109,20 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call updatePowerState(); } break; + case MSG_SET_STYLUS_BEING_USED: + // Remove any MSG_SET_STYLUS_USE_ENDED message from the handler queue and + // post a delayed MSG_SET_STYLUS_USE_ENDED message to delay the stylus + // usage ended event processing + mHandler.removeMessages(MSG_SET_STYLUS_USE_ENDED); + Message message = mHandler.obtainMessage(MSG_SET_STYLUS_USE_ENDED); + mHandler.sendMessageAtTime(message, + mClock.uptimeMillis() + mIdleStylusTimeoutMillisConfig); + mDisplayBrightnessController.setStylusBeingUsed(true); + break; + case MSG_SET_STYLUS_USE_ENDED: + mDisplayBrightnessController.setStylusBeingUsed(false); + updatePowerState(); + break; } } } diff --git a/services/core/java/com/android/server/display/LogicalDisplayMapper.java b/services/core/java/com/android/server/display/LogicalDisplayMapper.java index bcb600d0f91c..06a910396d6c 100644 --- a/services/core/java/com/android/server/display/LogicalDisplayMapper.java +++ b/services/core/java/com/android/server/display/LogicalDisplayMapper.java @@ -355,8 +355,8 @@ class LogicalDisplayMapper implements DisplayDeviceRepository.Listener { public SparseArray<int[]> getDisplayIdsByGroupIdLocked() { SparseArray<int[]> displayIdsByGroupIds = new SparseArray<>(); for (int i = 0; i < mDisplayGroups.size(); i++) { - int groupId = mDisplayGroups.get(i).getGroupId(); - displayIdsByGroupIds.put(groupId, getDisplayIdsForGroupLocked(groupId)); + final int displayGroupId = mDisplayGroups.keyAt(i); + displayIdsByGroupIds.put(displayGroupId, getDisplayIdsForGroupLocked(displayGroupId)); } return displayIdsByGroupIds; } diff --git a/services/core/java/com/android/server/display/VirtualDisplayAdapter.java b/services/core/java/com/android/server/display/VirtualDisplayAdapter.java index 9b02f4b71ebe..e77c5ec50f8b 100644 --- a/services/core/java/com/android/server/display/VirtualDisplayAdapter.java +++ b/services/core/java/com/android/server/display/VirtualDisplayAdapter.java @@ -207,13 +207,6 @@ public class VirtualDisplayAdapter extends DisplayAdapter { return device; } - void setVirtualDisplayStateLocked(IBinder appToken, boolean isOn) { - VirtualDisplayDevice device = mVirtualDisplayDevices.get(appToken); - if (device != null) { - device.setDisplayState(isOn); - } - } - DisplayDevice getDisplayDevice(IBinder appToken) { return mVirtualDisplayDevices.get(appToken); } @@ -273,7 +266,6 @@ public class VirtualDisplayAdapter extends DisplayAdapter { private boolean mStopped; private int mPendingChanges; private Display.Mode mMode; - private boolean mIsDisplayOn; private int mDisplayIdToMirror; private boolean mIsWindowManagerMirroring; private DisplayCutout mDisplayCutout; @@ -299,9 +291,8 @@ public class VirtualDisplayAdapter extends DisplayAdapter { mCallback = callback; mProjection = projection; mMediaProjectionCallback = mediaProjectionCallback; - mDisplayState = Display.STATE_UNKNOWN; + mDisplayState = Display.STATE_ON; mPendingChanges |= PENDING_SURFACE_CHANGE; - mIsDisplayOn = surface != null; mDisplayIdToMirror = virtualDisplayConfig.getDisplayIdToMirror(); mIsWindowManagerMirroring = virtualDisplayConfig.isWindowManagerMirroringEnabled(); } @@ -394,6 +385,8 @@ public class VirtualDisplayAdapter extends DisplayAdapter { float sdrBrightnessState, DisplayOffloadSessionImpl displayOffloadSession) { if (state != mDisplayState) { mDisplayState = state; + mInfo = null; + sendDisplayDeviceEventLocked(this, DISPLAY_DEVICE_EVENT_CHANGED); if (state == Display.STATE_OFF) { mCallback.dispatchDisplayPaused(); } else { @@ -416,12 +409,13 @@ public class VirtualDisplayAdapter extends DisplayAdapter { public void setSurfaceLocked(Surface surface) { if (!mStopped && mSurface != surface) { - if ((mSurface != null) != (surface != null)) { + if (mDisplayState == Display.STATE_ON + && ((mSurface == null) != (surface == null))) { + mInfo = null; sendDisplayDeviceEventLocked(this, DISPLAY_DEVICE_EVENT_CHANGED); } sendTraversalRequestLocked(); mSurface = surface; - mInfo = null; mPendingChanges |= PENDING_SURFACE_CHANGE; } } @@ -439,14 +433,6 @@ public class VirtualDisplayAdapter extends DisplayAdapter { } } - void setDisplayState(boolean isOn) { - if (mIsDisplayOn != isOn) { - mIsDisplayOn = isOn; - mInfo = null; - sendDisplayDeviceEventLocked(this, DISPLAY_DEVICE_EVENT_CHANGED); - } - } - public void stopLocked() { Slog.d(TAG, "Virtual Display: stopping device " + mName); setSurfaceLocked(null); @@ -567,7 +553,11 @@ public class VirtualDisplayAdapter extends DisplayAdapter { mInfo.touch = ((mFlags & VIRTUAL_DISPLAY_FLAG_SUPPORTS_TOUCH) == 0) ? DisplayDeviceInfo.TOUCH_NONE : DisplayDeviceInfo.TOUCH_VIRTUAL; - mInfo.state = mIsDisplayOn ? Display.STATE_ON : Display.STATE_OFF; + if (mSurface == null) { + mInfo.state = Display.STATE_OFF; + } else { + mInfo.state = mDisplayState; + } mInfo.ownerUid = mOwnerUid; mInfo.ownerPackageName = mOwnerPackageName; diff --git a/services/core/java/com/android/server/display/brightness/DisplayBrightnessController.java b/services/core/java/com/android/server/display/brightness/DisplayBrightnessController.java index 72a91d59c911..71fdaf3f85b6 100644 --- a/services/core/java/com/android/server/display/brightness/DisplayBrightnessController.java +++ b/services/core/java/com/android/server/display/brightness/DisplayBrightnessController.java @@ -501,6 +501,13 @@ public final class DisplayBrightnessController { return true; } + /** + * Notifies if the stylus is currently being used or not. + */ + public void setStylusBeingUsed(boolean isEnabled) { + // Todo(b/369977976) - Disable the auto-brightness strategy + } + @VisibleForTesting static class Injector { DisplayBrightnessStrategySelector getDisplayBrightnessStrategySelector(Context context, diff --git a/services/core/java/com/android/server/display/feature/DisplayManagerFlags.java b/services/core/java/com/android/server/display/feature/DisplayManagerFlags.java index df66893a2f35..5284d1c423f6 100644 --- a/services/core/java/com/android/server/display/feature/DisplayManagerFlags.java +++ b/services/core/java/com/android/server/display/feature/DisplayManagerFlags.java @@ -203,6 +203,10 @@ public class DisplayManagerFlags { Flags.FLAG_NORMAL_BRIGHTNESS_FOR_DOZE_PARAMETER, Flags::normalBrightnessForDozeParameter ); + private final FlagState mBlockAutobrightnessChangesOnStylusUsage = new FlagState( + Flags.FLAG_BLOCK_AUTOBRIGHTNESS_CHANGES_ON_STYLUS_USAGE, + Flags::blockAutobrightnessChangesOnStylusUsage + ); private final FlagState mEnableBatteryStatsForAllDisplays = new FlagState( Flags.FLAG_ENABLE_BATTERY_STATS_FOR_ALL_DISPLAYS, @@ -436,6 +440,13 @@ public class DisplayManagerFlags { } /** + * @return {@code true} if autobrightness is to be blocked when stylus is being used + */ + public boolean isBlockAutobrightnessChangesOnStylusUsage() { + return mBlockAutobrightnessChangesOnStylusUsage.isEnabled(); + } + + /** * dumps all flagstates * @param pw printWriter */ @@ -479,6 +490,7 @@ public class DisplayManagerFlags { pw.println(" " + mNormalBrightnessForDozeParameter); pw.println(" " + mIdleScreenConfigInSubscribingLightSensor); pw.println(" " + mEnableBatteryStatsForAllDisplays); + pw.println(" " + mBlockAutobrightnessChangesOnStylusUsage); } private static class FlagState { diff --git a/services/core/java/com/android/server/display/feature/display_flags.aconfig b/services/core/java/com/android/server/display/feature/display_flags.aconfig index e3ebe5bcd9ed..252ed09fd125 100644 --- a/services/core/java/com/android/server/display/feature/display_flags.aconfig +++ b/services/core/java/com/android/server/display/feature/display_flags.aconfig @@ -364,4 +364,12 @@ flag { description: "Flag to enable battery stats for all displays." bug: "366112793" is_fixed_read_only: true -}
\ No newline at end of file +} + +flag { + name: "block_autobrightness_changes_on_stylus_usage" + namespace: "display_manager" + description: "Block the usage of ALS to control the display brightness when stylus is being used" + bug: "352411468" + is_fixed_read_only: true +} diff --git a/services/core/java/com/android/server/input/InputManagerService.java b/services/core/java/com/android/server/input/InputManagerService.java index f04557665477..8acf583e0765 100644 --- a/services/core/java/com/android/server/input/InputManagerService.java +++ b/services/core/java/com/android/server/input/InputManagerService.java @@ -2694,6 +2694,9 @@ public class InputManagerService extends IInputManager.Stub @SuppressWarnings("unused") private void notifyStylusGestureStarted(int deviceId, long eventTime) { mBatteryController.notifyStylusGestureStarted(deviceId, eventTime); + if (mDisplayManagerInternal != null) { + mDisplayManagerInternal.stylusGestureStarted(eventTime); + } } /** diff --git a/services/core/java/com/android/server/media/projection/MediaProjectionManagerService.java b/services/core/java/com/android/server/media/projection/MediaProjectionManagerService.java index 47f579db604f..e7e519ede768 100644 --- a/services/core/java/com/android/server/media/projection/MediaProjectionManagerService.java +++ b/services/core/java/com/android/server/media/projection/MediaProjectionManagerService.java @@ -42,6 +42,8 @@ import android.app.AppOpsManager; import android.app.IProcessObserver; import android.app.KeyguardManager; import android.app.compat.CompatChanges; +import android.app.role.RoleManager; +import android.companion.AssociationRequest; import android.compat.annotation.ChangeId; import android.compat.annotation.EnabledSince; import android.content.ComponentName; @@ -94,7 +96,7 @@ import java.util.Objects; /** * Manages MediaProjection sessions. - * + * <p> * The {@link MediaProjectionManagerService} manages the creation and lifetime of MediaProjections, * as well as the capabilities they grant. Any service using MediaProjection tokens as permission * grants <b>must</b> validate the token before use by calling {@link @@ -137,6 +139,7 @@ public final class MediaProjectionManagerService extends SystemService private final PackageManager mPackageManager; private final WindowManagerInternal mWmInternal; private final KeyguardManager mKeyguardManager; + private final RoleManager mRoleManager; private final MediaRouter mMediaRouter; private final MediaRouterCallback mMediaRouterCallback; @@ -173,6 +176,7 @@ public final class MediaProjectionManagerService extends SystemService mKeyguardManager = (KeyguardManager) mContext.getSystemService(Context.KEYGUARD_SERVICE); mKeyguardManager.addKeyguardLockedStateListener( mContext.getMainExecutor(), this::onKeyguardLockedStateChanged); + mRoleManager = mContext.getSystemService(RoleManager.class); Watchdog.getInstance().addMonitor(this); } @@ -182,6 +186,7 @@ public final class MediaProjectionManagerService extends SystemService * - be one of the bugreport allowlisted packages, or * - hold the OP_PROJECT_MEDIA AppOp. */ + @SuppressWarnings("BooleanMethodIsAlwaysInverted") private boolean canCaptureKeyguard() { if (!android.companion.virtualdevice.flags.Flags.mediaProjectionKeyguardRestrictions()) { return true; @@ -193,6 +198,9 @@ public final class MediaProjectionManagerService extends SystemService if (mPackageManager.checkPermission(RECORD_SENSITIVE_CONTENT, mProjectionGrant.packageName) == PackageManager.PERMISSION_GRANTED) { + Slog.v(TAG, + "Allowing keyguard capture for package with RECORD_SENSITIVE_CONTENT " + + "permission"); return true; } if (AppOpsManager.MODE_ALLOWED == mAppOps.noteOpNoThrow(AppOpsManager.OP_PROJECT_MEDIA, @@ -200,6 +208,13 @@ public final class MediaProjectionManagerService extends SystemService "recording lockscreen")) { // Some tools use media projection by granting the OP_PROJECT_MEDIA app // op via a shell command. Those tools can be granted keyguard capture + Slog.v(TAG, + "Allowing keyguard capture for package with OP_PROJECT_MEDIA AppOp "); + return true; + } + if (isProjectionAppHoldingAppStreamingRoleLocked()) { + Slog.v(TAG, + "Allowing keyguard capture for package holding app streaming role."); return true; } return SystemConfig.getInstance().getBugreportWhitelistedPackages() @@ -698,6 +713,20 @@ public final class MediaProjectionManagerService extends SystemService } } + /** + * Application holding the app streaming role + * ({@value AssociationRequest#DEVICE_PROFILE_APP_STREAMING}) are allowed to record the + * lockscreen. + * + * @return true if the is held by the recording application. + */ + @GuardedBy("mLock") + private boolean isProjectionAppHoldingAppStreamingRoleLocked() { + return mRoleManager.getRoleHoldersAsUser(AssociationRequest.DEVICE_PROFILE_APP_STREAMING, + mContext.getUser()) + .contains(mProjectionGrant.packageName); + } + private void dump(final PrintWriter pw) { pw.println("MEDIA PROJECTION MANAGER (dumpsys media_projection)"); synchronized (mLock) { diff --git a/services/core/java/com/android/server/notification/ZenModeFiltering.java b/services/core/java/com/android/server/notification/ZenModeFiltering.java index ff263d1467c3..bdca555707e3 100644 --- a/services/core/java/com/android/server/notification/ZenModeFiltering.java +++ b/services/core/java/com/android/server/notification/ZenModeFiltering.java @@ -37,7 +37,6 @@ import android.util.ArrayMap; import android.util.ArraySet; import android.util.Slog; -import com.android.internal.messages.nano.SystemMessageProto; import com.android.internal.util.NotificationMessagingUtil; import java.io.PrintWriter; @@ -173,13 +172,6 @@ public class ZenModeFiltering { maybeLogInterceptDecision(record, false, "criticalNotification"); return false; } - // Make an exception to policy for the notification saying that policy has changed - if (NotificationManager.Policy.areAllVisualEffectsSuppressed(policy.suppressedVisualEffects) - && "android".equals(record.getSbn().getPackageName()) - && SystemMessageProto.SystemMessage.NOTE_ZEN_UPGRADE == record.getSbn().getId()) { - maybeLogInterceptDecision(record, false, "systemDndChangedNotification"); - return false; - } switch (zen) { case Global.ZEN_MODE_NO_INTERRUPTIONS: // #notevenalarms diff --git a/services/core/java/com/android/server/notification/ZenModeHelper.java b/services/core/java/com/android/server/notification/ZenModeHelper.java index 626c3ddd49d9..ea211a9ab806 100644 --- a/services/core/java/com/android/server/notification/ZenModeHelper.java +++ b/services/core/java/com/android/server/notification/ZenModeHelper.java @@ -54,10 +54,8 @@ import android.annotation.UserIdInt; import android.app.AppOpsManager; import android.app.AutomaticZenRule; import android.app.Flags; -import android.app.Notification; import android.app.NotificationManager; import android.app.NotificationManager.Policy; -import android.app.PendingIntent; import android.app.compat.CompatChanges; import android.compat.annotation.ChangeId; import android.compat.annotation.EnabledSince; @@ -74,7 +72,6 @@ import android.content.pm.ServiceInfo; import android.content.res.Resources; import android.content.res.XmlResourceParser; import android.database.ContentObserver; -import android.graphics.drawable.Icon; import android.media.AudioAttributes; import android.media.AudioManager; import android.media.AudioManagerInternal; @@ -90,7 +87,6 @@ import android.os.Message; import android.os.Process; import android.os.SystemClock; import android.os.UserHandle; -import android.provider.Settings; import android.provider.Settings.Global; import android.service.notification.Condition; import android.service.notification.ConditionProviderService; @@ -117,8 +113,6 @@ import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.config.sysui.SystemUiSystemPropertiesFlags; import com.android.internal.logging.MetricsLogger; -import com.android.internal.messages.nano.SystemMessageProto.SystemMessage; -import com.android.internal.notification.SystemNotificationChannels; import com.android.internal.util.FrameworkStatsLog; import com.android.internal.util.XmlUtils; import com.android.modules.utils.TypedXmlPullParser; @@ -309,7 +303,6 @@ public class ZenModeHelper { mHandler.postMetricsTimer(); cleanUpZenRules(); mIsSystemServicesReady = true; - showZenUpgradeNotification(mZenMode); } /** @@ -485,7 +478,7 @@ public class ZenModeHelper { populateZenRule(pkg, automaticZenRule, rule, origin, /* isNew= */ true); rule = maybeRestoreRemovedRule(newConfig, pkg, rule, automaticZenRule, origin); newConfig.automaticRules.put(rule.id, rule); - maybeReplaceDefaultRule(newConfig, automaticZenRule); + maybeReplaceDefaultRule(newConfig, null, automaticZenRule); if (setConfigLocked(newConfig, origin, reason, rule.component, true, callingUid)) { return rule.id; @@ -535,13 +528,24 @@ public class ZenModeHelper { return ruleToRestore; } - private static void maybeReplaceDefaultRule(ZenModeConfig config, AutomaticZenRule addedRule) { + /** + * Possibly delete built-in rules if a more suitable rule is added or updated. + * + * <p>Today, this is done in one case: delete a disabled "Sleeping" rule if a Bedtime Mode is + * added (or an existing mode is turned into {@link AutomaticZenRule#TYPE_BEDTIME}, when + * upgrading). Because only the {@code config_systemWellbeing} package is allowed to use rules + * of this type, this will not trigger wantonly. + * + * @param oldRule If non-null, {@code rule} is updating {@code oldRule}. Otherwise, + * {@code rule} is being added. + */ + private static void maybeReplaceDefaultRule(ZenModeConfig config, @Nullable ZenRule oldRule, + AutomaticZenRule rule) { if (!Flags.modesApi()) { return; } - if (addedRule.getType() == AutomaticZenRule.TYPE_BEDTIME) { - // Delete a built-in disabled "Sleeping" rule when a BEDTIME rule is added; it may have - // smarter triggers and it will prevent confusion about which one to use. + if (rule.getType() == AutomaticZenRule.TYPE_BEDTIME + && (oldRule == null || oldRule.type != rule.getType())) { // Note: we must not verify canManageAutomaticZenRule here, since most likely they // won't have the same owner (sleeping - system; bedtime - DWB). ZenRule sleepingRule = config.automaticRules.get( @@ -589,6 +593,10 @@ public class ZenModeHelper { // condition) when no changes happen. return true; } + + if (Flags.modesUi()) { + maybeReplaceDefaultRule(newConfig, oldRule, automaticZenRule); + } return setConfigLocked(newConfig, origin, reason, newRule.component, true, callingUid); } @@ -1584,8 +1592,6 @@ public class ZenModeHelper { String reason, @Nullable String caller, int callingUid) { setManualZenMode(zenMode, conditionId, origin, reason, caller, true /*setRingerMode*/, callingUid); - Settings.Secure.putInt(mContext.getContentResolver(), - Settings.Secure.SHOW_ZEN_SETTINGS_SUGGESTION, 0); } private void setManualZenMode(int zenMode, Uri conditionId, @ConfigOrigin int origin, @@ -1783,17 +1789,6 @@ public class ZenModeHelper { SystemZenRules.maybeUpgradeRules(mContext, config); } - // Resolve user id for settings. - userId = userId == UserHandle.USER_ALL ? UserHandle.USER_SYSTEM : userId; - if (config.version < ZenModeConfig.XML_VERSION_ZEN_UPGRADE) { - Settings.Secure.putIntForUser(mContext.getContentResolver(), - Settings.Secure.SHOW_ZEN_UPGRADE_NOTIFICATION, 1, userId); - } else { - // devices not restoring/upgrading already have updated zen settings - Settings.Secure.putIntForUser(mContext.getContentResolver(), - Settings.Secure.ZEN_SETTINGS_UPDATED, 1, userId); - } - if (Flags.modesApi() && forRestore) { // Note: forBackup doesn't write deletedRules, but just in case. config.deletedRules.clear(); @@ -2062,7 +2057,6 @@ public class ZenModeHelper { Global.putInt(mContext.getContentResolver(), Global.ZEN_MODE, zen); ZenLog.traceSetZenMode(Global.getInt(mContext.getContentResolver(), Global.ZEN_MODE, -1), "updated setting"); - showZenUpgradeNotification(zen); } private int getPreviousRingerModeSetting() { @@ -2117,12 +2111,6 @@ public class ZenModeHelper { for (ZenRule automaticRule : mConfig.automaticRules.values()) { if (automaticRule.isActive()) { if (zenSeverity(automaticRule.zenMode) > zenSeverity(zen)) { - // automatic rule triggered dnd and user hasn't seen update dnd dialog - if (Settings.Secure.getInt(mContext.getContentResolver(), - Settings.Secure.ZEN_SETTINGS_SUGGESTION_VIEWED, 1) == 0) { - Settings.Secure.putInt(mContext.getContentResolver(), - Settings.Secure.SHOW_ZEN_SETTINGS_SUGGESTION, 1); - } zen = automaticRule.zenMode; } } @@ -2702,62 +2690,6 @@ public class ZenModeHelper { } } - private void showZenUpgradeNotification(int zen) { - final boolean isWatch = mContext.getPackageManager().hasSystemFeature( - PackageManager.FEATURE_WATCH); - final boolean showNotification = mIsSystemServicesReady - && zen != Global.ZEN_MODE_OFF - && !isWatch - && Settings.Secure.getInt(mContext.getContentResolver(), - Settings.Secure.SHOW_ZEN_UPGRADE_NOTIFICATION, 0) != 0 - && Settings.Secure.getInt(mContext.getContentResolver(), - Settings.Secure.ZEN_SETTINGS_UPDATED, 0) != 1; - - if (isWatch) { - Settings.Secure.putInt(mContext.getContentResolver(), - Settings.Secure.SHOW_ZEN_UPGRADE_NOTIFICATION, 0); - } - - if (showNotification) { - mNotificationManager.notify(TAG, SystemMessage.NOTE_ZEN_UPGRADE, - createZenUpgradeNotification()); - Settings.Secure.putInt(mContext.getContentResolver(), - Settings.Secure.SHOW_ZEN_UPGRADE_NOTIFICATION, 0); - } - } - - @VisibleForTesting - protected Notification createZenUpgradeNotification() { - final Bundle extras = new Bundle(); - extras.putString(Notification.EXTRA_SUBSTITUTE_APP_NAME, - mContext.getResources().getString(R.string.global_action_settings)); - int title = R.string.zen_upgrade_notification_title; - int content = R.string.zen_upgrade_notification_content; - int drawable = R.drawable.ic_zen_24dp; - if (NotificationManager.Policy.areAllVisualEffectsSuppressed( - getConsolidatedNotificationPolicy().suppressedVisualEffects)) { - title = R.string.zen_upgrade_notification_visd_title; - content = R.string.zen_upgrade_notification_visd_content; - drawable = R.drawable.ic_dnd_block_notifications; - } - - Intent onboardingIntent = new Intent(Settings.ZEN_MODE_ONBOARDING); - onboardingIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); - return new Notification.Builder(mContext, SystemNotificationChannels.DO_NOT_DISTURB) - .setAutoCancel(true) - .setSmallIcon(R.drawable.ic_settings_24dp) - .setLargeIcon(Icon.createWithResource(mContext, drawable)) - .setContentTitle(mContext.getResources().getString(title)) - .setContentText(mContext.getResources().getString(content)) - .setContentIntent(PendingIntent.getActivity(mContext, 0, onboardingIntent, - PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE)) - .setAutoCancel(true) - .setLocalOnly(true) - .addExtras(extras) - .setStyle(new Notification.BigTextStyle()) - .build(); - } - private int drawableResNameToResId(String packageName, String resourceName) { if (TextUtils.isEmpty(resourceName)) { return 0; diff --git a/services/core/java/com/android/server/pm/ComputerEngine.java b/services/core/java/com/android/server/pm/ComputerEngine.java index 89ced12e873d..4665a72b0b06 100644 --- a/services/core/java/com/android/server/pm/ComputerEngine.java +++ b/services/core/java/com/android/server/pm/ComputerEngine.java @@ -2208,10 +2208,10 @@ public class ComputerEngine implements Computer { return true; } boolean permissionGranted = requireFullPermission ? hasPermission( - Manifest.permission.INTERACT_ACROSS_USERS_FULL, callingUid) + Manifest.permission.INTERACT_ACROSS_USERS_FULL) : (hasPermission( - android.Manifest.permission.INTERACT_ACROSS_USERS_FULL, callingUid) - || hasPermission(Manifest.permission.INTERACT_ACROSS_USERS, callingUid)); + android.Manifest.permission.INTERACT_ACROSS_USERS_FULL) + || hasPermission(Manifest.permission.INTERACT_ACROSS_USERS)); if (!permissionGranted) { if (Process.isIsolatedUid(callingUid) && isKnownIsolatedComputeApp(callingUid)) { return checkIsolatedOwnerHasPermission(callingUid, requireFullPermission); diff --git a/services/core/java/com/android/server/pm/DexOptHelper.java b/services/core/java/com/android/server/pm/DexOptHelper.java index 1569fa0aa8d7..02afdd662b10 100644 --- a/services/core/java/com/android/server/pm/DexOptHelper.java +++ b/services/core/java/com/android/server/pm/DexOptHelper.java @@ -80,6 +80,7 @@ import com.android.server.pinner.PinnerService; import com.android.server.pm.PackageDexOptimizer.DexOptResult; import com.android.server.pm.dex.DexManager; import com.android.server.pm.dex.DexoptOptions; +import com.android.server.pm.local.PackageManagerLocalImpl; import com.android.server.pm.pkg.AndroidPackage; import com.android.server.pm.pkg.PackageState; import com.android.server.pm.pkg.PackageStateInternal; @@ -819,10 +820,16 @@ public final class DexOptHelper { final PackageSetting ps = installRequest.getScannedPackageSetting(); final String packageName = ps.getPackageName(); + PackageSetting uncommittedPs = null; + if (Flags.improveInstallFreeze()) { + uncommittedPs = ps; + } + PackageManagerLocal packageManagerLocal = LocalManagerRegistry.getManager(PackageManagerLocal.class); try (PackageManagerLocal.FilteredSnapshot snapshot = - packageManagerLocal.withFilteredSnapshot()) { + PackageManagerLocalImpl.withFilteredSnapshot(packageManagerLocal, + uncommittedPs)) { boolean ignoreDexoptProfile = (installRequest.getInstallFlags() & PackageManager.INSTALL_IGNORE_DEXOPT_PROFILE) diff --git a/services/core/java/com/android/server/pm/InstallPackageHelper.java b/services/core/java/com/android/server/pm/InstallPackageHelper.java index aca65bfd561c..83292b775ddc 100644 --- a/services/core/java/com/android/server/pm/InstallPackageHelper.java +++ b/services/core/java/com/android/server/pm/InstallPackageHelper.java @@ -148,6 +148,7 @@ import android.util.ArrayMap; import android.util.ArraySet; import android.util.EventLog; import android.util.ExceptionUtils; +import android.util.IntArray; import android.util.Log; import android.util.Pair; import android.util.Slog; @@ -1014,13 +1015,17 @@ final class InstallPackageHelper { final Map<String, Settings.VersionInfo> versionInfos = new ArrayMap<>(requests.size()); try { CriticalEventLog.getInstance().logInstallPackagesStarted(); - if (prepareInstallPackages(requests) && scanInstallPackages(requests, createdAppId, versionInfos)) { List<ReconciledPackage> reconciledPackages = reconcileInstallPackages(requests, versionInfos); - if (reconciledPackages != null - && renameAndUpdatePaths(requests) + if (reconciledPackages == null) { + return; + } + if (Flags.improveInstallFreeze()) { + prepPerformDexoptIfNeeded(reconciledPackages); + } + if (renameAndUpdatePaths(requests) && commitInstallPackages(reconciledPackages)) { success = true; } @@ -1031,6 +1036,75 @@ final class InstallPackageHelper { } } + private int[] getNewUsers(InstallRequest installRequest, int[] allUsers) + throws PackageManagerException { + final int userId = installRequest.getUserId(); + if (userId != UserHandle.USER_ALL && userId != UserHandle.USER_CURRENT + && !mPm.mUserManager.exists(userId)) { + throw new PackageManagerException(PackageManagerException.INTERNAL_ERROR_MISSING_USER, + "User " + userId + " doesn't exist or has been removed"); + } + + final IntArray newUserIds = new IntArray(); + if (userId != UserHandle.USER_ALL) { + newUserIds.add(userId); + } else if (allUsers != null) { + final int[] installedForUsers = installRequest.getOriginUsers(); + for (int currentUserId : allUsers) { + final boolean installedForCurrentUser = ArrayUtils.contains( + installedForUsers, currentUserId); + final boolean restrictedByPolicy = + mPm.isUserRestricted(currentUserId, + UserManager.DISALLOW_INSTALL_APPS) + || mPm.isUserRestricted(currentUserId, + UserManager.DISALLOW_DEBUGGING_FEATURES); + if (installedForCurrentUser || !restrictedByPolicy) { + newUserIds.add(currentUserId); + } + } + } + + if (newUserIds.size() == 0) { + throw new PackageManagerException(PackageManagerException.INTERNAL_ERROR_MISSING_USER, + "User " + userId + " doesn't exist or has been removed"); + } else { + return newUserIds.toArray(); + } + } + + private void prepPerformDexoptIfNeeded(List<ReconciledPackage> reconciledPackages) { + for (ReconciledPackage reconciledPkg : reconciledPackages) { + final InstallRequest request = reconciledPkg.mInstallRequest; + // prepare profiles + final PackageSetting ps = request.getScannedPackageSetting(); + final PackageSetting oldPkgSetting = request.getScanRequestOldPackageSetting(); + final int[] allUsers = mPm.mUserManager.getUserIds(); + if (reconciledPkg.mCollectedSharedLibraryInfos != null + || (oldPkgSetting != null + && !oldPkgSetting.getSharedLibraryDependencies().isEmpty())) { + // Reconcile if the new package or the old package uses shared libraries. + // It is possible that the old package uses shared libraries but the new + // one doesn't. + mSharedLibraries.executeSharedLibrariesUpdate(request.getParsedPackage(), ps, + null, null, reconciledPkg.mCollectedSharedLibraryInfos, allUsers); + } + try (PackageManagerTracedLock installLock = mPm.mInstallLock.acquireLock()) { + final int[] newUsers = getNewUsers(request, allUsers); + // Hardcode previousAppId to 0 to disable any data migration (http://b/221088088) + mAppDataHelper.prepareAppDataPostCommitLIF(ps, 0, newUsers); + if (request.isClearCodeCache()) { + mAppDataHelper.clearAppDataLIF(ps.getPkg(), UserHandle.USER_ALL, + FLAG_STORAGE_DE | FLAG_STORAGE_CE | FLAG_STORAGE_EXTERNAL + | Installer.FLAG_CLEAR_CODE_CACHE_ONLY); + } + } catch (PackageManagerException e) { + request.setError(e.error, e.getMessage()); + return; + } + DexOptHelper.performDexoptIfNeeded(request, mDexManager, mContext, null); + } + } + private boolean renameAndUpdatePaths(List<InstallRequest> requests) { try (PackageManagerTracedLock installLock = mPm.mInstallLock.acquireLock()) { for (InstallRequest request : requests) { @@ -2655,20 +2729,22 @@ final class InstallPackageHelper { incrementalStorages.add(storage); } - // Hardcode previousAppId to 0 to disable any data migration (http://b/221088088) - mAppDataHelper.prepareAppDataPostCommitLIF(ps, 0, installRequest.getNewUsers()); - if (installRequest.isClearCodeCache()) { - mAppDataHelper.clearAppDataLIF(ps.getPkg(), UserHandle.USER_ALL, - FLAG_STORAGE_DE | FLAG_STORAGE_CE | FLAG_STORAGE_EXTERNAL - | Installer.FLAG_CLEAR_CODE_CACHE_ONLY); - } if (installRequest.isInstallReplace() && pkg != null) { mDexManager.notifyPackageUpdated(packageName, pkg.getBaseApkPath(), pkg.getSplitCodePaths()); } + if (!Flags.improveInstallFreeze()) { + // Hardcode previousAppId to 0 to disable any data migration (http://b/221088088) + mAppDataHelper.prepareAppDataPostCommitLIF(ps, 0, installRequest.getNewUsers()); + if (installRequest.isClearCodeCache()) { + mAppDataHelper.clearAppDataLIF(ps.getPkg(), UserHandle.USER_ALL, + FLAG_STORAGE_DE | FLAG_STORAGE_CE | FLAG_STORAGE_EXTERNAL + | Installer.FLAG_CLEAR_CODE_CACHE_ONLY); + } - DexOptHelper.performDexoptIfNeeded(installRequest, mDexManager, mContext, - mPm.mInstallLock.getRawLock()); + DexOptHelper.performDexoptIfNeeded(installRequest, mDexManager, mContext, + mPm.mInstallLock.getRawLock()); + } } PackageManagerServiceUtils.waitForNativeBinariesExtractionForIncremental( incrementalStorages); diff --git a/services/core/java/com/android/server/pm/LauncherAppsService.java b/services/core/java/com/android/server/pm/LauncherAppsService.java index 8657de24d725..5653da07779b 100644 --- a/services/core/java/com/android/server/pm/LauncherAppsService.java +++ b/services/core/java/com/android/server/pm/LauncherAppsService.java @@ -716,7 +716,7 @@ public class LauncherAppsService extends SystemService { visiblePackages.add(info.getActivityInfo().packageName); } final List<ApplicationInfo> installedPackages = - mPackageManagerInternal.getInstalledApplicationsCrossUser( + mPackageManagerInternal.getInstalledApplications( /* flags= */ 0, user.getIdentifier(), callingUid); for (ApplicationInfo applicationInfo : installedPackages) { if (!visiblePackages.contains(applicationInfo.packageName)) { diff --git a/services/core/java/com/android/server/pm/PackageMonitorCallbackHelper.java b/services/core/java/com/android/server/pm/PackageMonitorCallbackHelper.java index cf5de897cf5d..a28e3c142220 100644 --- a/services/core/java/com/android/server/pm/PackageMonitorCallbackHelper.java +++ b/services/core/java/com/android/server/pm/PackageMonitorCallbackHelper.java @@ -244,7 +244,7 @@ class PackageMonitorCallbackHelper { return; } int registerUid = registerUser.getUid(); - if (allowUids != null && registerUid != Process.SYSTEM_UID + if (allowUids != null && !UserHandle.isSameApp(registerUid, Process.SYSTEM_UID) && !ArrayUtils.contains(allowUids, registerUid)) { if (DEBUG) { Slog.w(TAG, "Skip invoke PackageMonitorCallback for " + intent.getAction() diff --git a/services/core/java/com/android/server/pm/local/PackageManagerLocalImpl.java b/services/core/java/com/android/server/pm/local/PackageManagerLocalImpl.java index 55afb17614af..c22e382682a7 100644 --- a/services/core/java/com/android/server/pm/local/PackageManagerLocalImpl.java +++ b/services/core/java/com/android/server/pm/local/PackageManagerLocalImpl.java @@ -31,6 +31,7 @@ import com.android.server.pm.Computer; import com.android.server.pm.PackageManagerLocal; import com.android.server.pm.PackageManagerService; import com.android.server.pm.pkg.PackageState; +import com.android.server.pm.pkg.PackageStateInternal; import com.android.server.pm.pkg.SharedUserApi; import com.android.server.pm.snapshot.PackageDataSnapshot; @@ -71,8 +72,26 @@ public class PackageManagerLocalImpl implements PackageManagerLocal { @NonNull @Override public FilteredSnapshotImpl withFilteredSnapshot(int callingUid, @NonNull UserHandle user) { + return withFilteredSnapshot(callingUid, user, /* uncommittedPs= */ null); + } + + /** + * Creates a {@link FilteredSnapshot} with a uncommitted {@link PackageState} that is used for + * dexopt in the art service to get the correct package state before the package is committed. + */ + @NonNull + public static FilteredSnapshotImpl withFilteredSnapshot(PackageManagerLocal pm, + @NonNull PackageState uncommittedPs) { + return ((PackageManagerLocalImpl) pm).withFilteredSnapshot(Binder.getCallingUid(), + Binder.getCallingUserHandle(), uncommittedPs); + } + + @NonNull + private FilteredSnapshotImpl withFilteredSnapshot(int callingUid, @NonNull UserHandle user, + @Nullable PackageState uncommittedPs) { return new FilteredSnapshotImpl(callingUid, user, - mService.snapshotComputer(false /*allowLiveComputer*/), null); + mService.snapshotComputer(/* allowLiveComputer= */ false), + /* parentSnapshot= */ null, uncommittedPs); } @Override @@ -145,7 +164,8 @@ public class PackageManagerLocalImpl implements PackageManagerLocal { @Override public FilteredSnapshot filtered(int callingUid, @NonNull UserHandle user) { - return new FilteredSnapshotImpl(callingUid, user, mSnapshot, this); + return new FilteredSnapshotImpl(callingUid, user, mSnapshot, this, + /* uncommittedPs= */ null); } @SuppressWarnings("RedundantSuppression") @@ -209,13 +229,18 @@ public class PackageManagerLocalImpl implements PackageManagerLocal { @Nullable private final UnfilteredSnapshotImpl mParentSnapshot; + @Nullable + private final PackageState mUncommitPackageState; + private FilteredSnapshotImpl(int callingUid, @NonNull UserHandle user, @NonNull PackageDataSnapshot snapshot, - @Nullable UnfilteredSnapshotImpl parentSnapshot) { + @Nullable UnfilteredSnapshotImpl parentSnapshot, + @Nullable PackageState uncommittedPs) { super(snapshot); mCallingUid = callingUid; mUserId = user.getIdentifier(); mParentSnapshot = parentSnapshot; + mUncommitPackageState = uncommittedPs; } @Override @@ -237,6 +262,10 @@ public class PackageManagerLocalImpl implements PackageManagerLocal { @Override public PackageState getPackageState(@NonNull String packageName) { checkClosed(); + if (mUncommitPackageState != null + && packageName.equals(mUncommitPackageState.getPackageName())) { + return mUncommitPackageState; + } return mSnapshot.getPackageStateFiltered(packageName, mCallingUid, mUserId); } @@ -250,6 +279,11 @@ public class PackageManagerLocalImpl implements PackageManagerLocal { var filteredPackageStates = new ArrayMap<String, PackageState>(); for (int index = 0, size = packageStates.size(); index < size; index++) { var packageState = packageStates.valueAt(index); + if (mUncommitPackageState != null + && packageState.getPackageName().equals( + mUncommitPackageState.getPackageName())) { + packageState = (PackageStateInternal) mUncommitPackageState; + } if (!mSnapshot.shouldFilterApplication(packageState, mCallingUid, mUserId)) { filteredPackageStates.put(packageStates.keyAt(index), packageState); } diff --git a/services/core/java/com/android/server/policy/ModifierShortcutManager.java b/services/core/java/com/android/server/policy/ModifierShortcutManager.java index 027e69cbc09b..66ec53e6500e 100644 --- a/services/core/java/com/android/server/policy/ModifierShortcutManager.java +++ b/services/core/java/com/android/server/policy/ModifierShortcutManager.java @@ -667,9 +667,11 @@ public class ModifierShortcutManager { public KeyboardShortcutGroup getApplicationLaunchKeyboardShortcuts(int deviceId) { List<KeyboardShortcutInfo> shortcuts = new ArrayList(); if (modifierShortcutManagerRefactor()) { + Context context = modifierShortcutManagerMultiuser() + ? mContext.createContextAsUser(mCurrentUser, 0) : mContext; for (Bookmark b : mBookmarks.values()) { KeyboardShortcutInfo info = shortcutInfoFromIntent( - b.getShortcutChar(), b.getIntent(mContext), b.isShift()); + b.getShortcutChar(), b.getIntent(context), b.isShift()); if (info != null) { shortcuts.add(info); } diff --git a/services/core/java/com/android/server/power/Notifier.java b/services/core/java/com/android/server/power/Notifier.java index 4fae798f0cef..eb62b5631c43 100644 --- a/services/core/java/com/android/server/power/Notifier.java +++ b/services/core/java/com/android/server/power/Notifier.java @@ -709,7 +709,7 @@ public class Notifier { SparseBooleanArray newDisplayInteractivities = new SparseBooleanArray(); for (int i = 0; i < displaysByGroupId.size(); i++) { final int groupId = displaysByGroupId.keyAt(i); - for (int displayId : displaysByGroupId.get(i)) { + for (int displayId : displaysByGroupId.get(groupId)) { // If we already know display interactivity, use that if (mDisplayInteractivities.indexOfKey(displayId) > 0) { newDisplayInteractivities.put( diff --git a/services/core/java/com/android/server/power/hint/HintManagerService.java b/services/core/java/com/android/server/power/hint/HintManagerService.java index dc482422f9d9..c969eff32f8e 100644 --- a/services/core/java/com/android/server/power/hint/HintManagerService.java +++ b/services/core/java/com/android/server/power/hint/HintManagerService.java @@ -21,6 +21,7 @@ import static android.os.Flags.adpfUseFmqChannel; import static com.android.internal.util.ConcurrentUtils.DIRECT_EXECUTOR; import static com.android.server.power.hint.Flags.adpfSessionTag; import static com.android.server.power.hint.Flags.powerhintThreadCleanup; +import static com.android.server.power.hint.Flags.resetOnForkEnabled; import android.annotation.NonNull; import android.annotation.Nullable; @@ -1057,6 +1058,11 @@ public final class HintManagerService extends SystemService { Slogf.w(TAG, errMsg); throw new SecurityException(errMsg); } + if (resetOnForkEnabled()){ + for (int tid : tids) { + Process.setThreadScheduler(tid, Process.SCHED_RESET_ON_FORK, 0); + } + } if (adpfSessionTag() && tag == SessionTag.APP) { // If the category of the app is a game, @@ -1447,6 +1453,11 @@ public final class HintManagerService extends SystemService { Slogf.w(TAG, errMsg); throw new SecurityException(errMsg); } + if (resetOnForkEnabled()){ + for (int tid : tids) { + Process.setThreadScheduler(tid, Process.SCHED_RESET_ON_FORK, 0); + } + } if (powerhintThreadCleanup()) { synchronized (mNonIsolatedTidsLock) { for (int i = nonIsolated.size() - 1; i >= 0; i--) { diff --git a/services/core/java/com/android/server/power/hint/flags.aconfig b/services/core/java/com/android/server/power/hint/flags.aconfig index 55afa05f66fe..e56b68c93480 100644 --- a/services/core/java/com/android/server/power/hint/flags.aconfig +++ b/services/core/java/com/android/server/power/hint/flags.aconfig @@ -14,3 +14,10 @@ flag { description: "Feature flag for adding session tag to hint session atom" bug: "345011125" } + +flag { + name: "reset_on_fork_enabled" + namespace: "game" + description: "Set reset_on_fork flag." + bug: "370988407" +} diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index 5372abe970c7..29727717bfc1 100644 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java @@ -230,6 +230,7 @@ import static com.android.server.wm.IdentifierProto.HASH_CODE; import static com.android.server.wm.IdentifierProto.TITLE; import static com.android.server.wm.IdentifierProto.USER_ID; import static com.android.server.wm.StartingData.AFTER_TRANSACTION_COPY_TO_CLIENT; +import static com.android.server.wm.StartingData.AFTER_TRANSACTION_IDLE; import static com.android.server.wm.StartingData.AFTER_TRANSACTION_REMOVE_DIRECTLY; import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_APP_TRANSITION; import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_PREDICT_BACK; @@ -286,6 +287,9 @@ import android.app.servertransaction.StopActivityItem; import android.app.servertransaction.TopResumedActivityChangeItem; import android.app.servertransaction.TransferSplashScreenViewStateItem; import android.app.usage.UsageEvents.Event; +import android.compat.annotation.ChangeId; +import android.compat.annotation.EnabledAfter; +import android.compat.annotation.Overridable; import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -465,6 +469,11 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A // finished destroying itself. private static final int DESTROY_TIMEOUT = 10 * 1000; + @ChangeId + @Overridable + @EnabledAfter(targetSdkVersion = Build.VERSION_CODES.VANILLA_ICE_CREAM) + static final long UNIVERSAL_RESIZABLE_BY_DEFAULT = 357141415; + final ActivityTaskManagerService mAtmService; final ActivityCallerState mCallerState; @NonNull @@ -2635,8 +2644,10 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A if (finishing || !mHandleExitSplashScreen || mStartingSurface == null || mStartingWindow == null || mTransferringSplashScreenState == TRANSFER_SPLASH_SCREEN_FINISH - // skip copy splash screen to client if it was resized - || (mStartingData != null && mStartingData.mResizedFromTransfer) + // Skip copy splash screen to client if it was resized, or the starting data already + // requested to be removed after transaction commit. + || (mStartingData != null && (mStartingData.mResizedFromTransfer + || mStartingData.mRemoveAfterTransaction != AFTER_TRANSACTION_IDLE)) || isRelaunching()) { return false; } @@ -3179,11 +3190,20 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A * will be ignored. */ boolean isUniversalResizeable() { - return mWmService.mConstants.mIgnoreActivityOrientationRequest - && info.applicationInfo.category != ApplicationInfo.CATEGORY_GAME - // If the user preference respects aspect ratio, then it becomes non-resizable. - && !mAppCompatController.getAppCompatOverrides().getAppCompatAspectRatioOverrides() - .shouldApplyUserMinAspectRatioOverride(); + if (info.applicationInfo.category == ApplicationInfo.CATEGORY_GAME) { + return false; + } + final boolean compatEnabled = Flags.universalResizableByDefault() + && mDisplayContent != null && mDisplayContent.getConfiguration() + .smallestScreenWidthDp >= WindowManager.LARGE_SCREEN_SMALLEST_SCREEN_WIDTH_DP + && mDisplayContent.getIgnoreOrientationRequest() + && info.isChangeEnabled(UNIVERSAL_RESIZABLE_BY_DEFAULT); + if (!compatEnabled && !mWmService.mConstants.mIgnoreActivityOrientationRequest) { + return false; + } + // If the user preference respects aspect ratio, then it becomes non-resizable. + return !mAppCompatController.getAppCompatOverrides().getAppCompatAspectRatioOverrides() + .shouldApplyUserMinAspectRatioOverride(); } boolean isResizeable() { @@ -8179,7 +8199,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A @ActivityInfo.ScreenOrientation protected int getOverrideOrientation() { int candidateOrientation = super.getOverrideOrientation(); - if (isUniversalResizeable() && ActivityInfo.isFixedOrientation(candidateOrientation)) { + if (ActivityInfo.isFixedOrientation(candidateOrientation) && isUniversalResizeable()) { candidateOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED; } return mAppCompatController.getOrientationPolicy() diff --git a/services/core/java/com/android/server/wm/ActivityStarter.java b/services/core/java/com/android/server/wm/ActivityStarter.java index 49380d4b8797..87fa62ac0e3b 100644 --- a/services/core/java/com/android/server/wm/ActivityStarter.java +++ b/services/core/java/com/android/server/wm/ActivityStarter.java @@ -2759,10 +2759,7 @@ class ActivityStarter { mInTask = null; // Launch ResolverActivity in the source task, so that it stays in the task bounds // when in freeform workspace. - // Also put noDisplay activities in the source task. These by itself can be placed - // in any task/root-task, however it could launch other activities like - // ResolverActivity, and we want those to stay in the original task. - if ((mStartActivity.isResolverOrDelegateActivity() || mStartActivity.noDisplay) + if (mStartActivity.isResolverOrDelegateActivity() && mSourceRecord != null && mSourceRecord.inFreeformWindowingMode()) { mAddingToTask = true; } diff --git a/services/core/java/com/android/server/wm/BackgroundLaunchProcessController.java b/services/core/java/com/android/server/wm/BackgroundLaunchProcessController.java index 1073713cca52..264c8beb44bf 100644 --- a/services/core/java/com/android/server/wm/BackgroundLaunchProcessController.java +++ b/services/core/java/com/android/server/wm/BackgroundLaunchProcessController.java @@ -146,7 +146,7 @@ class BackgroundLaunchProcessController { "process bound by foreground uid"); } // Allow if the caller has an activity in any foreground task. - if (checkConfiguration.checkVisibility && hasActivityInVisibleTask + if (checkConfiguration.checkOtherExemptions && hasActivityInVisibleTask && appSwitchState != APP_SWITCH_DISALLOW) { return new BalVerdict(BAL_ALLOW_FOREGROUND, /*background*/ false, "process has activity in foreground task"); diff --git a/services/core/java/com/android/server/wm/Dimmer.java b/services/core/java/com/android/server/wm/Dimmer.java index a74b0063588a..4824c1613f53 100644 --- a/services/core/java/com/android/server/wm/Dimmer.java +++ b/services/core/java/com/android/server/wm/Dimmer.java @@ -21,6 +21,7 @@ import static com.android.server.wm.WindowManagerDebugConfig.TAG_WITH_CLASS_NAME import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM; import android.annotation.NonNull; +import android.annotation.Nullable; import android.graphics.Rect; import android.util.Log; import android.view.Surface; @@ -128,7 +129,7 @@ class Dimmer { /** * Set the parameters to prepare the dim to be relative parented to the dimming container */ - void prepareReparent(@NonNull WindowContainer<?> geometryParent, + void prepareReparent(@Nullable WindowContainer<?> geometryParent, @NonNull WindowState relativeParent) { mAnimationHelper.setRequestedRelativeParent(relativeParent); mAnimationHelper.setRequestedGeometryParent(geometryParent); @@ -221,7 +222,7 @@ class Dimmer { * @param dimmingContainer The container that is dimming. The dim layer will be rel-z * parented below it */ - public void adjustPosition(@NonNull WindowContainer<?> geometryParent, + public void adjustPosition(@Nullable WindowContainer<?> geometryParent, @NonNull WindowState dimmingContainer) { if (mDimState != null) { mDimState.prepareReparent(geometryParent, dimmingContainer); diff --git a/services/core/java/com/android/server/wm/DimmerAnimationHelper.java b/services/core/java/com/android/server/wm/DimmerAnimationHelper.java index 298edaeaa6d2..3999e03c8a53 100644 --- a/services/core/java/com/android/server/wm/DimmerAnimationHelper.java +++ b/services/core/java/com/android/server/wm/DimmerAnimationHelper.java @@ -108,7 +108,7 @@ public class DimmerAnimationHelper { } // Sets the requested layer to reparent the dim to without applying it immediately - void setRequestedGeometryParent(WindowContainer<?> geometryParent) { + void setRequestedGeometryParent(@Nullable WindowContainer<?> geometryParent) { if (geometryParent != null) { mRequestedProperties.mGeometryParent = geometryParent; } diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java index 08789122c607..66f9230098d8 100644 --- a/services/core/java/com/android/server/wm/WindowState.java +++ b/services/core/java/com/android/server/wm/WindowState.java @@ -5215,7 +5215,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP // but not window manager visible (!isVisibleNow()), it can still be the parent of the // dim, but can not create a new surface or continue a dim alone. Dimmer dimmer; - WindowContainer<?> geometryParent = task; + WindowContainer<?> geometryParent = null; if (Flags.useTasksDimOnly()) { geometryParent = getDimParent(); dimmer = getDimController(); 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 a07facf79423..776de2e52061 100644 --- a/services/core/xsd/display-device-config/display-device-config.xsd +++ b/services/core/xsd/display-device-config/display-device-config.xsd @@ -712,6 +712,12 @@ minOccurs="0" maxOccurs="unbounded"> <xs:annotation name="final"/> </xs:element> + <!-- The time after which the stylus is to be assumed to be not under use. This will + enable the logic of changing the brightness with ambient light changes --> + <xs:element name="idleStylusTimeoutMillis" type="xs:nonNegativeInteger" + minOccurs="0" maxOccurs="1"> + <xs:annotation name="final"/> + </xs:element> </xs:sequence> </xs:complexType> diff --git a/services/core/xsd/display-device-config/schema/current.txt b/services/core/xsd/display-device-config/schema/current.txt index 5309263ed87c..110a5a20da6a 100644 --- a/services/core/xsd/display-device-config/schema/current.txt +++ b/services/core/xsd/display-device-config/schema/current.txt @@ -8,12 +8,14 @@ package com.android.server.display.config { method public final java.math.BigInteger getDarkeningLightDebounceIdleMillis(); method public final java.math.BigInteger getDarkeningLightDebounceMillis(); method public boolean getEnabled(); + method public final java.math.BigInteger getIdleStylusTimeoutMillis(); method public final java.util.List<com.android.server.display.config.LuxToBrightnessMapping> getLuxToBrightnessMapping(); method public final void setBrighteningLightDebounceIdleMillis(java.math.BigInteger); method public final void setBrighteningLightDebounceMillis(java.math.BigInteger); method public final void setDarkeningLightDebounceIdleMillis(java.math.BigInteger); method public final void setDarkeningLightDebounceMillis(java.math.BigInteger); method public void setEnabled(boolean); + method public final void setIdleStylusTimeoutMillis(java.math.BigInteger); } public enum AutoBrightnessModeName { diff --git a/services/tests/PackageManagerComponentOverrideTests/src/com/android/server/pm/test/override/PackageManagerComponentLabelIconOverrideTest.kt b/services/tests/PackageManagerComponentOverrideTests/src/com/android/server/pm/test/override/PackageManagerComponentLabelIconOverrideTest.kt index 7d5532f6e401..5c4716dc751e 100644 --- a/services/tests/PackageManagerComponentOverrideTests/src/com/android/server/pm/test/override/PackageManagerComponentLabelIconOverrideTest.kt +++ b/services/tests/PackageManagerComponentOverrideTests/src/com/android/server/pm/test/override/PackageManagerComponentLabelIconOverrideTest.kt @@ -57,7 +57,6 @@ import org.junit.BeforeClass import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.Parameterized -import org.mockito.ArgumentMatchers.eq import org.mockito.Mockito.any import org.mockito.Mockito.anyInt import org.mockito.Mockito.doReturn @@ -384,10 +383,6 @@ class PackageManagerComponentLabelIconOverrideTest { android.Manifest.permission.INTERACT_ACROSS_USERS_FULL)) { PackageManager.PERMISSION_GRANTED } - whenever(this.checkPermission( - eq(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL), anyInt(), anyInt())) { - PackageManager.PERMISSION_GRANTED - } } val mockSharedLibrariesImpl: SharedLibrariesImpl = mock { whenever(this.snapshot()) { this@mock } diff --git a/services/tests/PackageManagerServiceTests/appenumeration/src/com/android/server/pm/test/appenumeration/CrossUserPackageVisibilityTests.java b/services/tests/PackageManagerServiceTests/appenumeration/src/com/android/server/pm/test/appenumeration/CrossUserPackageVisibilityTests.java index e33ca7775e22..70a2d4847ce7 100644 --- a/services/tests/PackageManagerServiceTests/appenumeration/src/com/android/server/pm/test/appenumeration/CrossUserPackageVisibilityTests.java +++ b/services/tests/PackageManagerServiceTests/appenumeration/src/com/android/server/pm/test/appenumeration/CrossUserPackageVisibilityTests.java @@ -45,7 +45,7 @@ import androidx.test.platform.app.InstrumentationRegistry; import com.android.bedstead.harrier.BedsteadJUnit4; import com.android.bedstead.harrier.DeviceState; -import com.android.bedstead.harrier.annotations.EnsureHasSecondaryUser; +import com.android.bedstead.multiuser.annotations.EnsureHasSecondaryUser; import com.android.bedstead.nene.users.UserReference; import com.android.compatibility.common.util.PollingCheck; import com.android.compatibility.common.util.TestUtils; diff --git a/services/tests/displayservicetests/src/com/android/server/display/DisplayDeviceConfigTest.java b/services/tests/displayservicetests/src/com/android/server/display/DisplayDeviceConfigTest.java index 8e1be9a777fd..3976ea4fc86e 100644 --- a/services/tests/displayservicetests/src/com/android/server/display/DisplayDeviceConfigTest.java +++ b/services/tests/displayservicetests/src/com/android/server/display/DisplayDeviceConfigTest.java @@ -157,6 +157,7 @@ public final class DisplayDeviceConfigTest { .getIdleScreenRefreshRateTimeoutLuxThresholdPoint()); assertNull(mDisplayDeviceConfig.getTempSensor().name); assertTrue(mDisplayDeviceConfig.isAutoBrightnessAvailable()); + assertEquals(0, mDisplayDeviceConfig.getIdleStylusTimeoutMillis()); } @Test @@ -253,6 +254,7 @@ public final class DisplayDeviceConfigTest { .getLux().intValue()); assertEquals(800, idleScreenRefreshRateTimeoutLuxThresholdPoints.get(1) .getTimeout().intValue()); + assertEquals(1000, mDisplayDeviceConfig.getIdleStylusTimeoutMillis()); } @Test @@ -1479,6 +1481,7 @@ public final class DisplayDeviceConfigTest { + "</point>\n" + "</map>\n" + "</luxToBrightnessMapping>\n" + + "<idleStylusTimeoutMillis>1000</idleStylusTimeoutMillis>\n" + "</autoBrightness>\n" + getPowerThrottlingConfig() + "<highBrightnessMode enabled=\"true\">\n" diff --git a/services/tests/displayservicetests/src/com/android/server/display/DisplayManagerServiceTest.java b/services/tests/displayservicetests/src/com/android/server/display/DisplayManagerServiceTest.java index 342c87a6b5f6..6093a67cd320 100644 --- a/services/tests/displayservicetests/src/com/android/server/display/DisplayManagerServiceTest.java +++ b/services/tests/displayservicetests/src/com/android/server/display/DisplayManagerServiceTest.java @@ -1309,6 +1309,38 @@ public class DisplayManagerServiceTest { } /** + * Tests that it's not allowed to create an auto-mirror virtual display without + * CAPTURE_VIDEO_OUTPUT permission or a virtual device that can mirror displays + */ + @Test + public void createAutoMirrorDisplay_withoutPermissionOrAllowedVirtualDevice_throwsException() + throws Exception { + DisplayManagerService displayManager = new DisplayManagerService(mContext, mBasicInjector); + DisplayManagerInternal localService = displayManager.new LocalService(); + registerDefaultDisplays(displayManager); + when(mMockAppToken.asBinder()).thenReturn(mMockAppToken); + IVirtualDevice virtualDevice = mock(IVirtualDevice.class); + when(virtualDevice.getDeviceId()).thenReturn(1); + when(virtualDevice.canCreateMirrorDisplays()).thenReturn(false); + when(mIVirtualDeviceManager.isValidVirtualDeviceId(1)).thenReturn(true); + when(mContext.checkCallingPermission(CAPTURE_VIDEO_OUTPUT)).thenReturn( + PackageManager.PERMISSION_DENIED); + + final VirtualDisplayConfig.Builder builder = + new VirtualDisplayConfig.Builder(VIRTUAL_DISPLAY_NAME, 600, 800, 320) + .setFlags(VIRTUAL_DISPLAY_FLAG_AUTO_MIRROR) + .setUniqueId("uniqueId --- mirror display"); + assertThrows(SecurityException.class, () -> { + localService.createVirtualDisplay( + builder.build(), + mMockAppToken /* callback */, + virtualDevice /* virtualDeviceToken */, + mock(DisplayWindowPolicyController.class), + PACKAGE_NAME); + }); + } + + /** * Tests that the virtual display is added to the default display group when created with * VIRTUAL_DISPLAY_FLAG_AUTO_MIRROR using a virtual device. */ @@ -1320,6 +1352,7 @@ public class DisplayManagerServiceTest { when(mMockAppToken.asBinder()).thenReturn(mMockAppToken); IVirtualDevice virtualDevice = mock(IVirtualDevice.class); when(virtualDevice.getDeviceId()).thenReturn(1); + when(virtualDevice.canCreateMirrorDisplays()).thenReturn(true); when(mIVirtualDeviceManager.isValidVirtualDeviceId(1)).thenReturn(true); // Create an auto-mirror virtual display using a virtual device. @@ -1352,6 +1385,7 @@ public class DisplayManagerServiceTest { when(mMockAppToken.asBinder()).thenReturn(mMockAppToken); IVirtualDevice virtualDevice = mock(IVirtualDevice.class); when(virtualDevice.getDeviceId()).thenReturn(1); + when(virtualDevice.canCreateMirrorDisplays()).thenReturn(true); when(mIVirtualDeviceManager.isValidVirtualDeviceId(1)).thenReturn(true); // Create an auto-mirror virtual display using a virtual device. @@ -1418,6 +1452,7 @@ public class DisplayManagerServiceTest { when(mMockAppToken.asBinder()).thenReturn(mMockAppToken); IVirtualDevice virtualDevice = mock(IVirtualDevice.class); when(virtualDevice.getDeviceId()).thenReturn(1); + when(virtualDevice.canCreateMirrorDisplays()).thenReturn(true); when(mIVirtualDeviceManager.isValidVirtualDeviceId(1)).thenReturn(true); when(mContext.checkCallingPermission(ADD_ALWAYS_UNLOCKED_DISPLAY)) .thenReturn(PackageManager.PERMISSION_GRANTED); @@ -1453,6 +1488,7 @@ public class DisplayManagerServiceTest { when(mMockAppToken.asBinder()).thenReturn(mMockAppToken); IVirtualDevice virtualDevice = mock(IVirtualDevice.class); when(virtualDevice.getDeviceId()).thenReturn(1); + when(virtualDevice.canCreateMirrorDisplays()).thenReturn(true); when(mIVirtualDeviceManager.isValidVirtualDeviceId(1)).thenReturn(true); // Create an auto-mirror virtual display using a virtual device. diff --git a/services/tests/mockingservicestests/src/com/android/server/am/ApplicationStartInfoTest.java b/services/tests/mockingservicestests/src/com/android/server/am/ApplicationStartInfoTest.java index e863f1574932..e678acc092e9 100644 --- a/services/tests/mockingservicestests/src/com/android/server/am/ApplicationStartInfoTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/am/ApplicationStartInfoTest.java @@ -39,6 +39,7 @@ import android.content.pm.PackageManagerInternal; import android.os.FileUtils; import android.os.Handler; import android.os.HandlerThread; +import android.os.Parcel; import android.os.Process; import android.platform.test.annotations.EnableFlags; import android.platform.test.annotations.Presubmit; @@ -580,6 +581,50 @@ public class ApplicationStartInfoTest { assertTrue(mAppStartInfoTracker.mMonotonicClock.monotonicTime() >= originalMonotonicTime); } + /** + * Test to confirm that parcel read and write implementations match, correctly loading records + * with the same values and leaving no data unread. + */ + @Test + public void testParcelReadWriteMatch() throws Exception { + // Create a start info records with all fields set. + ApplicationStartInfo startInfo = new ApplicationStartInfo(1234L); + startInfo.setPid(123); + startInfo.setRealUid(987); + startInfo.setPackageUid(654); + startInfo.setDefiningUid(321); + startInfo.setReason(ApplicationStartInfo.START_REASON_LAUNCHER); + startInfo.setStartupState(ApplicationStartInfo.STARTUP_STATE_FIRST_FRAME_DRAWN); + startInfo.setStartType(ApplicationStartInfo.START_TYPE_WARM); + startInfo.setLaunchMode(ApplicationStartInfo.LAUNCH_MODE_SINGLE_TOP); + startInfo.setPackageName(APP_1_PACKAGE_NAME); + startInfo.setProcessName(APP_1_PROCESS_NAME); + startInfo.addStartupTimestamp(ApplicationStartInfo.START_TIMESTAMP_LAUNCH, 999L); + startInfo.addStartupTimestamp(ApplicationStartInfo.START_TIMESTAMP_FIRST_FRAME, 888L); + startInfo.setForceStopped(true); + startInfo.setStartComponent(ApplicationStartInfo.START_COMPONENT_OTHER); + startInfo.setIntent(buildIntent(COMPONENT)); + + // Write the start info to a parcel. + Parcel parcel = Parcel.obtain(); + startInfo.writeToParcel(parcel, 0 /* flags */); + + // Set the data position back to 0 so it's ready to be read. + parcel.setDataPosition(0); + + // Now load the record from the parcel. + ApplicationStartInfo startInfoFromParcel = new ApplicationStartInfo(parcel); + + // Make sure there is no unread data remaining in the parcel, and confirm that the loaded + // start info object is equal to the one it was written from. Check dataAvail first as if + // that check fails then the next check will fail too, but knowing the status of this check + // will tell us that we're missing a read or write. Check the objects are equals second as + // if the avail check passes and equals fails, then we know we're reading all the data just + // not to the correct fields. + assertEquals(0, parcel.dataAvail()); + assertTrue(startInfo.equals(startInfoFromParcel)); + } + private static <T> void setFieldValue(Class clazz, Object obj, String fieldName, T val) { try { Field field = clazz.getDeclaredField(fieldName); diff --git a/services/tests/mockingservicestests/src/com/android/server/pm/PackageMonitorCallbackHelperTest.java b/services/tests/mockingservicestests/src/com/android/server/pm/PackageMonitorCallbackHelperTest.java index 24e7242792fb..54ee2a3ae0d5 100644 --- a/services/tests/mockingservicestests/src/com/android/server/pm/PackageMonitorCallbackHelperTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/pm/PackageMonitorCallbackHelperTest.java @@ -33,6 +33,7 @@ import android.os.Handler; import android.os.IRemoteCallback; import android.os.Looper; import android.os.Process; +import android.os.UserHandle; import android.util.SparseArray; import org.junit.After; @@ -340,6 +341,24 @@ public class PackageMonitorCallbackHelperTest { verify(callback, after(WAIT_CALLBACK_CALLED_IN_MS).times(1)).sendResult(any()); } + @Test + public void registerPackageMonitor_callbackNotInAllowListSystemUidSecondUser_callbackIsCalled() + throws Exception { + IRemoteCallback callback = createMockPackageMonitorCallback(); + int userId = 10; + int fakeAppId = 12345; + SparseArray<int[]> broadcastAllowList = new SparseArray<>(); + broadcastAllowList.put(userId, new int[]{UserHandle.getUid(userId, fakeAppId)}); + + mPackageMonitorCallbackHelper.registerPackageMonitorCallback(callback, userId, + UserHandle.getUid(userId, Process.SYSTEM_UID)); + mPackageMonitorCallbackHelper.notifyPackageMonitor(Intent.ACTION_PACKAGE_ADDED, + FAKE_PACKAGE_NAME, createFakeBundle(), new int[]{userId}, + null /* instantUserIds */, broadcastAllowList, mHandler, null /* filterExtras */); + + verify(callback, after(WAIT_CALLBACK_CALLED_IN_MS).times(1)).sendResult(any()); + } + private IRemoteCallback createMockPackageMonitorCallback() { return spy(new IRemoteCallback.Stub() { @Override diff --git a/services/tests/servicestests/src/com/android/server/accessibility/magnification/FullScreenMagnificationControllerTest.java b/services/tests/servicestests/src/com/android/server/accessibility/magnification/FullScreenMagnificationControllerTest.java index 1426d5d20419..c4b4afd13a60 100644 --- a/services/tests/servicestests/src/com/android/server/accessibility/magnification/FullScreenMagnificationControllerTest.java +++ b/services/tests/servicestests/src/com/android/server/accessibility/magnification/FullScreenMagnificationControllerTest.java @@ -69,6 +69,7 @@ import androidx.test.InstrumentationRegistry; import androidx.test.runner.AndroidJUnit4; import com.android.internal.R; +import com.android.internal.os.BackgroundThread; import com.android.internal.util.ConcurrentUtils; import com.android.internal.util.test.FakeSettingsProvider; import com.android.server.LocalServices; @@ -92,6 +93,8 @@ import org.mockito.stubbing.Answer; import org.testng.Assert; import java.util.Locale; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ExecutionException; @RunWith(AndroidJUnit4.class) public class FullScreenMagnificationControllerTest { @@ -1440,19 +1443,42 @@ public class FullScreenMagnificationControllerTest { @Test public void persistScale_setValueWhenScaleIsOne_nothingChanged() { + register(TEST_DISPLAY); final float persistedScale = mFullScreenMagnificationController.getPersistedScale(TEST_DISPLAY); PointF pivotPoint = INITIAL_BOUNDS_LOWER_RIGHT_2X_CENTER; - mFullScreenMagnificationController.setScale(DISPLAY_0, 1.0f, pivotPoint.x, pivotPoint.y, + mFullScreenMagnificationController.setScale(TEST_DISPLAY, 1.0f, pivotPoint.x, pivotPoint.y, false, SERVICE_ID_1); mFullScreenMagnificationController.persistScale(TEST_DISPLAY); + // persistScale may post a task to a background thread. Let's wait for it completes. + waitForBackgroundThread(); Assert.assertEquals(mFullScreenMagnificationController.getPersistedScale(TEST_DISPLAY), persistedScale); } @Test + public void persistScale_setValuesOnMultipleDisplays() { + register(DISPLAY_0); + register(DISPLAY_1); + final PointF pivotPoint = INITIAL_BOUNDS_LOWER_RIGHT_2X_CENTER; + mFullScreenMagnificationController.setScale(DISPLAY_0, 3.0f, pivotPoint.x, pivotPoint.y, + false, SERVICE_ID_1); + mFullScreenMagnificationController.persistScale(DISPLAY_0); + mFullScreenMagnificationController.setScale(DISPLAY_1, 4.0f, pivotPoint.x, pivotPoint.y, + false, SERVICE_ID_1); + mFullScreenMagnificationController.persistScale(DISPLAY_1); + + // persistScale may post a task to a background thread. Let's wait for it completes. + waitForBackgroundThread(); + Assert.assertEquals(mFullScreenMagnificationController.getPersistedScale(DISPLAY_0), + 3.0f); + Assert.assertEquals(mFullScreenMagnificationController.getPersistedScale(DISPLAY_1), + 4.0f); + } + + @Test public void testOnContextChanged_alwaysOnFeatureDisabled_resetMagnification() { setScaleToMagnifying(); @@ -1494,6 +1520,15 @@ public class FullScreenMagnificationControllerTest { ); } + private static void waitForBackgroundThread() { + final CompletableFuture<Void> future = new CompletableFuture<>(); + BackgroundThread.getHandler().post(() -> future.complete(null)); + try { + future.get(); + } catch (InterruptedException | ExecutionException ignore) { + } + } + private void setScaleToMagnifying() { register(DISPLAY_0); float scale = 2.0f; diff --git a/services/tests/servicestests/src/com/android/server/accessibility/magnification/MagnificationConnectionManagerTest.java b/services/tests/servicestests/src/com/android/server/accessibility/magnification/MagnificationConnectionManagerTest.java index 87fe6cf8f283..6aa8a32dd7db 100644 --- a/services/tests/servicestests/src/com/android/server/accessibility/magnification/MagnificationConnectionManagerTest.java +++ b/services/tests/servicestests/src/com/android/server/accessibility/magnification/MagnificationConnectionManagerTest.java @@ -300,7 +300,8 @@ public class MagnificationConnectionManagerTest { mMagnificationConnectionManager.setConnection(mMockConnection.getConnection()); mMagnificationConnectionManager.enableWindowMagnification(TEST_DISPLAY, 2.5f, NaN, NaN); - mMagnificationConnectionManager.setScale(TEST_DISPLAY, 10.0f); + mMagnificationConnectionManager.setScale(TEST_DISPLAY, + MagnificationScaleProvider.MAX_SCALE * 2.f); assertEquals(mMagnificationConnectionManager.getScale(TEST_DISPLAY), MagnificationScaleProvider.MAX_SCALE); diff --git a/services/tests/servicestests/src/com/android/server/biometrics/UtilsTest.java b/services/tests/servicestests/src/com/android/server/biometrics/UtilsTest.java index efc2d974a7cc..1bea371c5786 100644 --- a/services/tests/servicestests/src/com/android/server/biometrics/UtilsTest.java +++ b/services/tests/servicestests/src/com/android/server/biometrics/UtilsTest.java @@ -217,7 +217,13 @@ public class UtilsTest { doNothing().when(mContext).enforceCallingOrSelfPermission( eq(SET_BIOMETRIC_DIALOG_ADVANCED), any()); - assertTrue(Utils.isValidAuthenticatorConfig(mContext, Authenticators.MANDATORY_BIOMETRICS)); + if (Flags.mandatoryBiometrics()) { + assertTrue(Utils.isValidAuthenticatorConfig(mContext, + Authenticators.MANDATORY_BIOMETRICS)); + } else { + assertFalse(Utils.isValidAuthenticatorConfig(mContext, + Authenticators.MANDATORY_BIOMETRICS)); + } // The rest of the bits are not allowed to integrate with the public APIs for (int i = 8; i < 32; i++) { diff --git a/services/tests/servicestests/src/com/android/server/media/projection/MediaProjectionManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/media/projection/MediaProjectionManagerServiceTest.java index ee63d5d32ff1..425bb158f997 100644 --- a/services/tests/servicestests/src/com/android/server/media/projection/MediaProjectionManagerServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/media/projection/MediaProjectionManagerServiceTest.java @@ -33,6 +33,7 @@ import static android.view.Display.DEFAULT_DISPLAY; import static android.view.Display.INVALID_DISPLAY; import static com.google.common.truth.Truth.assertThat; +import static com.google.common.truth.Truth.assertWithMessage; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; @@ -51,11 +52,15 @@ import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; import static org.testng.Assert.assertThrows; +import android.Manifest; import android.annotation.SuppressLint; import android.app.ActivityManagerInternal; import android.app.ActivityOptions.LaunchCookie; import android.app.AppOpsManager; +import android.app.Instrumentation; import android.app.KeyguardManager; +import android.app.role.RoleManager; +import android.companion.AssociationRequest; import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; @@ -68,6 +73,7 @@ import android.media.projection.ReviewGrantedConsentResult; import android.os.Binder; import android.os.IBinder; import android.os.Looper; +import android.os.Process; import android.os.RemoteException; import android.os.UserHandle; import android.os.test.TestLooper; @@ -88,6 +94,7 @@ import com.android.server.testutils.OffsettableClock; import com.android.server.wm.WindowManagerInternal; import org.junit.After; +import org.junit.Assert; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -98,6 +105,7 @@ import org.mockito.Captor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import java.util.Objects; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -312,7 +320,6 @@ public class MediaProjectionManagerServiceTest { assertThat(mService.getActiveProjectionInfo()).isNotNull(); } - @SuppressLint("MissingPermission") @EnableFlags(android.companion.virtualdevice.flags .Flags.FLAG_MEDIA_PROJECTION_KEYGUARD_RESTRICTIONS) @Test @@ -335,6 +342,36 @@ public class MediaProjectionManagerServiceTest { assertThat(mService.getActiveProjectionInfo()).isNotNull(); } + @EnableFlags(android.companion.virtualdevice.flags + .Flags.FLAG_MEDIA_PROJECTION_KEYGUARD_RESTRICTIONS) + @Test + public void testCreateProjection_keyguardLocked_RoleHeld() { + runWithRole(AssociationRequest.DEVICE_PROFILE_APP_STREAMING, () -> { + try { + mAppInfo.privateFlags |= PRIVATE_FLAG_PRIVILEGED; + doReturn(mAppInfo).when(mPackageManager).getApplicationInfoAsUser(anyString(), + any(ApplicationInfoFlags.class), any(UserHandle.class)); + MediaProjectionManagerService.MediaProjection projection = + mService.createProjectionInternal(Process.myUid(), + mContext.getPackageName(), + TYPE_MIRRORING, /* isPermanentGrant= */ false, UserHandle.CURRENT); + doReturn(true).when(mKeyguardManager).isKeyguardLocked(); + doReturn(PackageManager.PERMISSION_DENIED).when( + mPackageManager).checkPermission( + RECORD_SENSITIVE_CONTENT, projection.packageName); + + projection.start(mIMediaProjectionCallback); + projection.notifyVirtualDisplayCreated(10); + + // The projection was started because it was allowed to capture the keyguard. + assertWithMessage("Failed to run projection") + .that(mService.getActiveProjectionInfo()).isNotNull(); + } catch (NameNotFoundException e) { + throw new RuntimeException(e); + } + }); + } + @Test public void testCreateProjection_attemptReuse_noPriorProjectionGrant() throws NameNotFoundException { @@ -1202,6 +1239,47 @@ public class MediaProjectionManagerServiceTest { return mService.getProjectionInternal(UID, PACKAGE_NAME); } + /** + * Run the provided block giving the current context's package the provided role. + */ + @SuppressWarnings("SameParameterValue") + private void runWithRole(String role, Runnable block) { + Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation(); + String packageName = mContext.getPackageName(); + UserHandle user = instrumentation.getTargetContext().getUser(); + RoleManager roleManager = Objects.requireNonNull( + mContext.getSystemService(RoleManager.class)); + try { + CountDownLatch latch = new CountDownLatch(1); + instrumentation.getUiAutomation().adoptShellPermissionIdentity( + Manifest.permission.MANAGE_ROLE_HOLDERS, + Manifest.permission.BYPASS_ROLE_QUALIFICATION); + + roleManager.setBypassingRoleQualification(true); + roleManager.addRoleHolderAsUser(role, packageName, /* flags = */ 0, user, + mContext.getMainExecutor(), success -> { + if (success) { + latch.countDown(); + } else { + Assert.fail("Couldn't set role for test (failure) " + role); + } + }); + assertWithMessage("Couldn't set role for test (timeout) : " + role) + .that(latch.await(1, TimeUnit.SECONDS)).isTrue(); + block.run(); + + } catch (InterruptedException e) { + throw new RuntimeException(e); + } finally { + roleManager.removeRoleHolderAsUser(role, packageName, 0, user, + mContext.getMainExecutor(), (aBool) -> { + }); + roleManager.setBypassingRoleQualification(false); + instrumentation.getUiAutomation() + .dropShellPermissionIdentity(); + } + } + private static class FakeIMediaProjectionCallback extends IMediaProjectionCallback.Stub { CountDownLatch mLatch = new CountDownLatch(1); @Override diff --git a/services/tests/uiservicestests/src/com/android/server/notification/ZenModeDiffTest.java b/services/tests/uiservicestests/src/com/android/server/notification/ZenModeDiffTest.java index cf58d9b49832..c6cc941ba1cd 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/ZenModeDiffTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/ZenModeDiffTest.java @@ -70,6 +70,7 @@ import java.util.Set; import platform.test.runner.parameterized.ParameterizedAndroidJunit4; import platform.test.runner.parameterized.Parameters; + @SmallTest @RunWith(ParameterizedAndroidJunit4.class) @TestableLooper.RunWithLooper @@ -147,6 +148,147 @@ public class ZenModeDiffTest extends UiServiceTestCase { } @Test + @EnableFlags({FLAG_MODES_API, FLAG_MODES_UI}) + public void testRuleDiff_toStringNoChangeAddRemove() throws Exception { + // Start with two identical rules + ZenModeConfig.ZenRule r1 = makeRule(); + ZenModeConfig.ZenRule r2 = makeRule(); + + ZenModeDiff.RuleDiff d = new ZenModeDiff.RuleDiff(r1, r2); + assertThat(d.toString()).isEqualTo("ZenRuleDiff{no changes}"); + + d = new ZenModeDiff.RuleDiff(r1, null); + assertThat(d.toString()).isEqualTo("ZenRuleDiff{removed}"); + + d = new ZenModeDiff.RuleDiff(null, r2); + assertThat(d.toString()).isEqualTo("ZenRuleDiff{added}"); + } + + @Test + @EnableFlags({FLAG_MODES_API, FLAG_MODES_UI}) + public void testRuleDiff_toString() throws Exception { + // Start with two identical rules + ZenModeConfig.ZenRule r1 = makeRule(); + ZenModeConfig.ZenRule r2 = makeRule(); + + ArrayMap<String, Object> expectedFrom = new ArrayMap<>(); + ArrayMap<String, Object> expectedTo = new ArrayMap<>(); + List<Field> fieldsForDiff = getFieldsForDiffCheck( + ZenModeConfig.ZenRule.class, getZenRuleExemptFields(), false); + generateFieldDiffs(r1, r2, fieldsForDiff, expectedFrom, expectedTo); + + ZenModeDiff.RuleDiff d = new ZenModeDiff.RuleDiff(r1, r2); + assertThat(d.toString()).isEqualTo("ZenRuleDiff{" + + "enabled:true->false, " + + "conditionOverride:2->1, " + + "name:string1->string2, " + + "zenMode:2->1, " + + "conditionId:null->, " + + "condition:null->Condition[" + + "state=STATE_TRUE," + + "id=hello:," + + "summary=," + + "line1=," + + "line2=," + + "icon=-1," + + "source=SOURCE_UNKNOWN," + + "flags=2], " + + "component:null->ComponentInfo{b/b}, " + + "configurationActivity:null->ComponentInfo{a/a}, " + + "id:string1->string2, " + + "creationTime:200->100, " + + "enabler:string1->string2, " + + "zenPolicy:ZenPolicyDiff{" + + "mPriorityCategories_Reminders:1->2, " + + "mPriorityCategories_Events:1->2, " + + "mPriorityCategories_Messages:1->2, " + + "mPriorityCategories_Calls:1->2, " + + "mPriorityCategories_RepeatCallers:1->2, " + + "mPriorityCategories_Alarms:1->2, " + + "mPriorityCategories_Media:1->2, " + + "mPriorityCategories_System:1->2, " + + "mPriorityCategories_Conversations:1->2, " + + "mVisualEffects_FullScreenIntent:1->2, " + + "mVisualEffects_Lights:1->2, " + + "mVisualEffects_Peek:1->2, " + + "mVisualEffects_StatusBar:1->2, " + + "mVisualEffects_Badge:1->2, " + + "mVisualEffects_Ambient:1->2, " + + "mVisualEffects_NotificationList:1->2, " + + "mPriorityMessages:2->1, " + + "mPriorityCalls:2->1, " + + "mConversationSenders:2->1, " + + "mAllowChannels:2->1}, " + + "modified:true->false, " + + "pkg:string1->string2, " + + "zenDeviceEffects:ZenDeviceEffectsDiff{" + + "mGrayscale:true->false, " + + "mSuppressAmbientDisplay:true->false, " + + "mDimWallpaper:true->false, " + + "mNightMode:true->false, " + + "mDisableAutoBrightness:true->false, " + + "mDisableTapToWake:true->false, " + + "mDisableTiltToWake:true->false, " + + "mDisableTouch:true->false, " + + "mMinimizeRadioUsage:true->false, " + + "mMaximizeDoze:true->false, " + + "mExtraEffects:[effect1]->[effect2]}, " + + "triggerDescription:string1->string2, " + + "type:2->1, " + + "allowManualInvocation:true->false, " + + "iconResName:string1->string2, " + + "legacySuppressedEffects:2->1}"); + } + + @Test + @EnableFlags({FLAG_MODES_API, FLAG_MODES_UI}) + public void testRuleDiff_toStringNullStartPolicy() throws Exception { + // Start with two identical rules + ZenModeConfig.ZenRule r1 = makeRule(); + ZenModeConfig.ZenRule r2 = makeRule(); + + ArrayMap<String, Object> expectedFrom = new ArrayMap<>(); + ArrayMap<String, Object> expectedTo = new ArrayMap<>(); + List<Field> fieldsForDiff = getFieldsForDiffCheck( + ZenModeConfig.ZenRule.class, getZenRuleExemptFields(), false); + generateFieldDiffs(r1, r2, fieldsForDiff, expectedFrom, expectedTo); + + // Create a ZenRule with ZenDeviceEffects and ZenPolicy as null. + r1.zenPolicy = null; + r1.zenDeviceEffects = null; + ZenModeDiff.RuleDiff d = new ZenModeDiff.RuleDiff(r1, r2); + assertThat(d.toString()).isEqualTo("ZenRuleDiff{" + + "enabled:true->false, " + + "conditionOverride:2->1, " + + "name:string1->string2, " + + "zenMode:2->1, " + + "conditionId:null->, " + + "condition:null->Condition[" + + "state=STATE_TRUE," + + "id=hello:," + + "summary=," + + "line1=," + + "line2=," + + "icon=-1," + + "source=SOURCE_UNKNOWN," + + "flags=2], " + + "component:null->ComponentInfo{b/b}, " + + "configurationActivity:null->ComponentInfo{a/a}, " + + "id:string1->string2, " + + "creationTime:200->100, " + + "enabler:string1->string2, " + + "zenPolicy:ZenPolicyDiff{added}, " + + "modified:true->false, " + + "pkg:string1->string2, " + + "zenDeviceEffects:ZenDeviceEffectsDiff{added}, " + + "triggerDescription:string1->string2, " + + "type:2->1, " + + "allowManualInvocation:true->false, " + + "iconResName:string1->string2, " + + "legacySuppressedEffects:2->1}"); + } + + @Test public void testDeviceEffectsDiff_addRemoveSame() { // Test add, remove, and both sides same ZenDeviceEffects effects = new ZenDeviceEffects.Builder().build(); @@ -216,12 +358,18 @@ public class ZenModeDiffTest extends UiServiceTestCase { generateFieldDiffs(effects1, effects2, fieldsForDiff, expectedFrom, expectedTo); d = new ZenModeDiff.DeviceEffectsDiff(effects1, effects2); - assertThat(d.toString()).isEqualTo("ZenDeviceEffectsDiff{mNightMode:true->false, " - + "mDisableTapToWake:true->false, mDisableAutoBrightness:true->false, " - + "mSuppressAmbientDisplay:true->false, mDisableTiltToWake:true->false, " - + "mGrayscale:true->false, mDisableTouch:true->false, mMaximizeDoze:true->false, " - + "mMinimizeRadioUsage:true->false, mExtraEffects:null->[], " - + "mDimWallpaper:true->false}"); + assertThat(d.toString()).isEqualTo("ZenDeviceEffectsDiff{" + + "mGrayscale:true->false, " + + "mSuppressAmbientDisplay:true->false, " + + "mDimWallpaper:true->false, " + + "mNightMode:true->false, " + + "mDisableAutoBrightness:true->false, " + + "mDisableTapToWake:true->false, " + + "mDisableTiltToWake:true->false, " + + "mDisableTouch:true->false, " + + "mMinimizeRadioUsage:true->false, " + + "mMaximizeDoze:true->false, " + + "mExtraEffects:[effect1]->[effect2]}"); } @@ -307,17 +455,27 @@ public class ZenModeDiffTest extends UiServiceTestCase { generateFieldDiffsForZenPolicy(policy1, policy2, fieldsForDiff, expectedFrom, expectedTo); d = new ZenModeDiff.PolicyDiff(policy1, policy2); - assertThat(d.toString()).isEqualTo("ZenPolicyDiff{mPriorityCalls:2->1, " - + "mVisualEffects_StatusBar:1->2, mPriorityCategories_RepeatCallers:1->2, " - + "mPriorityCategories_Calls:1->2, mPriorityCategories_Media:1->2, " - + "mConversationSenders:2->1, mPriorityCategories_Reminders:1->2, " - + "mVisualEffects_Badge:1->2, mPriorityCategories_Messages:1->2, " - + "mAllowChannels:2->1, mPriorityMessages:2->1, " - + "mVisualEffects_NotificationList:1->2, mVisualEffects_FullScreenIntent:1->2, " - + "mPriorityCategories_Alarms:1->2, mVisualEffects_Lights:1->2, " - + "mPriorityCategories_Events:1->2, mVisualEffects_Ambient:1->2, " - + "mPriorityCategories_System:1->2, mPriorityCategories_Conversations:1->2, " - + "mVisualEffects_Peek:1->2}"); + assertThat(d.toString()).isEqualTo("ZenPolicyDiff{" + + "mPriorityCategories_Reminders:1->2, " + + "mPriorityCategories_Events:1->2, " + + "mPriorityCategories_Messages:1->2, " + + "mPriorityCategories_Calls:1->2, " + + "mPriorityCategories_RepeatCallers:1->2, " + + "mPriorityCategories_Alarms:1->2, " + + "mPriorityCategories_Media:1->2, " + + "mPriorityCategories_System:1->2, " + + "mPriorityCategories_Conversations:1->2, " + + "mVisualEffects_FullScreenIntent:1->2, " + + "mVisualEffects_Lights:1->2, " + + "mVisualEffects_Peek:1->2, " + + "mVisualEffects_StatusBar:1->2, " + + "mVisualEffects_Badge:1->2, " + + "mVisualEffects_Ambient:1->2, " + + "mVisualEffects_NotificationList:1->2, " + + "mPriorityMessages:2->1, " + + "mPriorityCalls:2->1, " + + "mConversationSenders:2->1, " + + "mAllowChannels:2->1}"); } private static Set<String> getZenRuleExemptFields() { @@ -701,6 +859,44 @@ public class ZenModeDiffTest extends UiServiceTestCase { expectedA.put(f.getName(), "string1"); f.set(b, "string2"); expectedB.put(f.getName(), "string2"); + } else if (Set.class.equals(t)) { + Set<String> aSet = Set.of("effect1"); + Set<String> bSet = Set.of("effect2"); + f.set(a, aSet); + expectedA.put(f.getName(), aSet); + f.set(b, bSet); + expectedB.put(f.getName(), bSet); + } else if (ZenDeviceEffects.class.equals(t)) { + // Recurse into generating field diffs for ZenDeviceEffects. + ZenDeviceEffects effects1 = new ZenDeviceEffects.Builder().build(); + ZenDeviceEffects effects2 = new ZenDeviceEffects.Builder().build(); + // maps mapping field name -> expected output value as we set diffs + ArrayMap<String, Object> expectedFrom = new ArrayMap<>(); + ArrayMap<String, Object> expectedTo = new ArrayMap<>(); + + List<Field> fieldsForDiff = getFieldsForDiffCheck( + ZenDeviceEffects.class, Collections.emptySet() /*no exempt fields*/, true); + generateFieldDiffs(effects1, effects2, fieldsForDiff, expectedFrom, expectedTo); + f.set(a, effects1); + expectedA.put(f.getName(), effects1); + f.set(b, effects2); + expectedB.put(f.getName(), effects2); + } else if (ZenPolicy.class.equals(t)) { + // Recurse into generating field diffs for ZenPolicy. + ZenPolicy policy1 = new ZenPolicy.Builder().build(); + ZenPolicy policy2 = new ZenPolicy.Builder().build(); + // maps mapping field name -> expected output value as we set diffs + ArrayMap<String, Object> expectedFrom = new ArrayMap<>(); + ArrayMap<String, Object> expectedTo = new ArrayMap<>(); + + List<Field> fieldsForDiff = getFieldsForDiffCheck(ZenPolicy.class, + Collections.emptySet(), false); + generateFieldDiffsForZenPolicy(policy1, policy2, fieldsForDiff, expectedFrom, + expectedTo); + f.set(a, policy1); + expectedA.put(f.getName(), policy1); + f.set(b, policy2); + expectedB.put(f.getName(), policy2); } else { // catch-all for other types: have the field be "added" f.set(a, null); 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 b997f5d9a2a0..a49f5a89b11b 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/ZenModeFilteringTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/ZenModeFilteringTest.java @@ -26,8 +26,6 @@ import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_CONVERSAT import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES; import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_REPEAT_CALLERS; import static android.app.NotificationManager.Policy.PRIORITY_SENDERS_ANY; -import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_STATUS_BAR; -import static android.provider.Settings.Global.ZEN_MODE_ALARMS; import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS; import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS; import static android.provider.Settings.Global.ZEN_MODE_OFF; @@ -57,7 +55,6 @@ import android.util.ArraySet; import androidx.test.filters.SmallTest; -import com.android.internal.messages.nano.SystemMessageProto.SystemMessage; import com.android.internal.util.NotificationMessagingUtil; import com.android.server.UiServiceTestCase; @@ -188,49 +185,6 @@ public class ZenModeFilteringTest extends UiServiceTestCase { } @Test - public void testSuppressDNDInfo_yes_VisEffectsAllowed() { - NotificationRecord r = getNotificationRecord(); - when(r.getSbn().getPackageName()).thenReturn("android"); - when(r.getSbn().getId()).thenReturn(SystemMessage.NOTE_ZEN_UPGRADE); - Policy policy = new Policy(0, 0, 0, Policy.getAllSuppressedVisualEffects() - - SUPPRESSED_EFFECT_STATUS_BAR, 0); - - assertTrue(mZenModeFiltering.shouldIntercept(ZEN_MODE_IMPORTANT_INTERRUPTIONS, policy, r)); - } - - @Test - public void testSuppressDNDInfo_yes_WrongId() { - NotificationRecord r = getNotificationRecord(); - when(r.getSbn().getPackageName()).thenReturn("android"); - when(r.getSbn().getId()).thenReturn(SystemMessage.NOTE_ACCOUNT_CREDENTIAL_PERMISSION); - Policy policy = new Policy(0, 0, 0, Policy.getAllSuppressedVisualEffects(), 0); - - assertTrue(mZenModeFiltering.shouldIntercept(ZEN_MODE_IMPORTANT_INTERRUPTIONS, policy, r)); - } - - @Test - public void testSuppressDNDInfo_yes_WrongPackage() { - NotificationRecord r = getNotificationRecord(); - when(r.getSbn().getPackageName()).thenReturn("android2"); - when(r.getSbn().getId()).thenReturn(SystemMessage.NOTE_ZEN_UPGRADE); - Policy policy = new Policy(0, 0, 0, Policy.getAllSuppressedVisualEffects(), 0); - - assertTrue(mZenModeFiltering.shouldIntercept(ZEN_MODE_IMPORTANT_INTERRUPTIONS, policy, r)); - } - - @Test - public void testSuppressDNDInfo_no() { - NotificationRecord r = getNotificationRecord(); - when(r.getSbn().getPackageName()).thenReturn("android"); - when(r.getSbn().getId()).thenReturn(SystemMessage.NOTE_ZEN_UPGRADE); - Policy policy = new Policy(0, 0, 0, Policy.getAllSuppressedVisualEffects(), 0); - - assertFalse(mZenModeFiltering.shouldIntercept(ZEN_MODE_IMPORTANT_INTERRUPTIONS, policy, r)); - assertFalse(mZenModeFiltering.shouldIntercept(ZEN_MODE_ALARMS, policy, r)); - assertFalse(mZenModeFiltering.shouldIntercept(ZEN_MODE_NO_INTERRUPTIONS, policy, r)); - } - - @Test public void testSuppressAnything_yes_ZenModeOff() { NotificationRecord r = getNotificationRecord(); when(r.getSbn().getPackageName()).thenReturn("bananas"); diff --git a/services/tests/uiservicestests/src/com/android/server/notification/ZenModeHelperTest.java b/services/tests/uiservicestests/src/com/android/server/notification/ZenModeHelperTest.java index d4cba8d726fb..294027b10b26 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/ZenModeHelperTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/ZenModeHelperTest.java @@ -169,7 +169,6 @@ import androidx.test.filters.SmallTest; import com.android.internal.R; import com.android.internal.config.sysui.TestableFlagResolver; -import com.android.internal.messages.nano.SystemMessageProto.SystemMessage; import com.android.modules.utils.TypedXmlPullParser; import com.android.modules.utils.TypedXmlSerializer; import com.android.os.AtomsProto; @@ -747,54 +746,6 @@ public class ZenModeHelperTest extends UiServiceTestCase { } @Test - public void testZenUpgradeNotification() { - /** - * Commit a485ec65b5ba947d69158ad90905abf3310655cf disabled DND status change - * notification on watches. So, assume that the device is not watch. - */ - when(mContext.getPackageManager()).thenReturn(mPackageManager); - when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_WATCH)).thenReturn(false); - - // shows zen upgrade notification if stored settings says to shows, - // zen has not been updated, boot is completed - // and we're setting zen mode on - Settings.Secure.putInt(mContentResolver, Settings.Secure.SHOW_ZEN_UPGRADE_NOTIFICATION, 1); - Settings.Secure.putInt(mContentResolver, Settings.Secure.ZEN_SETTINGS_UPDATED, 0); - mZenModeHelper.mIsSystemServicesReady = true; - mZenModeHelper.mConsolidatedPolicy = new Policy(0, 0, 0, 0, 0, 0); - mZenModeHelper.setZenModeSetting(ZEN_MODE_IMPORTANT_INTERRUPTIONS); - - verify(mNotificationManager, times(1)).notify(eq(ZenModeHelper.TAG), - eq(SystemMessage.NOTE_ZEN_UPGRADE), any()); - assertEquals(0, Settings.Secure.getInt(mContentResolver, - Settings.Secure.SHOW_ZEN_UPGRADE_NOTIFICATION, -1)); - } - - @Test - public void testNoZenUpgradeNotification() { - // doesn't show upgrade notification if stored settings says don't show - Settings.Secure.putInt(mContentResolver, Settings.Secure.SHOW_ZEN_UPGRADE_NOTIFICATION, 0); - Settings.Secure.putInt(mContentResolver, Settings.Secure.ZEN_SETTINGS_UPDATED, 0); - mZenModeHelper.mIsSystemServicesReady = true; - mZenModeHelper.setZenModeSetting(ZEN_MODE_IMPORTANT_INTERRUPTIONS); - - verify(mNotificationManager, never()).notify(eq(ZenModeHelper.TAG), - eq(SystemMessage.NOTE_ZEN_UPGRADE), any()); - } - - @Test - public void testNoZenUpgradeNotificationZenUpdated() { - // doesn't show upgrade notification since zen was already updated - Settings.Secure.putInt(mContentResolver, Settings.Secure.SHOW_ZEN_UPGRADE_NOTIFICATION, 0); - Settings.Secure.putInt(mContentResolver, Settings.Secure.ZEN_SETTINGS_UPDATED, 1); - mZenModeHelper.mIsSystemServicesReady = true; - mZenModeHelper.setZenModeSetting(ZEN_MODE_IMPORTANT_INTERRUPTIONS); - - verify(mNotificationManager, never()).notify(eq(ZenModeHelper.TAG), - eq(SystemMessage.NOTE_ZEN_UPGRADE), any()); - } - - @Test public void testZenSetInternalRinger_AllPriorityNotificationSoundsMuted() { AudioManagerInternal mAudioManager = mock(AudioManagerInternal.class); mZenModeHelper.mAudioManager = mAudioManager; @@ -3032,6 +2983,33 @@ public class ZenModeHelperTest extends UiServiceTestCase { } @Test + @EnableFlags({FLAG_MODES_API, FLAG_MODES_UI}) + public void updateAutomaticZenRule_withTypeBedtime_replacesDisabledSleeping() { + ZenRule sleepingRule = createCustomAutomaticRule(ZEN_MODE_IMPORTANT_INTERRUPTIONS, + ZenModeConfig.EVERY_NIGHT_DEFAULT_RULE_ID); + sleepingRule.enabled = false; + sleepingRule.userModifiedFields = 0; + sleepingRule.name = "ZZZZZZZ..."; + mZenModeHelper.mConfig.automaticRules.clear(); + mZenModeHelper.mConfig.automaticRules.put(sleepingRule.id, sleepingRule); + + AutomaticZenRule futureBedtime = new AutomaticZenRule.Builder("Bedtime (?)", CONDITION_ID) + .build(); + String bedtimeRuleId = mZenModeHelper.addAutomaticZenRule(mPkg, futureBedtime, + ORIGIN_APP, "reason", CUSTOM_PKG_UID); + assertThat(mZenModeHelper.mConfig.automaticRules.keySet()) + .containsExactly(sleepingRule.id, bedtimeRuleId); + + AutomaticZenRule bedtime = new AutomaticZenRule.Builder("Bedtime (!)", CONDITION_ID) + .setType(TYPE_BEDTIME) + .build(); + mZenModeHelper.updateAutomaticZenRule(bedtimeRuleId, bedtime, ORIGIN_APP, "reason", + CUSTOM_PKG_UID); + + assertThat(mZenModeHelper.mConfig.automaticRules.keySet()).containsExactly(bedtimeRuleId); + } + + @Test @EnableFlags(FLAG_MODES_API) public void testSetManualZenMode() { setupZenConfig(); diff --git a/services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java b/services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java index adc969c40e35..72f4fa9158fb 100644 --- a/services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java @@ -4881,6 +4881,25 @@ public class SizeCompatTests extends WindowTestsBase { assertNotEquals(SCREEN_ORIENTATION_UNSPECIFIED, mActivity.getOverrideOrientation()); } + + @Test + @EnableCompatChanges({ActivityRecord.UNIVERSAL_RESIZABLE_BY_DEFAULT}) + public void testUniversalResizeableByDefault() { + mSetFlagsRule.enableFlags(Flags.FLAG_UNIVERSAL_RESIZABLE_BY_DEFAULT); + mDisplayContent.setIgnoreOrientationRequest(false); + setUpApp(mDisplayContent); + assertFalse(mActivity.isUniversalResizeable()); + + mDisplayContent.setIgnoreOrientationRequest(true); + final int swDp = mDisplayContent.getConfiguration().smallestScreenWidthDp; + if (swDp < WindowManager.LARGE_SCREEN_SMALLEST_SCREEN_WIDTH_DP) { + final int height = 100 + (int) (mDisplayContent.getDisplayMetrics().density + * WindowManager.LARGE_SCREEN_SMALLEST_SCREEN_WIDTH_DP); + resizeDisplay(mDisplayContent, 100 + height, height); + } + assertTrue(mActivity.isUniversalResizeable()); + } + @Test public void testClearSizeCompat_resetOverrideConfig() { final int origDensity = 480; diff --git a/services/usb/java/com/UsbDataSignalDisableRequesters.java b/services/usb/java/com/UsbDataSignalDisableRequesters.java new file mode 100644 index 000000000000..d4d6492ab984 --- /dev/null +++ b/services/usb/java/com/UsbDataSignalDisableRequesters.java @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.usb; + +import android.util.ArraySet; + +/** + * A helper class to store and manage the request for disabling USB port data signaling. + * + * External requesters are identified by UIDs. + * Internal requesters are identified by a reason code enumerated in UsbManagerInternal. + * + * @hide + */ +public final class UsbDataSignalDisableRequesters { + final ArraySet<Integer> mExternalUids = new ArraySet<>(); + final ArraySet<Integer> mInternalReasons = new ArraySet<>(); + + public boolean isEmpty() { + return mExternalUids.isEmpty() && mInternalReasons.isEmpty(); + } +}
\ No newline at end of file diff --git a/services/usb/java/com/android/server/usb/UsbManagerInternal.java b/services/usb/java/com/android/server/usb/UsbManagerInternal.java new file mode 100644 index 000000000000..c97df6b4f63a --- /dev/null +++ b/services/usb/java/com/android/server/usb/UsbManagerInternal.java @@ -0,0 +1,48 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.usb; + +import android.annotation.IntDef; +import android.annotation.NonNull; +import android.hardware.usb.IUsbOperationInternal; +import android.hardware.usb.UsbPort; +import android.util.ArraySet; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +/** + * UsbManagerInternal provides internal APIs for the UsbService to + * reduce IPC overhead costs and support internal USB data signal stakers. + * + * @hide Only for use within the system server. + */ +public abstract class UsbManagerInternal { + + public static final int OS_USB_DISABLE_REASON_AAPM = 0; + + @Retention(RetentionPolicy.SOURCE) + @IntDef(value = {OS_USB_DISABLE_REASON_AAPM}) + public @interface OsUsbDisableReason { + } + + public abstract boolean enableUsbData(String portId, boolean enable, + int operationId, IUsbOperationInternal callback, @OsUsbDisableReason int disableReason); + + public abstract UsbPort[] getPorts(); + +}
\ No newline at end of file diff --git a/services/usb/java/com/android/server/usb/UsbService.java b/services/usb/java/com/android/server/usb/UsbService.java index 9470c0a944c2..ba9dff656f0a 100644 --- a/services/usb/java/com/android/server/usb/UsbService.java +++ b/services/usb/java/com/android/server/usb/UsbService.java @@ -46,6 +46,7 @@ import android.hardware.usb.UsbDevice; import android.hardware.usb.UsbManager; import android.hardware.usb.UsbPort; import android.hardware.usb.UsbPortStatus; + import android.os.Binder; import android.os.Bundle; import android.os.Looper; @@ -69,6 +70,7 @@ import com.android.internal.util.Preconditions; import com.android.internal.util.dump.DualDumpOutputStream; import com.android.internal.widget.LockPatternUtils; import com.android.server.FgThread; +import com.android.server.LocalServices; import com.android.server.SystemServerInitThreadPool; import com.android.server.SystemService; @@ -165,8 +167,10 @@ public class UsbService extends IUsbManager.Stub { private final Object mLock = new Object(); // Key: USB port id - // Value: A set of UIDs of requesters who request disabling usb data - private final ArrayMap<String, ArraySet<Integer>> mUsbDisableRequesters = new ArrayMap<>(); + // Value: UsbDataSignalDisableRequesters: UIDs of requesters who request + // disabling usb data and disable request reasons by local service callers + private final ArrayMap<String, UsbDataSignalDisableRequesters> + mUsbDisableRequesters = new ArrayMap<>(); /** * @return the {@link UsbUserSettingsManager} for the given userId @@ -221,6 +225,9 @@ public class UsbService extends IUsbManager.Stub { filter.setPriority(IntentFilter.SYSTEM_HIGH_PRIORITY); filter.addAction(DevicePolicyManager.ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED); mContext.registerReceiverAsUser(receiver, UserHandle.ALL, filter, null, null); + if(android.hardware.usb.flags.Flags.enableUsbDataSignalStakingInternal()) { + LocalServices.addService(UsbManagerInternal.class, new UsbManagerInternalImpl()); + } } // Ideally we should use the injector pattern so we wouldn't need this constructor for test @@ -236,6 +243,10 @@ public class UsbService extends IUsbManager.Stub { mUserManager = userManager; mSettingsManager = usbSettingsManager; mPermissionManager = new UsbPermissionManager(context, this); + + if(android.hardware.usb.flags.Flags.enableUsbDataSignalStakingInternal()) { + LocalServices.addService(UsbManagerInternal.class, new UsbManagerInternalImpl()); + } } /** @@ -903,15 +914,21 @@ public class UsbService extends IUsbManager.Stub { @Override public boolean enableUsbData(String portId, boolean enable, int operationId, IUsbOperationInternal callback) { - return enableUsbDataInternal(portId, enable, operationId, callback, Binder.getCallingUid()); + return enableUsbDataInternal(portId, enable, operationId, callback, + Binder.getCallingUid(), false); } /** - * Internal function abstracted for testing with callerUid + * Manages the enablement of USB data. Requester field could mean two things: + * 1. UID of the app that requested USB data to be disabled if caller is external. + * 2. Enumberated disable request reason if the caller is internal. + * + * For internal requests, isInternalRequest should be set to true. Since + * internal requests all share the same UID, the request managed separately. */ @VisibleForTesting boolean enableUsbDataInternal(String portId, boolean enable, int operationId, - IUsbOperationInternal callback, int callerUid) { + IUsbOperationInternal callback, int requester, boolean isInternalRequest) { Objects.requireNonNull(portId, "enableUsbData: portId must not be null. opId:" + operationId); Objects.requireNonNull(callback, "enableUsbData: callback must not be null. opId:" @@ -919,7 +936,7 @@ public class UsbService extends IUsbManager.Stub { mContext.enforceCallingOrSelfPermission(android.Manifest.permission.MANAGE_USB, null); if (android.hardware.usb.flags.Flags.enableUsbDataSignalStaking()) { - if (!shouldUpdateUsbSignaling(portId, enable, callerUid)) { + if (!shouldUpdateUsbSignaling(portId, enable, requester, isInternalRequest)) { try { callback.onOperationComplete(USB_OPERATION_ERROR_INTERNAL); } catch (RemoteException e) { @@ -949,25 +966,42 @@ public class UsbService extends IUsbManager.Stub { } /** + * Function to determine if USB data signaling state should be updated. + * Depending on if request is internal, input requester should be UID or enumerated disable + * reason. + * * If enable = true, exclude UID from update list. * If enable = false, include UID in update list. * Return false if enable = true and the list is empty (no updates). * Return true otherwise (let downstream decide on updates). */ - private boolean shouldUpdateUsbSignaling(String portId, boolean enable, int uid) { + private boolean shouldUpdateUsbSignaling(String portId, boolean enable, + int requester, boolean isInternalRequest) { + if(isInternalRequest && + !android.hardware.usb.flags.Flags.enableUsbDataSignalStakingInternal()) + return false; synchronized (mUsbDisableRequesters) { if (!mUsbDisableRequesters.containsKey(portId)) { - mUsbDisableRequesters.put(portId, new ArraySet<>()); + mUsbDisableRequesters.put(portId, new UsbDataSignalDisableRequesters()); } - - ArraySet<Integer> uidsOfDisableRequesters = mUsbDisableRequesters.get(portId); + UsbDataSignalDisableRequesters disableRequests = + mUsbDisableRequesters.get(portId); if (enable) { - uidsOfDisableRequesters.remove(uid); - // re-enable USB port (return true) if there are no other disable requesters - return uidsOfDisableRequesters.isEmpty(); + if(isInternalRequest) { + disableRequests.mInternalReasons.remove(requester); + } else { + disableRequests.mExternalUids.remove(requester); + } + // re-enable USB port (return true) if there are no other + // disable requesters + return disableRequests.isEmpty(); } else { - uidsOfDisableRequesters.add(uid); + if(isInternalRequest) { + disableRequests.mInternalReasons.add(requester); + } else { + disableRequests.mExternalUids.add(requester); + } } } return true; @@ -976,7 +1010,8 @@ public class UsbService extends IUsbManager.Stub { @Override public void enableUsbDataWhileDocked(String portId, int operationId, IUsbOperationInternal callback) { - enableUsbDataWhileDockedInternal(portId, operationId, callback, Binder.getCallingUid()); + enableUsbDataWhileDockedInternal(portId, operationId, callback, + Binder.getCallingUid(), false); } /** @@ -984,7 +1019,7 @@ public class UsbService extends IUsbManager.Stub { */ @VisibleForTesting void enableUsbDataWhileDockedInternal(String portId, int operationId, - IUsbOperationInternal callback, int callerUid) { + IUsbOperationInternal callback, int callerUid, boolean isInternalRequest) { Objects.requireNonNull(portId, "enableUsbDataWhileDocked: portId must not be null. opId:" + operationId); Objects.requireNonNull(callback, @@ -993,7 +1028,7 @@ public class UsbService extends IUsbManager.Stub { mContext.enforceCallingOrSelfPermission(android.Manifest.permission.MANAGE_USB, null); if (android.hardware.usb.flags.Flags.enableUsbDataSignalStaking()) { - if (!shouldUpdateUsbSignaling(portId, true, callerUid)) { + if (!shouldUpdateUsbSignaling(portId, true, callerUid, isInternalRequest)) { try { callback.onOperationComplete(USB_OPERATION_ERROR_INTERNAL); } catch (RemoteException e) { @@ -1455,10 +1490,11 @@ public class UsbService extends IUsbManager.Stub { public void onUidRemoved(int uid) { synchronized (mUsbDisableRequesters) { for (String portId : mUsbDisableRequesters.keySet()) { - ArraySet<Integer> disabledUid = mUsbDisableRequesters.get(portId); - if (disabledUid != null) { - disabledUid.remove(uid); - if (disabledUid.isEmpty()) { + UsbDataSignalDisableRequesters disableRequesters = + mUsbDisableRequesters.get(portId); + if (disableRequesters != null) { + disableRequesters.mExternalUids.remove(uid); + if (disableRequesters.isEmpty()) { enableUsbData(portId, true, PACKAGE_MONITOR_OPERATION_ID, new IUsbOperationInternal.Default()); } @@ -1496,4 +1532,19 @@ public class UsbService extends IUsbManager.Stub { } } } + + private class UsbManagerInternalImpl extends UsbManagerInternal { + @Override + public boolean enableUsbData(String portId, boolean enable, + int operationId, IUsbOperationInternal callback, + @OsUsbDisableReason int disableReason) { + return enableUsbDataInternal(portId, enable, operationId, callback, + disableReason, true); + } + + @Override + public UsbPort[] getPorts() { + return mPortManager.getPorts(); + } + } } diff --git a/telephony/java/android/telephony/satellite/SatelliteManager.java b/telephony/java/android/telephony/satellite/SatelliteManager.java index bd5c7597ba14..49ca6f34d2d9 100644 --- a/telephony/java/android/telephony/satellite/SatelliteManager.java +++ b/telephony/java/android/telephony/satellite/SatelliteManager.java @@ -249,6 +249,13 @@ public final class SatelliteManager { public static final String KEY_PROVISION_SATELLITE_TOKENS = "provision_satellite"; /** + * Bundle key to get the response from + * {@link #deprovisionSatellite(List, Executor, OutcomeReceiver)}. + * @hide + */ + public static final String KEY_DEPROVISION_SATELLITE_TOKENS = "deprovision_satellite"; + + /** * The request was successfully processed. */ @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) @@ -2791,6 +2798,61 @@ public final class SatelliteManager { } } + /** + * Deliver the list of deprovisioned satellite subscriber infos. + * + * @param list The list of deprovisioned satellite subscriber infos. + * @param executor The executor on which the callback will be called. + * @param callback The callback object to which the result will be delivered. + * + * @throws SecurityException if the caller doesn't have required permission. + * @hide + */ + @RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION) + @FlaggedApi(Flags.FLAG_CARRIER_ROAMING_NB_IOT_NTN) + public void deprovisionSatellite(@NonNull List<SatelliteSubscriberInfo> list, + @NonNull @CallbackExecutor Executor executor, + @NonNull OutcomeReceiver<Boolean, SatelliteException> callback) { + Objects.requireNonNull(executor); + Objects.requireNonNull(callback); + + try { + ITelephony telephony = getITelephony(); + if (telephony != null) { + ResultReceiver receiver = new ResultReceiver(null) { + @Override + protected void onReceiveResult(int resultCode, Bundle resultData) { + if (resultCode == SATELLITE_RESULT_SUCCESS) { + if (resultData.containsKey(KEY_DEPROVISION_SATELLITE_TOKENS)) { + boolean isUpdated = + resultData.getBoolean(KEY_DEPROVISION_SATELLITE_TOKENS); + executor.execute(() -> Binder.withCleanCallingIdentity(() -> + callback.onResult(isUpdated))); + } else { + loge("KEY_DEPROVISION_SATELLITE_TOKENS does not exist."); + executor.execute(() -> Binder.withCleanCallingIdentity(() -> + callback.onError(new SatelliteException( + SATELLITE_RESULT_REQUEST_FAILED)))); + } + } else { + executor.execute(() -> Binder.withCleanCallingIdentity(() -> + callback.onError(new SatelliteException(resultCode)))); + } + } + }; + telephony.deprovisionSatellite(list, receiver); + } else { + loge("deprovisionSatellite() invalid telephony"); + executor.execute(() -> Binder.withCleanCallingIdentity(() -> callback.onError( + new SatelliteException(SATELLITE_RESULT_ILLEGAL_STATE)))); + } + } catch (RemoteException ex) { + loge("deprovisionSatellite() RemoteException: " + ex); + executor.execute(() -> Binder.withCleanCallingIdentity(() -> callback.onError( + new SatelliteException(SATELLITE_RESULT_ILLEGAL_STATE)))); + } + } + @Nullable private static ITelephony getITelephony() { ITelephony binder = ITelephony.Stub.asInterface(TelephonyFrameworkInitializer diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl index 3161d17681ed..61f01461232f 100644 --- a/telephony/java/com/android/internal/telephony/ITelephony.aidl +++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl @@ -3444,4 +3444,15 @@ interface ITelephony { */ boolean overrideCarrierRoamingNtnEligibilityChanged( in boolean status, in boolean resetRequired); + + /** + * Deliver the list of deprovisioned satellite subscriber infos. + * + * @param list The list of deprovisioned satellite subscriber infos. + * @param result The result receiver that returns whether deliver success or fail. + * @hide + */ + @JavaPassthrough(annotation="@android.annotation.RequiresPermission(" + + "android.Manifest.permission.SATELLITE_COMMUNICATION)") + void deprovisionSatellite(in List<SatelliteSubscriberInfo> list, in ResultReceiver result); } diff --git a/tests/Tracing/src/com/android/internal/protolog/ProtoLogTest.java b/tests/Tracing/src/com/android/internal/protolog/ProtoLogTest.java index 9d56a92fad52..8ecddaa76216 100644 --- a/tests/Tracing/src/com/android/internal/protolog/ProtoLogTest.java +++ b/tests/Tracing/src/com/android/internal/protolog/ProtoLogTest.java @@ -16,6 +16,8 @@ package com.android.internal.protolog; +import static org.junit.Assert.assertThrows; + import android.platform.test.annotations.Presubmit; import com.android.internal.protolog.common.IProtoLogGroup; @@ -44,8 +46,29 @@ public class ProtoLogTest { .containsExactly(TEST_GROUP_1, TEST_GROUP_2); } + @Test + public void throwOnRegisteringDuplicateGroup() { + final var assertion = assertThrows(RuntimeException.class, + () -> ProtoLog.init(TEST_GROUP_1, TEST_GROUP_1, TEST_GROUP_2)); + + Truth.assertThat(assertion).hasMessageThat().contains("" + TEST_GROUP_1.getId()); + Truth.assertThat(assertion).hasMessageThat().contains("duplicate"); + } + + @Test + public void throwOnRegisteringGroupsWithIdCollisions() { + final var assertion = assertThrows(RuntimeException.class, + () -> ProtoLog.init(TEST_GROUP_1, TEST_GROUP_WITH_COLLISION, TEST_GROUP_2)); + + Truth.assertThat(assertion).hasMessageThat() + .contains("" + TEST_GROUP_WITH_COLLISION.getId()); + Truth.assertThat(assertion).hasMessageThat().contains("collision"); + } + private static final IProtoLogGroup TEST_GROUP_1 = new ProtoLogGroup("TEST_TAG_1", 1); private static final IProtoLogGroup TEST_GROUP_2 = new ProtoLogGroup("TEST_TAG_2", 2); + private static final IProtoLogGroup TEST_GROUP_WITH_COLLISION = + new ProtoLogGroup("TEST_TAG_WITH_COLLISION", 1); private static class ProtoLogGroup implements IProtoLogGroup { private final boolean mEnabled; diff --git a/tests/UsbTests/src/com/android/server/usb/UsbServiceTest.java b/tests/UsbTests/src/com/android/server/usb/UsbServiceTest.java index 56845aeb6a2c..51d57f0a0de9 100644 --- a/tests/UsbTests/src/com/android/server/usb/UsbServiceTest.java +++ b/tests/UsbTests/src/com/android/server/usb/UsbServiceTest.java @@ -18,6 +18,10 @@ package com.android.server.usb; import static android.hardware.usb.UsbOperationInternal.USB_OPERATION_ERROR_INTERNAL; +import static com.google.common.truth.Truth.assertThat; +import static com.google.common.truth.Truth.assertWithMessage; + +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; @@ -31,12 +35,15 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.hardware.usb.IUsbOperationInternal; import android.hardware.usb.flags.Flags; +import android.hardware.usb.UsbPort; import android.os.RemoteException; import android.os.UserManager; import android.platform.test.flag.junit.SetFlagsRule; import androidx.test.runner.AndroidJUnit4; +import com.android.server.LocalServices; + import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -71,26 +78,38 @@ public class UsbServiceTest { private static final int TEST_SECOND_CALLER_ID = 2000; + private static final int TEST_INTERNAL_REQUESTER_REASON_1 = 100; + + private static final int TEST_INTERNAL_REQUESTER_REASON_2 = 200; + private UsbService mUsbService; + private UsbManagerInternal mUsbManagerInternal; + @Rule public final SetFlagsRule mSetFlagsRule = new SetFlagsRule(); @Before public void setUp() { mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_USB_DATA_SIGNAL_STAKING); + mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_USB_DATA_SIGNAL_STAKING_INTERNAL); + LocalServices.removeAllServicesForTest(); MockitoAnnotations.initMocks(this); - when(mUsbPortManager.enableUsbData(eq(TEST_PORT_ID), anyBoolean(), eq(TEST_TRANSACTION_ID), - eq(mCallback), any())).thenReturn(true); + when(mUsbPortManager.enableUsbData(eq(TEST_PORT_ID), anyBoolean(), + eq(TEST_TRANSACTION_ID), eq(mCallback), any())).thenReturn(true); mUsbService = new UsbService(mContext, mUsbPortManager, mUsbAlsaManager, mUserManager, mUsbSettingsManager); + mUsbManagerInternal = LocalServices.getService(UsbManagerInternal.class); + assertWithMessage("LocalServices.getService(UsbManagerInternal.class)") + .that(mUsbManagerInternal).isNotNull(); } - private void assertToggleUsbSuccessfully(int uid, boolean enable) { + private void assertToggleUsbSuccessfully(int requester, boolean enable, + boolean isInternalRequest) { assertTrue(mUsbService.enableUsbDataInternal(TEST_PORT_ID, enable, - TEST_TRANSACTION_ID, mCallback, uid)); + TEST_TRANSACTION_ID, mCallback, requester, isInternalRequest)); verify(mUsbPortManager).enableUsbData(TEST_PORT_ID, enable, TEST_TRANSACTION_ID, mCallback, null); @@ -100,9 +119,10 @@ public class UsbServiceTest { clearInvocations(mCallback); } - private void assertToggleUsbFailed(int uid, boolean enable) throws Exception { + private void assertToggleUsbFailed(int requester, boolean enable, + boolean isInternalRequest) throws Exception { assertFalse(mUsbService.enableUsbDataInternal(TEST_PORT_ID, enable, - TEST_TRANSACTION_ID, mCallback, uid)); + TEST_TRANSACTION_ID, mCallback, requester, isInternalRequest)); verifyZeroInteractions(mUsbPortManager); verify(mCallback).onOperationComplete(USB_OPERATION_ERROR_INTERNAL); @@ -116,15 +136,16 @@ public class UsbServiceTest { */ @Test public void disableUsb_successfullyDisable() { - assertToggleUsbSuccessfully(TEST_FIRST_CALLER_ID, false); + assertToggleUsbSuccessfully(TEST_FIRST_CALLER_ID, false, false); } /** - * Verify enableUsbData successfully enables USB port without error given no other stakers + * Verify enableUsbData successfully enables USB port without error given + * no other stakers */ @Test public void enableUsbWhenNoOtherStakers_successfullyEnable() { - assertToggleUsbSuccessfully(TEST_FIRST_CALLER_ID, true); + assertToggleUsbSuccessfully(TEST_FIRST_CALLER_ID, true, false); } /** @@ -132,47 +153,132 @@ public class UsbServiceTest { */ @Test public void enableUsbPortWithOtherStakers_failsToEnable() throws Exception { - assertToggleUsbSuccessfully(TEST_FIRST_CALLER_ID, false); + assertToggleUsbSuccessfully(TEST_FIRST_CALLER_ID, false, false); - assertToggleUsbFailed(TEST_SECOND_CALLER_ID, true); + assertToggleUsbFailed(TEST_SECOND_CALLER_ID, true, false); } /** - * Verify enableUsbData successfully enables USB port when the last staker is removed + * Verify enableUsbData successfully enables USB port when the last staker + * is removed */ @Test public void enableUsbByTheOnlyStaker_successfullyEnable() { - assertToggleUsbSuccessfully(TEST_FIRST_CALLER_ID, false); + assertToggleUsbSuccessfully(TEST_FIRST_CALLER_ID, false, false); - assertToggleUsbSuccessfully(TEST_FIRST_CALLER_ID, true); + assertToggleUsbSuccessfully(TEST_FIRST_CALLER_ID, true, false); } /** - * Verify enableUsbDataWhileDockedInternal does not enable USB port if other stakers are present + * Verify enableUsbDataWhileDockedInternal does not enable USB port if other + * stakers are present */ @Test public void enableUsbWhileDockedWhenThereAreOtherStakers_failsToEnable() throws RemoteException { - assertToggleUsbSuccessfully(TEST_FIRST_CALLER_ID, false); + assertToggleUsbSuccessfully(TEST_FIRST_CALLER_ID, false, false); mUsbService.enableUsbDataWhileDockedInternal(TEST_PORT_ID, TEST_TRANSACTION_ID, - mCallback, TEST_SECOND_CALLER_ID); + mCallback, TEST_SECOND_CALLER_ID, false); verifyZeroInteractions(mUsbPortManager); verify(mCallback).onOperationComplete(USB_OPERATION_ERROR_INTERNAL); } /** - * Verify enableUsbDataWhileDockedInternal does enable USB port if other stakers are - * not present + * Verify enableUsbDataWhileDockedInternal does enable USB port if other + * stakers are not present */ @Test public void enableUsbWhileDockedWhenThereAreNoStakers_SuccessfullyEnable() { mUsbService.enableUsbDataWhileDockedInternal(TEST_PORT_ID, TEST_TRANSACTION_ID, - mCallback, TEST_SECOND_CALLER_ID); + mCallback, TEST_SECOND_CALLER_ID, false); verify(mUsbPortManager).enableUsbDataWhileDocked(TEST_PORT_ID, TEST_TRANSACTION_ID, mCallback, null); verifyZeroInteractions(mCallback); } + + /** + * Verify enableUsbData successfully enables USB port without error given no + * other stakers for internal requests + */ + @Test + public void enableUsbWhenNoOtherStakers_forInternalRequest_successfullyEnable() { + assertToggleUsbSuccessfully(TEST_INTERNAL_REQUESTER_REASON_1, true, true); + } + + /** + * Verify enableUsbData does not enable USB port if other internal stakers + * are present for internal requests + */ + @Test + public void enableUsbPortWithOtherInternalStakers_forInternalRequest_failsToEnable() + throws Exception { + assertToggleUsbSuccessfully(TEST_INTERNAL_REQUESTER_REASON_1, false, true); + + assertToggleUsbFailed(TEST_INTERNAL_REQUESTER_REASON_2, true, true); + } + + /** + * Verify enableUsbData does not enable USB port if other external stakers + * are present for internal requests + */ + @Test + public void enableUsbPortWithOtherExternalStakers_forInternalRequest_failsToEnable() + throws Exception { + assertToggleUsbSuccessfully(TEST_FIRST_CALLER_ID, false, false); + + assertToggleUsbFailed(TEST_INTERNAL_REQUESTER_REASON_2, true, true); + } + + /** + * Verify enableUsbData does not enable USB port if other internal stakers + * are present for external requests + */ + @Test + public void enableUsbPortWithOtherInternalStakers_forExternalRequest_failsToEnable() + throws Exception { + assertToggleUsbSuccessfully(TEST_INTERNAL_REQUESTER_REASON_1, false, true); + + assertToggleUsbFailed(TEST_FIRST_CALLER_ID, true, false); + } + + /** + * Verify enableUsbData successfully enables USB port when the last staker + * is removed for internal requests + */ + @Test + public void enableUsbByTheOnlyStaker_forInternalRequest_successfullyEnable() { + assertToggleUsbSuccessfully(TEST_INTERNAL_REQUESTER_REASON_1, false, false); + + assertToggleUsbSuccessfully(TEST_INTERNAL_REQUESTER_REASON_1, true, false); + } + + /** + * Verify USB Manager internal calls mPortManager to get UsbPorts + */ + @Test + public void usbManagerInternal_getPorts_callsPortManager() { + when(mUsbPortManager.getPorts()).thenReturn(new UsbPort[] {}); + + UsbPort[] ports = mUsbManagerInternal.getPorts(); + + verify(mUsbPortManager).getPorts(); + assertEquals(ports.length, 0); + } + + @Test + public void usbManagerInternal_enableUsbData_successfullyEnable() { + boolean desiredEnableState = true; + + assertTrue(mUsbManagerInternal.enableUsbData(TEST_PORT_ID, desiredEnableState, + TEST_TRANSACTION_ID, mCallback, TEST_INTERNAL_REQUESTER_REASON_1)); + + verify(mUsbPortManager).enableUsbData(TEST_PORT_ID, + desiredEnableState, TEST_TRANSACTION_ID, mCallback, null); + verifyZeroInteractions(mCallback); + clearInvocations(mUsbPortManager); + clearInvocations(mCallback); + } } diff --git a/tests/vcn/java/android/net/vcn/VcnTransportInfoTest.java b/tests/vcn/java/android/net/vcn/VcnTransportInfoTest.java index 81814b67f5ee..7bc9970629a6 100644 --- a/tests/vcn/java/android/net/vcn/VcnTransportInfoTest.java +++ b/tests/vcn/java/android/net/vcn/VcnTransportInfoTest.java @@ -25,6 +25,7 @@ import static android.telephony.SubscriptionManager.INVALID_SUBSCRIPTION_ID; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNull; +import static org.junit.Assert.fail; import android.net.NetworkCapabilities; import android.net.wifi.WifiConfiguration; @@ -39,6 +40,7 @@ public class VcnTransportInfoTest { private static final int SUB_ID = 1; private static final int NETWORK_ID = 5; private static final int MIN_UDP_PORT_4500_NAT_TIMEOUT = 120; + private static final int MIN_UDP_PORT_4500_NAT_TIMEOUT_INVALID = 119; private static final WifiInfo WIFI_INFO = new WifiInfo.Builder().setNetworkId(NETWORK_ID).build(); @@ -48,6 +50,27 @@ public class VcnTransportInfoTest { new VcnTransportInfo(WIFI_INFO, MIN_UDP_PORT_4500_NAT_TIMEOUT); @Test + public void testBuilder() { + final VcnTransportInfo transportInfo = + new VcnTransportInfo.Builder() + .setMinUdpPort4500NatTimeoutSeconds(MIN_UDP_PORT_4500_NAT_TIMEOUT) + .build(); + + assertEquals( + MIN_UDP_PORT_4500_NAT_TIMEOUT, transportInfo.getMinUdpPort4500NatTimeoutSeconds()); + } + + @Test + public void testBuilder_withInvalidNatTimeout() { + try { + new VcnTransportInfo.Builder() + .setMinUdpPort4500NatTimeoutSeconds(MIN_UDP_PORT_4500_NAT_TIMEOUT_INVALID); + fail("Expected to fail due to invalid NAT timeout"); + } catch (Exception expected) { + } + } + + @Test public void testGetWifiInfo() { assertEquals(WIFI_INFO, WIFI_UNDERLYING_INFO.getWifiInfo()); diff --git a/tests/vcn/java/android/net/vcn/VcnUtilsTest.java b/tests/vcn/java/android/net/vcn/VcnUtilsTest.java new file mode 100644 index 000000000000..3ce6c8f9386d --- /dev/null +++ b/tests/vcn/java/android/net/vcn/VcnUtilsTest.java @@ -0,0 +1,136 @@ +/* + * 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 android.net.vcn; + +import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR; +import static android.net.NetworkCapabilities.TRANSPORT_WIFI; +import static android.telephony.SubscriptionManager.INVALID_SUBSCRIPTION_ID; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import android.net.ConnectivityManager; +import android.net.Network; +import android.net.NetworkCapabilities; +import android.net.TelephonyNetworkSpecifier; +import android.net.wifi.WifiInfo; + +import org.junit.Before; +import org.junit.Test; + +import java.util.Arrays; +import java.util.Collections; + +public class VcnUtilsTest { + private static final int SUB_ID = 1; + + private static final WifiInfo WIFI_INFO = new WifiInfo.Builder().build(); + private static final TelephonyNetworkSpecifier TEL_NETWORK_SPECIFIER = + new TelephonyNetworkSpecifier.Builder().setSubscriptionId(SUB_ID).build(); + private static final VcnTransportInfo VCN_TRANSPORT_INFO = + new VcnTransportInfo.Builder().build(); + + private ConnectivityManager mMockConnectivityManager; + private Network mMockWifiNetwork; + private Network mMockCellNetwork; + + private NetworkCapabilities mVcnCapsWithUnderlyingWifi; + private NetworkCapabilities mVcnCapsWithUnderlyingCell; + + @Before + public void setUp() { + mMockConnectivityManager = mock(ConnectivityManager.class); + + mMockWifiNetwork = mock(Network.class); + mVcnCapsWithUnderlyingWifi = newVcnCaps(VCN_TRANSPORT_INFO, mMockWifiNetwork); + final NetworkCapabilities wifiCaps = + new NetworkCapabilities.Builder() + .addTransportType(TRANSPORT_WIFI) + .setTransportInfo(WIFI_INFO) + .build(); + when(mMockConnectivityManager.getNetworkCapabilities(mMockWifiNetwork)) + .thenReturn(wifiCaps); + + mMockCellNetwork = mock(Network.class); + mVcnCapsWithUnderlyingCell = newVcnCaps(VCN_TRANSPORT_INFO, mMockCellNetwork); + final NetworkCapabilities cellCaps = + new NetworkCapabilities.Builder() + .addTransportType(TRANSPORT_CELLULAR) + .setNetworkSpecifier(TEL_NETWORK_SPECIFIER) + .build(); + when(mMockConnectivityManager.getNetworkCapabilities(mMockCellNetwork)) + .thenReturn(cellCaps); + } + + private static NetworkCapabilities newVcnCaps( + VcnTransportInfo vcnTransportInfo, Network underlyingNetwork) { + return new NetworkCapabilities.Builder() + .setTransportInfo(vcnTransportInfo) + .setUnderlyingNetworks(Collections.singletonList(underlyingNetwork)) + .build(); + } + + @Test + public void getWifiInfoFromVcnCaps() { + assertEquals( + WIFI_INFO, + VcnUtils.getWifiInfoFromVcnCaps( + mMockConnectivityManager, mVcnCapsWithUnderlyingWifi)); + } + + @Test + public void getWifiInfoFromVcnCaps_onVcnWithUnderlyingCell() { + assertNull( + VcnUtils.getWifiInfoFromVcnCaps( + mMockConnectivityManager, mVcnCapsWithUnderlyingCell)); + } + + @Test + public void getSubIdFromVcnCaps() { + assertEquals( + SUB_ID, + VcnUtils.getSubIdFromVcnCaps(mMockConnectivityManager, mVcnCapsWithUnderlyingCell)); + } + + @Test + public void getSubIdFromVcnCaps_onVcnWithUnderlyingWifi() { + assertEquals( + INVALID_SUBSCRIPTION_ID, + VcnUtils.getSubIdFromVcnCaps(mMockConnectivityManager, mVcnCapsWithUnderlyingWifi)); + } + + @Test + public void getSubIdFromVcnCaps_onNonVcnNetwork() { + assertEquals( + INVALID_SUBSCRIPTION_ID, + VcnUtils.getSubIdFromVcnCaps( + mMockConnectivityManager, new NetworkCapabilities.Builder().build())); + } + + @Test + public void getSubIdFromVcnCaps_withMultipleUnderlyingNetworks() { + final NetworkCapabilities vcnCaps = + new NetworkCapabilities.Builder(mVcnCapsWithUnderlyingCell) + .setUnderlyingNetworks( + Arrays.asList( + new Network[] {mMockCellNetwork, mock(Network.class)})) + .build(); + assertEquals(SUB_ID, VcnUtils.getSubIdFromVcnCaps(mMockConnectivityManager, vcnCaps)); + } +} diff --git a/tools/aapt/StringPool.cpp b/tools/aapt/StringPool.cpp index 1af8d6f67bd3..b2e48bd74e8a 100644 --- a/tools/aapt/StringPool.cpp +++ b/tools/aapt/StringPool.cpp @@ -40,7 +40,7 @@ void strcpy16_htod(uint16_t* dst, const char16_t* src) void printStringPool(const ResStringPool* pool) { if (pool->getError() == NO_INIT) { - printf("String pool is unitialized.\n"); + printf("String pool is uninitialized.\n"); return; } else if (pool->getError() != NO_ERROR) { printf("String pool is corrupt/invalid.\n"); diff --git a/tools/aapt2/Debug.cpp b/tools/aapt2/Debug.cpp index 064b4617b0a2..2527dcd26382 100644 --- a/tools/aapt2/Debug.cpp +++ b/tools/aapt2/Debug.cpp @@ -445,7 +445,7 @@ void Debug::DumpResStringPool(const android::ResStringPool* pool, text::Printer* using namespace android; if (pool->getError() == NO_INIT) { - printer->Print("String pool is unitialized.\n"); + printer->Print("String pool is uninitialized.\n"); return; } else if (pool->getError() != NO_ERROR) { printer->Print("String pool is corrupt/invalid.\n"); diff --git a/tools/processors/property_cache/Android.bp b/tools/processors/property_cache/Android.bp new file mode 100644 index 000000000000..81fab7a4c862 --- /dev/null +++ b/tools/processors/property_cache/Android.bp @@ -0,0 +1,57 @@ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "frameworks_base_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["frameworks_base_license"], + default_team: "trendy_team_framework_android_multiuser", +} + +java_library_host { + name: "libcached-property-annotation-processor", + srcs: [ + ":framework-annotations", + "src/**/*.java", + ], + static_libs: [ + "codegen-version-info", + "android.multiuser.flags-aconfig-java-host", + "guava", + ], + use_tools_jar: true, +} + +java_plugin { + name: "cached-property-annotation-processor", + processor_class: "android.processor.property_cache.CachedPropertyProcessor", + static_libs: ["libcached-property-annotation-processor"], +} + +java_aconfig_library { + name: "android.multiuser.flags-aconfig-java-host", + aconfig_declarations: "android.multiuser.flags-aconfig", + host_supported: true, + defaults: ["framework-minus-apex-aconfig-java-defaults"], +} + +java_test_host { + name: "cached-property-annotation-processor-test", + srcs: ["test/java/**/*.java"], + java_resources: [":CachedPropertyAnnotationJavaTestSource"], + static_libs: [ + "compile-testing-prebuilt", + "truth", + "junit", + "guava", + "libcached-property-annotation-processor", + ], + test_suites: ["general-tests"], +} + +filegroup { + name: "CachedPropertyAnnotationJavaTestSource", + srcs: ["test/resources/*.java"], + path: "test/resources/", + visibility: ["//visibility:private"], +} diff --git a/tools/processors/property_cache/TEST_MAPPING b/tools/processors/property_cache/TEST_MAPPING new file mode 100644 index 000000000000..7177abc8c52d --- /dev/null +++ b/tools/processors/property_cache/TEST_MAPPING @@ -0,0 +1,7 @@ +{ + "postsubmit": [ + { + "name": "cached-property-annotation-processor-test" + } + ] +} diff --git a/tools/processors/property_cache/src/java/android/processor/property_cache/CacheConfig.java b/tools/processors/property_cache/src/java/android/processor/property_cache/CacheConfig.java new file mode 100644 index 000000000000..c665c840f376 --- /dev/null +++ b/tools/processors/property_cache/src/java/android/processor/property_cache/CacheConfig.java @@ -0,0 +1,138 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.processor.property_cache; + +import com.android.internal.annotations.CachedProperty; +import com.android.internal.annotations.CachedPropertyDefaults; + +import com.google.common.base.CaseFormat; + +import javax.lang.model.element.ExecutableElement; +import javax.lang.model.element.TypeElement; + +public class CacheConfig { + private final CacheModifiers mModifiers; + private final int mMaxSize; + private final String mModuleName; + private final String mApiName; + private final String mClassName; + private final String mQualifiedName; + private String mPropertyName; + private String mMethodName; + private int mNumberOfParams = 0; + private String mInputType = Constants.JAVA_LANG_VOID; + private String mResultType; + + public CacheConfig(TypeElement classElement, ExecutableElement method) { + CachedPropertyDefaults classAnnotation = classElement.getAnnotation( + CachedPropertyDefaults.class); + CachedProperty methodAnnotation = method.getAnnotation(CachedProperty.class); + + mModuleName = methodAnnotation.module().isEmpty() ? classAnnotation.module() + : methodAnnotation.module(); + mClassName = classElement.getSimpleName().toString(); + mQualifiedName = classElement.getQualifiedName().toString(); + mModifiers = new CacheModifiers(methodAnnotation.modsFlagOnOrNone()); + mMethodName = method.getSimpleName().toString(); + mPropertyName = getPropertyName(mMethodName); + mApiName = methodAnnotation.api().isEmpty() ? getUniqueApiName(mClassName, mPropertyName) + : methodAnnotation.api(); + mMaxSize = methodAnnotation.max() == -1 ? classAnnotation.max() : methodAnnotation.max(); + mNumberOfParams = method.getParameters().size(); + if (mNumberOfParams > 0) { + mInputType = primitiveTypeToObjectEquivalent( + method.getParameters().get(0).asType().toString()); + } + mResultType = primitiveTypeToObjectEquivalent(method.getReturnType().toString()); + } + + public CacheModifiers getModifiers() { + return mModifiers; + } + + public int getMaxSize() { + return mMaxSize; + } + + public String getApiName() { + return mApiName; + } + + public String getClassName() { + return mClassName; + } + + public String getQualifiedName() { + return mQualifiedName; + } + + public String getModuleName() { + return mModuleName; + } + + public String getMethodName() { + return mMethodName; + } + + public String getPropertyName() { + return mPropertyName; + } + + public String getPropertyVariable() { + return (mModifiers.isStatic() ? "s" : "m") + mPropertyName; + } + + private String getPropertyName(String methodName) { + if (methodName.startsWith("get")) { + return methodName.substring(3); + } else if (methodName.startsWith("is")) { + return methodName.substring(2); + } else { + return CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_CAMEL, methodName); + } + } + + public int getNumberOfParams() { + return mNumberOfParams; + } + + public String getInputType() { + return mInputType; + } + + public String getResultType() { + return mResultType; + } + + /** + * This method returns the unique api name for a given class and property name. + * Property name is retrieved from the method name. + * Both names are combined and converted to lower snake case. + * + * @param className The name of the class that contains the property. + * @param propertyName The name of the property. + * @return The registration name for the property. + */ + private String getUniqueApiName(String className, String propertyName) { + return CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, className + propertyName); + } + + private String primitiveTypeToObjectEquivalent(String simpleType) { + // checking against primitive types + return Constants.PRIMITIVE_TYPE_MAP.getOrDefault(simpleType, simpleType); + } +} diff --git a/tools/processors/property_cache/src/java/android/processor/property_cache/CacheModifiers.java b/tools/processors/property_cache/src/java/android/processor/property_cache/CacheModifiers.java new file mode 100644 index 000000000000..fda9b2c40e27 --- /dev/null +++ b/tools/processors/property_cache/src/java/android/processor/property_cache/CacheModifiers.java @@ -0,0 +1,40 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.processor.property_cache; + +import com.android.internal.annotations.CacheModifier; + +import java.util.Arrays; +import java.util.List; + +public class CacheModifiers { + private final boolean mIsStatic; + private static final String STATIC_MODIFIER_STRING = "static "; + + CacheModifiers(CacheModifier[] modifierArray) { + final List<CacheModifier> modifiers = Arrays.asList(modifierArray); + mIsStatic = modifiers.contains(CacheModifier.STATIC); + } + + public boolean isStatic() { + return mIsStatic; + } + + public String getStaticModifier() { + return mIsStatic ? STATIC_MODIFIER_STRING : Constants.EMPTY_STRING; + } +} diff --git a/tools/processors/property_cache/src/java/android/processor/property_cache/CachedPropertyProcessor.java b/tools/processors/property_cache/src/java/android/processor/property_cache/CachedPropertyProcessor.java new file mode 100644 index 000000000000..03610128d269 --- /dev/null +++ b/tools/processors/property_cache/src/java/android/processor/property_cache/CachedPropertyProcessor.java @@ -0,0 +1,95 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.processor.property_cache; + +import com.android.internal.annotations.CachedProperty; +import com.android.internal.annotations.CachedPropertyDefaults; + +import com.google.common.collect.ImmutableSet; + +import java.io.IOException; +import java.io.Writer; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import javax.annotation.processing.AbstractProcessor; +import javax.annotation.processing.Filer; +import javax.annotation.processing.RoundEnvironment; +import javax.lang.model.element.Element; +import javax.lang.model.element.ExecutableElement; +import javax.lang.model.element.TypeElement; +import javax.lang.model.util.ElementFilter; +import javax.tools.JavaFileObject; + +public class CachedPropertyProcessor extends AbstractProcessor { + + IpcDataCacheComposer mIpcDataCacheComposer = + new IpcDataCacheComposer(); + + @Override + public Set<String> getSupportedAnnotationTypes() { + return new HashSet<String>( + ImmutableSet.of(CachedPropertyDefaults.class.getCanonicalName())); + } + + @Override + public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) { + for (Element element : roundEnv.getElementsAnnotatedWith(CachedPropertyDefaults.class)) { + try { + generateCachedClass((TypeElement) element, processingEnv.getFiler()); + } catch (IOException e) { + e.printStackTrace(); + return false; + } + } + return false; + } + + private void generateCachedClass(TypeElement classElement, Filer filer) throws IOException { + String packageName = + processingEnv + .getElementUtils() + .getPackageOf(classElement) + .getQualifiedName() + .toString(); + String className = classElement.getSimpleName().toString() + "Cache"; + JavaFileObject jfo = filer.createSourceFile(packageName + "." + className); + Writer writer = jfo.openWriter(); + writer.write("package " + packageName + ";\n\n"); + writer.write("import android.os.IpcDataCache;\n"); + writer.write("\n /** \n * This class is auto-generated \n * @hide \n **/"); + writer.write("\npublic class " + className + " {\n"); + + List<ExecutableElement> methods = + ElementFilter.methodsIn(classElement.getEnclosedElements()); + String initCache = String.format(Constants.METHOD_COMMENT, + " - initialise all caches for class " + className) + + "\npublic static void initCache() {"; + for (ExecutableElement method : methods) { + if (method.getAnnotation(CachedProperty.class) != null) { + mIpcDataCacheComposer.generatePropertyCache(writer, classElement, method); + initCache += "\n " + mIpcDataCacheComposer.generateInvalidatePropertyCall(); + } + } + initCache += "\n}"; + writer.write(initCache); + writer.write("\n}"); + writer.write("\n"); + writer.close(); + } +} diff --git a/tools/processors/property_cache/src/java/android/processor/property_cache/Constants.java b/tools/processors/property_cache/src/java/android/processor/property_cache/Constants.java new file mode 100644 index 000000000000..03961bcaaba0 --- /dev/null +++ b/tools/processors/property_cache/src/java/android/processor/property_cache/Constants.java @@ -0,0 +1,40 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.processor.property_cache; + +import com.google.common.collect.ImmutableMap; + +public final class Constants { + public static final String EMPTY_STRING = ""; + public static final String JAVA_LANG_VOID = "java.lang.Void"; + public static final ImmutableMap<String, String> PRIMITIVE_TYPE_MAP = + ImmutableMap.of( + "int", "java.lang.Integer", + "boolean", "java.lang.Boolean", + "long", "java.lang.Long", + "float", "java.lang.Float", + "double", "java.lang.Double", + "byte", "java.lang.Byte", + "short", "java.lang.Short", + "char", "java.lang.Character"); + + public static final String METHOD_COMMENT = "\n /**" + + "\n * This method is auto-generated%s" + + "\n * " + + "\n * @hide" + + "\n */"; +} diff --git a/tools/processors/property_cache/src/java/android/processor/property_cache/IpcDataCacheComposer.java b/tools/processors/property_cache/src/java/android/processor/property_cache/IpcDataCacheComposer.java new file mode 100644 index 000000000000..8526a04e9910 --- /dev/null +++ b/tools/processors/property_cache/src/java/android/processor/property_cache/IpcDataCacheComposer.java @@ -0,0 +1,152 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.processor.property_cache; + +import java.io.IOException; +import java.io.Writer; + +import javax.lang.model.element.ExecutableElement; +import javax.lang.model.element.TypeElement; + +public class IpcDataCacheComposer { + + private static final String PROPERTY_DEFINITION_LINE = "private %s%s %s;\n"; + private static final String METHOD_NAME_LINE = "\npublic %s%s %s(%s%s%s\n) {\n"; + private static final String RETURN_IF_NOT_NULL_LINE = + "if (%s != null) {\n return %s.%s;\n }"; + + private CacheConfig mCacheConfig; + + /** + * Generates code for property cache. + * + * @param writer writer to write code to. + * @param classElement class element to generate code for. + * @param method method element to generate code for. + * @throws IOException if writer throws IOException. + */ + public void generatePropertyCache(Writer writer, TypeElement classElement, + ExecutableElement method) throws IOException { + + mCacheConfig = new CacheConfig(classElement, method); + + ParamComposer inputParam = new ParamComposer(null, null); + ParamComposer binderParam = new ParamComposer( + String.format("IpcDataCache.RemoteCall<%s, %s>", mCacheConfig.getInputType(), + mCacheConfig.getResultType()), "binderCall"); + + ParamComposer bypassParam = new ParamComposer(null, null); // empty if method have no params + String queryCall = "query(null)"; + if (mCacheConfig.getNumberOfParams() > 0) { + bypassParam = new ParamComposer( + String.format("IpcDataCache.BypassCall<%s> ", mCacheConfig.getInputType()), + "bypassPredicate"); + inputParam = new ParamComposer(mCacheConfig.getInputType(), "query"); + queryCall = "query(query)"; + } + String propertyClass = + "IpcDataCache<" + mCacheConfig.getInputType() + ", " + mCacheConfig.getResultType() + + ">"; + String invalidateName = "invalidate" + mCacheConfig.getPropertyName(); + String lockObject = mCacheConfig.getPropertyVariable() + "Lock"; + writer.write("private " + mCacheConfig.getModifiers().getStaticModifier() + "final Object " + + lockObject + " = new Object();\n"); + writer.write(String.format(PROPERTY_DEFINITION_LINE, + mCacheConfig.getModifiers().getStaticModifier(), propertyClass, + mCacheConfig.getPropertyVariable())); + + writer.write(propertyInvalidatedCacheMethod(binderParam, bypassParam, inputParam, queryCall, + lockObject)); + + // If binder param is not empty then generate getter without binder param to be called + if (!bypassParam.getParam().isEmpty()) { + writer.write(propertyInvalidatedCacheMethod(binderParam, new ParamComposer(null, null), + inputParam, queryCall, lockObject)); + } + writer.write(String.format(Constants.METHOD_COMMENT, + "- invalidate cache for {@link " + mCacheConfig.getQualifiedName() + "#" + + mCacheConfig.getMethodName() + "}")); + writer.write("\n public static final void " + invalidateName + "() {"); + writer.write( + "\n IpcDataCache.invalidateCache(\"" + mCacheConfig.getModuleName() + "\", \"" + + mCacheConfig.getApiName() + "\");"); + writer.write("\n }"); + writer.write("\n"); + writer.write("\n"); + } + + /** + * Generates code to call cache invalidation. + * + * @return code string calling cache invalidation. + */ + public String generateInvalidatePropertyCall() { + String invalidateName = "invalidate" + mCacheConfig.getPropertyName(); + return mCacheConfig.getClassName() + "Cache." + invalidateName + "();"; + } + + /** + * Generates code for getter that returns cached value or calls binder and caches result. + * + * @param binderParam parameter for binder call. + * @param bypassParam parameter for bypass predicate. + * @param inputParam parameter for input value. + * @param queryCall cache query call syntax. + * @param lockObject object to synchronize on. + * @return String with code for method. + */ + private String propertyInvalidatedCacheMethod(ParamComposer binderParam, + ParamComposer bypassParam, ParamComposer inputParam, String queryCall, + String lockObject) { + String result = "\n"; + CacheModifiers modifiers = mCacheConfig.getModifiers(); + String paramsComments = binderParam.getParamComment( + "lambda for remote call" + " {@link " + mCacheConfig.getQualifiedName() + "#" + + mCacheConfig.getMethodName() + " }") + bypassParam.getParamComment( + "lambda to bypass remote call") + inputParam.getParamComment( + "parameter to call remote lambda"); + result += String.format(Constants.METHOD_COMMENT, paramsComments); + result += String.format(METHOD_NAME_LINE, modifiers.getStaticModifier(), + mCacheConfig.getResultType(), mCacheConfig.getMethodName(), + binderParam.getParam(), bypassParam.getNextParam(), + inputParam.getNextParam()); + result += String.format(RETURN_IF_NOT_NULL_LINE, mCacheConfig.getPropertyVariable(), + mCacheConfig.getPropertyVariable(), queryCall); + result += "\n synchronized (" + lockObject + " ) {"; + result += "\n if (" + mCacheConfig.getPropertyVariable() + " == null) {"; + result += "\n " + mCacheConfig.getPropertyVariable() + " = new IpcDataCache" + "(" + + generateCreateIpcConfig() + ", " + binderParam.getName() + + bypassParam.getNextName() + ");\n"; + result += "\n }"; + result += "\n }"; + result += "\n return " + mCacheConfig.getPropertyVariable() + "." + queryCall + ";"; + result += "\n }"; + result += "\n"; + return result; + } + + /** + * Generates code for new IpcDataCache.Config object for given configuration. + * + * @return String with code for new IpcDataCache.Config object. + */ + public String generateCreateIpcConfig() { + return "new IpcDataCache.Config(" + mCacheConfig.getMaxSize() + ", " + "\"" + + mCacheConfig.getModuleName() + "\"" + ", " + "\"" + mCacheConfig.getApiName() + + "\"" + ", " + "\"" + mCacheConfig.getPropertyName() + "\"" + ")"; + } +} diff --git a/tools/processors/property_cache/src/java/android/processor/property_cache/ParamComposer.java b/tools/processors/property_cache/src/java/android/processor/property_cache/ParamComposer.java new file mode 100644 index 000000000000..307443aea730 --- /dev/null +++ b/tools/processors/property_cache/src/java/android/processor/property_cache/ParamComposer.java @@ -0,0 +1,103 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.processor.property_cache; + +public class ParamComposer { + private String mType; + private String mName; + + /** Creates ParamComposer with given type and name. + * + * @param type type of parameter. + * @param name name of parameter. + */ + public ParamComposer(String type, String name) { + mType = type; + mName = name; + } + + /** Returns name of parameter. + * + * @return name of parameter. + */ + public String getName() { + if (mName != null) { + return mName; + } + return Constants.EMPTY_STRING; + } + + /** Returns name of parameter for next parameter followed by comma. + * + * @return name of parameter for next parameter if exists, empty string otherwise. + */ + public String getNextName() { + if (!getName().isEmpty()) { + return ", " + getName(); + } + return Constants.EMPTY_STRING; + } + + /** + * Returns type of parameter. + * + * @return type of parameter. + */ + public String getType() { + if (mType != null) { + return mType; + } + return Constants.EMPTY_STRING; + } + + /** + * Returns type and name of parameter. + * + * @return type and name of parameter if exists, empty string otherwise. + */ + public String getParam() { + if (!getType().isEmpty() && !getName().isEmpty()) { + return getType() + " " + getName(); + } + return Constants.EMPTY_STRING; + } + + /** + * Returns type and name of parameter for next parameter followed by comma. + * + * @return type and name of parameter for next parameter if exists, empty string otherwise. + */ + public String getNextParam() { + if (!getType().isEmpty() && !getName().isEmpty()) { + return ", " + getParam(); + } + return Constants.EMPTY_STRING; + } + + /** + * Returns comment for parameter. + * + * @param description of parameter. + * @return comment for parameter if exists, empty string otherwise. + */ + public String getParamComment(String description) { + if (!getType().isEmpty() && !getName().isEmpty()) { + return "\n * @param " + getName() + " - " + description; + } + return Constants.EMPTY_STRING; + } +} diff --git a/tools/processors/property_cache/test/java/android/processor/property_cache/CachedPropertyProcessorTest.java b/tools/processors/property_cache/test/java/android/processor/property_cache/CachedPropertyProcessorTest.java new file mode 100644 index 000000000000..1e23c78d4816 --- /dev/null +++ b/tools/processors/property_cache/test/java/android/processor/property_cache/CachedPropertyProcessorTest.java @@ -0,0 +1,64 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.processor.property_cache.test; + +import static com.google.common.truth.Truth.assertThat; +import static com.google.testing.compile.CompilationSubject.assertThat; + +import android.processor.property_cache.CachedPropertyProcessor; + +import com.google.testing.compile.Compilation; +import com.google.testing.compile.Compiler; +import com.google.testing.compile.JavaFileObjects; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; + +import javax.tools.JavaFileObject; +import javax.tools.StandardLocation; + +/** Tests the {@link CachedPropertyProcessor}. */ +@RunWith(JUnit4.class) +public class CachedPropertyProcessorTest { + private final Compiler mCompiler = + Compiler.javac().withProcessors(new CachedPropertyProcessor()); + + @Test + public void testDefaultValues() { + JavaFileObject expectedJava = JavaFileObjects.forResource("DefaultCache.java"); + + Compilation compilation = mCompiler.compile(JavaFileObjects.forResource("Default.java")); + assertThat(compilation).succeeded(); + assertThat(compilation) + .generatedFile(StandardLocation.SOURCE_OUTPUT, + "android/processor/property_cache/test/DefaultCache.java") + .hasSourceEquivalentTo(expectedJava); + } + + @Test + public void testCustomValues() { + JavaFileObject expectedJava = JavaFileObjects.forResource("CustomCache.java"); + + Compilation compilation = mCompiler.compile(JavaFileObjects.forResource("Custom.java")); + assertThat(compilation).succeeded(); + assertThat(compilation) + .generatedFile(StandardLocation.SOURCE_OUTPUT, + "android/processor/property_cache/test/CustomCache.java") + .hasSourceEquivalentTo(expectedJava); + } +} diff --git a/tools/processors/property_cache/test/java/android/processor/property_cache/shadows/IpcDataCache.java b/tools/processors/property_cache/test/java/android/processor/property_cache/shadows/IpcDataCache.java new file mode 100644 index 000000000000..e5ef48c14436 --- /dev/null +++ b/tools/processors/property_cache/test/java/android/processor/property_cache/shadows/IpcDataCache.java @@ -0,0 +1,134 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.os; + +// Mocked class for generation compilation tests purposes only. +public class IpcDataCache<Input, Output> { + public static class Config { + public Config(int max, String module, String api, String name) { + } + } + + /** Shadow method for generated code compilation tests purposes only. + * + * @param query - shadow parameter from IpcDataCache in Frameworks. + * @return null + */ + public Output query(Input query) { + return null; + } + + /** Shadow method for generated code compilation tests purposes only. + * + * @param key - shadow parameter from IpcDataCache in Frameworks; + */ + public static void invalidateCache(String key) { + } + + /** Shadow method for generated code compilation tests purposes only. + * + * @param query - shadow parameter from IpcDataCache in Frameworks; + * @return null + */ + public Output recompute(Input query) { + return null; + } + + /** Shadow method for generated code compilation tests purposes only. + * + * @param query - parameter equivalent to IpcDataCache in android framework. + * @param query - shadow parameter from IpcDataCache in Frameworks; + * @return false + */ + public boolean bypass(Input query) { + return false; + } + + /** Shadow method for generated code compilation tests purposes only. + * + * @param module - parameter equivalent to IpcDataCache in android framework. + * @param key - parameter equivalent to IpcDataCache in android framework. + * @return module + key sttring + */ + public static String createPropertyName(String module, String key) { + return module + key; + } + + public abstract static class QueryHandler<Input, Output> { + /** Shadow method for generated code compilation tests purposes only. + * + * @param query - parameter equivalent to IpcDataCache.QueryHandler in android framework. + * @return expected value + */ + public abstract Output apply(Input query); + /** Shadow method for generated code compilation tests purposes only. + * + * @param query - parameter equivalent to IpcDataCache.QueryHandler in android framework. + */ + public boolean shouldBypassCache(Input query) { + return false; + } + } + + public interface RemoteCall<Input, Output> { + /** Shadow method for generated code compilation tests purposes only. + * + * @param query - parameter equivalent to IpcDataCache.RemoteCall in android framework. + */ + Output apply(Input query); + } + + public interface BypassCall<Input> { + /** Shadow method for generated code compilation tests purposes only. + * + * @param query - parameter equivalent to IpcDataCache.BypassCall in android framework. + */ + boolean apply(Input query); + } + + public IpcDataCache( + int maxEntries, + String module, + String api, + String cacheName, + QueryHandler<Input, Output> computer) { + } + + public IpcDataCache(Config config, QueryHandler<Input, Output> computer) { + } + + public IpcDataCache(Config config, RemoteCall<Input, Output> computer) { + } + + public IpcDataCache(Config config, RemoteCall<Input, Output> computer, + BypassCall<Input> bypassCall) { + } + + /** Shadow method for generated code compilation tests purposes only.*/ + public void invalidateCache() { + } + + + /** Shadow method for generated code compilation tests purposes only. + * + * @param module - shadow parameter from IpcDataCache in Frameworks. + * @param api - shadow parameter from IpcDataCache in Frameworks. + */ + public static void invalidateCache(String module, String api) { + } + +} diff --git a/tools/processors/property_cache/test/resources/Custom.java b/tools/processors/property_cache/test/resources/Custom.java new file mode 100644 index 000000000000..05024da67e6c --- /dev/null +++ b/tools/processors/property_cache/test/resources/Custom.java @@ -0,0 +1,127 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.processor.property_cache.test; + +import com.android.internal.annotations.CacheModifier; +import com.android.internal.annotations.CachedProperty; +import com.android.internal.annotations.CachedPropertyDefaults; + +import java.util.Date; + +@CachedPropertyDefaults(max = 4, module = "bluetooth") +public class Custom { + BirthdayManagerService mService = new BirthdayManagerService(); + Object mCache = new CustomCache(); + + public Custom() { + CustomCache.initCache(); + } + + /** + * Testing custom class values to generate static IpcDataCache + * + * @param userId - user Id + * @return birthday date of given user Id + */ + @CachedProperty() + public Date getBirthday(int userId) { + return CustomCache.getBirthday(mService::getBirthday, userId); + } + + /** + * Testing custom class values to generate static IpcDataCache + * + * @param userId - user Id + * @return number of days till birthday of given user Id + */ + @CachedProperty(modsFlagOnOrNone = {CacheModifier.STATIC}) + public int getDaysTillBirthday(int userId) { + return CustomCache.getDaysTillBirthday(mService::getDaysTillBirthday, userId); + } + + /** + * Testing custom class values to generate non-static IpcDataCache + * + * @param userId - user Id + * @return number of days since birthday of given user Id + */ + @CachedProperty(modsFlagOnOrNone = {}) + public int getDaysSinceBirthday(int userId) { + return ((CustomCache) mCache).getDaysSinceBirthday(mService::getDaysSinceBirthday, userId); + } + + /** + * Testing custom class values to generate static IpcDataCache with max capasity of 1 + * + * @return number of days till birthay of current user + */ + @CachedProperty(modsFlagOnOrNone = {CacheModifier.STATIC}, max = 1) + public int getDaysTillMyBirthday() { + return CustomCache.getDaysTillMyBirthday((Void) -> mService.getDaysTillMyBirthday()); + } + + /** + * Testing custom class values to generate static IpcDataCache with max capasity of 1 and custom + * api + * + * @return number of days since birthay of current user + */ + @CachedProperty(modsFlagOnOrNone = {}, max = 1, api = "my_unique_key") + public int getDaysSinceMyBirthday() { + return ((CustomCache) mCache).getDaysSinceMyBirthday( + (Void) -> mService.getDaysSinceMyBirthday()); + } + + /** + * Testing custom class values to generate static IpcDataCache with custom module name + * + * @return birthday wishes of given user Id + */ + @CachedProperty(module = "telephony") + public String getBirthdayWishesFromUser(int userId) { + return CustomCache.getBirthdayWishesFromUser(mService::getBirthdayWishesFromUser, + userId); + } + + class BirthdayManagerService { + int mDaysTillBirthday = 182; + + public Date getBirthday(int userId) { + return new Date(2024, 6, 1 + userId); + } + + public int getDaysTillBirthday(int userId) { + return mDaysTillBirthday + userId; + } + + public int getDaysSinceBirthday(int userId) { + return 365 - getDaysTillBirthday(userId); + } + + public int getDaysTillMyBirthday() { + return 0; + } + + public int getDaysSinceMyBirthday() { + return 365; + } + + public String getBirthdayWishesFromUser(int userId) { + return "Happy Birthday!\n- " + userId; + } + } +} diff --git a/tools/processors/property_cache/test/resources/CustomCache.java b/tools/processors/property_cache/test/resources/CustomCache.java new file mode 100644 index 000000000000..326467fb5639 --- /dev/null +++ b/tools/processors/property_cache/test/resources/CustomCache.java @@ -0,0 +1,384 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package android.processor.property_cache.test; + +import android.os.IpcDataCache; + +/** + * This class is auto-generated + * + * @hide + **/ +public class CustomCache { + private static final Object sBirthdayLock = new Object(); + private static IpcDataCache<java.lang.Integer, java.util.Date> sBirthday; + + + /** + * This method is auto-generated + * + * @param binderCall - lambda for remote call + * {@link android.processor.property_cache.test.Custom#getBirthday } + * @param bypassPredicate - lambda to bypass remote call + * @param query - parameter to call remote lambda + * @hide + */ + public static java.util.Date getBirthday( + IpcDataCache.RemoteCall<java.lang.Integer, java.util.Date> binderCall, + IpcDataCache.BypassCall<java.lang.Integer> bypassPredicate, java.lang.Integer query) { + if (sBirthday != null) { + return sBirthday.query(query); + } + synchronized (sBirthdayLock) { + if (sBirthday == null) { + sBirthday = new IpcDataCache( + new IpcDataCache.Config(4, "bluetooth", "custom_birthday", "Birthday"), + binderCall, bypassPredicate); + + } + } + return sBirthday.query(query); + } + + /** + * This method is auto-generated + * + * @param binderCall - lambda for remote call + * {@link android.processor.property_cache.test.Custom#getBirthday } + * @param query - parameter to call remote lambda + * @hide + */ + public static java.util.Date getBirthday( + IpcDataCache.RemoteCall<java.lang.Integer, java.util.Date> binderCall, + java.lang.Integer query) { + if (sBirthday != null) { + return sBirthday.query(query); + } + synchronized (sBirthdayLock) { + if (sBirthday == null) { + sBirthday = new IpcDataCache( + new IpcDataCache.Config(4, "bluetooth", "custom_birthday", "Birthday"), + binderCall); + } + } + return sBirthday.query(query); + } + + /** + * This method is auto-generated- invalidate cache for + * {@link android.processor.property_cache.test.Custom#getBirthday} + * + * @hide + */ + public static final void invalidateBirthday() { + IpcDataCache.invalidateCache("bluetooth", "custom_birthday"); + } + + private static final Object sDaysTillBirthdayLock = new Object(); + private static IpcDataCache<java.lang.Integer, java.lang.Integer> sDaysTillBirthday; + + + /** + * This method is auto-generated + * + * @param binderCall - lambda for remote call + * {@link + * android.processor.property_cache.test.Custom#getDaysTillBirthday } + * @param bypassPredicate - lambda to bypass remote call + * @param query - parameter to call remote lambda + * @hide + */ + public static java.lang.Integer getDaysTillBirthday( + IpcDataCache.RemoteCall<java.lang.Integer, java.lang.Integer> binderCall, + IpcDataCache.BypassCall<java.lang.Integer> bypassPredicate, java.lang.Integer query) { + if (sDaysTillBirthday != null) { + return sDaysTillBirthday.query(query); + } + synchronized (sDaysTillBirthdayLock) { + if (sDaysTillBirthday == null) { + sDaysTillBirthday = new IpcDataCache( + new IpcDataCache.Config(4, "bluetooth", "custom_days_till_birthday", + "DaysTillBirthday"), binderCall, bypassPredicate); + + } + } + return sDaysTillBirthday.query(query); + } + + + /** + * This method is auto-generated + * + * @param binderCall - lambda for remote call + * {@link android.processor.property_cache.test.Custom#getDaysTillBirthday } + * @param query - parameter to call remote lambda + * @hide + */ + public static java.lang.Integer getDaysTillBirthday( + IpcDataCache.RemoteCall<java.lang.Integer, java.lang.Integer> binderCall, + java.lang.Integer query) { + if (sDaysTillBirthday != null) { + return sDaysTillBirthday.query(query); + } + synchronized (sDaysTillBirthdayLock) { + if (sDaysTillBirthday == null) { + sDaysTillBirthday = new IpcDataCache( + new IpcDataCache.Config(4, "bluetooth", "custom_days_till_birthday", + "DaysTillBirthday"), binderCall); + + } + } + return sDaysTillBirthday.query(query); + } + + /** + * This method is auto-generated- invalidate cache for + * {@link android.processor.property_cache.test.Custom#getDaysTillBirthday} + * + * @hide + */ + public static final void invalidateDaysTillBirthday() { + IpcDataCache.invalidateCache("bluetooth", "custom_days_till_birthday"); + } + + private final Object mDaysSinceBirthdayLock = new Object(); + private IpcDataCache<java.lang.Integer, java.lang.Integer> mDaysSinceBirthday; + + + /** + * This method is auto-generated + * + * @param binderCall - lambda for remote call + * {@link + * android.processor.property_cache.test.Custom#getDaysSinceBirthday } + * @param bypassPredicate - lambda to bypass remote call + * @param query - parameter to call remote lambda + * @hide + */ + public java.lang.Integer getDaysSinceBirthday( + IpcDataCache.RemoteCall<java.lang.Integer, java.lang.Integer> binderCall, + IpcDataCache.BypassCall<java.lang.Integer> bypassPredicate, java.lang.Integer query) { + if (mDaysSinceBirthday != null) { + return mDaysSinceBirthday.query(query); + } + synchronized (mDaysSinceBirthdayLock) { + if (mDaysSinceBirthday == null) { + mDaysSinceBirthday = new IpcDataCache( + new IpcDataCache.Config(4, "bluetooth", "custom_days_since_birthday", + "DaysSinceBirthday"), binderCall, bypassPredicate); + + } + } + return mDaysSinceBirthday.query(query); + } + + + /** + * This method is auto-generated + * + * @param binderCall - lambda for remote call + * {@link android.processor.property_cache.test.Custom#getDaysSinceBirthday + * } + * @param query - parameter to call remote lambda + * @hide + */ + public java.lang.Integer getDaysSinceBirthday( + IpcDataCache.RemoteCall<java.lang.Integer, java.lang.Integer> binderCall, + java.lang.Integer query) { + if (mDaysSinceBirthday != null) { + return mDaysSinceBirthday.query(query); + } + synchronized (mDaysSinceBirthdayLock) { + if (mDaysSinceBirthday == null) { + mDaysSinceBirthday = new IpcDataCache( + new IpcDataCache.Config(4, "bluetooth", "custom_days_since_birthday", + "DaysSinceBirthday"), binderCall); + + } + } + return mDaysSinceBirthday.query(query); + } + + /** + * This method is auto-generated- invalidate cache for + * {@link android.processor.property_cache.test.Custom#getDaysSinceBirthday} + * + * @hide + */ + public static final void invalidateDaysSinceBirthday() { + IpcDataCache.invalidateCache("bluetooth", "custom_days_since_birthday"); + } + + private static final Object sDaysTillMyBirthdayLock = new Object(); + private static IpcDataCache<java.lang.Void, java.lang.Integer> sDaysTillMyBirthday; + + + /** + * This method is auto-generated + * + * @param binderCall - lambda for remote call + * {@link android.processor.property_cache.test.Custom#getDaysTillMyBirthday + * } + * @hide + */ + public static java.lang.Integer getDaysTillMyBirthday( + IpcDataCache.RemoteCall<java.lang.Void, java.lang.Integer> binderCall) { + if (sDaysTillMyBirthday != null) { + return sDaysTillMyBirthday.query(null); + } + synchronized (sDaysTillMyBirthdayLock) { + if (sDaysTillMyBirthday == null) { + sDaysTillMyBirthday = new IpcDataCache( + new IpcDataCache.Config(1, "bluetooth", "custom_days_till_my_birthday", + "DaysTillMyBirthday"), binderCall); + + } + } + return sDaysTillMyBirthday.query(null); + } + + /** + * This method is auto-generated- invalidate cache for + * {@link android.processor.property_cache.test.Custom#getDaysTillMyBirthday} + * + * @hide + */ + public static final void invalidateDaysTillMyBirthday() { + IpcDataCache.invalidateCache("bluetooth", "custom_days_till_my_birthday"); + } + + private final Object mDaysSinceMyBirthdayLock = new Object(); + private IpcDataCache<java.lang.Void, java.lang.Integer> mDaysSinceMyBirthday; + + + /** + * This method is auto-generated + * + * @param binderCall - lambda for remote call + * {@link android.processor.property_cache.test.Custom#getDaysSinceMyBirthday + * } + * @hide + */ + public java.lang.Integer getDaysSinceMyBirthday( + IpcDataCache.RemoteCall<java.lang.Void, java.lang.Integer> binderCall) { + if (mDaysSinceMyBirthday != null) { + return mDaysSinceMyBirthday.query(null); + } + synchronized (mDaysSinceMyBirthdayLock) { + if (mDaysSinceMyBirthday == null) { + mDaysSinceMyBirthday = new IpcDataCache( + new IpcDataCache.Config(1, "bluetooth", "my_unique_key", + "DaysSinceMyBirthday"), binderCall); + + } + } + return mDaysSinceMyBirthday.query(null); + } + + /** + * This method is auto-generated- invalidate cache for + * {@link android.processor.property_cache.test.Custom#getDaysSinceMyBirthday} + * + * @hide + */ + public static final void invalidateDaysSinceMyBirthday() { + IpcDataCache.invalidateCache("bluetooth", "my_unique_key"); + } + + private static final Object sBirthdayWishesFromUserLock = new Object(); + private static IpcDataCache<java.lang.Integer, java.lang.String> sBirthdayWishesFromUser; + + + /** + * This method is auto-generated + * + * @param binderCall - lambda for remote call + * {@link + * android.processor.property_cache.test.Custom#getBirthdayWishesFromUser + * } + * @param bypassPredicate - lambda to bypass remote call + * @param query - parameter to call remote lambda + * @hide + */ + public static java.lang.String getBirthdayWishesFromUser( + IpcDataCache.RemoteCall<java.lang.Integer, java.lang.String> binderCall, + IpcDataCache.BypassCall<java.lang.Integer> bypassPredicate, java.lang.Integer query) { + if (sBirthdayWishesFromUser != null) { + return sBirthdayWishesFromUser.query(query); + } + synchronized (sBirthdayWishesFromUserLock) { + if (sBirthdayWishesFromUser == null) { + sBirthdayWishesFromUser = new IpcDataCache( + new IpcDataCache.Config(4, "telephony", "custom_birthday_wishes_from_user", + "BirthdayWishesFromUser"), binderCall, bypassPredicate); + + } + } + return sBirthdayWishesFromUser.query(query); + } + + + /** + * This method is auto-generated + * + * @param binderCall - lambda for remote call + * {@link + * android.processor.property_cache.test.Custom#getBirthdayWishesFromUser } + * @param query - parameter to call remote lambda + * @hide + */ + public static java.lang.String getBirthdayWishesFromUser( + IpcDataCache.RemoteCall<java.lang.Integer, java.lang.String> binderCall, + java.lang.Integer query) { + if (sBirthdayWishesFromUser != null) { + return sBirthdayWishesFromUser.query(query); + } + synchronized (sBirthdayWishesFromUserLock) { + if (sBirthdayWishesFromUser == null) { + sBirthdayWishesFromUser = new IpcDataCache( + new IpcDataCache.Config(4, "telephony", "custom_birthday_wishes_from_user", + "BirthdayWishesFromUser"), binderCall); + + } + } + return sBirthdayWishesFromUser.query(query); + } + + /** + * This method is auto-generated- invalidate cache for + * {@link android.processor.property_cache.test.Custom#getBirthdayWishesFromUser} + * + * @hide + */ + public static final void invalidateBirthdayWishesFromUser() { + IpcDataCache.invalidateCache("telephony", "custom_birthday_wishes_from_user"); + } + + + /** + * This method is auto-generated - initialise all caches for class CustomCache + * + * @hide + */ + public static void initCache() { + CustomCache.invalidateBirthday(); + CustomCache.invalidateDaysTillBirthday(); + CustomCache.invalidateDaysSinceBirthday(); + CustomCache.invalidateDaysTillMyBirthday(); + CustomCache.invalidateDaysSinceMyBirthday(); + CustomCache.invalidateBirthdayWishesFromUser(); + } +} diff --git a/tools/processors/property_cache/test/resources/Default.java b/tools/processors/property_cache/test/resources/Default.java new file mode 100644 index 000000000000..d2449aad656c --- /dev/null +++ b/tools/processors/property_cache/test/resources/Default.java @@ -0,0 +1,125 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.processor.property_cache.test; + +import com.android.internal.annotations.CacheModifier; +import com.android.internal.annotations.CachedProperty; +import com.android.internal.annotations.CachedPropertyDefaults; + +import java.util.Date; + +@CachedPropertyDefaults() +public class Default { + BirthdayManagerService mService = new BirthdayManagerService(); + Object mCache = new DefaultCache(); + + /** Testing default class values to generate static IpcDataCache + * + * @param userId - user Id + * @return birthday date of given user Id + */ + @CachedProperty() + public Date getBirthday(int userId) { + return DefaultCache.getBirthday(mService::getBirthday, userId); + } + + /** Testing default class values to generate static IpcDataCache + * + * @param userId - user Id + * @return number of days till birthday of given user Id + */ + @CachedProperty(modsFlagOnOrNone = {CacheModifier.STATIC}) + public int getDaysTillBirthday(int userId) { + return DefaultCache.getDaysTillBirthday(mService::getDaysTillBirthday, userId); + } + + /** Testing generate non-static IpcDataCache + * + * @param userId - user Id + * @return number of days since birthday of given user Id + */ + @CachedProperty(modsFlagOnOrNone = {}) + public int getDaysSinceBirthday(int userId) { + return ((DefaultCache) mCache).getDaysSinceBirthday(mService::getDaysSinceBirthday, userId); + } + + /** Testing default class values to generate static IpcDataCache with max capacity of 1 + * + * @return number of days till birthay of current user + */ + @CachedProperty( + modsFlagOnOrNone = {CacheModifier.STATIC}, + max = 1) + public int getDaysTillMyBirthday() { + return DefaultCache.getDaysTillMyBirthday((Void) -> mService.getDaysTillMyBirthday()); + } + + /** Testing default class values to generate static IpcDataCache with max capacity of 1 and + custom api + * + * @return number of days since birthay of current user + */ + @CachedProperty( + modsFlagOnOrNone = {}, + max = 1, + api = "my_unique_key") + public int getDaysSinceMyBirthday() { + return ((DefaultCache) mCache).getDaysSinceMyBirthday( + (Void) -> mService.getDaysSinceMyBirthday()); + } + + /** Testing default class values to generate static IpcDataCache with custom module name + * + * @return birthday wishes of given user Id + */ + @CachedProperty(module = "telephony") + public String getBirthdayWishesFromUser(int userId) { + return DefaultCache.getBirthdayWishesFromUser(mService::getBirthdayWishesFromUser, + userId); + } + + class BirthdayManagerService { + + BirthdayManagerService() { + DefaultCache.initCache(); + } + + public Date getBirthday(int userId) { + return new Date(); + } + + public int getDaysTillBirthday(int userId) { + return 0; + } + + public int getDaysSinceBirthday(int userId) { + return 0; + } + + public int getDaysTillMyBirthday() { + return 0; + } + + public int getDaysSinceMyBirthday() { + return 0; + } + + public String getBirthdayWishesFromUser(int userId) { + return "Happy Birthday!\n- " + userId; + } + } +} diff --git a/tools/processors/property_cache/test/resources/DefaultCache.java b/tools/processors/property_cache/test/resources/DefaultCache.java new file mode 100644 index 000000000000..9531118752bb --- /dev/null +++ b/tools/processors/property_cache/test/resources/DefaultCache.java @@ -0,0 +1,402 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package android.processor.property_cache.test; + +import android.os.IpcDataCache; + +/** + * This class is auto-generated + * + * @hide + **/ +public class DefaultCache { + private static final Object sBirthdayLock = new Object(); + private static IpcDataCache<java.lang.Integer, java.util.Date> sBirthday; + + + /** + * This method is auto-generated + * + * @param binderCall - lambda for remote call + * {@link android.processor.property_cache.test.Default#getBirthday } + * @param bypassPredicate - lambda to bypass remote call + * @param query - parameter to call remote lambda + * @hide + */ + public static java.util.Date getBirthday( + IpcDataCache.RemoteCall<java.lang.Integer, java.util.Date> binderCall, + IpcDataCache.BypassCall<java.lang.Integer> bypassPredicate, java.lang.Integer query + ) { + if (sBirthday != null) { + return sBirthday.query(query); + } + synchronized (sBirthdayLock) { + if (sBirthday == null) { + sBirthday = new IpcDataCache( + new IpcDataCache.Config(32, "system_server", + "default_birthday", "Birthday"), + binderCall, bypassPredicate); + + } + } + return sBirthday.query(query); + } + + + /** + * This method is auto-generated + * + * @param binderCall - lambda for remote call + * {@link android.processor.property_cache.test.Default#getBirthday } + * @param query - parameter to call remote lambda + * @hide + */ + public static java.util.Date getBirthday( + IpcDataCache.RemoteCall<java.lang.Integer, java.util.Date> binderCall, + java.lang.Integer query + ) { + if (sBirthday != null) { + return sBirthday.query(query); + } + synchronized (sBirthdayLock) { + if (sBirthday == null) { + sBirthday = new IpcDataCache( + new IpcDataCache.Config(32, "system_server", + "default_birthday", "Birthday"), + binderCall); + + } + } + return sBirthday.query(query); + } + + /** + * This method is auto-generated- invalidate cache for + * {@link android.processor.property_cache.test.Default#getBirthday} + * + * @hide + */ + public static final void invalidateBirthday() { + IpcDataCache.invalidateCache("system_server", "default_birthday"); + } + + private static final Object sDaysTillBirthdayLock = new Object(); + private static IpcDataCache<java.lang.Integer, java.lang.Integer> sDaysTillBirthday; + + + /** + * This method is auto-generated + * + * @param binderCall - lambda for remote call + * {@link + * android.processor.property_cache.test.Default#getDaysTillBirthday } + * @param bypassPredicate - lambda to bypass remote call + * @param query - parameter to call remote lambda + * @hide + */ + public static java.lang.Integer getDaysTillBirthday( + IpcDataCache.RemoteCall<java.lang.Integer, java.lang.Integer> binderCall, + IpcDataCache.BypassCall<java.lang.Integer> bypassPredicate, java.lang.Integer query + ) { + if (sDaysTillBirthday != null) { + return sDaysTillBirthday.query(query); + } + synchronized (sDaysTillBirthdayLock) { + if (sDaysTillBirthday == null) { + sDaysTillBirthday = new IpcDataCache( + new IpcDataCache.Config(32, "system_server", "default_days_till_birthday", + "DaysTillBirthday"), binderCall, bypassPredicate); + + } + } + return sDaysTillBirthday.query(query); + } + + + /** + * This method is auto-generated + * + * @param binderCall - lambda for remote call + * {@link android.processor.property_cache.test.Default#getDaysTillBirthday + * } + * @param query - parameter to call remote lambda + * @hide + */ + public static java.lang.Integer getDaysTillBirthday( + IpcDataCache.RemoteCall<java.lang.Integer, java.lang.Integer> binderCall, + java.lang.Integer query + ) { + if (sDaysTillBirthday != null) { + return sDaysTillBirthday.query(query); + } + synchronized (sDaysTillBirthdayLock) { + if (sDaysTillBirthday == null) { + sDaysTillBirthday = new IpcDataCache( + new IpcDataCache.Config(32, "system_server", "default_days_till_birthday", + "DaysTillBirthday"), binderCall); + + } + } + return sDaysTillBirthday.query(query); + } + + /** + * This method is auto-generated- invalidate cache for + * {@link android.processor.property_cache.test.Default#getDaysTillBirthday} + * + * @hide + */ + public static final void invalidateDaysTillBirthday() { + IpcDataCache.invalidateCache("system_server", "default_days_till_birthday"); + } + + private final Object mDaysSinceBirthdayLock = new Object(); + private IpcDataCache<java.lang.Integer, java.lang.Integer> mDaysSinceBirthday; + + + /** + * This method is auto-generated + * + * @param binderCall - lambda for remote call + * {@link + * android.processor.property_cache.test.Default#getDaysSinceBirthday } + * @param bypassPredicate - lambda to bypass remote call + * @param query - parameter to call remote lambda + * @hide + */ + public java.lang.Integer getDaysSinceBirthday( + IpcDataCache.RemoteCall<java.lang.Integer, java.lang.Integer> binderCall, + IpcDataCache.BypassCall<java.lang.Integer> bypassPredicate, java.lang.Integer query + ) { + if (mDaysSinceBirthday != null) { + return mDaysSinceBirthday.query(query); + } + synchronized (mDaysSinceBirthdayLock) { + if (mDaysSinceBirthday == null) { + mDaysSinceBirthday = new IpcDataCache( + new IpcDataCache.Config(32, "system_server", "default_days_since_birthday", + "DaysSinceBirthday"), binderCall, bypassPredicate); + + } + } + return mDaysSinceBirthday.query(query); + } + + + /** + * This method is auto-generated + * + * @param binderCall - lambda for remote call + * {@link android.processor.property_cache.test.Default#getDaysSinceBirthday + * } + * @param query - parameter to call remote lambda + * @hide + */ + public java.lang.Integer getDaysSinceBirthday( + IpcDataCache.RemoteCall<java.lang.Integer, java.lang.Integer> binderCall, + java.lang.Integer query + ) { + if (mDaysSinceBirthday != null) { + return mDaysSinceBirthday.query(query); + } + synchronized (mDaysSinceBirthdayLock) { + if (mDaysSinceBirthday == null) { + mDaysSinceBirthday = new IpcDataCache( + new IpcDataCache.Config(32, "system_server", "default_days_since_birthday", + "DaysSinceBirthday"), binderCall); + + } + } + return mDaysSinceBirthday.query(query); + } + + /** + * This method is auto-generated- invalidate cache for + * {@link android.processor.property_cache.test.Default#getDaysSinceBirthday} + * + * @hide + */ + public static final void invalidateDaysSinceBirthday() { + IpcDataCache.invalidateCache("system_server", "default_days_since_birthday"); + } + + private static final Object sDaysTillMyBirthdayLock = new Object(); + private static IpcDataCache<java.lang.Void, java.lang.Integer> sDaysTillMyBirthday; + + + /** + * This method is auto-generated + * + * @param binderCall - lambda for remote call + * {@link android.processor.property_cache.test.Default#getDaysTillMyBirthday + * } + * @hide + */ + public static java.lang.Integer getDaysTillMyBirthday( + IpcDataCache.RemoteCall<java.lang.Void, java.lang.Integer> binderCall + ) { + if (sDaysTillMyBirthday != null) { + return sDaysTillMyBirthday.query(null); + } + synchronized (sDaysTillMyBirthdayLock) { + if (sDaysTillMyBirthday == null) { + sDaysTillMyBirthday = new IpcDataCache( + new IpcDataCache.Config(1, "system_server", "default_days_till_my_birthday", + "DaysTillMyBirthday"), binderCall); + + } + } + return sDaysTillMyBirthday.query(null); + } + + /** + * This method is auto-generated- invalidate cache for + * {@link android.processor.property_cache.test.Default#getDaysTillMyBirthday} + * + * @hide + */ + public static final void invalidateDaysTillMyBirthday() { + IpcDataCache.invalidateCache("system_server", "default_days_till_my_birthday"); + } + + private final Object mDaysSinceMyBirthdayLock = new Object(); + private IpcDataCache<java.lang.Void, java.lang.Integer> mDaysSinceMyBirthday; + + + /** + * This method is auto-generated + * + * @param binderCall - lambda for remote call + * {@link + * android.processor.property_cache.test.Default#getDaysSinceMyBirthday } + * @hide + */ + public java.lang.Integer getDaysSinceMyBirthday( + IpcDataCache.RemoteCall<java.lang.Void, java.lang.Integer> binderCall + ) { + if (mDaysSinceMyBirthday != null) { + return mDaysSinceMyBirthday.query(null); + } + synchronized (mDaysSinceMyBirthdayLock) { + if (mDaysSinceMyBirthday == null) { + mDaysSinceMyBirthday = new IpcDataCache( + new IpcDataCache.Config(1, "system_server", "my_unique_key", + "DaysSinceMyBirthday"), binderCall); + + } + } + return mDaysSinceMyBirthday.query(null); + } + + /** + * This method is auto-generated- invalidate cache for + * {@link android.processor.property_cache.test.Default#getDaysSinceMyBirthday} + * + * @hide + */ + public static final void invalidateDaysSinceMyBirthday() { + IpcDataCache.invalidateCache("system_server", "my_unique_key"); + } + + private static final Object sBirthdayWishesFromUserLock = new Object(); + private static IpcDataCache<java.lang.Integer, java.lang.String> sBirthdayWishesFromUser; + + + /** + * This method is auto-generated + * + * @param binderCall - lambda for remote call + * {@link + * + * android.processor.property_cache.test.Default#getBirthdayWishesFromUser + * } + * @param bypassPredicate - lambda to bypass remote call + * @param query - parameter to call remote lambda + * @hide + */ + public static java.lang.String getBirthdayWishesFromUser( + IpcDataCache.RemoteCall<java.lang.Integer, java.lang.String> binderCall, + IpcDataCache.BypassCall<java.lang.Integer> bypassPredicate, java.lang.Integer query + ) { + if (sBirthdayWishesFromUser != null) { + return sBirthdayWishesFromUser.query(query); + } + synchronized (sBirthdayWishesFromUserLock) { + if (sBirthdayWishesFromUser == null) { + sBirthdayWishesFromUser = new IpcDataCache( + new IpcDataCache.Config(32, "telephony", + "default_birthday_wishes_from_user", + "BirthdayWishesFromUser"), binderCall, bypassPredicate); + + } + } + return sBirthdayWishesFromUser.query(query); + } + + + /** + * This method is auto-generated + * + * @param binderCall - lambda for remote call + * {@link + * android.processor.property_cache.test.Default#getBirthdayWishesFromUser } + * @param query - parameter to call remote lambda + * @hide + */ + public static java.lang.String getBirthdayWishesFromUser( + IpcDataCache.RemoteCall<java.lang.Integer, java.lang.String> binderCall, + java.lang.Integer query + ) { + if (sBirthdayWishesFromUser != null) { + return sBirthdayWishesFromUser.query(query); + } + synchronized (sBirthdayWishesFromUserLock) { + if (sBirthdayWishesFromUser == null) { + sBirthdayWishesFromUser = new IpcDataCache( + new IpcDataCache.Config(32, "telephony", + "default_birthday_wishes_from_user", + "BirthdayWishesFromUser"), binderCall); + + } + } + return sBirthdayWishesFromUser.query(query); + } + + /** + * This method is auto-generated- invalidate cache for + * {@link android.processor.property_cache.test.Default#getBirthdayWishesFromUser} + * + * @hide + */ + public static final void invalidateBirthdayWishesFromUser() { + IpcDataCache.invalidateCache("telephony", "default_birthday_wishes_from_user"); + } + + + /** + * This method is auto-generated - initialise all caches for class DefaultCache + * + * @hide + */ + public static void initCache() { + DefaultCache.invalidateBirthday(); + DefaultCache.invalidateDaysTillBirthday(); + DefaultCache.invalidateDaysSinceBirthday(); + DefaultCache.invalidateDaysTillMyBirthday(); + DefaultCache.invalidateDaysSinceMyBirthday(); + DefaultCache.invalidateBirthdayWishesFromUser(); + } +} |