Snap for 7539234 from 1e67f861653cc8eff765f434929cdf790ecb8c9a to sc-d1-release (76bcfaf0) · Commits · e / os / android_frameworks_base

core/res/res/values-is/strings.xml

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -617,7 +617,7 @@
	<string name="face_setup_notification_content" msgid="5463999831057751676">"Taktu símann úr lás með því að horfa á hann"</string>		<string name="face_setup_notification_content" msgid="5463999831057751676">"Taktu símann úr lás með því að horfa á hann"</string>
	<string name="fingerprint_setup_notification_title" msgid="2002630611398849495">"Settu upp fleiri leiðir til að taka úr lás"</string>		<string name="fingerprint_setup_notification_title" msgid="2002630611398849495">"Settu upp fleiri leiðir til að taka úr lás"</string>
	<string name="fingerprint_setup_notification_content" msgid="205578121848324852">"Ýttu til að bæta við fingrafari"</string>		<string name="fingerprint_setup_notification_content" msgid="205578121848324852">"Ýttu til að bæta við fingrafari"</string>
	<string name="fingerprint_recalibrate_notification_name" msgid="1414578431898579354">"Fingrafarsopnun"</string>		<string name="fingerprint_recalibrate_notification_name" msgid="1414578431898579354">"Fingrafarskenni"</string>
	<string name="fingerprint_recalibrate_notification_title" msgid="2406561052064558497">"Ekki er hægt að nota fingrafaralesara"</string>		<string name="fingerprint_recalibrate_notification_title" msgid="2406561052064558497">"Ekki er hægt að nota fingrafaralesara"</string>
	<string name="fingerprint_recalibrate_notification_content" msgid="8519935717822194943">"Þú verður að fara á verkstæði."</string>		<string name="fingerprint_recalibrate_notification_content" msgid="8519935717822194943">"Þú verður að fara á verkstæði."</string>
	<string name="face_acquired_insufficient" msgid="2150805835949162453">"Nákvæm andlitsgögn fengust ekki. Reyndu aftur."</string>		<string name="face_acquired_insufficient" msgid="2150805835949162453">"Nákvæm andlitsgögn fengust ekki. Reyndu aftur."</string>

core/res/res/values-ko/strings.xml

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -579,7 +579,7 @@
	<string name="fingerprint_acquired_partial" msgid="694598777291084823">"지문의 일부만 감지됨"</string>		<string name="fingerprint_acquired_partial" msgid="694598777291084823">"지문의 일부만 감지됨"</string>
	<string name="fingerprint_acquired_insufficient" msgid="2545149524031515411">"지문을 인식할 수 없습니다. 다시 시도해 주세요."</string>		<string name="fingerprint_acquired_insufficient" msgid="2545149524031515411">"지문을 인식할 수 없습니다. 다시 시도해 주세요."</string>
	<string name="fingerprint_acquired_imager_dirty" msgid="5236744087471419479">"센서 닦기"</string>		<string name="fingerprint_acquired_imager_dirty" msgid="5236744087471419479">"센서 닦기"</string>
	<string name="fingerprint_acquired_too_fast" msgid="6038375140739678098">"조금 더 오래 기다려 주세요."</string>		<string name="fingerprint_acquired_too_fast" msgid="6038375140739678098">"조금 더 길게 터치하세요."</string>
	<string name="fingerprint_acquired_too_slow" msgid="6683510291554497580">"손가락을 너무 느리게 움직였습니다. 다시 시도해 주세요."</string>		<string name="fingerprint_acquired_too_slow" msgid="6683510291554497580">"손가락을 너무 느리게 움직였습니다. 다시 시도해 주세요."</string>
	<string name="fingerprint_acquired_already_enrolled" msgid="2285166003936206785">"다른 지문으로 시도"</string>		<string name="fingerprint_acquired_already_enrolled" msgid="2285166003936206785">"다른 지문으로 시도"</string>
	<string name="fingerprint_acquired_too_bright" msgid="3863560181670915607">"너무 밝음"</string>		<string name="fingerprint_acquired_too_bright" msgid="3863560181670915607">"너무 밝음"</string>

libs/hwui/Android.bp

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -47,6 +47,7 @@ cc_defaults {
	"-DATRACE_TAG=ATRACE_TAG_VIEW",		"-DATRACE_TAG=ATRACE_TAG_VIEW",
	"-DLOG_TAG=\"OpenGLRenderer\"",		"-DLOG_TAG=\"OpenGLRenderer\"",
	"-Wall",		"-Wall",
			"-Wthread-safety",
	"-Wno-unused-parameter",		"-Wno-unused-parameter",
	"-Wunreachable-code",		"-Wunreachable-code",
	"-Werror",		"-Werror",

libs/hwui/JankTracker.cpp

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -99,7 +99,7 @@ JankTracker::JankTracker(ProfileDataContainer* globalData)
	mFrameIntervalLegacy = frameIntervalNanos;		mFrameIntervalLegacy = frameIntervalNanos;
	}		}

	void JankTracker::calculateLegacyJank(FrameInfo& frame) {		void JankTracker::calculateLegacyJank(FrameInfo& frame) REQUIRES(mDataMutex) {
	// Fast-path for jank-free frames		// Fast-path for jank-free frames
	int64_t totalDuration = frame.duration(sFrameStart, FrameInfoIndex::SwapBuffersCompleted);		int64_t totalDuration = frame.duration(sFrameStart, FrameInfoIndex::SwapBuffersCompleted);
	if (mDequeueTimeForgivenessLegacy && frame[FrameInfoIndex::DequeueBufferDuration] > 500_us) {		if (mDequeueTimeForgivenessLegacy && frame[FrameInfoIndex::DequeueBufferDuration] > 500_us) {
	@@ -257,7 +257,7 @@ void JankTracker::finishFrame(FrameInfo& frame, std::unique_ptr<FrameMetricsRepo
	}		}
	}		}

	void JankTracker::recomputeThresholds(int64_t frameBudget) {		void JankTracker::recomputeThresholds(int64_t frameBudget) REQUIRES(mDataMutex) {
	if (mThresholdsFrameBudget == frameBudget) {		if (mThresholdsFrameBudget == frameBudget) {
	return;		return;
	}		}
	@@ -308,7 +308,7 @@ void JankTracker::dumpFrames(int fd) {
	dprintf(fd, "\n---PROFILEDATA---\n\n");		dprintf(fd, "\n---PROFILEDATA---\n\n");
	}		}

	void JankTracker::reset() {		void JankTracker::reset() REQUIRES(mDataMutex) {
	mFrames.clear();		mFrames.clear();
	mData->reset();		mData->reset();
	(*mGlobalData)->reset();		(*mGlobalData)->reset();

libs/hwui/JankTracker.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -62,7 +62,7 @@ public:
	// Calculates the 'legacy' jank information, i.e. with outdated refresh rate information and		// Calculates the 'legacy' jank information, i.e. with outdated refresh rate information and
	// without GPU completion or deadlined information.		// without GPU completion or deadlined information.
	void calculateLegacyJank(FrameInfo& frame);		void calculateLegacyJank(FrameInfo& frame);
	void dumpStats(int fd) { dumpData(fd, &mDescription, mData.get()); }		void dumpStats(int fd) NO_THREAD_SAFETY_ANALYSIS { dumpData(fd, &mDescription, mData.get()); }
	void dumpFrames(int fd);		void dumpFrames(int fd);
	void reset();		void reset();