Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Alexander Dorokhine
2021-05-11 17:29:35 +00:00
committed by Android (Google) Code Review
parent b61fb4ee86 7de178b090
commit e3eea0e2a5
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apex/appsearch/framework/api/current.txt
View File

@@ -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);

13
apex/appsearch/framework/java/external/android/app/appsearch/SearchResult.java vendored
View File

@@ -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);