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

Commit 3d50516b authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7453216 from 2aa8be16 to sc-release 

Change-Id: I99580e91850cabf898d2d9e2bb012236a4a82695
parents 8bae5bc2 2aa8be16

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -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

    }

    }

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

+1 −2
Original line number Original line Diff line number Diff line
@@ -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.

 *

 *

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

+1 −2
Original line number Original line Diff line number Diff line
@@ -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 */

core/java/android/app/AppOpsManager.java

+0 −13
Original line number Original line Diff line number Diff line
@@ -3105,24 +3105,11 @@ public class AppOpsManager { 
         */

         */

        public boolean isRecordAudioRestrictionExcept;

        public boolean isRecordAudioRestrictionExcept;





        /**

         * Is attribution tag not null and not contained in the package attributions

         */

        public boolean isAttributionTagNotFound = false;



        public RestrictionBypass(boolean isPrivileged, boolean isRecordAudioRestrictionExcept) {

        public RestrictionBypass(boolean isPrivileged, boolean isRecordAudioRestrictionExcept) {

            this.isPrivileged = isPrivileged;

            this.isPrivileged = isPrivileged;

            this.isRecordAudioRestrictionExcept = isRecordAudioRestrictionExcept;

            this.isRecordAudioRestrictionExcept = isRecordAudioRestrictionExcept;

        }

        }





        public void setIsAttributionTagNotFound(boolean isAttributionTagNotFound) {

            this.isAttributionTagNotFound = isAttributionTagNotFound;

        }



        public boolean getIsAttributionTagNotFound() {

            return this.isAttributionTagNotFound;

        }



        public static RestrictionBypass UNRESTRICTED = new RestrictionBypass(true, true);

        public static RestrictionBypass UNRESTRICTED = new RestrictionBypass(true, true);

    }

    }

core/jni/Android.bp

+1 −3
Original line number Original line Diff line number Diff line
@@ -232,6 +232,7 @@ cc_library_shared { 
                "libseccomp_policy",

                "libseccomp_policy",

                "libgrallocusage",

                "libgrallocusage",

                "libscrypt_static",

                "libscrypt_static",

                "libstatssocket_lazy",

            ],

            ],





            shared_libs: [

            shared_libs: [
@@ -295,11 +296,8 @@ cc_library_shared { 
                "libnativewindow",

                "libnativewindow",

                "libdl",

                "libdl",

                "libdl_android",

                "libdl_android",

                "libstatslog",

                "libstatssocket",

                "libtimeinstate",

                "libtimeinstate",

                "server_configurable_flags",

                "server_configurable_flags",

                "libstatspull",

            ],

            ],

            export_shared_lib_headers: [

            export_shared_lib_headers: [

                // our headers include libnativewindow's public headers

                // our headers include libnativewindow's public headers