Merge changes I29d91abd,Ie13d2c1a (cbee8d1b) · Commits · e / os / android_frameworks_base

core/java/android/os/ZygoteProcess.java

+31 −24

Original line number	Diff line number	Diff line
		@@ -120,10 +120,6 @@ public class ZygoteProcess {
		mUsapPoolSecondarySocketAddress =
		new LocalSocketAddress(Zygote.USAP_POOL_SECONDARY_SOCKET_NAME,
		LocalSocketAddress.Namespace.RESERVED);

		if (fetchUsapPoolEnabledProp()) {
		informZygotesOfUsapPoolStatus();
		}
		}

		public ZygoteProcess(LocalSocketAddress primarySocketAddress,
		@@ -179,14 +175,18 @@ public class ZygoteProcess {
		* address
		* @throws IOException
		*/
		public static ZygoteState connect(LocalSocketAddress zygoteSocketAddress,
		LocalSocketAddress usapSocketAddress)
		public static ZygoteState connect(@NonNull LocalSocketAddress zygoteSocketAddress,
		@Nullable LocalSocketAddress usapSocketAddress)
		throws IOException {

		DataInputStream zygoteInputStream = null;
		BufferedWriter zygoteOutputWriter = null;
		final LocalSocket zygoteSessionSocket = new LocalSocket();

		if (zygoteSocketAddress == null) {
		throw new IllegalArgumentException("zygoteSocketAddress can't be null");
		}

		try {
		zygoteSessionSocket.connect(zygoteSocketAddress);
		zygoteInputStream = new DataInputStream(zygoteSessionSocket.getInputStream());
		@@ -678,12 +678,15 @@ public class ZygoteProcess {
		return origVal != mUsapPoolEnabled;
		}

		private boolean mIsFirstPropCheck = true;
		private long mLastPropCheckTimestamp = 0;

		private boolean fetchUsapPoolEnabledPropWithMinInterval() {
		final long currentTimestamp = SystemClock.elapsedRealtime();

		if (currentTimestamp - mLastPropCheckTimestamp >= Zygote.PROPERTY_CHECK_INTERVAL) {
		if (mIsFirstPropCheck
		\|\| (currentTimestamp - mLastPropCheckTimestamp >= Zygote.PROPERTY_CHECK_INTERVAL)) {
		mIsFirstPropCheck = false;
		mLastPropCheckTimestamp = currentTimestamp;
		return fetchUsapPoolEnabledProp();
		}
		@@ -919,12 +922,14 @@ public class ZygoteProcess {
		return primaryZygoteState;
		}

		if (mZygoteSecondarySocketAddress != null) {
		// The primary zygote didn't match. Try the secondary.
		attemptConnectionToSecondaryZygote();

		if (secondaryZygoteState.matches(abi)) {
		return secondaryZygoteState;
		}
		}
		} catch (IOException ioe) {
		throw new ZygoteStartFailedEx("Error connecting to zygote", ioe);
		}
		@@ -1071,6 +1076,7 @@ public class ZygoteProcess {
		return;
		}

		if (mZygoteSecondarySocketAddress != null) {
		try {
		attemptConnectionToSecondaryZygote();

		@@ -1088,6 +1094,7 @@ public class ZygoteProcess {
		} catch (IOException ioe) {
		// No secondary zygote present. This is expected on some devices.
		}
		}

		// Wait for the response from the primary zygote here so the primary/secondary zygotes
		// can work concurrently.

core/java/com/android/internal/os/ZygoteServer.java

+19 −2

Original line number	Diff line number	Diff line
		@@ -277,17 +277,31 @@ class ZygoteServer {
		Integer.parseInt(usapPoolRefillThresholdPropString),
		mUsapPoolSizeMax);
		}

		// Sanity check

		if (mUsapPoolSizeMin >= mUsapPoolSizeMax) {
		Log.w(TAG, "The max size of the USAP pool must be greater than the minimum size."
		+ " Restoring default values.");

		mUsapPoolSizeMax = Integer.parseInt(USAP_POOL_SIZE_MAX_DEFAULT);
		mUsapPoolSizeMin = Integer.parseInt(USAP_POOL_SIZE_MIN_DEFAULT);
		mUsapPoolRefillThreshold = mUsapPoolSizeMax / 2;
		}
		}
		}

		private boolean mIsFirstPropertyCheck = true;
		private long mLastPropCheckTimestamp = 0;

		private void fetchUsapPoolPolicyPropsWithMinInterval() {
		final long currentTimestamp = SystemClock.elapsedRealtime();

		if (currentTimestamp - mLastPropCheckTimestamp >= Zygote.PROPERTY_CHECK_INTERVAL) {
		fetchUsapPoolPolicyProps();
		if (mIsFirstPropertyCheck
		\|\| (currentTimestamp - mLastPropCheckTimestamp >= Zygote.PROPERTY_CHECK_INTERVAL)) {
		mIsFirstPropertyCheck = false;
		mLastPropCheckTimestamp = currentTimestamp;
		fetchUsapPoolPolicyProps();
		}
		}

		@@ -304,6 +318,9 @@ class ZygoteServer {
		Runnable fillUsapPool(int[] sessionSocketRawFDs) {
		Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "Zygote:FillUsapPool");

		// Ensure that the pool properties have been fetched.
		fetchUsapPoolPolicyPropsWithMinInterval();

		int usapPoolCount = Zygote.getUsapPoolCount();
		int numUsapsToSpawn = mUsapPoolSizeMax - usapPoolCount;