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

Commit 974b4830 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Make device_config clear_override take effect immediately." into main

parents 4b03ce47 cf585956

services/core/java/com/android/server/am/SettingsToPropertiesMapper.java

+15 −3
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ import android.aconfigd.Aconfigd.StorageReturnMessage; 
import android.aconfigd.Aconfigd.StorageReturnMessages;

import static com.android.aconfig_new_storage.Flags.enableAconfigStorageDaemon;

import static com.android.aconfig_new_storage.Flags.supportImmediateLocalOverrides;

import static com.android.aconfig_new_storage.Flags.supportClearLocalOverridesImmediately;



import java.io.DataInputStream;

import java.io.DataOutputStream;
@@ -526,14 +527,21 @@ public class SettingsToPropertiesMapper { 
     * @param proto

     * @param packageName the package of the flag

     * @param flagName the name of the flag

     * @param immediate if true, clear immediately; otherwise, clear on next reboot

     *

     * @hide

     */

    static void writeFlagOverrideRemovalRequest(

        ProtoOutputStream proto, String packageName, String flagName) {

    public static void writeFlagOverrideRemovalRequest(

        ProtoOutputStream proto, String packageName, String flagName, boolean immediate) {

      long msgsToken = proto.start(StorageRequestMessages.MSGS);

      long msgToken = proto.start(StorageRequestMessage.REMOVE_LOCAL_OVERRIDE_MESSAGE);

      proto.write(StorageRequestMessage.RemoveLocalOverrideMessage.PACKAGE_NAME, packageName);

      proto.write(StorageRequestMessage.RemoveLocalOverrideMessage.FLAG_NAME, flagName);

      proto.write(StorageRequestMessage.RemoveLocalOverrideMessage.REMOVE_ALL, false);

      proto.write(StorageRequestMessage.RemoveLocalOverrideMessage.REMOVE_OVERRIDE_TYPE,

          immediate

              ? StorageRequestMessage.REMOVE_LOCAL_IMMEDIATE

              : StorageRequestMessage.REMOVE_LOCAL_ON_REBOOT);

      proto.end(msgToken);

      proto.end(msgsToken);

    }
@@ -610,7 +618,11 @@ public class SettingsToPropertiesMapper { 
            String realFlagName = fullFlagName.substring(idx+1);



            if (Flags.syncLocalOverridesRemovalNewStorage() && flagValue == null) {

              writeFlagOverrideRemovalRequest(requests, packageName, realFlagName);

              if (supportClearLocalOverridesImmediately()) {

                writeFlagOverrideRemovalRequest(requests, packageName, realFlagName, true);

              } else {

                writeFlagOverrideRemovalRequest(requests, packageName, realFlagName, false);

              }

            } else {

              writeFlagOverrideRequest(requests, packageName, realFlagName, flagValue, true);

            }