Snap for 7364021 from 3bf189f78b09fcd1be04146945d81c52c5c30e87 to sc-release (a9354a78) · Commits · e / os / android_frameworks_base

StubLibraries.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -255,7 +255,7 @@ modules_public_stubs = [

		modules_system_stubs = [
		"android.net.ipsec.ike.stubs.system",
		"art.module.public.api.stubs",
		"art.module.public.api.stubs", // Only has public stubs
		"conscrypt.module.public.api.stubs", // Only has public stubs
		"framework-appsearch.stubs.system",
		"framework-connectivity.stubs.system",

apct-tests/perftests/core/src/android/text/SystemFontsPerfTest.java

0 → 100644

+49 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2021 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.text;

		import android.graphics.fonts.SystemFonts;
		import android.perftests.utils.BenchmarkState;
		import android.perftests.utils.PerfStatusReporter;

		import androidx.test.filters.LargeTest;
		import androidx.test.runner.AndroidJUnit4;

		import org.junit.Rule;
		import org.junit.Test;
		import org.junit.runner.RunWith;


		@LargeTest
		@RunWith(AndroidJUnit4.class)
		public class SystemFontsPerfTest {
		@Rule
		public PerfStatusReporter mPerfStatusReporter = new PerfStatusReporter();

		@Test
		public void getAvailableFonts() {
		final BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
		while (state.keepRunning()) {
		state.pauseTiming();
		SystemFonts.resetAvailableFonts();
		System.gc();
		state.resumeTiming();

		SystemFonts.getAvailableFonts();
		}
		}
		}

apex/appsearch/framework/java/android/app/appsearch/AppSearchSession.java

+22 −12

Original line number	Diff line number	Diff line
		@@ -90,14 +90,17 @@ public final class AppSearchSession implements Closeable {
		@NonNull @CallbackExecutor Executor executor,
		@NonNull Consumer<AppSearchResult<AppSearchSession>> callback) {
		try {
		mService.initialize(mUserId, new IAppSearchResultCallback.Stub() {
		mService.initialize(mUserId,
		/binderCallStartTimeMillis=/ SystemClock.elapsedRealtime(),
		new IAppSearchResultCallback.Stub() {
		@Override
		public void onResult(AppSearchResultParcel resultParcel) {
		executor.execute(() -> {
		AppSearchResult<Void> result = resultParcel.getResult();
		if (result.isSuccess()) {
		callback.accept(
		AppSearchResult.newSuccessfulResult(AppSearchSession.this));
		AppSearchResult.newSuccessfulResult(
		AppSearchSession.this));
		} else {
		callback.accept(AppSearchResult.newFailedResult(result));
		}
		@@ -350,6 +353,7 @@ public final class AppSearchSession implements Closeable {
		new ArrayList<>(request.getIds()),
		request.getProjectionsInternal(),
		mUserId,
		/binderCallStartTimeMillis=/ SystemClock.elapsedRealtime(),
		new IAppSearchBatchResultCallback.Stub() {
		@Override
		public void onResult(AppSearchBatchResultParcel resultParcel) {
		@@ -563,6 +567,7 @@ public final class AppSearchSession implements Closeable {
		try {
		mService.removeByDocumentId(mPackageName, mDatabaseName, request.getNamespace(),
		new ArrayList<>(request.getIds()), mUserId,
		/binderCallStartTimeMillis=/ SystemClock.elapsedRealtime(),
		new IAppSearchBatchResultCallback.Stub() {
		@Override
		public void onResult(AppSearchBatchResultParcel resultParcel) {
		@@ -613,6 +618,7 @@ public final class AppSearchSession implements Closeable {
		try {
		mService.removeByQuery(mPackageName, mDatabaseName, queryExpression,
		searchSpec.getBundle(), mUserId,
		/binderCallStartTimeMillis=/ SystemClock.elapsedRealtime(),
		new IAppSearchResultCallback.Stub() {
		@Override
		public void onResult(AppSearchResultParcel resultParcel) {
		@@ -672,7 +678,8 @@ public final class AppSearchSession implements Closeable {
		public void close() {
		if (mIsMutated && !mIsClosed) {
		try {
		mService.persistToDisk(mUserId);
		mService.persistToDisk(mUserId,
		/binderCallStartTimeMillis=/ SystemClock.elapsedRealtime());
		mIsClosed = true;
		} catch (RemoteException e) {
		Log.e(TAG, "Unable to close the AppSearchSession", e);
		@@ -702,6 +709,7 @@ public final class AppSearchSession implements Closeable {
		request.isForceOverride(),
		request.getVersion(),
		mUserId,
		/binderCallStartTimeMillis=/ SystemClock.elapsedRealtime(),
		new IAppSearchResultCallback.Stub() {
		@Override
		public void onResult(AppSearchResultParcel resultParcel) {
		@@ -789,6 +797,7 @@ public final class AppSearchSession implements Closeable {
		/forceOverride=/ false,
		request.getVersion(),
		mUserId,
		/binderCallStartTimeMillis=/ SystemClock.elapsedRealtime(),
		new IAppSearchResultCallback.Stub() {
		@Override
		public void onResult(AppSearchResultParcel resultParcel) {
		@@ -840,6 +849,7 @@ public final class AppSearchSession implements Closeable {
		/forceOverride=/ true,
		request.getVersion(),
		mUserId,
		/binderCallStartTimeMillis=/ SystemClock.elapsedRealtime(),
		new IAppSearchResultCallback.Stub() {
		@Override
		public void onResult(AppSearchResultParcel resultParcel) {

apex/appsearch/framework/java/android/app/appsearch/GlobalSearchSession.java

+17 −12

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ import android.app.appsearch.aidl.AppSearchResultParcel;
		import android.app.appsearch.aidl.IAppSearchManager;
		import android.app.appsearch.aidl.IAppSearchResultCallback;
		import android.os.RemoteException;
		import android.os.SystemClock;
		import android.util.Log;

		import com.android.internal.util.Preconditions;
		@@ -72,14 +73,17 @@ public class GlobalSearchSession implements Closeable {
		@NonNull @CallbackExecutor Executor executor,
		@NonNull Consumer<AppSearchResult<GlobalSearchSession>> callback) {
		try {
		mService.initialize(mUserId, new IAppSearchResultCallback.Stub() {
		mService.initialize(mUserId,
		/binderCallStartTimeMillis=/ SystemClock.elapsedRealtime(),
		new IAppSearchResultCallback.Stub() {
		@Override
		public void onResult(AppSearchResultParcel resultParcel) {
		executor.execute(() -> {
		AppSearchResult<Void> result = resultParcel.getResult();
		if (result.isSuccess()) {
		callback.accept(
		AppSearchResult.newSuccessfulResult(GlobalSearchSession.this));
		AppSearchResult.newSuccessfulResult(
		GlobalSearchSession.this));
		} else {
		callback.accept(AppSearchResult.newFailedResult(result));
		}
		@@ -182,7 +186,8 @@ public class GlobalSearchSession implements Closeable {
		public void close() {
		if (mIsMutated && !mIsClosed) {
		try {
		mService.persistToDisk(mUserId);
		mService.persistToDisk(mUserId,
		/binderCallStartTimeMillis=/ SystemClock.elapsedRealtime());
		mIsClosed = true;
		} catch (RemoteException e) {
		Log.e(TAG, "Unable to close the GlobalSearchSession", e);

apex/appsearch/framework/java/android/app/appsearch/SearchResults.java

+8 −2

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@ import android.app.appsearch.aidl.IAppSearchManager;
		import android.app.appsearch.aidl.IAppSearchResultCallback;
		import android.os.Bundle;
		import android.os.RemoteException;
		import android.os.SystemClock;
		import android.util.Log;

		import com.android.internal.util.Preconditions;
		@@ -109,14 +110,19 @@ public class SearchResults implements Closeable {
		try {
		if (mIsFirstLoad) {
		mIsFirstLoad = false;
		long binderCallStartTimeMillis = SystemClock.elapsedRealtime();
		if (mDatabaseName == null) {
		// Global query, there's no one package-database combination to check.
		mService.globalQuery(mPackageName, mQueryExpression,
		mSearchSpec.getBundle(), mUserId, wrapCallback(executor, callback));
		mSearchSpec.getBundle(), mUserId,
		binderCallStartTimeMillis,
		wrapCallback(executor, callback));
		} else {
		// Normal local query, pass in specified database.
		mService.query(mPackageName, mDatabaseName, mQueryExpression,
		mSearchSpec.getBundle(), mUserId, wrapCallback(executor, callback));
		mSearchSpec.getBundle(), mUserId,
		binderCallStartTimeMillis,
		wrapCallback(executor, callback));
		}
		} else {
		mService.getNextPage(mNextPageToken, mUserId, wrapCallback(executor, callback));