Snap for 5533229 from aaac8325248ba613448f0f624907b6ae2a2991f5 to qt-release (e55caf5f) · Commits · e / os / android_frameworks_base

apct-tests/perftests/textclassifier/src/android/view/textclassifier/TextClassificationManagerPerfTest.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -52,7 +52,7 @@ public class TextClassificationManagerPerfTest {
		BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
		while (state.keepRunning()) {
		textClassificationManager.getTextClassifier();
		textClassificationManager.invalidate();
		textClassificationManager.invalidateForTesting();
		}
		}

		@@ -68,7 +68,7 @@ public class TextClassificationManagerPerfTest {
		BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
		while (state.keepRunning()) {
		textClassificationManager.getTextClassifier();
		textClassificationManager.invalidate();
		textClassificationManager.invalidateForTesting();
		}
		}
		}

api/system-current.txt

+4 −8

Original line number	Diff line number	Diff line
		@@ -6401,14 +6401,10 @@ package android.service.contentsuggestions {

		public abstract class ContentSuggestionsService extends android.app.Service {
		ctor public ContentSuggestionsService();
		method @Deprecated public void classifyContentSelections(@NonNull android.app.contentsuggestions.ClassificationsRequest, @NonNull android.app.contentsuggestions.ContentSuggestionsManager.ClassificationsCallback);
		method @Deprecated public void notifyInteraction(@NonNull String, @NonNull android.os.Bundle);
		method public void onClassifyContentSelections(@NonNull android.app.contentsuggestions.ClassificationsRequest, @NonNull android.app.contentsuggestions.ContentSuggestionsManager.ClassificationsCallback);
		method public void onNotifyInteraction(@NonNull String, @NonNull android.os.Bundle);
		method public void onProcessContextImage(int, @Nullable android.graphics.Bitmap, @NonNull android.os.Bundle);
		method public void onSuggestContentSelections(@NonNull android.app.contentsuggestions.SelectionsRequest, @NonNull android.app.contentsuggestions.ContentSuggestionsManager.SelectionsCallback);
		method @Deprecated public void processContextImage(int, @Nullable android.graphics.Bitmap, @NonNull android.os.Bundle);
		method @Deprecated public void suggestContentSelections(@NonNull android.app.contentsuggestions.SelectionsRequest, @NonNull android.app.contentsuggestions.ContentSuggestionsManager.SelectionsCallback);
		method public abstract void onClassifyContentSelections(@NonNull android.app.contentsuggestions.ClassificationsRequest, @NonNull android.app.contentsuggestions.ContentSuggestionsManager.ClassificationsCallback);
		method public abstract void onNotifyInteraction(@NonNull String, @NonNull android.os.Bundle);
		method public abstract void onProcessContextImage(int, @Nullable android.graphics.Bitmap, @NonNull android.os.Bundle);
		method public abstract void onSuggestContentSelections(@NonNull android.app.contentsuggestions.SelectionsRequest, @NonNull android.app.contentsuggestions.ContentSuggestionsManager.SelectionsCallback);
		field public static final String SERVICE_INTERFACE = "android.service.contentsuggestions.ContentSuggestionsService";
		}

api/test-current.txt

+3 −0

Original line number	Diff line number	Diff line
		@@ -731,6 +731,7 @@ package android.content.pm {
		}

		public class PermissionInfo extends android.content.pm.PackageItemInfo implements android.os.Parcelable {
		field public static final int FLAG_REMOVED = 2; // 0x2
		field public static final int PROTECTION_FLAG_APP_PREDICTOR = 2097152; // 0x200000
		field public static final int PROTECTION_FLAG_CONFIGURATOR = 524288; // 0x80000
		field public static final int PROTECTION_FLAG_DOCUMENTER = 262144; // 0x40000
		@@ -3262,6 +3263,7 @@ package android.view.autofill {
		ctor public AutofillId(@NonNull android.view.autofill.AutofillId, int);
		ctor public AutofillId(int, int);
		ctor public AutofillId(@NonNull android.view.autofill.AutofillId, long, int);
		method public boolean equalsIgnoreSession(@Nullable android.view.autofill.AutofillId);
		}

		public final class AutofillManager {
		@@ -3390,6 +3392,7 @@ package android.view.contentcapture {
		package android.view.inputmethod {

		public final class InputMethodManager {
		method public int getDisplayId();
		method public boolean isInputMethodPickerShown();
		}

cmds/statsd/src/guardrail/StatsdStats.cpp

+18 −5

Original line number	Diff line number	Diff line
		@@ -432,12 +432,13 @@ void StatsdStats::notePullExceedMaxDelay(int pullAtomId) {
		void StatsdStats::noteAtomLogged(int atomId, int32_t timeSec) {
		lock_guard<std::mutex> lock(mLock);

		if (atomId > android::util::kMaxPushedAtomId) {
		ALOGW("not interested in atom %d", atomId);
		return;
		}

		if (atomId <= android::util::kMaxPushedAtomId) {
		mPushedAtomStats[atomId]++;
		} else {
		if (mNonPlatformPushedAtomStats.size() < kMaxNonPlatformPushedAtoms) {
		mNonPlatformPushedAtomStats[atomId]++;
		}
		}
		}

		void StatsdStats::noteSystemServerRestart(int32_t timeSec) {
		@@ -551,6 +552,7 @@ void StatsdStats::resetInternalLocked() {
		mStartTimeSec = getWallClockSec();
		mIceBox.clear();
		std::fill(mPushedAtomStats.begin(), mPushedAtomStats.end(), 0);
		mNonPlatformPushedAtomStats.clear();
		mAnomalyAlarmRegisteredStats = 0;
		mPeriodicAlarmRegisteredStats = 0;
		mSystemServerRestartSec.clear();
		@@ -705,6 +707,9 @@ void StatsdStats::dumpStats(int out) const {
		dprintf(out, "Atom %lu->%d\n", (unsigned long)i, mPushedAtomStats[i]);
		}
		}
		for (const auto& pair : mNonPlatformPushedAtomStats) {
		dprintf(out, "Atom %lu->%d\n", (unsigned long)pair.first, pair.second);
		}

		dprintf(out, "******Pulled Atom stats*********\n");
		for (const auto& pair : mPulledAtomStats) {
		@@ -890,6 +895,14 @@ void StatsdStats::dumpStats(std::vector<uint8_t>* output, bool reset) {
		}
		}

		for (const auto& pair : mNonPlatformPushedAtomStats) {
		uint64_t token =
		proto.start(FIELD_TYPE_MESSAGE \| FIELD_ID_ATOM_STATS \| FIELD_COUNT_REPEATED);
		proto.write(FIELD_TYPE_INT32 \| FIELD_ID_ATOM_STATS_TAG, pair.first);
		proto.write(FIELD_TYPE_INT32 \| FIELD_ID_ATOM_STATS_COUNT, pair.second);
		proto.end(token);
		}

		for (const auto& pair : mPulledAtomStats) {
		android::os::statsd::writePullerStatsToStream(pair, &proto);
		}

cmds/statsd/src/guardrail/StatsdStats.h

+10 −1

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@
		#include <mutex>
		#include <string>
		#include <vector>
		#include <unordered_map>

		namespace android {
		namespace os {
		@@ -160,6 +161,9 @@ public:
		// Max time to do a pull.
		static const int64_t kPullMaxDelayNs = 10 * NS_PER_SEC;

		// Maximum number of pushed atoms statsd stats will track above kMaxPushedAtomId.
		static const int kMaxNonPlatformPushedAtoms = 100;

		// Max platform atom tag number.
		static const int32_t kMaxPlatformAtomTag = 100000;

		@@ -508,10 +512,14 @@ private:

		// Stores the number of times a pushed atom is logged.
		// The size of the vector is the largest pushed atom id in atoms.proto + 1. Atoms
		// out of that range will be dropped (it's either pulled atoms or test atoms).
		// out of that range will be put in mNonPlatformPushedAtomStats.
		// This is a vector, not a map because it will be accessed A LOT -- for each stats log.
		std::vector<int> mPushedAtomStats;

		// Stores the number of times a pushed atom is logged for atom ids above kMaxPushedAtomId.
		// The max size of the map is kMaxNonPlatformPushedAtoms.
		std::unordered_map<int, int> mNonPlatformPushedAtomStats;

		// Maps PullAtomId to its stats. The size is capped by the puller atom counts.
		std::map<int, PulledAtomStats> mPulledAtomStats;

		@@ -587,6 +595,7 @@ private:
		FRIEND_TEST(StatsdStatsTest, TestConfigRemove);
		FRIEND_TEST(StatsdStatsTest, TestSubStats);
		FRIEND_TEST(StatsdStatsTest, TestAtomLog);
		FRIEND_TEST(StatsdStatsTest, TestNonPlatformAtomLog);
		FRIEND_TEST(StatsdStatsTest, TestTimestampThreshold);
		FRIEND_TEST(StatsdStatsTest, TestAnomalyMonitor);
		FRIEND_TEST(StatsdStatsTest, TestSystemServerCrash);