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

Merge "Fix some incorrect annotations in AppSearch." into sc-dev am: 625d330a48

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14925630

Change-Id: Ie2623ef2a9a986fd12a4680d834abd4807e61ad5
This commit is contained in:
Alexander Dorokhine
2021-06-12 23:00:17 +00:00
committed by Automerger Merge Worker
parent bfda804adc 625d330a48
commit 7b0a2d6f3a
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apex/appsearch/service/java/com/android/server/appsearch/stats/PlatformLogger.java
View File

@@ -170,7 +170,7 @@ public final class PlatformLogger implements AppSearchLogger {
} }
@Override @Override
public void logStats(@androidx.annotation.NonNull RemoveStats stats) throws AppSearchException { public void logStats(@NonNull RemoveStats stats) throws AppSearchException {
// TODO(b/173532925): Log stats // TODO(b/173532925): Log stats
} }

3
apex/appsearch/service/java/com/android/server/appsearch/visibilitystore/PackageAccessibleDocument.java
View File

@@ -16,12 +16,11 @@
package com.android.server.appsearch.visibilitystore; package com.android.server.appsearch.visibilitystore;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.Nullable;
import android.app.appsearch.AppSearchSchema; import android.app.appsearch.AppSearchSchema;
import android.app.appsearch.GenericDocument; import android.app.appsearch.GenericDocument;
import android.app.appsearch.PackageIdentifier; import android.app.appsearch.PackageIdentifier;
import androidx.annotation.Nullable;
/** /**
* Holds configuration about a package+cert that can access a schema. * Holds configuration about a package+cert that can access a schema.
* *

3
apex/appsearch/service/java/com/android/server/appsearch/visibilitystore/VisibilityDocument.java
View File

@@ -16,11 +16,10 @@
package com.android.server.appsearch.visibilitystore; package com.android.server.appsearch.visibilitystore;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.Nullable;
import android.app.appsearch.AppSearchSchema; import android.app.appsearch.AppSearchSchema;
import android.app.appsearch.GenericDocument; import android.app.appsearch.GenericDocument;
import androidx.annotation.Nullable;
/** Holds the visibility settings that apply to a package's databases. */ /** Holds the visibility settings that apply to a package's databases. */
class VisibilityDocument extends GenericDocument { class VisibilityDocument extends GenericDocument {
/** Schema type for documents that hold AppSearch's metadata, e.g. visibility settings */ /** Schema type for documents that hold AppSearch's metadata, e.g. visibility settings */