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

Commit b97319ee authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12210778 from db292b6d to 24Q4-release

Change-Id: I841a14bcd24692ff6ebadf551480a0440d9a5c36
parents b1332624 db292b6d
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ import java.util.List;

@RunWith(AndroidJUnit4.class)
public final class SettingsProviderPerfTest {
    private static final String NAMESPACE = "test@namespace";
    private static final String NAMESPACE = "testing";
    private static final String SETTING_NAME1 = "test:setting1";
    private static final String SETTING_NAME2 = "test-setting2";
    private static final String UNSET_SETTING = "test_unset_setting";
+7 −3
Original line number Diff line number Diff line
@@ -4441,6 +4441,11 @@ public class AlarmManagerService extends SystemService {
        public void run() {
            ArrayList<Alarm> triggerList = new ArrayList<Alarm>();

            synchronized (mLock) {
                mLastTimeChangeClockTime = mInjector.getCurrentTimeMillis();
                mLastTimeChangeRealtime = mInjector.getElapsedRealtimeMillis();
            }

            while (true) {
                int result = mInjector.waitForAlarm();
                final long nowRTC = mInjector.getCurrentTimeMillis();
@@ -4464,10 +4469,9 @@ public class AlarmManagerService extends SystemService {
                        expectedClockTime = lastTimeChangeClockTime
                                + (nowELAPSED - mLastTimeChangeRealtime);
                    }
                    if (lastTimeChangeClockTime == 0 || nowRTC < (expectedClockTime - 1000)
                    if (nowRTC < (expectedClockTime - 1000)
                            || nowRTC > (expectedClockTime + 1000)) {
                        // The change is by at least +/- 1000 ms (or this is the first change),
                        // let's do it!
                        // The change is by at least +/- 1000 ms, let's do it!
                        if (DEBUG_BATCH) {
                            Slog.v(TAG, "Time changed notification from kernel; rebatching");
                        }
+1 −1
Original line number Diff line number Diff line
@@ -7312,7 +7312,7 @@ public class Activity extends ContextThemeWrapper
    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
    private void finish(int finishTask) {
        if (DEBUG_FINISH_ACTIVITY) {
            Log.d("Instrumentation", "finishActivity: finishTask=" + finishTask, new Throwable());
            Log.d(Instrumentation.TAG, "finishActivity: finishTask=" + finishTask, new Throwable());
        }
        if (mParent == null) {
            int resultCode;
+6 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@

package android.app;

import static android.app.Instrumentation.DEBUG_FINISH_ACTIVITY;
import static android.app.WindowConfiguration.activityTypeToString;
import static android.app.WindowConfiguration.windowingModeToString;
import static android.content.Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS;
@@ -80,6 +81,7 @@ import android.os.WorkSource;
import android.text.TextUtils;
import android.util.ArrayMap;
import android.util.DisplayMetrics;
import android.util.Log;
import android.util.Singleton;
import android.util.Size;
import android.view.WindowInsetsController.Appearance;
@@ -6011,6 +6013,10 @@ public class ActivityManager {
         * Finishes all activities in this task and removes it from the recent tasks list.
         */
        public void finishAndRemoveTask() {
            if (DEBUG_FINISH_ACTIVITY) {
                Log.d(Instrumentation.TAG, "AppTask#finishAndRemoveTask: task="
                        + getTaskInfo(), new Throwable());
            }
            try {
                mAppTaskImpl.finishAndRemoveTask();
            } catch (RemoteException e) {
+11 −0
Original line number Diff line number Diff line
@@ -960,6 +960,17 @@ public abstract class ActivityManagerInternal {
    public abstract void setVoiceInteractionManagerProvider(
            @Nullable VoiceInteractionManagerProvider provider);

    /**
     * Get whether or not the previous user's packages will be killed before the user is
     * stopped during a user switch.
     *
     * <p> The primary use case of this method is for {@link com.android.server.SystemService}
     * classes to call this API in their
     * {@link com.android.server.SystemService#onUserSwitching} method implementation to prevent
     * restarting any of the previous user's processes that will be killed during the user switch.
     */
    public abstract boolean isEarlyPackageKillEnabledForUserSwitch(int fromUserId, int toUserId);

    /**
     * Sets whether the current foreground user (and its profiles) should be stopped after switched
     * out.
Loading