Snap for 6687127 from 274ce4442a822efa8ec3b86468c77049eec67762 to rvc-release (ca4c384a) · Commits · e / os / android_frameworks_base

media/java/android/media/MediaCas.java

+6 −3

Original line number	Diff line number	Diff line
		@@ -34,7 +34,6 @@ import android.media.tv.tunerresourcemanager.ResourceClientProfile;
		import android.media.tv.tunerresourcemanager.TunerResourceManager;
		import android.os.Bundle;
		import android.os.Handler;
		import android.os.HandlerExecutor;
		import android.os.HandlerThread;
		import android.os.IHwBinder;
		import android.os.Looper;
		@@ -50,6 +49,7 @@ import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;
		import java.util.ArrayList;
		import java.util.HashMap;
		import java.util.List;
		import java.util.Map;
		import java.util.Objects;

		@@ -392,7 +392,10 @@ public final class MediaCas implements AutoCloseable {
		@Override
		public void onReclaimResources() {
		synchronized (mSessionMap) {
		mSessionMap.forEach((casSession, sessionResourceHandle) -> casSession.close());
		List<Session> sessionList = new ArrayList<>(mSessionMap.keySet());
		for (Session casSession: sessionList) {
		casSession.close();
		}
		}
		mEventHandler.sendMessage(mEventHandler.obtainMessage(
		EventHandler.MSG_CAS_RESOURCE_LOST));
		@@ -734,7 +737,7 @@ public final class MediaCas implements AutoCloseable {
		ResourceClientProfile profile =
		new ResourceClientProfile(tvInputServiceSessionId, priorityHint);
		mTunerResourceManager.registerClientProfile(
		profile, new HandlerExecutor(mEventHandler), mResourceListener, clientId);
		profile, context.getMainExecutor(), mResourceListener, clientId);
		mClientId = clientId[0];
		}
		}

packages/CarSystemUI/res/layout/system_icons.xml

+0 −6

Original line number	Diff line number	Diff line
		@@ -31,10 +31,4 @@
		android:gravity="center_vertical"
		android:orientation="horizontal"
		/>

		<com.android.systemui.BatteryMeterView
		android:id="@+id/battery"
		android:layout_width="0dp"
		android:layout_height="match_parent"
		/>
		</LinearLayout>
		No newline at end of file

packages/CarSystemUI/src/com/android/systemui/car/userswitcher/CarStatusBarHeader.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -26,7 +26,6 @@ import android.widget.LinearLayout;
		import androidx.annotation.IdRes;

		import com.android.settingslib.Utils;
		import com.android.systemui.BatteryMeterView;
		import com.android.systemui.R;
		import com.android.systemui.plugins.DarkIconDispatcher;

		@@ -49,10 +48,7 @@ public class CarStatusBarHeader extends LinearLayout {
		float intensity = colorForeground == Color.WHITE ? 0f : 1f;
		Rect tintArea = new Rect(0, 0, 0, 0);

		applyDarkness(R.id.battery, tintArea, intensity, colorForeground);
		applyDarkness(R.id.clock, tintArea, intensity, colorForeground);

		((BatteryMeterView) findViewById(R.id.battery)).setForceShowPercent(true);
		}

		private void applyDarkness(@IdRes int id, Rect tintArea, float intensity, int color) {

packages/SystemUI/res/values-gu/strings.xml

+3 −3

Original line number	Diff line number	Diff line
		@@ -21,7 +21,7 @@
		xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
		<string name="app_label" msgid="4811759950673118541">"સિસ્ટમ UI"</string>
		<string name="status_bar_clear_all_button" msgid="2491321682873657397">"સાફ કરો"</string>
		<string name="status_bar_no_notifications_title" msgid="7812479124981107507">"કોઈ સૂચનાઓ નથી"</string>
		<string name="status_bar_no_notifications_title" msgid="7812479124981107507">"કોઈ નોટિફિકેશન નથી"</string>
		<string name="status_bar_ongoing_events_title" msgid="3986169317496615446">"ચાલુ"</string>
		<string name="status_bar_latest_events_title" msgid="202755896454005436">"નોટિફિકેશનો"</string>
		<string name="battery_low_title" msgid="6891106956328275225">"બૅટરી ટૂંક સમયમાં સમાપ્ત થશે"</string>
		@@ -368,7 +368,7 @@
		<string name="quick_settings_location_off_label" msgid="7923929131443915919">"સ્થાન બંધ"</string>
		<string name="quick_settings_media_device_label" msgid="8034019242363789941">"મીડિયા ઉપકરણ"</string>
		<string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string>
		<string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"ફક્ત કટોકટીના કૉલ્સ"</string>
		<string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"ફક્ત ઇમર્જન્સી કૉલ"</string>
		<string name="quick_settings_settings_label" msgid="2214639529565474534">"સેટિંગ"</string>
		<string name="quick_settings_time_label" msgid="3352680970557509303">"સમય"</string>
		<string name="quick_settings_user_label" msgid="1253515509432672496">"હું"</string>
		@@ -517,7 +517,7 @@
		<string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"બધા સાઇલન્ટ નોટિફિકેશન સાફ કરો"</string>
		<string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"ખલેલ પાડશો નહીં દ્વારા થોભાવેલ નોટિફિકેશન"</string>
		<string name="media_projection_action_text" msgid="3634906766918186440">"હવે પ્રારંભ કરો"</string>
		<string name="empty_shade_text" msgid="8935967157319717412">"કોઈ સૂચનાઓ નથી"</string>
		<string name="empty_shade_text" msgid="8935967157319717412">"કોઈ નોટિફિકેશન નથી"</string>
		<string name="profile_owned_footer" msgid="2756770645766113964">"પ્રોફાઇલ મૉનિટર કરી શકાય છે"</string>
		<string name="vpn_footer" msgid="3457155078010607471">"નેટવર્ક મૉનિટર કરી શકાય છે"</string>
		<string name="branded_vpn_footer" msgid="816930186313188514">"નેટવર્ક મૉનિટર કરવામાં આવી શકે છે"</string>

services/autofill/java/com/android/server/autofill/AutofillInlineSessionController.java

+9 −3

Original line number	Diff line number	Diff line
		@@ -31,9 +31,16 @@ import com.android.server.inputmethod.InputMethodManagerInternal;
		import java.util.Optional;
		import java.util.function.Consumer;


		/**
		* Controls the interaction with the IME for the inline suggestion sessions.
		* Controls the interaction with the IME for the {@link AutofillInlineSuggestionsRequestSession}s.
		*
		* <p>The class maintains the inline suggestion session with the autofill service. There is at most
		* one active inline suggestion session at any given corresponding to one focused view.
		* New sessions are created only when {@link #onCreateInlineSuggestionsRequestLocked} is called.</p>
		*
		* <p>The class manages the interaction between the {@link com.android.server.autofill.Session} and
		* the inline suggestion session whenever inline suggestions can be provided. All calls to the
		* inline suggestion session must be made through this controller.</p>
		*/
		final class AutofillInlineSessionController {
		@NonNull
		@@ -66,7 +73,6 @@ final class AutofillInlineSessionController {
		mUiCallback = callback;
		}


		/**
		* Requests the IME to create an {@link InlineSuggestionsRequest} for {@code autofillId}.
		*