Merge "Clean up launched flags application_shared_memory_enabled and... (ce5a90dc) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityThread.java

+9 −11

Original line number	Diff line number	Diff line
		@@ -1360,7 +1360,6 @@ public final class ActivityThread extends ClientTransactionHandler

		// This must be initialized as early as possible to ensure availability for any
		// downstream callers.
		if (com.android.internal.os.Flags.applicationSharedMemoryEnabled()) {
		ApplicationSharedMemory instance =
		ApplicationSharedMemory.fromFileDescriptor(
		applicationSharedMemoryFd, /* mutable= */ false);
		@@ -1370,7 +1369,6 @@ public final class ActivityThread extends ClientTransactionHandler
		}
		instance.closeFileDescriptor();
		ApplicationSharedMemory.setInstance(instance);
		}

		setCoreSettings(coreSettings);

core/java/android/app/ApplicationPackageManager.java

+0 −3

Original line number	Diff line number	Diff line
		@@ -2244,9 +2244,6 @@ public class ApplicationPackageManager extends PackageManager {
		if (!android.content.pm.Flags.cacheSdkSystemFeatures()) {
		return false;
		}
		if (!com.android.internal.os.Flags.applicationSharedMemoryEnabled()) {
		return false;
		}
		if (ActivityThread.isSystem() && !SystemFeaturesCache.hasInstance()) {
		// There are a handful of utility "system" processes that are neither system_server nor
		// bound as applications. For these processes, we don't have access to application

core/java/android/os/SystemClock.java

+4 −41

Original line number	Diff line number	Diff line
		@@ -19,8 +19,6 @@ package android.os;
		import android.annotation.FlaggedApi;
		import android.annotation.NonNull;
		import android.app.IAlarmManager;
		import android.app.time.UnixEpochTime;
		import android.app.timedetector.ITimeDetectorService;
		import android.compat.annotation.UnsupportedAppUsage;
		import android.content.Context;
		import android.location.ILocationManager;
		@@ -111,7 +109,6 @@ public final class SystemClock {
		private static final String TAG = "SystemClock";

		private static volatile IAlarmManager sIAlarmManager;
		private static volatile ITimeDetectorService sITimeDetectorService;

		/**
		* Since {@code nanoTime()} is arbitrary, anchor our Ravenwood clocks against it.
		@@ -191,14 +188,6 @@ public final class SystemClock {
		return sIAlarmManager;
		}

		private static ITimeDetectorService getITimeDetectorService() {
		if (sITimeDetectorService == null) {
		sITimeDetectorService = ITimeDetectorService.Stub
		.asInterface(ServiceManager.getService(Context.TIME_DETECTOR_SERVICE));
		}
		return sITimeDetectorService;
		}

		/**
		* Returns milliseconds since boot, not counting time spent in deep sleep.
		*
		@@ -345,36 +334,10 @@ public final class SystemClock {
		* @hide
		*/
		public static long currentNetworkTimeMillis() {
		if (com.android.internal.os.Flags.applicationSharedMemoryEnabled()
		&& Flags.networkTimeUsesSharedMemory()) {
		final long latestNetworkTimeUnixEpochMillisAtZeroElapsedRealtimeMillis =
		ApplicationSharedMemory.getInstance()
		.getLatestNetworkTimeUnixEpochMillisAtZeroElapsedRealtimeMillis();
		return latestNetworkTimeUnixEpochMillisAtZeroElapsedRealtimeMillis + elapsedRealtime();
		} else {
		ITimeDetectorService timeDetectorService = getITimeDetectorService();
		if (timeDetectorService == null) {
		throw new RuntimeException(new DeadSystemException());
		}

		UnixEpochTime time;
		try {
		time = timeDetectorService.latestNetworkTime();
		} catch (ParcelableException e) {
		e.maybeRethrow(DateTimeException.class);
		throw new RuntimeException(e);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		if (time == null) {
		// This is not expected.
		throw new DateTimeException("Network based time is not available.");
		}

		long currentMillis = elapsedRealtime();
		long deltaMs = currentMillis - time.getElapsedRealtimeMillis();
		return time.getUnixEpochTimeMillis() + deltaMs;
		}
		}

		/**

core/java/com/android/internal/os/flags.aconfig

+0 −8

Original line number	Diff line number	Diff line
		@@ -68,11 +68,3 @@ flag {
		bug: "314735374"
		is_fixed_read_only: true
		}
		No newline at end of file

		flag {
		name: "application_shared_memory_enabled"
		namespace: "system_performance"
		description: "Whether ApplicationSharedMemory is enabled."
		bug: "365575551"
		is_fixed_read_only: true
		}
		No newline at end of file

services/core/java/com/android/server/timedetector/TimeDetectorStrategyImpl.java

+9 −15

Original line number	Diff line number	Diff line
		@@ -317,8 +317,6 @@ public final class TimeDetectorStrategyImpl implements TimeDetectorStrategy {
		// detected time if, for example, the age of all suggestions are considered.
		NetworkTimeSuggestion lastNetworkSuggestion = mLastNetworkSuggestion.get();
		if (lastNetworkSuggestion == null \|\| !lastNetworkSuggestion.equals(suggestion)) {
		if (com.android.internal.os.Flags.applicationSharedMemoryEnabled()
		&& android.os.Flags.networkTimeUsesSharedMemory()) {
		UnixEpochTime networkUnixEpochTime = suggestion.getUnixEpochTime();
		long lastNetworkTimeUnixEpochMillisAtZeroElapsedRealtimeMillis =
		networkUnixEpochTime.getUnixEpochTimeMillis()
		@@ -326,7 +324,6 @@ public final class TimeDetectorStrategyImpl implements TimeDetectorStrategy {
		ApplicationSharedMemory.getInstance()
		.setLatestNetworkTimeUnixEpochMillisAtZeroElapsedRealtimeMillis(
		lastNetworkTimeUnixEpochMillisAtZeroElapsedRealtimeMillis);
		}

		mLastNetworkSuggestion.set(suggestion);
		notifyNetworkTimeUpdateListenersAsynchronously();
		@@ -360,11 +357,8 @@ public final class TimeDetectorStrategyImpl implements TimeDetectorStrategy {

		@Override
		public synchronized void clearLatestNetworkSuggestion() {
		if (com.android.internal.os.Flags.applicationSharedMemoryEnabled()
		&& android.os.Flags.networkTimeUsesSharedMemory()) {
		ApplicationSharedMemory.getInstance()
		.clearLatestNetworkTimeUnixEpochMillisAtZeroElapsedRealtimeMillis();
		}
		mLastNetworkSuggestion.set(null);
		notifyNetworkTimeUpdateListenersAsynchronously();