Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0460ab2 authored by Shai Barack's avatar Shai Barack
Browse files

Clean up launched flags application_shared_memory_enabled and network_time_uses_shared_memory 

Fixes: 409606578
Fixes: 409604723
Flag: EXEMPT launched flags cleanup
Test: N/A cleanup

Change-Id: Ieca7518b2d31b70327ea8cc86e8a6957770529dc
parent d80cd594

core/java/android/app/ActivityThread.java

+9 −11
Original line number Original line 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

            // This must be initialized as early as possible to ensure availability for any

            // downstream callers.

            // downstream callers.

            if (com.android.internal.os.Flags.applicationSharedMemoryEnabled()) {

            ApplicationSharedMemory instance =

            ApplicationSharedMemory instance =

                    ApplicationSharedMemory.fromFileDescriptor(

                    ApplicationSharedMemory.fromFileDescriptor(

                            applicationSharedMemoryFd, /* mutable= */ false);

                            applicationSharedMemoryFd, /* mutable= */ false);
@@ -1370,7 +1369,6 @@ public final class ActivityThread extends ClientTransactionHandler 
            }

            }

            instance.closeFileDescriptor();

            instance.closeFileDescriptor();

            ApplicationSharedMemory.setInstance(instance);

            ApplicationSharedMemory.setInstance(instance);

            }





            setCoreSettings(coreSettings);

            setCoreSettings(coreSettings);

core/java/android/app/ApplicationPackageManager.java

+0 −3
Original line number Original line Diff line number Diff line
@@ -2244,9 +2244,6 @@ public class ApplicationPackageManager extends PackageManager { 
        if (!android.content.pm.Flags.cacheSdkSystemFeatures()) {

        if (!android.content.pm.Flags.cacheSdkSystemFeatures()) {

            return false;

            return false;

        }

        }

        if (!com.android.internal.os.Flags.applicationSharedMemoryEnabled()) {

            return false;

        }

        if (ActivityThread.isSystem() && !SystemFeaturesCache.hasInstance()) {

        if (ActivityThread.isSystem() && !SystemFeaturesCache.hasInstance()) {

            // There are a handful of utility "system" processes that are neither system_server nor

            // 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

            // bound as applications. For these processes, we don't have access to application

core/java/android/os/SystemClock.java

+4 −41
Original line number Original line Diff line number Diff line
@@ -19,8 +19,6 @@ package android.os; 
import android.annotation.FlaggedApi;

import android.annotation.FlaggedApi;

import android.annotation.NonNull;

import android.annotation.NonNull;

import android.app.IAlarmManager;

import android.app.IAlarmManager;

import android.app.time.UnixEpochTime;

import android.app.timedetector.ITimeDetectorService;

import android.compat.annotation.UnsupportedAppUsage;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.Context;

import android.content.Context;

import android.location.ILocationManager;

import android.location.ILocationManager;
@@ -111,7 +109,6 @@ public final class SystemClock { 
    private static final String TAG = "SystemClock";

    private static final String TAG = "SystemClock";





    private static volatile IAlarmManager sIAlarmManager;

    private static volatile IAlarmManager sIAlarmManager;

    private static volatile ITimeDetectorService sITimeDetectorService;





    /**

    /**

     * Since {@code nanoTime()} is arbitrary, anchor our Ravenwood clocks against it.

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

        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.

     * Returns milliseconds since boot, not counting time spent in deep sleep.

     *

     *
@@ -345,36 +334,10 @@ public final class SystemClock { 
     * @hide

     * @hide

     */

     */

    public static long currentNetworkTimeMillis() {

    public static long currentNetworkTimeMillis() {

        if (com.android.internal.os.Flags.applicationSharedMemoryEnabled()

                && Flags.networkTimeUsesSharedMemory()) {

        final long latestNetworkTimeUnixEpochMillisAtZeroElapsedRealtimeMillis =

        final long latestNetworkTimeUnixEpochMillisAtZeroElapsedRealtimeMillis =

                ApplicationSharedMemory.getInstance()

                ApplicationSharedMemory.getInstance()

                        .getLatestNetworkTimeUnixEpochMillisAtZeroElapsedRealtimeMillis();

                        .getLatestNetworkTimeUnixEpochMillisAtZeroElapsedRealtimeMillis();

        return latestNetworkTimeUnixEpochMillisAtZeroElapsedRealtimeMillis + elapsedRealtime();

        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 Original line Diff line number Diff line
@@ -77,11 +77,3 @@ flag { 
    bug: "314735374"

    bug: "314735374"

    is_fixed_read_only: true

    is_fixed_read_only: true

}
 
}
 


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 Original line 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.

        // detected time if, for example, the age of all suggestions are considered.

        NetworkTimeSuggestion lastNetworkSuggestion = mLastNetworkSuggestion.get();

        NetworkTimeSuggestion lastNetworkSuggestion = mLastNetworkSuggestion.get();

        if (lastNetworkSuggestion == null || !lastNetworkSuggestion.equals(suggestion)) {

        if (lastNetworkSuggestion == null || !lastNetworkSuggestion.equals(suggestion)) {

            if (com.android.internal.os.Flags.applicationSharedMemoryEnabled()

                    && android.os.Flags.networkTimeUsesSharedMemory()) {

            UnixEpochTime networkUnixEpochTime = suggestion.getUnixEpochTime();

            UnixEpochTime networkUnixEpochTime = suggestion.getUnixEpochTime();

            long lastNetworkTimeUnixEpochMillisAtZeroElapsedRealtimeMillis =

            long lastNetworkTimeUnixEpochMillisAtZeroElapsedRealtimeMillis =

                    networkUnixEpochTime.getUnixEpochTimeMillis()

                    networkUnixEpochTime.getUnixEpochTimeMillis()
@@ -326,7 +324,6 @@ public final class TimeDetectorStrategyImpl implements TimeDetectorStrategy { 
            ApplicationSharedMemory.getInstance()

            ApplicationSharedMemory.getInstance()

                    .setLatestNetworkTimeUnixEpochMillisAtZeroElapsedRealtimeMillis(

                    .setLatestNetworkTimeUnixEpochMillisAtZeroElapsedRealtimeMillis(

                            lastNetworkTimeUnixEpochMillisAtZeroElapsedRealtimeMillis);

                            lastNetworkTimeUnixEpochMillisAtZeroElapsedRealtimeMillis);

            }





            mLastNetworkSuggestion.set(suggestion);

            mLastNetworkSuggestion.set(suggestion);

            notifyNetworkTimeUpdateListenersAsynchronously();

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




    @Override

    @Override

    public synchronized void clearLatestNetworkSuggestion() {

    public synchronized void clearLatestNetworkSuggestion() {

        if (com.android.internal.os.Flags.applicationSharedMemoryEnabled()

                && android.os.Flags.networkTimeUsesSharedMemory()) {

        ApplicationSharedMemory.getInstance()

        ApplicationSharedMemory.getInstance()

                .clearLatestNetworkTimeUnixEpochMillisAtZeroElapsedRealtimeMillis();

                .clearLatestNetworkTimeUnixEpochMillisAtZeroElapsedRealtimeMillis();

        }

        mLastNetworkSuggestion.set(null);

        mLastNetworkSuggestion.set(null);

        notifyNetworkTimeUpdateListenersAsynchronously();

        notifyNetworkTimeUpdateListenersAsynchronously();