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

Commit be7fedfd authored by Garfield Tan's avatar Garfield Tan Committed by Android (Google) Code Review
Browse files

Merge "Add web_apps_on_chromeos_and_android to native binding" into main

parents 6fdb9d03 d887bfec
Loading
Loading
Loading
Loading
+15 −18
Original line number Diff line number Diff line
@@ -16,12 +16,23 @@

package com.android.server.am;

import static com.android.aconfig_new_storage.Flags.enableAconfigStorageDaemon;
import static com.android.aconfig_new_storage.Flags.enableAconfigdFromMainline;
import static com.android.aconfig_new_storage.Flags.supportClearLocalOverridesImmediately;
import static com.android.aconfig_new_storage.Flags.supportImmediateLocalOverrides;

import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor;

import android.aconfigd.Aconfigd.StorageRequestMessage;
import android.aconfigd.Aconfigd.StorageRequestMessages;
import android.aconfigd.Aconfigd.StorageReturnMessage;
import android.aconfigd.Aconfigd.StorageReturnMessages;
import android.annotation.NonNull;
import android.content.ContentResolver;
import android.database.ContentObserver;
import android.net.Uri;
import android.net.LocalSocketAddress;
import android.net.LocalSocket;
import android.net.LocalSocketAddress;
import android.net.Uri;
import android.os.AsyncTask;
import android.os.Build;
import android.os.SystemProperties;
@@ -35,28 +46,13 @@ import android.util.proto.ProtoOutputStream;
import com.android.internal.annotations.VisibleForTesting;
import com.android.providers.settings.Flags;

import android.aconfigd.Aconfigd.StorageRequestMessage;
import android.aconfigd.Aconfigd.StorageRequestMessages;
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 static com.android.aconfig_new_storage.Flags.enableAconfigdFromMainline;

import java.io.BufferedReader;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
import java.io.IOException;
import java.util.HashSet;
import java.util.HashMap;
import java.util.Map;
import java.util.List;
import java.util.ArrayList;
import java.util.Set;
import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor;

/**
 * Maps system settings to system properties.
@@ -271,6 +267,7 @@ public class SettingsToPropertiesMapper {
        "wear_sysui",
        "wear_system_managed_surfaces",
        "wear_watchfaces",
        "web_apps_on_chromeos_and_android",
        "window_surfaces",
        "windowing_frontend",
        "xr",