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

Commit ce88ca30 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[Contextual Search] Remove FLAG_ENABLE_SERVICE" into main

parents c2ac4e9f 083300e3

core/api/system-current.txt

+4 −4
Original line number Diff line number Diff line
@@ -2224,7 +2224,7 @@ package android.app.contentsuggestions { 














package android.app.contextualsearch {



























  @FlaggedApi("android.app.contextualsearch.flags.enable_service") public final class CallbackToken implements android.os.Parcelable {













  public final class CallbackToken implements android.os.Parcelable {















    ctor public CallbackToken();















    method public int describeContents();















    method public void getContextualSearchState(@NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<android.app.contextualsearch.ContextualSearchState,java.lang.Throwable>);









@@ -2232,7 +2232,7 @@ package android.app.contextualsearch {













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















  }



























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













  public final class ContextualSearchManager {















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















    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









@@ -2250,7 +2250,7 @@ package android.app.contextualsearch {













    field public static final String EXTRA_VISIBLE_PACKAGE_NAMES = "android.app.contextualsearch.extra.VISIBLE_PACKAGE_NAMES";















  }



























  @FlaggedApi("android.app.contextualsearch.flags.enable_service") public final class ContextualSearchState implements android.os.Parcelable {













  public final class ContextualSearchState implements android.os.Parcelable {















    ctor public ContextualSearchState(@Nullable android.app.assist.AssistStructure, @Nullable android.app.assist.AssistContent, @NonNull android.os.Bundle);















    method public int describeContents();















    method @Nullable public android.app.assist.AssistContent getContent();










@@ -3774,7 +3774,7 @@ package android.content {













    field public static final String CLOUDSEARCH_SERVICE = "cloudsearch";















    field public static final String CONTENT_SUGGESTIONS_SERVICE = "content_suggestions";















    field public static final String CONTEXTHUB_SERVICE = "contexthub";













    field @FlaggedApi("android.app.contextualsearch.flags.enable_service") public static final String CONTEXTUAL_SEARCH_SERVICE = "contextual_search";













    field public static final String CONTEXTUAL_SEARCH_SERVICE = "contextual_search";















    field @FlaggedApi("android.permission.flags.enhanced_confirmation_mode_apis_enabled") public static final String ECM_ENHANCED_CONFIRMATION_SERVICE = "ecm_enhanced_confirmation";















    field public static final String ETHERNET_SERVICE = "ethernet";















    field public static final String EUICC_CARD_SERVICE = "euicc_card";

























core/api/test-current.txt



+1
−1




























Original line number
Diff line number
Diff line








@@ -809,7 +809,7 @@ package android.app.contentsuggestions {





























package android.app.contextualsearch {





























  @FlaggedApi("android.app.contextualsearch.flags.enable_service") public final class CallbackToken implements android.os.Parcelable {













  public final class CallbackToken implements android.os.Parcelable {















    method @NonNull public android.os.IBinder getToken();















  }

















































core/java/android/app/contextualsearch/CallbackToken.java



+0
−1




























Original line number
Diff line number
Diff line








@@ -44,7 +44,6 @@ import java.util.concurrent.Executor;













 *















 * @hide















 */













@FlaggedApi(Flags.FLAG_ENABLE_SERVICE)















@SystemApi















public final class CallbackToken implements Parcelable {















    private static final boolean DEBUG = true;

































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



+0
−1




























Original line number
Diff line number
Diff line








@@ -43,7 +43,6 @@ import java.lang.annotation.RetentionPolicy;













 * @hide















 */















@SystemApi













@FlaggedApi(Flags.FLAG_ENABLE_SERVICE)















public final class ContextualSearchManager {































    /**

































core/java/android/app/contextualsearch/ContextualSearchState.java



+0
−1




























Original line number
Diff line number
Diff line








@@ -38,7 +38,6 @@ import androidx.annotation.NonNull;













 *















 * @hide















 */













@FlaggedApi(Flags.FLAG_ENABLE_SERVICE)















@SystemApi















public final class ContextualSearchState implements Parcelable {















    private final @NonNull Bundle mExtras;