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

Commit 0d55ad71 authored by Alexander Dorokhine's avatar Alexander Dorokhine Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I682344713a89f01b1e90cbe0cc87cb07e25e8e4a
parents a397dd2a 625d330a

apex/appsearch/service/java/com/android/server/appsearch/stats/PlatformLogger.java

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ public final class PlatformLogger implements AppSearchLogger { 
    }



    @Override

    public void logStats(@androidx.annotation.NonNull RemoveStats stats) throws AppSearchException {

    public void logStats(@NonNull RemoveStats stats) throws AppSearchException {

        // TODO(b/173532925): Log stats

    }

apex/appsearch/service/java/com/android/server/appsearch/visibilitystore/PackageAccessibleDocument.java

+1 −2
Original line number Diff line number Diff line
@@ -16,12 +16,11 @@ 
package com.android.server.appsearch.visibilitystore;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.app.appsearch.AppSearchSchema;

import android.app.appsearch.GenericDocument;

import android.app.appsearch.PackageIdentifier;



import androidx.annotation.Nullable;



/**

 * Holds configuration about a package+cert that can access a schema.

 *

apex/appsearch/service/java/com/android/server/appsearch/visibilitystore/VisibilityDocument.java

+1 −2
Original line number Diff line number Diff line
@@ -16,11 +16,10 @@ 
package com.android.server.appsearch.visibilitystore;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.app.appsearch.AppSearchSchema;

import android.app.appsearch.GenericDocument;



import androidx.annotation.Nullable;



/** Holds the visibility settings that apply to a package's databases. */

class VisibilityDocument extends GenericDocument {

    /** Schema type for documents that hold AppSearch's metadata, e.g. visibility settings */