Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7f2ee80 authored by Andy Wickham's avatar Andy Wickham
Browse files

Move ContextualSearchManager self-invocation to SystemApi. 

We will revisit making it a public API in the future.

Primary use case: allowing the Contextual Search app to
invoke itself after an initial invocation (i.e. while it's
already in the foreground).

Bug: 368653769
Flag: android.app.contextualsearch.flags.self_invocation
Test: Build and presubmit
Change-Id: I553cc38463ebc5b4401b14c5d2862c531c4cd133
parent 8b5f8436

core/api/current.txt

+0 −9
Original line number Diff line number Diff line
@@ -9430,15 +9430,6 @@ package android.app.blob { 














}



























package android.app.contextualsearch {

























  @FlaggedApi("android.app.contextualsearch.flags.self_invocation") public final class ContextualSearchManager {













    method @FlaggedApi("android.app.contextualsearch.flags.self_invocation") public boolean isContextualSearchAvailable();













    method @FlaggedApi("android.app.contextualsearch.flags.self_invocation") public void startContextualSearch();













  }

























}



























package android.app.jank {





























  @FlaggedApi("android.app.jank.detailed_app_jank_metrics_api") public final class AppJankStats {

























core/api/system-current.txt



+3
−1




























Original line number
Diff line number
Diff line








@@ -2273,8 +2273,10 @@ package android.app.contextualsearch {













    field @NonNull public static final android.os.Parcelable.Creator<android.app.contextualsearch.CallbackToken> CREATOR;















  }



























  @FlaggedApi("android.app.contextualsearch.flags.self_invocation") public final class ContextualSearchManager {













  public final class ContextualSearchManager {













    method @FlaggedApi("android.app.contextualsearch.flags.self_invocation") public boolean isContextualSearchAvailable();















    method @RequiresPermission(android.Manifest.permission.ACCESS_CONTEXTUAL_SEARCH) public void startContextualSearch(int);













    method @FlaggedApi("android.app.contextualsearch.flags.self_invocation") public void startContextualSearch();















    field public static final String ACTION_LAUNCH_CONTEXTUAL_SEARCH = "android.app.contextualsearch.action.LAUNCH_CONTEXTUAL_SEARCH";















    field public static final int ENTRYPOINT_LONG_PRESS_HOME = 2; // 0x2















    field public static final int ENTRYPOINT_LONG_PRESS_META = 10; // 0xa

























core/java/android/app/contextualsearch/ContextualSearchManager.java



+11
−1




























Original line number
Diff line number
Diff line








@@ -42,8 +42,10 @@ import java.util.Set;













 * <p>















 * This class lets a caller start contextual search by calling {@link #startContextualSearch}















 * method.













 *













 * @hide















 */













@FlaggedApi(Flags.FLAG_SELF_INVOCATION)













@SystemApi















public final class ContextualSearchManager {































    /**










@@ -260,8 +262,11 @@ public final class ContextualSearchManager {













     *















     * @see #startContextualSearch()















     * @return true if contextual search is available on the device, false otherwise.













     *













     * @hide















     */















    @FlaggedApi(Flags.FLAG_SELF_INVOCATION)













    @SystemApi















    public boolean isContextualSearchAvailable() {















        if (DEBUG) Log.d(TAG, "isContextualSearchAvailable");















        try {










@@ -290,6 +295,8 @@ public final class ContextualSearchManager {













     * <p>This method will fail silently if Contextual Search is not available on the device.















     *















     * @param entrypoint the invocation entrypoint













     * @throws SecurityException if the caller does not have the {@link ACCESS_CONTEXTUAL_SEARCH}













     * permission.















     *















     * @hide















     */










@@ -322,8 +329,11 @@ public final class ContextualSearchManager {













     *















     * @see #isContextualSearchAvailable()















     * @throws SecurityException if the caller does not have a foreground Activity.













     *













     * @hide















     */















    @FlaggedApi(Flags.FLAG_SELF_INVOCATION)













    @SystemApi















    public void startContextualSearch() {















        if (DEBUG) Log.d(TAG, "startContextualSearch from app");















        try {