fix: Conflict incoming changes from 15-dev

2025-11-22 17:14:31 +07:00
parent 14e352c827
commit 2e76c99dad
1726 changed files with 146971 additions and 95028 deletions
@@ -177,6 +177,13 @@ public interface ActivityStarter {
            boolean dismissShade,
            @Nullable String customMessage);

+    /** Starts an activity and dismisses keyguard. */
+    void startActivityDismissingKeyguard(Intent intent,
+            boolean onlyProvisioned,
+            boolean dismissShade,
+            @Nullable String customMessage,
+            Callback callback);
+
    /** Starts an activity and dismisses keyguard. */
    void startActivityDismissingKeyguard(Intent intent,
            boolean onlyProvisioned,