Snap for 5800080 from d7a23cc714c8842efc4ca83a454ebabf24ed578a to qt-c2f2-release (b43a4f83) · Commits · e / os / android_frameworks_base

cmds/bootanimation/bootanim.rc

+1 −0

Original line number	Diff line number	Diff line
		@@ -4,4 +4,5 @@ service bootanim /system/bin/bootanimation
		group graphics audio
		disabled
		oneshot
		ioprio rt 0
		writepid /dev/stune/top-app/tasks

packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -216,10 +216,14 @@ public class MobileSignalController extends SignalController<

		MobileIconGroup hGroup = TelephonyIcons.THREE_G;
		MobileIconGroup hPlusGroup = TelephonyIcons.THREE_G;
		if (mConfig.hspaDataDistinguishable) {
		if (mConfig.show4gFor3g) {
		hGroup = TelephonyIcons.FOUR_G;
		hPlusGroup = TelephonyIcons.FOUR_G;
		} else if (mConfig.hspaDataDistinguishable) {
		hGroup = TelephonyIcons.H;
		hPlusGroup = TelephonyIcons.H_PLUS;
		}

		mNetworkToIconLookup.put(TelephonyManager.NETWORK_TYPE_HSDPA, hGroup);
		mNetworkToIconLookup.put(TelephonyManager.NETWORK_TYPE_HSUPA, hGroup);
		mNetworkToIconLookup.put(TelephonyManager.NETWORK_TYPE_HSPA, hGroup);

packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -1114,6 +1114,7 @@ public class NetworkControllerImpl extends BroadcastReceiver
		Map<Integer, MobileIconGroup> nr5GIconMap = new HashMap<>();

		boolean showAtLeast3G = false;
		boolean show4gFor3g = false;
		boolean alwaysShowCdmaRssi = false;
		boolean show4gForLte = false;
		boolean hideLtePlus = false;
		@@ -1158,6 +1159,8 @@ public class NetworkControllerImpl extends BroadcastReceiver
		CarrierConfigManager.KEY_ALWAYS_SHOW_DATA_RAT_ICON_BOOL);
		config.show4gForLte = b.getBoolean(
		CarrierConfigManager.KEY_SHOW_4G_FOR_LTE_DATA_ICON_BOOL);
		config.show4gFor3g = b.getBoolean(
		CarrierConfigManager.KEY_SHOW_4G_FOR_3G_DATA_ICON_BOOL);
		config.hideLtePlus = b.getBoolean(
		CarrierConfigManager.KEY_HIDE_LTE_PLUS_DATA_ICON_BOOL);
		config.patternOfCarrierSpecificDataIcon = b.getString(

services/core/java/com/android/server/wm/ActivityStack.java

+13 −15

Original line number	Diff line number	Diff line
		@@ -5651,14 +5651,21 @@ class ActivityStack extends ConfigurationContainer {
		void animateResizePinnedStack(Rect sourceHintBounds, Rect toBounds, int animationDuration,
		boolean fromFullscreen) {
		if (!inPinnedWindowingMode()) return;
		if (skipResizeAnimation(toBounds == null /* toFullscreen */)) {
		if (toBounds == null /* toFullscreen */) {
		final Configuration parentConfig = getParent().getConfiguration();
		final ActivityRecord top = topRunningNonOverlayTaskActivity();
		if (top != null && !top.isConfigurationCompatible(parentConfig)) {
		// The final orientation of this activity will change after moving to full screen.
		// Start freezing screen here to prevent showing a temporary full screen window.
		top.startFreezingScreenLocked(top.app, CONFIG_SCREEN_LAYOUT);
		mService.moveTasksToFullscreenStack(mStackId, true /* onTop */);
		} else {
		return;
		}
		}
		if (getTaskStack() == null) return;
		getTaskStack().animateResizePinnedStack(toBounds, sourceHintBounds,
		animationDuration, fromFullscreen);
		}
		}

		/**
		* Get current bounds of this stack, return empty when it is unavailable.
		@@ -5673,15 +5680,6 @@ class ActivityStack extends ConfigurationContainer {
		stack.getAnimationOrCurrentBounds(outBounds);
		}

		private boolean skipResizeAnimation(boolean toFullscreen) {
		if (!toFullscreen) {
		return false;
		}
		final Configuration parentConfig = getParent().getConfiguration();
		final ActivityRecord top = topRunningNonOverlayTaskActivity();
		return top != null && !top.isConfigurationCompatible(parentConfig);
		}

		void setPictureInPictureAspectRatio(float aspectRatio) {
		if (getTaskStack() == null) return;
		getTaskStack().setPictureInPictureAspectRatio(aspectRatio);

telephony/java/android/telephony/CarrierConfigManager.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -1404,6 +1404,13 @@ public class CarrierConfigManager {
		public static final String KEY_SHOW_4G_FOR_LTE_DATA_ICON_BOOL =
		"show_4g_for_lte_data_icon_bool";

		/**
		* Boolean indicating if default data account should show 4G icon when in 3G.
		* @hide
		*/
		public static final String KEY_SHOW_4G_FOR_3G_DATA_ICON_BOOL =
		"show_4g_for_3g_data_icon_bool";

		/**
		* Boolean indicating if lte+ icon should be shown if available
		* @hide
		@@ -3383,6 +3390,7 @@ public class CarrierConfigManager {
		sDefaults.putBoolean(KEY_SPN_DISPLAY_RULE_USE_ROAMING_FROM_SERVICE_STATE_BOOL, false);
		sDefaults.putBoolean(KEY_ALWAYS_SHOW_DATA_RAT_ICON_BOOL, false);
		sDefaults.putBoolean(KEY_SHOW_4G_FOR_LTE_DATA_ICON_BOOL, false);
		sDefaults.putBoolean(KEY_SHOW_4G_FOR_3G_DATA_ICON_BOOL, false);
		sDefaults.putString(KEY_OPERATOR_NAME_FILTER_PATTERN_STRING, "");
		sDefaults.putString(KEY_SHOW_CARRIER_DATA_ICON_PATTERN_STRING, "");
		sDefaults.putBoolean(KEY_HIDE_LTE_PLUS_DATA_ICON_BOOL, true);