Snap for 5860054 from 8a91775d3f98ee16dc5876729d0523b058bfe0f2 to qt-qpr1-release (463fe5f3) · Commits · e / os / android_frameworks_base

cmds/statsd/src/main.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -78,7 +78,7 @@ int main(int /argc/, char** /argv/) {
		ps->giveThreadPoolName();
		IPCThreadState::self()->disableBackgroundScheduling(true);

		::android::hardware::configureRpcThreadpool(1 /threads/, false /willJoin/);
		::android::hardware::configureRpcThreadpool(4 /threads/, false /willJoin/);

		std::shared_ptr<LogEventQueue> eventQueue =
		std::make_shared<LogEventQueue>(2000 /buffer limit. Buffer is NOT pre-allocated/);

core/java/android/content/res/Configuration.java

+9 −1

Original line number	Diff line number	Diff line
		@@ -1222,7 +1222,15 @@ public final class Configuration implements Parcelable, Comparable<Configuration
		.setVariant(variant)
		.setScript(script)
		.build();
		// Log a WTF here if a repeated locale is found to avoid throwing an
		// exception in system server when LocaleList is created below
		final int inListIndex = list.indexOf(locale);
		if (inListIndex != -1) {
		Slog.wtf(TAG, "Repeated locale (" + list.get(inListIndex) + ")"
		+ " found when trying to add: " + locale.toString());
		} else {
		list.add(locale);
		}
		} catch (IllformedLocaleException e) {
		Slog.e(TAG, "readFromProto error building locale with: "
		+ "language-" + language + ";country-" + country

core/java/android/inputmethodservice/SoftInputWindow.java

+13 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import static java.lang.annotation.RetentionPolicy.SOURCE;
		import android.annotation.IntDef;
		import android.app.Dialog;
		import android.content.Context;
		import android.content.pm.PackageManager;
		import android.graphics.Rect;
		import android.os.Debug;
		import android.os.IBinder;
		@@ -50,6 +51,7 @@ public class SoftInputWindow extends Dialog {
		final int mWindowType;
		final int mGravity;
		final boolean mTakesFocus;
		final boolean mAutomotiveHideNavBarForKeyboard;
		private final Rect mBounds = new Rect();

		@Retention(SOURCE)
		@@ -134,6 +136,8 @@ public class SoftInputWindow extends Dialog {
		mWindowType = windowType;
		mGravity = gravity;
		mTakesFocus = takesFocus;
		mAutomotiveHideNavBarForKeyboard = context.getResources().getBoolean(
		com.android.internal.R.bool.config_automotiveHideNavBarForKeyboard);
		initDockWindow();
		}

		@@ -247,6 +251,11 @@ public class SoftInputWindow extends Dialog {
		windowModFlags \|= WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL;
		}

		if (isAutomotive() && mAutomotiveHideNavBarForKeyboard) {
		windowSetFlags \|= WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS;
		windowModFlags \|= WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS;
		}

		getWindow().setFlags(windowSetFlags, windowModFlags);
		}

		@@ -338,6 +347,10 @@ public class SoftInputWindow extends Dialog {
		mWindowState = newState;
		}

		private boolean isAutomotive() {
		return getContext().getPackageManager().hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE);
		}

		private static String stateToString(@SoftInputWindowState int state) {
		switch (state) {
		case SoftInputWindowState.TOKEN_PENDING:

core/java/android/os/BatteryStats.java

+18 −8

Original line number	Diff line number	Diff line
		@@ -266,8 +266,11 @@ public abstract class BatteryStats implements Parcelable {
		* - Fixed bug in min learned capacity updating process.
		* New in version 34:
		* - Deprecated STATS_SINCE_UNPLUGGED and STATS_CURRENT.
		* New in version 35:
		* - Fixed bug that was not reporting high cellular tx power correctly
		* - Added out of service and emergency service modes to data connection types
		*/
		static final int CHECKIN_VERSION = 34;
		static final int CHECKIN_VERSION = 35;

		/**
		* Old version, we hit 9 and ran out of room, need to remove.
		@@ -2371,14 +2374,17 @@ public abstract class BatteryStats implements Parcelable {
		*/
		public abstract int getMobileRadioActiveUnknownCount(int which);

		public static final int DATA_CONNECTION_NONE = 0;
		public static final int DATA_CONNECTION_OTHER = TelephonyManager.MAX_NETWORK_TYPE + 1;
		public static final int DATA_CONNECTION_OUT_OF_SERVICE = 0;
		public static final int DATA_CONNECTION_EMERGENCY_SERVICE =
		TelephonyManager.MAX_NETWORK_TYPE + 1;
		public static final int DATA_CONNECTION_OTHER = DATA_CONNECTION_EMERGENCY_SERVICE + 1;


		static final String[] DATA_CONNECTION_NAMES = {
		"none", "gprs", "edge", "umts", "cdma", "evdo_0", "evdo_A",
		"oos", "gprs", "edge", "umts", "cdma", "evdo_0", "evdo_A",
		"1xrtt", "hsdpa", "hsupa", "hspa", "iden", "evdo_b", "lte",
		"ehrpd", "hspap", "gsm", "td_scdma", "iwlan", "lte_ca", "nr",
		"other"
		"emngcy", "other"
		};

		@UnsupportedAppUsage
		@@ -6564,6 +6570,10 @@ public abstract class BatteryStats implements Parcelable {
		}
		oldState = rec.states;
		oldState2 = rec.states2;
		// Clear High Tx Power Flag for volta positioning
		if ((rec.states2 & HistoryItem.STATE2_CELLULAR_HIGH_TX_POWER_FLAG) != 0) {
		rec.states2 &= ~HistoryItem.STATE2_CELLULAR_HIGH_TX_POWER_FLAG;
		}
		}

		return item.toString();
		@@ -7865,9 +7875,9 @@ public abstract class BatteryStats implements Parcelable {
		// Phone data connection (DATA_CONNECTION_TIME_DATA and DATA_CONNECTION_COUNT_DATA)
		for (int i = 0; i < NUM_DATA_CONNECTION_TYPES; ++i) {
		// Map OTHER to TelephonyManager.NETWORK_TYPE_UNKNOWN and mark NONE as a boolean.
		boolean isNone = (i == DATA_CONNECTION_NONE);
		boolean isNone = (i == DATA_CONNECTION_OUT_OF_SERVICE);
		int telephonyNetworkType = i;
		if (i == DATA_CONNECTION_OTHER) {
		if (i == DATA_CONNECTION_OTHER \|\| i == DATA_CONNECTION_EMERGENCY_SERVICE) {
		telephonyNetworkType = TelephonyManager.NETWORK_TYPE_UNKNOWN;
		}
		final long pdcToken = proto.start(SystemProto.DATA_CONNECTION);

core/java/android/provider/Settings.java

+12 −0

Original line number	Diff line number	Diff line
		@@ -5956,6 +5956,18 @@ public final class Settings {
		@Deprecated
		public static final String DEVICE_PROVISIONED = Global.DEVICE_PROVISIONED;

		/**
		* Indicates whether a DPC has been downloaded during provisioning.
		*
		* <p>Type: int (0 for false, 1 for true)
		*
		* <p>If this is true, then any attempts to begin setup again should result in factory reset
		*
		* @hide
		*/
		public static final String MANAGED_PROVISIONING_DPC_DOWNLOADED =
		"managed_provisioning_dpc_downloaded";

		/**
		* Indicates whether the current user has completed setup via the setup wizard.
		* <p>