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

Commit e3eea0e2 authored by Alexander Dorokhine's avatar Alexander Dorokhine Committed by Android (Google) Code Review
Browse files

Merge "Delete deprecated methods after dogfood transition." into sc-dev

parents b61fb4ee 7de178b0

apex/appsearch/framework/api/current.txt

+0 −2
Original line number Diff line number Diff line
@@ -290,14 +290,12 @@ package android.app.appsearch { 
    method @NonNull public String getDatabaseName();

    method @NonNull public android.app.appsearch.GenericDocument getGenericDocument();

    method @NonNull public java.util.List<android.app.appsearch.SearchResult.MatchInfo> getMatchInfos();

    method @Deprecated @NonNull public java.util.List<android.app.appsearch.SearchResult.MatchInfo> getMatches();

    method @NonNull public String getPackageName();

    method public double getRankingSignal();

  }



  public static final class SearchResult.Builder {

    ctor public SearchResult.Builder(@NonNull String, @NonNull String);

    method @Deprecated @NonNull public android.app.appsearch.SearchResult.Builder addMatch(@NonNull android.app.appsearch.SearchResult.MatchInfo);

    method @NonNull public android.app.appsearch.SearchResult.Builder addMatchInfo(@NonNull android.app.appsearch.SearchResult.MatchInfo);

    method @NonNull public android.app.appsearch.SearchResult build();

    method @NonNull public android.app.appsearch.SearchResult.Builder setGenericDocument(@NonNull android.app.appsearch.GenericDocument);

apex/appsearch/framework/java/external/android/app/appsearch/SearchResult.java

+11 −2
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package android.app.appsearch; 


import android.annotation.NonNull;

import android.annotation.Nullable;

import android.compat.annotation.UnsupportedAppUsage;

import android.os.Bundle;



import com.android.internal.util.Preconditions;
@@ -82,8 +83,12 @@ public final class SearchResult { 
        return mDocument;

    }



    /** @deprecated This method exists only for dogfooder transition and must be removed. */

    /**

     * @deprecated TODO(b/181887768): Exists for dogfood transition; must be removed.

     * @hide

     */

    @Deprecated

    @UnsupportedAppUsage

    @NonNull

    public List<MatchInfo> getMatches() {

        return getMatchInfos();
@@ -191,8 +196,12 @@ public final class SearchResult { 
            return this;

        }



        /** @deprecated This method exists only for dogfooder transition and must be removed. */

        /**

         * @deprecated TODO(b/181887768): Exists for dogfood transition; must be removed.

         * @hide

         */

        @Deprecated

        @UnsupportedAppUsage

        @NonNull

        public Builder addMatch(@NonNull MatchInfo matchInfo) {

            return addMatchInfo(matchInfo);