From 385f5a0c7ba8a7f1213b1d6c4f0532aefe1e45f5 Mon Sep 17 00:00:00 2001
From: Daniel <danieljkim@google.com>
Date: Thu, 18 Apr 2024 07:24:07 +0000
Subject: [PATCH 01/21] Replace credential provider placeholder

Replace credential provider placeholder with the actual credential
autofill provider.

Bug: 330177328
Test: cts
Change-Id: Ib6c9688b3f728706b1f5ac0faa3f042bb6dc447c
---
 ...CredentialManagerPreferenceController.java | 30 ++++++++++++++-----
 .../credentials/DefaultCombinedPicker.java    | 12 ++++++--
 2 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/src/com/android/settings/applications/credentials/CredentialManagerPreferenceController.java b/src/com/android/settings/applications/credentials/CredentialManagerPreferenceController.java
index a92b755331c..4619bdade5a 100644
--- a/src/com/android/settings/applications/credentials/CredentialManagerPreferenceController.java
+++ b/src/com/android/settings/applications/credentials/CredentialManagerPreferenceController.java
@@ -87,6 +87,11 @@ public class CredentialManagerPreferenceController extends BasePreferenceControl
         implements LifecycleObserver {
     public static final String ADD_SERVICE_DEVICE_CONFIG = "credential_manager_service_search_uri";
 
+    private static final String TAG = "CredentialManagerPreferenceController";
+    private static final String ALTERNATE_INTENT = "android.settings.SYNC_SETTINGS";
+    private static final String PRIMARY_INTENT = "android.settings.CREDENTIAL_PROVIDER";
+    private static final int MAX_SELECTABLE_PROVIDERS = 5;
+
     /**
      * In the settings logic we should hide the list of additional credman providers if there is no
      * provider selected at the top. The current logic relies on checking whether the autofill
@@ -95,11 +100,6 @@ public class CredentialManagerPreferenceController extends BasePreferenceControl
      */
     public static final String AUTOFILL_CREDMAN_ONLY_PROVIDER_PLACEHOLDER = "credential-provider";
 
-    private static final String TAG = "CredentialManagerPreferenceController";
-    private static final String ALTERNATE_INTENT = "android.settings.SYNC_SETTINGS";
-    private static final String PRIMARY_INTENT = "android.settings.CREDENTIAL_PROVIDER";
-    private static final int MAX_SELECTABLE_PROVIDERS = 5;
-
     private final PackageManager mPm;
     private final List<CredentialProviderInfo> mServices;
     private final Set<String> mEnabledPackageNames;
@@ -494,8 +494,13 @@ public class CredentialManagerPreferenceController extends BasePreferenceControl
         // empty string.
         String selectedAutofillProvider =
                 DefaultCombinedPicker.getSelectedAutofillProvider(mContext, getUser());
-        if (TextUtils.equals(
-                selectedAutofillProvider, AUTOFILL_CREDMAN_ONLY_PROVIDER_PLACEHOLDER)) {
+        String credentialAutofillService = "";
+        if (android.service.autofill.Flags.autofillCredmanDevIntegration()) {
+            credentialAutofillService = getCredentialAutofillService(mContext, TAG);
+        }
+        if (TextUtils.equals(selectedAutofillProvider, credentialAutofillService)
+                || TextUtils.equals(
+                        selectedAutofillProvider, AUTOFILL_CREDMAN_ONLY_PROVIDER_PLACEHOLDER)) {
             selectedAutofillProvider = "";
         }
 
@@ -652,6 +657,17 @@ public class CredentialManagerPreferenceController extends BasePreferenceControl
         return (enabledAdditionalProviderCount + 1) >= MAX_SELECTABLE_PROVIDERS;
     }
 
+    /** Gets the credential autofill service component name. */
+    public static String getCredentialAutofillService(Context context, String tag) {
+        try {
+            return context.getResources().getString(
+                    com.android.internal.R.string.config_defaultCredentialManagerAutofillService);
+        } catch (Resources.NotFoundException e) {
+            Log.e(tag, "Failed to find credential autofill service.", e);
+        }
+        return "";
+    }
+
     private CombiPreference addProviderPreference(
             @NonNull Context prefContext,
             @NonNull CharSequence title,
diff --git a/src/com/android/settings/applications/credentials/DefaultCombinedPicker.java b/src/com/android/settings/applications/credentials/DefaultCombinedPicker.java
index 6fdcf675e9f..8bc0bca627b 100644
--- a/src/com/android/settings/applications/credentials/DefaultCombinedPicker.java
+++ b/src/com/android/settings/applications/credentials/DefaultCombinedPicker.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.applications.credentials;
 
+import static com.android.settings.applications.credentials.CredentialManagerPreferenceController.getCredentialAutofillService;
+
 import android.app.Activity;
 import android.app.settings.SettingsEnums;
 import android.content.Context;
@@ -463,9 +465,13 @@ public class DefaultCombinedPicker extends DefaultAppPickerFragment {
     private void setProviders(String autofillProvider, List<String> primaryCredManProviders) {
         if (TextUtils.isEmpty(autofillProvider)) {
             if (primaryCredManProviders.size() > 0) {
-                autofillProvider =
-                        CredentialManagerPreferenceController
-                                .AUTOFILL_CREDMAN_ONLY_PROVIDER_PLACEHOLDER;
+                if (android.service.autofill.Flags.autofillCredmanDevIntegration()) {
+                    autofillProvider = getCredentialAutofillService(getContext(), TAG);
+                } else {
+                    autofillProvider =
+                            CredentialManagerPreferenceController
+                                    .AUTOFILL_CREDMAN_ONLY_PROVIDER_PLACEHOLDER;
+                }
             }
         }
 

From 4e13fdcd378dc1f55cd0d7fa40446a2343ed75cb Mon Sep 17 00:00:00 2001
From: Tetiana Meronyk <tetianameronyk@google.com>
Date: Thu, 2 May 2024 11:54:46 +0000
Subject: [PATCH 02/21] Remove telephony related settings preferences for HSUM
 devices

Bug: 338358654
Test: atest UserDetailsSettingsTest
Change-Id: I53c3a8e4386b5d7738caffb42abf15dd33c360c7
---
 .../settings/users/GuestTelephonyPreferenceController.java     | 3 ++-
 src/com/android/settings/users/UserDetailsSettings.java        | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/users/GuestTelephonyPreferenceController.java b/src/com/android/settings/users/GuestTelephonyPreferenceController.java
index 83e4bfc5310..4fbd4493bb7 100644
--- a/src/com/android/settings/users/GuestTelephonyPreferenceController.java
+++ b/src/com/android/settings/users/GuestTelephonyPreferenceController.java
@@ -75,6 +75,7 @@ public class GuestTelephonyPreferenceController extends TogglePreferenceControll
         super.updateState(preference);
         mUserCaps.updateAddUserCapabilities(mContext);
         preference.setVisible(isAvailable() && mUserCaps.mUserSwitcherEnabled
-                && mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEPHONY));
+                && mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEPHONY)
+                && !UserManager.isHeadlessSystemUserMode());
     }
 }
diff --git a/src/com/android/settings/users/UserDetailsSettings.java b/src/com/android/settings/users/UserDetailsSettings.java
index a030d865a8b..1f0d824d087 100644
--- a/src/com/android/settings/users/UserDetailsSettings.java
+++ b/src/com/android/settings/users/UserDetailsSettings.java
@@ -376,7 +376,7 @@ public class UserDetailsSettings extends SettingsPreferenceFragment
             if (!Utils.isVoiceCapable(context)) { // no telephony
                 removePreference(KEY_ENABLE_TELEPHONY);
             }
-            if (mUserInfo.isMain()) {
+            if (mUserInfo.isMain() || UserManager.isHeadlessSystemUserMode()) {
                 removePreference(KEY_ENABLE_TELEPHONY);
             }
             if (mUserInfo.isRestricted()) {

From 7d0d858136df1c72f8d817d5bc7cd8e027b83012 Mon Sep 17 00:00:00 2001
From: Pawan Wagh <waghpawan@google.com>
Date: Thu, 2 May 2024 18:02:53 +0000
Subject: [PATCH 03/21] Make links in dialog text clickable

Test: m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Bug: 295035851
Change-Id: I71d4f5cb1e27cd52e6f0c5aaeabc9b3f89520cf1
---
 .../development/Enable16KOemUnlockDialog.java   | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/development/Enable16KOemUnlockDialog.java b/src/com/android/settings/development/Enable16KOemUnlockDialog.java
index 65690df7ab4..8ddded41057 100644
--- a/src/com/android/settings/development/Enable16KOemUnlockDialog.java
+++ b/src/com/android/settings/development/Enable16KOemUnlockDialog.java
@@ -16,10 +16,15 @@
 
 package com.android.settings.development;
 
+import static androidx.core.text.HtmlCompat.FROM_HTML_MODE_COMPACT;
+
 import android.app.Dialog;
 import android.app.settings.SettingsEnums;
 import android.content.DialogInterface;
 import android.os.Bundle;
+import android.text.Html;
+import android.text.method.LinkMovementMethod;
+import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -60,7 +65,10 @@ public class Enable16KOemUnlockDialog extends InstrumentedDialogFragment
     public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
         return new AlertDialog.Builder(getActivity())
                 .setTitle(R.string.confirm_oem_unlock_for_16k_title)
-                .setMessage(R.string.confirm_oem_unlock_for_16k_text)
+                .setMessage(
+                        Html.fromHtml(
+                                getString(R.string.confirm_oem_unlock_for_16k_text),
+                                FROM_HTML_MODE_COMPACT))
                 .setPositiveButton(android.R.string.ok, this /* onClickListener */)
                 .create();
     }
@@ -74,4 +82,11 @@ public class Enable16KOemUnlockDialog extends InstrumentedDialogFragment
     public void onDismiss(@NonNull DialogInterface dialog) {
         super.onDismiss(dialog);
     }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        ((TextView) getDialog().findViewById(android.R.id.message))
+                .setMovementMethod(LinkMovementMethod.getInstance());
+    }
 }

From dc087a635b1fe31617e8484caf1beed3a0637793 Mon Sep 17 00:00:00 2001
From: marcusge <marcusge@google.com>
Date: Tue, 23 Apr 2024 19:26:55 +0000
Subject: [PATCH 04/21] [Settings] Migrate color roles to respect color
 contrast

This change updated color roles in the main Settings page and in the
alert dialogs.

Bug: 335668262
Bug: 335668306
Bug: 335711196
Bug: 335711422
Bug: 335713067
Bug: 335712185
Bug: 335713398
Bug: 335714079
Bug: 335713405
Bug: 335714437
Test: local raven device

Change-Id: I29895ecb869f1053bbcc55ebeb42020e7ce77b8b
---
 .../settings_two_pane_background_color.xml     | 18 ++++++++++++++++++
 .../settings_two_pane_background_color.xml     | 18 ++++++++++++++++++
 res/values-night/themes.xml                    |  6 +++---
 res/values/themes.xml                          |  5 +++--
 4 files changed, 42 insertions(+), 5 deletions(-)
 create mode 100644 res/color-night-v35/settings_two_pane_background_color.xml
 create mode 100644 res/color-v35/settings_two_pane_background_color.xml

diff --git a/res/color-night-v35/settings_two_pane_background_color.xml b/res/color-night-v35/settings_two_pane_background_color.xml
new file mode 100644
index 00000000000..1d5daf29f77
--- /dev/null
+++ b/res/color-night-v35/settings_two_pane_background_color.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2024 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@android:color/system_surface_dim_dark" />
+</selector>
\ No newline at end of file
diff --git a/res/color-v35/settings_two_pane_background_color.xml b/res/color-v35/settings_two_pane_background_color.xml
new file mode 100644
index 00000000000..ff305abada2
--- /dev/null
+++ b/res/color-v35/settings_two_pane_background_color.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2024 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@android:color/system_surface_dim_light" />
+</selector>
\ No newline at end of file
diff --git a/res/values-night/themes.xml b/res/values-night/themes.xml
index c28bfbb94ef..141badbc9c6 100644
--- a/res/values-night/themes.xml
+++ b/res/values-night/themes.xml
@@ -20,7 +20,7 @@
     <style name="Theme.Settings.Home" parent="Theme.Settings.HomeBase">
         <item name="colorPrimary">@*android:color/primary_device_default_settings</item>
         <item name="colorPrimaryDark">@*android:color/primary_dark_device_default_settings</item>
-        <item name="android:colorBackground">?android:attr/colorPrimaryDark</item>
+        <item name="android:colorBackground">@android:color/system_surface_container_dark</item>
         <!-- Homepage should follow device default design, the values is same as device default theme.-->
         <item name="android:navigationBarColor">@android:color/black</item>
         <item name="android:statusBarColor">?attr/colorPrimaryDark</item>
@@ -29,9 +29,9 @@
     <style name="Theme.SubSettings" parent="Theme.SubSettings.Base"/>
 
     <style name="Theme.AlertDialog.Base" parent="@style/Theme.AppCompat.DayNight.Dialog.Alert">
-        <item name="colorAccent">@*android:color/accent_device_default_dark</item>
+        <item name="colorAccent">@android:color/system_primary_dark</item>
         <item name="android:colorError">@color/settings_dialog_colorError</item>
-        <item name="android:colorBackground">@*android:color/surface_dark</item>
+        <item name="android:colorBackground">@android:color/system_surface_container_high_dark</item>
     </style>
 
     <style name="Theme.Panel.Material" parent="Theme.Panel" >
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 73a7d6769e1..182dd694318 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -115,9 +115,9 @@
     </style>
 
     <style name="Theme.AlertDialog.Base" parent="@style/Theme.AppCompat.DayNight.Dialog.Alert">
-        <item name="colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="colorAccent">@android:color/system_primary_light</item>
         <item name="android:colorError">@color/settings_dialog_colorError</item>
-        <item name="android:colorBackground">@*android:color/surface_light</item>
+        <item name="android:colorBackground">@android:color/system_surface_container_high_light</item>
     </style>
 
     <style name="Theme.AlertDialog" parent="Theme.AlertDialog.Base">
@@ -204,6 +204,7 @@
         <!-- Homepage should follow device default design, the values is same as device default theme.-->
         <item name="android:navigationBarColor">@android:color/white</item>
         <item name="android:statusBarColor">?attr/colorPrimaryDark</item>
+        <item name="android:colorBackground">@android:color/system_surface_container_light</item>
     </style>
 
     <style name="Theme.Settings.Home.NoAnimation">

From 699bbe760d1f48bc47485bb790997ce00c740d85 Mon Sep 17 00:00:00 2001
From: Lais Andrade <lsandrade@google.com>
Date: Fri, 3 May 2024 14:50:07 +0100
Subject: [PATCH 05/21] Fix feedback for main haptic settings toggle

The SettingsMainSwitchPreferenceController might trigger a state change
twice on the page main switch when the user toggles the setting value.

Make sure we only trigger haptic feedback when the state is changing
between untoggled to toggled to avoid a double-click feedback.

No flag for small bug fix, no UI changes.

Fix: 338334977
Test: enable the "Use vibration & haptics" settings and feel a single
      click feedback
Change-Id: I0c22b99bcb40f35ebe09c153133c354306ed1ff0
---
 .../VibrationMainSwitchPreferenceController.java             | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/accessibility/VibrationMainSwitchPreferenceController.java b/src/com/android/settings/accessibility/VibrationMainSwitchPreferenceController.java
index 02e89269209..db184bf9d73 100644
--- a/src/com/android/settings/accessibility/VibrationMainSwitchPreferenceController.java
+++ b/src/com/android/settings/accessibility/VibrationMainSwitchPreferenceController.java
@@ -83,11 +83,14 @@ public class VibrationMainSwitchPreferenceController extends SettingsMainSwitchP
 
     @Override
     public boolean setChecked(boolean isChecked) {
+        // The main switch change can be triggered by both the user click and the
+        // SettingsMainSwitchPreferenceController state change. Make sure we only do it once.
+        boolean wasChecked = isChecked();
         boolean success = Settings.System.putInt(mContext.getContentResolver(),
                 VibrationPreferenceConfig.MAIN_SWITCH_SETTING_KEY,
                 isChecked ? ON : OFF);
 
-        if (success && isChecked) {
+        if (success && !wasChecked && isChecked) {
             // Play a haptic as preview for the main toggle only when touch feedback is enabled.
             VibrationPreferenceConfig.playVibrationPreview(
                     mVibrator, VibrationAttributes.USAGE_TOUCH);

From ba39bd6edd0323ba3a706031a3e147f021f54693 Mon Sep 17 00:00:00 2001
From: Song Chun Fan <schfan@google.com>
Date: Thu, 2 May 2024 00:46:22 +0000
Subject: [PATCH 06/21] [Install-unknown-apps] not include all the apps that
 have OP_REQUEST_INSTALL_PACKAGES granted

Due to a recent change in AppOpsService, apps that share system_uid have all the appops granted. However, we don't want them to be listed under "Install unknown apps" if they don't explicitly declare the permission usage of REQUEST_INSTALL_PACKAGES in their manifest. This CL fixes that.

Change-Id: I025bc17c335093ae5d3b15a3bef67d659c8f790f
BUG: 338066634
BUG: 336677341
FIXES: 338066634
Test: manual by checking the Settings page
---
 .../settings/spa/app/specialaccess/InstallUnknownApps.kt      | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/com/android/settings/spa/app/specialaccess/InstallUnknownApps.kt b/src/com/android/settings/spa/app/specialaccess/InstallUnknownApps.kt
index 3e9058f25ff..1446bbca5b4 100644
--- a/src/com/android/settings/spa/app/specialaccess/InstallUnknownApps.kt
+++ b/src/com/android/settings/spa/app/specialaccess/InstallUnknownApps.kt
@@ -94,9 +94,7 @@ class InstallUnknownAppsListModel(private val context: Context) :
         private fun isChangeable(
             record: InstallUnknownAppsRecord,
             potentialPackageNames: Set<String>,
-        ) =
-            record.appOpsController.getMode() != MODE_DEFAULT ||
-                record.app.packageName in potentialPackageNames
+        ) = record.app.packageName in potentialPackageNames
 
         private fun getPotentialPackageNames(userId: Int): Set<String> =
             AppGlobals.getPackageManager()

From f1be1400b77059299f684bb4f2d1fc0d374da92e Mon Sep 17 00:00:00 2001
From: Jason Chang <jasonsfchang@google.com>
Date: Fri, 26 Apr 2024 09:44:38 +0000
Subject: [PATCH 07/21] Fix the text under the "Setup for limited vision or
 head motion" is grayed out

Align the sub-title text color with main-title.

Flag: NONE

Bug: 337171531
Bug: 336678451

Test: manually test with reproducible steps then check it visually:
1. Go to Settings > Security & privacy > Device unlock
> Fingerprint & Face Unlock > Face Unlock
2. Confirm your PIN/Pattern/Password
3. Tap on "Setup for limited vision or head motion"

Change-Id: Id6db60d1fc97833607e184bc2fa71b76f46983a4
(cherry picked from commit a538f4efdc57aa5c43a074e0e897868593bd3282)
---
 res/layout/face_enroll_accessibility_toggle.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/layout/face_enroll_accessibility_toggle.xml b/res/layout/face_enroll_accessibility_toggle.xml
index f2987dbfd6e..428916ed2d3 100644
--- a/res/layout/face_enroll_accessibility_toggle.xml
+++ b/res/layout/face_enroll_accessibility_toggle.xml
@@ -51,7 +51,7 @@
         android:letterSpacing="0"
         android:minHeight="20dp"
         android:fontFamily="@string/sudFontSecondaryText"
-        android:textColor="?androidprv:attr/materialColorOnSurfaceVariant"/>
+        android:textColor="?android:attr/textColorPrimary"/>
 
     <!-- Toggle -->
     <com.google.android.material.materialswitch.MaterialSwitch

From caaddc87f35de6f36f0c4858914d6b888445bcfc Mon Sep 17 00:00:00 2001
From: Chaohui Wang <chaohuiw@google.com>
Date: Mon, 6 May 2024 13:51:12 +0800
Subject: [PATCH 08/21] Clean up unused params from SubscriptionAnnotation

Bug: 338904413
Test: m Settings
Change-Id: Ic714066e45bb0050361c8096394929828a871589
---
 .../network/helper/QueryEsimCardId.java       | 57 -------------------
 .../helper/SelectableSubscriptions.java       | 15 +----
 .../helper/SubscriptionAnnotation.java        | 29 ++--------
 3 files changed, 6 insertions(+), 95 deletions(-)
 delete mode 100644 src/com/android/settings/network/helper/QueryEsimCardId.java

diff --git a/src/com/android/settings/network/helper/QueryEsimCardId.java b/src/com/android/settings/network/helper/QueryEsimCardId.java
deleted file mode 100644
index 7ac73726070..00000000000
--- a/src/com/android/settings/network/helper/QueryEsimCardId.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.network.helper;
-
-import android.telephony.TelephonyManager;
-import android.telephony.UiccCardInfo;
-
-import java.util.List;
-import java.util.Objects;
-import java.util.concurrent.Callable;
-import java.util.concurrent.atomic.AtomicIntegerArray;
-
-/**
- * This is a Callable class which queries valid card ID for eSIM
- */
-public class QueryEsimCardId implements Callable<AtomicIntegerArray> {
-    private static final String TAG = "QueryEsimCardId";
-
-    private TelephonyManager mTelephonyManager;
-
-    /**
-     * Constructor of class
-     * @param TelephonyManager
-     */
-    public QueryEsimCardId(TelephonyManager telephonyManager) {
-        mTelephonyManager = telephonyManager;
-    }
-
-    /**
-     * Implementation of Callable
-     * @return card ID(s) in AtomicIntegerArray
-     */
-    public AtomicIntegerArray call() {
-        List<UiccCardInfo> cardInfos = mTelephonyManager.getUiccCardsInfo();
-        if (cardInfos == null) {
-            return new AtomicIntegerArray(0);
-        }
-        return new AtomicIntegerArray(cardInfos.stream()
-                .filter(Objects::nonNull)
-                .filter(cardInfo -> (!cardInfo.isRemovable() && (cardInfo.getCardId() >= 0)))
-                .mapToInt(UiccCardInfo::getCardId)
-                .toArray());
-    }
-}
\ No newline at end of file
diff --git a/src/com/android/settings/network/helper/SelectableSubscriptions.java b/src/com/android/settings/network/helper/SelectableSubscriptions.java
index b4a3b577575..419f4cd9226 100644
--- a/src/com/android/settings/network/helper/SelectableSubscriptions.java
+++ b/src/com/android/settings/network/helper/SelectableSubscriptions.java
@@ -24,7 +24,6 @@ import android.util.Log;
 import androidx.annotation.Keep;
 import androidx.annotation.VisibleForTesting;
 
-import com.android.settings.network.helper.SubscriptionAnnotation;
 import com.android.settingslib.utils.ThreadUtils;
 
 import java.util.Collections;
@@ -103,15 +102,6 @@ public class SelectableSubscriptions implements Callable<List<SubscriptionAnnota
         TelephonyManager telMgr = mContext.getSystemService(TelephonyManager.class);
 
         try {
-            // query in background thread
-            Future<AtomicIntegerArray> eSimCardId =
-                    ThreadUtils.postOnBackgroundThread(new QueryEsimCardId(telMgr));
-
-            // query in background thread
-            Future<AtomicIntegerArray> simSlotIndex =
-                    ThreadUtils.postOnBackgroundThread(
-                    new QuerySimSlotIndex(telMgr, true, true));
-
             // query in background thread
             Future<AtomicIntegerArray> activeSimSlotIndex =
                     ThreadUtils.postOnBackgroundThread(
@@ -120,16 +110,13 @@ public class SelectableSubscriptions implements Callable<List<SubscriptionAnnota
             List<SubscriptionInfo> subInfoList = mSubscriptions.get();
 
             // wait for result from background thread
-            List<Integer> eSimCardIdList = atomicToList(eSimCardId.get());
-            List<Integer> simSlotIndexList = atomicToList(simSlotIndex.get());
             List<Integer> activeSimSlotIndexList = atomicToList(activeSimSlotIndex.get());
 
             // build a list of SubscriptionAnnotation
             return IntStream.range(0, subInfoList.size())
                     .mapToObj(subInfoIndex ->
                             new SubscriptionAnnotation.Builder(subInfoList, subInfoIndex))
-                    .map(annoBdr -> annoBdr.build(mContext,
-                            eSimCardIdList, simSlotIndexList, activeSimSlotIndexList))
+                    .map(annoBdr -> annoBdr.build(mContext, activeSimSlotIndexList))
                     .filter(mFilter)
                     .collect(Collectors.collectingAndThen(Collectors.toList(), mFinisher));
         } catch (Exception exception) {
diff --git a/src/com/android/settings/network/helper/SubscriptionAnnotation.java b/src/com/android/settings/network/helper/SubscriptionAnnotation.java
index 79fbf68b6d9..96ce831515c 100644
--- a/src/com/android/settings/network/helper/SubscriptionAnnotation.java
+++ b/src/com/android/settings/network/helper/SubscriptionAnnotation.java
@@ -16,7 +16,6 @@
 package com.android.settings.network.helper;
 
 import android.content.Context;
-import android.os.ParcelUuid;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 
@@ -35,14 +34,11 @@ public class SubscriptionAnnotation {
     private static final String TAG = "SubscriptionAnnotation";
 
     private SubscriptionInfo mSubInfo;
-    private int mOrderWithinList;
     private int mType = TYPE_UNKNOWN;
     private boolean mIsExisted;
     private boolean mIsActive;
     private boolean mIsAllowToDisplay;
 
-    public static final ParcelUuid EMPTY_UUID = ParcelUuid.fromString("0-0-0-0-0");
-
     public static final int TYPE_UNKNOWN = 0x0;
     public static final int TYPE_PSIM = 0x1;
     public static final int TYPE_ESIM = 0x2;
@@ -52,8 +48,8 @@ public class SubscriptionAnnotation {
      */
     public static class Builder {
 
-        private List<SubscriptionInfo> mSubInfoList;
-        private int mIndexWithinList;
+        private final List<SubscriptionInfo> mSubInfoList;
+        private final int mIndexWithinList;
 
         /**
          * Constructor of builder
@@ -65,10 +61,9 @@ public class SubscriptionAnnotation {
             mIndexWithinList = indexWithinList;
         }
 
-        public SubscriptionAnnotation build(Context context, List<Integer> eSimCardId,
-                List<Integer> simSlotIndex, List<Integer> activeSimSlotIndex) {
+        public SubscriptionAnnotation build(Context context, List<Integer> activeSimSlotIndex) {
             return new SubscriptionAnnotation(mSubInfoList, mIndexWithinList, context,
-                    eSimCardId, simSlotIndex, activeSimSlotIndex);
+                    activeSimSlotIndex);
         }
     }
 
@@ -78,8 +73,7 @@ public class SubscriptionAnnotation {
     @Keep
     @VisibleForTesting
     protected SubscriptionAnnotation(List<SubscriptionInfo> subInfoList, int subInfoIndex,
-            Context context, List<Integer> eSimCardId,
-            List<Integer> simSlotIndex, List<Integer> activeSimSlotIndexList) {
+            Context context, List<Integer> activeSimSlotIndexList) {
         if ((subInfoIndex < 0) || (subInfoIndex >= subInfoList.size())) {
             return;
         }
@@ -88,7 +82,6 @@ public class SubscriptionAnnotation {
             return;
         }
 
-        mOrderWithinList = subInfoIndex;
         mType = mSubInfo.isEmbedded() ? TYPE_ESIM : TYPE_PSIM;
         mIsExisted = true;
         if (mType == TYPE_ESIM) {
@@ -104,12 +97,6 @@ public class SubscriptionAnnotation {
         mIsAllowToDisplay = isDisplayAllowed(context);
     }
 
-    // the index provided during construction of Builder
-    @Keep
-    public int getOrderingInList() {
-        return mOrderWithinList;
-    }
-
     // type of subscription
     @Keep
     public int getType() {
@@ -141,12 +128,6 @@ public class SubscriptionAnnotation {
                 mSubInfo.getSubscriptionId();
     }
 
-    // the grouping UUID
-    @Keep
-    public ParcelUuid getGroupUuid() {
-        return (mSubInfo == null) ? null : mSubInfo.getGroupUuid();
-    }
-
     // the SubscriptionInfo
     @Keep
     public SubscriptionInfo getSubInfo() {

From 8b2305acd405244459b617e43035a16447f75322 Mon Sep 17 00:00:00 2001
From: songferngwang <songferngwang@google.com>
Date: Mon, 6 May 2024 07:18:13 +0000
Subject: [PATCH 09/21] Add the OtherSection for NetworkCellularGroupProvider

Bug: 338914255
Test: Verified the SIMs UI
Change-Id: I49d5e4126e43054b5d147de15d35805d1e445c38
---
 .../network/MobileNetworkListFragment.kt      |  2 +-
 .../settings/spa/SettingsSpaEnvironment.kt    |  2 +-
 .../network/NetworkCellularGroupProvider.kt   | 71 +++++++++----------
 3 files changed, 34 insertions(+), 41 deletions(-)

diff --git a/src/com/android/settings/network/MobileNetworkListFragment.kt b/src/com/android/settings/network/MobileNetworkListFragment.kt
index e7228666da7..eb0d16cef09 100644
--- a/src/com/android/settings/network/MobileNetworkListFragment.kt
+++ b/src/com/android/settings/network/MobileNetworkListFragment.kt
@@ -47,7 +47,7 @@ class MobileNetworkListFragment : DashboardFragment() {
         super.onCreate(icicle)
 
         if (Flags.isDualSimOnboardingEnabled()) {
-            context?.startSpaActivity(NetworkCellularGroupProvider.name);
+            context?.startSpaActivity(NetworkCellularGroupProvider.fileName)
             finish()
         }
     }
diff --git a/src/com/android/settings/spa/SettingsSpaEnvironment.kt b/src/com/android/settings/spa/SettingsSpaEnvironment.kt
index bcac8d50000..5dbc8dc7099 100644
--- a/src/com/android/settings/spa/SettingsSpaEnvironment.kt
+++ b/src/com/android/settings/spa/SettingsSpaEnvironment.kt
@@ -118,7 +118,7 @@ open class SettingsSpaEnvironment(context: Context) : SpaEnvironment(context) {
         ApnEditPageProvider,
         SimOnboardingPageProvider,
         BatteryOptimizationModeAppListPageProvider,
-        NetworkCellularGroupProvider,
+        NetworkCellularGroupProvider(),
         WifiPrivacyPageProvider,
     )
 
diff --git a/src/com/android/settings/spa/network/NetworkCellularGroupProvider.kt b/src/com/android/settings/spa/network/NetworkCellularGroupProvider.kt
index 640ad7a5dd6..7b7c85d23d6 100644
--- a/src/com/android/settings/spa/network/NetworkCellularGroupProvider.kt
+++ b/src/com/android/settings/spa/network/NetworkCellularGroupProvider.kt
@@ -75,8 +75,8 @@ import kotlinx.coroutines.withContext
 /**
  * Showing the sim onboarding which is the process flow of sim switching on.
  */
-object NetworkCellularGroupProvider : SettingsPageProvider {
-    override val name = "NetworkCellularGroupProvider"
+open class NetworkCellularGroupProvider : SettingsPageProvider {
+    override val name = fileName
 
     private val owner = createSettingsPage()
 
@@ -85,7 +85,7 @@ object NetworkCellularGroupProvider : SettingsPageProvider {
     var defaultDataSubId: Int = SubscriptionManager.INVALID_SUBSCRIPTION_ID
     var nonDds: Int = SubscriptionManager.INVALID_SUBSCRIPTION_ID
 
-    fun buildInjectEntry() = SettingsEntryBuilder.createInject(owner = owner)
+    open fun buildInjectEntry() = SettingsEntryBuilder.createInject(owner = owner)
             .setUiLayoutFn {
                 // never using
                 Preference(object : PreferenceModel {
@@ -123,13 +123,26 @@ object NetworkCellularGroupProvider : SettingsPageProvider {
             nonDdsRemember.intValue = nonDds
         }
 
-        PageImpl(
-            subscriptionViewModel.selectableSubscriptionInfoListFlow,
-            callsSelectedId,
-            textsSelectedId,
-            mobileDataSelectedId,
-            nonDdsRemember
-        )
+        val selectableSubscriptionInfoList by subscriptionViewModel
+                .selectableSubscriptionInfoListFlow
+                .collectAsStateWithLifecycle(initialValue = emptyList())
+
+        val stringSims = stringResource(R.string.provider_network_settings_title)
+        RegularScaffold(title = stringSims) {
+            SimsSection(selectableSubscriptionInfoList)
+            MobileDataSectionImpl(mobileDataSelectedId,
+                nonDdsRemember,
+            )
+
+            PrimarySimSectionImpl(
+                subscriptionViewModel.selectableSubscriptionInfoListFlow,
+                callsSelectedId,
+                textsSelectedId,
+                mobileDataSelectedId,
+            )
+
+            OtherSection()
+        }
     }
 
     private fun allOfFlows(context: Context,
@@ -139,7 +152,7 @@ object NetworkCellularGroupProvider : SettingsPageProvider {
                     context.defaultVoiceSubscriptionFlow(),
                     context.defaultSmsSubscriptionFlow(),
                     context.defaultDefaultDataSubscriptionFlow(),
-                    NetworkCellularGroupProvider::refreshUiStates,
+                    this::refreshUiStates,
             ).flowOn(Dispatchers.Default)
 
     private fun refreshUiStates(
@@ -164,32 +177,12 @@ object NetworkCellularGroupProvider : SettingsPageProvider {
 
         Log.d(name, "defaultDataSubId: $defaultDataSubId, nonDds: $nonDds")
     }
-}
-
-@Composable
-fun PageImpl(
-    selectableSubscriptionInfoListFlow: StateFlow<List<SubscriptionInfo>>,
-    defaultVoiceSubId: MutableIntState,
-    defaultSmsSubId: MutableIntState,
-    defaultDataSubId: MutableIntState,
-    nonDds: MutableIntState,
-) {
-    val selectableSubscriptionInfoList by selectableSubscriptionInfoListFlow
-        .collectAsStateWithLifecycle(initialValue = emptyList())
-
-    val stringSims = stringResource(R.string.provider_network_settings_title)
-    RegularScaffold(title = stringSims) {
-        SimsSection(selectableSubscriptionInfoList)
-        MobileDataSectionImpl(defaultDataSubId,
-            nonDds,
-        )
-
-        PrimarySimSectionImpl(
-            selectableSubscriptionInfoListFlow,
-            defaultVoiceSubId,
-            defaultSmsSubId,
-            defaultDataSubId,
-        )
+    @Composable
+    open fun OtherSection(){
+        // Do nothing
+    }
+    companion object {
+        const val fileName = "NetworkCellularGroupProvider"
     }
 }
 
@@ -417,9 +410,9 @@ suspend fun setMobileData(
     enabled: Boolean,
 ): Unit =
     withContext(Dispatchers.Default) {
-        Log.d(NetworkCellularGroupProvider.name, "setMobileData: $enabled")
+        Log.d(NetworkCellularGroupProvider.fileName, "setMobileData: $enabled")
         if (enabled) {
-            Log.d(NetworkCellularGroupProvider.name, "setDefaultData: [$subId]")
+            Log.d(NetworkCellularGroupProvider.fileName, "setDefaultData: [$subId]")
             subscriptionManager?.setDefaultDataSubId(subId)
         }
         TelephonyRepository(context)

From 5f3fc72bd40e4a83def002710bc8e7d93eff1d02 Mon Sep 17 00:00:00 2001
From: songferngwang <songferngwang@google.com>
Date: Mon, 6 May 2024 10:00:42 +0000
Subject: [PATCH 10/21] Show sim onboarding for user when insert sim and no DDS

When the user remove the sim and then insert it back, the DDS may
be -1. If the DDS is -1, then the mobile data can not be turned on.

Show the sim onboarding for user for this case, the user can update
DDS by the flow.

Bug: 336380853
Test: verified UI
Change-Id: I7fd086cb08917f2cac2c1252585687179a2a2f93
---
 .../sim/receivers/SimSlotChangeHandler.java   | 49 +++++++++++++------
 1 file changed, 34 insertions(+), 15 deletions(-)

diff --git a/src/com/android/settings/sim/receivers/SimSlotChangeHandler.java b/src/com/android/settings/sim/receivers/SimSlotChangeHandler.java
index 67cac712059..61d91114119 100644
--- a/src/com/android/settings/sim/receivers/SimSlotChangeHandler.java
+++ b/src/com/android/settings/sim/receivers/SimSlotChangeHandler.java
@@ -31,10 +31,10 @@ import android.telephony.UiccCardInfo;
 import android.telephony.UiccSlotInfo;
 import android.util.Log;
 
+import com.android.settings.flags.Flags;
 import com.android.settings.network.SubscriptionUtil;
 import com.android.settings.network.UiccSlotUtil;
 import com.android.settings.network.UiccSlotsException;
-import com.android.settings.network.telephony.ToggleSubscriptionDialogActivity;
 import com.android.settings.sim.ChooseSimActivity;
 import com.android.settings.sim.DsdsDialogActivity;
 import com.android.settings.sim.SimActivationNotifier;
@@ -86,11 +86,6 @@ public class SimSlotChangeHandler {
             throw new IllegalStateException("Cannot be called from main thread.");
         }
 
-        if (mTelMgr.getActiveModemCount() > 1 && !isMultipleEnabledProfilesSupported()) {
-            Log.i(TAG, "The device is already in DSDS mode and no MEP. Do nothing.");
-            return;
-        }
-
         UiccSlotInfo removableSlotInfo = getRemovableUiccSlotInfo();
         if (removableSlotInfo == null) {
             Log.e(TAG, "Unable to find the removable slot. Do nothing.");
@@ -112,12 +107,25 @@ public class SimSlotChangeHandler {
         // Sets the current removable slot state.
         setRemovableSimSlotState(mContext, currentRemovableSlotState);
 
-        if (mTelMgr.getActiveModemCount() > 1 && isMultipleEnabledProfilesSupported()) {
-            if(!isRemovableSimInserted) {
-                Log.i(TAG, "Removable Sim is not inserted in DSDS mode and MEP. Do nothing.");
+        if (mTelMgr.getActiveModemCount() > 1) {
+            if (!Flags.isDualSimOnboardingEnabled() && !isMultipleEnabledProfilesSupported()) {
+                Log.d(TAG, "The device is already in DSDS mode and no MEP. Do nothing.");
                 return;
             }
-            handleRemovableSimInsertUnderDsdsMep(removableSlotInfo);
+            if (!isRemovableSimInserted) {
+                Log.d(TAG, "Removable Sim is not inserted in DSDS mode. Do nothing.");
+                return;
+            }
+            boolean isDdsInvalidForNewUi = Flags.isDualSimOnboardingEnabled()
+                    && SubscriptionManager.getDefaultDataSubscriptionId()
+                            == SubscriptionManager.INVALID_SUBSCRIPTION_ID;
+            if (isDdsInvalidForNewUi) {
+                handleRemovableSimInsertWhenDsdsAndNoDds();
+            } else if (isMultipleEnabledProfilesSupported()) {
+                handleRemovableSimInsertUnderDsdsMep(removableSlotInfo);
+                return;
+            }
+            Log.d(TAG, "the device is already in DSDS mode and have the DDS. Do nothing.");
             return;
         }
 
@@ -164,8 +172,8 @@ public class SimSlotChangeHandler {
                 Log.i(
                         TAG,
                         "Both removable SIM and eSIM are present. DSDS condition doesn't"
-                            + " satisfied. User inserted pSIM during SUW. Show choose SIM"
-                            + " screen.");
+                                + " satisfied. User inserted pSIM during SUW. Show choose SIM"
+                                + " screen.");
                 startChooseSimActivity(true);
             }
         } else if (removableSlotAction == LAST_USER_ACTION_IN_SUW_REMOVE) {
@@ -232,8 +240,8 @@ public class SimSlotChangeHandler {
         if (groupedEmbeddedSubscriptions.size() == 0 || !removableSlotInfo.getPorts().stream()
                 .findFirst().get().isActive()) {
             Log.i(TAG, "eSIM slot is active or no subscriptions exist. Do nothing."
-                            + " The removableSlotInfo: " + removableSlotInfo
-                            + ", groupedEmbeddedSubscriptions: " + groupedEmbeddedSubscriptions);
+                    + " The removableSlotInfo: " + removableSlotInfo
+                    + ", groupedEmbeddedSubscriptions: " + groupedEmbeddedSubscriptions);
             return;
         }
 
@@ -251,6 +259,17 @@ public class SimSlotChangeHandler {
         startChooseSimActivity(false);
     }
 
+    private void handleRemovableSimInsertWhenDsdsAndNoDds() {
+        List<SubscriptionInfo> subscriptionInfos = getAvailableRemovableSubscription();
+        if (subscriptionInfos.isEmpty()) {
+            Log.e(TAG, "Unable to find the removable subscriptionInfo. Do nothing.");
+            return;
+        }
+        Log.d(TAG, "isDdsInvalidForNewUi and getAvailableRemovableSubscription:"
+                + subscriptionInfos);
+        startSimConfirmDialogActivity(subscriptionInfos.get(0).getSubscriptionId());
+    }
+
     private void handleRemovableSimInsertUnderDsdsMep(UiccSlotInfo removableSlotInfo) {
         Log.i(TAG, "Handle Removable SIM inserted under DSDS+Mep.");
 
@@ -309,7 +328,7 @@ public class SimSlotChangeHandler {
         try {
             // DEVICE_PROVISIONED is 0 if still in setup wizard. 1 if setup completed.
             return Settings.Global.getInt(
-                            context.getContentResolver(), Settings.Global.DEVICE_PROVISIONED)
+                    context.getContentResolver(), Settings.Global.DEVICE_PROVISIONED)
                     == 1;
         } catch (Settings.SettingNotFoundException e) {
             Log.e(TAG, "Cannot get DEVICE_PROVISIONED from the device.", e);

From 3905f1069afeb3cbf548934c594cd3b52d4398f3 Mon Sep 17 00:00:00 2001
From: Mill Chen <millchen@google.com>
Date: Mon, 22 Apr 2024 15:12:55 +0000
Subject: [PATCH 11/21] Redirect NFC Panel to settings page

Flag: com.android.settings.flags.slices_retirement
Bug: 328528962
Test: manual test
adb shell am start -a android.settings.panel.action.NFC

Change-Id: I5232c9e8ed8608d8f27bedbef10c62d7cc12cb8e
---
 .../settings/panel/PanelFeatureProviderImpl.java    | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/panel/PanelFeatureProviderImpl.java b/src/com/android/settings/panel/PanelFeatureProviderImpl.java
index 71711f9228e..8196b9f4e67 100644
--- a/src/com/android/settings/panel/PanelFeatureProviderImpl.java
+++ b/src/com/android/settings/panel/PanelFeatureProviderImpl.java
@@ -22,11 +22,15 @@ import android.os.Bundle;
 import android.provider.Settings;
 import android.util.FeatureFlagUtils;
 
+import androidx.annotation.Nullable;
+
 import com.android.settings.Utils;
+import com.android.settings.flags.Flags;
 
 public class PanelFeatureProviderImpl implements PanelFeatureProvider {
 
     @Override
+    @Nullable
     public PanelContent getPanel(Context context, Bundle bundle) {
         if (context == null) {
             return null;
@@ -46,7 +50,14 @@ public class PanelFeatureProviderImpl implements PanelFeatureProvider {
                 context.sendBroadcast(intent);
                 return null;
             case Settings.Panel.ACTION_NFC:
-                return NfcPanel.create(context);
+                if (Flags.slicesRetirement()) {
+                    Intent nfcIntent = new Intent(Settings.ACTION_NFC_SETTINGS);
+                    nfcIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                    context.startActivity(nfcIntent);
+                    return null;
+                } else {
+                    return NfcPanel.create(context);
+                }
             case Settings.Panel.ACTION_WIFI:
                 return WifiPanel.create(context);
             case Settings.Panel.ACTION_VOLUME:

From a697fba513e7a107fab0236a48dc1df84cbea3d7 Mon Sep 17 00:00:00 2001
From: Pawan Wagh <waghpawan@google.com>
Date: Fri, 3 May 2024 20:20:56 +0000
Subject: [PATCH 12/21] Show persistent notification for page-agnostic mode

When device enters page-agnostic mode using 16KB developer
options, show notification to user using boot receiver and service.
On clicked on notification, show detailed instructions on how to
get back to production mode. Removing OEM carrier unlock allowed
condition.

Bug: 295035851
Bug: 338139755
Bug: 302600682
Test: m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Change-Id: Ib7a57af4c6151d2a8da1ec94130532d10b1679aa
---
 AndroidManifest.xml                           |  22 ++++
 .../development/Enable16KBootReceiver.java    |  44 +++++++
 .../Enable16kPagesPreferenceController.java   |  71 +----------
 .../settings/development/Enable16kUtils.java  | 119 ++++++++++++++++++
 .../PageAgnosticNotificationService.java      | 119 ++++++++++++++++++
 .../PageAgnosticWarningActivity.java          |  72 +++++++++++
 ...nable16kPagesPreferenceControllerTest.java |   4 +-
 7 files changed, 384 insertions(+), 67 deletions(-)
 create mode 100644 src/com/android/settings/development/Enable16KBootReceiver.java
 create mode 100644 src/com/android/settings/development/Enable16kUtils.java
 create mode 100644 src/com/android/settings/development/PageAgnosticNotificationService.java
 create mode 100644 src/com/android/settings/development/PageAgnosticWarningActivity.java

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2325408eb5b..c3c5012e361 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -231,6 +231,28 @@
             </intent-filter>
         </receiver>
 
+        <receiver
+            android:name=".development.Enable16KBootReceiver"
+            android:enabled="true"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+            </intent-filter>
+        </receiver>
+
+        <service
+            android:name=".development.PageAgnosticNotificationService"
+            android:enabled="true"
+            android:exported="false"
+            android:permission="android.permission.POST_NOTIFICATIONS"/>
+
+        <activity android:name=".development.PageAgnosticWarningActivity"
+                  android:enabled="true"
+                  android:launchMode="singleTask"
+                  android:taskAffinity=""
+                  android:excludeFromRecents="true"
+                  android:theme="@*android:style/Theme.DeviceDefault.Dialog.Alert.DayNight"/>
+
         <activity android:name=".SubSettings"
                   android:exported="false"
                   android:theme="@style/Theme.SubSettings"
diff --git a/src/com/android/settings/development/Enable16KBootReceiver.java b/src/com/android/settings/development/Enable16KBootReceiver.java
new file mode 100644
index 00000000000..007a67b9d4f
--- /dev/null
+++ b/src/com/android/settings/development/Enable16KBootReceiver.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.os.UserHandle;
+
+import androidx.annotation.NonNull;
+
+public class Enable16KBootReceiver extends BroadcastReceiver {
+
+    @Override
+    public void onReceive(@NonNull Context context, @NonNull Intent intent) {
+        String action = intent.getAction();
+        if (!Intent.ACTION_BOOT_COMPLETED.equals(action)) {
+            return;
+        }
+
+        // Do nothing if device is not in page-agnostic mode
+        if (!Enable16kUtils.isPageAgnosticModeOn(context)) {
+            return;
+        }
+
+        // start a service to post persistent notification
+        Intent startNotificationIntent = new Intent(context, PageAgnosticNotificationService.class);
+        context.startServiceAsUser(startNotificationIntent, UserHandle.SYSTEM);
+    }
+}
diff --git a/src/com/android/settings/development/Enable16kPagesPreferenceController.java b/src/com/android/settings/development/Enable16kPagesPreferenceController.java
index 7156f0b8963..23a6a22fdb1 100644
--- a/src/com/android/settings/development/Enable16kPagesPreferenceController.java
+++ b/src/com/android/settings/development/Enable16kPagesPreferenceController.java
@@ -23,17 +23,11 @@ import android.os.ParcelFileDescriptor;
 import android.os.PersistableBundle;
 import android.os.PowerManager;
 import android.os.RecoverySystem;
-import android.os.SystemProperties;
 import android.os.SystemUpdateManager;
 import android.os.UpdateEngine;
 import android.os.UpdateEngineStable;
 import android.os.UpdateEngineStableCallback;
-import android.os.UserHandle;
-import android.os.UserManager;
 import android.provider.Settings;
-import android.service.oemlock.OemLockManager;
-import android.system.Os;
-import android.system.OsConstants;
 import android.util.Log;
 import android.widget.LinearLayout;
 import android.widget.ProgressBar;
@@ -59,7 +53,6 @@ import com.google.common.util.concurrent.MoreExecutors;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileNotFoundException;
-import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -80,10 +73,6 @@ public class Enable16kPagesPreferenceController extends DeveloperOptionsPreferen
     private static final String TAG = "Enable16kPages";
     private static final String REBOOT_REASON = "toggle16k";
     private static final String ENABLE_16K_PAGES = "enable_16k_pages";
-
-    @VisibleForTesting
-    static final String DEV_OPTION_PROPERTY = "ro.product.build.16k_page.enabled";
-
     private static final int ENABLE_4K_PAGE_SIZE = 0;
     private static final int ENABLE_16K_PAGE_SIZE = 1;
 
@@ -97,9 +86,6 @@ public class Enable16kPagesPreferenceController extends DeveloperOptionsPreferen
     private static final int OFFSET_TO_FILE_NAME = 30;
     public static final String EXPERIMENTAL_UPDATE_TITLE = "Android 16K Kernel Experimental Update";
 
-    private static final long PAGE_SIZE = Os.sysconf(OsConstants._SC_PAGESIZE);
-    private static final int PAGE_SIZE_16KB = 16 * 1024;
-
     private @NonNull DevelopmentSettingsDashboardFragment mFragment;
     private boolean mEnable16k;
 
@@ -112,12 +98,12 @@ public class Enable16kPagesPreferenceController extends DeveloperOptionsPreferen
             @NonNull Context context, @NonNull DevelopmentSettingsDashboardFragment fragment) {
         super(context);
         this.mFragment = fragment;
-        mEnable16k = (PAGE_SIZE == PAGE_SIZE_16KB);
+        mEnable16k = Enable16kUtils.isUsing16kbPages();
     }
 
     @Override
     public boolean isAvailable() {
-        return SystemProperties.getBoolean(DEV_OPTION_PROPERTY, false);
+        return Enable16kUtils.is16KbToggleAvailable();
     }
 
     @Override
@@ -129,12 +115,12 @@ public class Enable16kPagesPreferenceController extends DeveloperOptionsPreferen
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         mEnable16k = (Boolean) newValue;
         // Prompt user to do oem unlock first
-        if (!isDeviceOEMUnlocked()) {
+        if (!Enable16kUtils.isDeviceOEMUnlocked(mContext)) {
             Enable16KOemUnlockDialog.show(mFragment);
             return false;
         }
 
-        if (isDataf2fs()) {
+        if (!Enable16kUtils.isDataExt4()) {
             EnableExt4WarningDialog.show(mFragment, this);
             return false;
         }
@@ -145,7 +131,7 @@ public class Enable16kPagesPreferenceController extends DeveloperOptionsPreferen
     @Override
     public void updateState(Preference preference) {
         int defaultOptionValue =
-                PAGE_SIZE == PAGE_SIZE_16KB ? ENABLE_16K_PAGE_SIZE : ENABLE_4K_PAGE_SIZE;
+                Enable16kUtils.isUsing16kbPages() ? ENABLE_16K_PAGE_SIZE : ENABLE_4K_PAGE_SIZE;
         final int optionValue =
                 Settings.Global.getInt(
                         mContext.getContentResolver(),
@@ -169,7 +155,7 @@ public class Enable16kPagesPreferenceController extends DeveloperOptionsPreferen
     @Override
     protected void onDeveloperOptionsSwitchEnabled() {
         int currentStatus =
-                PAGE_SIZE == PAGE_SIZE_16KB ? ENABLE_16K_PAGE_SIZE : ENABLE_4K_PAGE_SIZE;
+                Enable16kUtils.isUsing16kbPages() ? ENABLE_16K_PAGE_SIZE : ENABLE_4K_PAGE_SIZE;
         Settings.Global.putInt(
                 mContext.getContentResolver(), Settings.Global.ENABLE_16K_PAGES, currentStatus);
     }
@@ -432,51 +418,6 @@ public class Enable16kPagesPreferenceController extends DeveloperOptionsPreferen
         return infoBundle;
     }
 
-    private boolean isDataf2fs() {
-        try (BufferedReader br = new BufferedReader(new FileReader("/proc/mounts"))) {
-            String line;
-            while ((line = br.readLine()) != null) {
-                final String[] fields = line.split(" ");
-                final String partition = fields[1];
-                final String fsType = fields[2];
-                if (partition.equals("/data") && fsType.equals("f2fs")) {
-                    return true;
-                }
-            }
-        } catch (IOException e) {
-            Log.e(TAG, "Failed to read /proc/mounts");
-            displayToast(mContext.getString(R.string.format_ext4_failure_toast));
-        }
-
-        return false;
-    }
-
-    private boolean isDeviceOEMUnlocked() {
-        // OEM unlock is checked for bootloader, carrier and user. Check all three to ensure
-        // that device is unlocked and it is also allowed by user as well as carrier
-        final OemLockManager oemLockManager = mContext.getSystemService(OemLockManager.class);
-        final UserManager userManager = mContext.getSystemService(UserManager.class);
-        if (oemLockManager == null || userManager == null) {
-            Log.e(TAG, "Required services not found on device to check for OEM unlock state.");
-            return false;
-        }
-
-        // If either of device or carrier is not allowed to unlock, return false
-        if (!oemLockManager.isDeviceOemUnlocked()
-                || !oemLockManager.isOemUnlockAllowedByCarrier()) {
-            Log.e(TAG, "Device is not OEM unlocked or it is not allowed by carrier");
-            return false;
-        }
-
-        final UserHandle userHandle = UserHandle.of(UserHandle.myUserId());
-        if (userManager.hasBaseUserRestriction(UserManager.DISALLOW_FACTORY_RESET, userHandle)) {
-            Log.e(TAG, "Factory reset is not allowed for user.");
-            return false;
-        }
-
-        return true;
-    }
-
     // if BOARD_16K_OTA_MOVE_VENDOR, OTAs will be present on the /vendor partition
     private File getOtaFile() throws FileNotFoundException {
         String otaPath = mEnable16k ? OTA_16K_PATH : OTA_4K_PATH;
diff --git a/src/com/android/settings/development/Enable16kUtils.java b/src/com/android/settings/development/Enable16kUtils.java
new file mode 100644
index 00000000000..7b6ab68bdce
--- /dev/null
+++ b/src/com/android/settings/development/Enable16kUtils.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import android.content.Context;
+import android.os.SystemProperties;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.service.oemlock.OemLockManager;
+import android.system.Os;
+import android.system.OsConstants;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
+
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.io.IOException;
+
+public class Enable16kUtils {
+    private static final long PAGE_SIZE = Os.sysconf(OsConstants._SC_PAGESIZE);
+    private static final int PAGE_SIZE_16KB = 16 * 1024;
+
+    @VisibleForTesting
+    static final String DEV_OPTION_PROPERTY = "ro.product.build.16k_page.enabled";
+
+    private static final String TAG = "Enable16kUtils";
+
+    /**
+     * @param context uses context to retrieve OEM unlock info
+     * @return true if device is OEM unlocked and factory reset is allowed for user.
+     */
+    public static boolean isDeviceOEMUnlocked(@NonNull Context context) {
+        // OEM unlock is checked for bootloader, carrier and user. Check all three to ensure
+        // that device is unlocked and it is also allowed by user as well as carrier
+        final OemLockManager oemLockManager = context.getSystemService(OemLockManager.class);
+        final UserManager userManager = context.getSystemService(UserManager.class);
+        if (oemLockManager == null || userManager == null) {
+            Log.e(TAG, "Required services not found on device to check for OEM unlock state.");
+            return false;
+        }
+
+        // If either of device or carrier is not allowed to unlock, return false
+        if (!oemLockManager.isDeviceOemUnlocked()) {
+            Log.e(TAG, "Device is not OEM unlocked");
+            return false;
+        }
+
+        final UserHandle userHandle = UserHandle.of(UserHandle.myUserId());
+        if (userManager.hasBaseUserRestriction(UserManager.DISALLOW_FACTORY_RESET, userHandle)) {
+            Log.e(TAG, "Factory reset is not allowed for user.");
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * @return true if /data partition is ext4
+     */
+    public static boolean isDataExt4() {
+        try (BufferedReader br = new BufferedReader(new FileReader("/proc/mounts"))) {
+            String line;
+            while ((line = br.readLine()) != null) {
+                Log.i(TAG, line);
+                final String[] fields = line.split(" ");
+                final String partition = fields[1];
+                final String fsType = fields[2];
+                if (partition.equals("/data") && fsType.equals("ext4")) {
+                    return true;
+                }
+            }
+        } catch (IOException e) {
+            Log.e(TAG, "Failed to read /proc/mounts");
+        }
+
+        return false;
+    }
+
+    /**
+     * @return returns true if 16KB developer option is available for the device.
+     */
+    public static boolean is16KbToggleAvailable() {
+        return SystemProperties.getBoolean(DEV_OPTION_PROPERTY, false);
+    }
+
+    /**
+     * 16kB page-agnostic mode requires /data to be ext4, ro.product.build.16k_page.enabled for
+     * device and Device OEM unlocked.
+     *
+     * @param context is needed to query OEM unlock state
+     * @return true if device is in page-agnostic mode.
+     */
+    public static boolean isPageAgnosticModeOn(@NonNull Context context) {
+        return is16KbToggleAvailable() && isDeviceOEMUnlocked(context) && isDataExt4();
+    }
+
+    /**
+     * @return returns true if current page size is 16KB
+     */
+    public static boolean isUsing16kbPages() {
+        return PAGE_SIZE == PAGE_SIZE_16KB;
+    }
+}
diff --git a/src/com/android/settings/development/PageAgnosticNotificationService.java b/src/com/android/settings/development/PageAgnosticNotificationService.java
new file mode 100644
index 00000000000..29bc7767084
--- /dev/null
+++ b/src/com/android/settings/development/PageAgnosticNotificationService.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import android.app.Notification;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.app.Service;
+import android.content.Intent;
+import android.os.IBinder;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.android.settings.R;
+
+public class PageAgnosticNotificationService extends Service {
+
+    private static final String NOTIFICATION_CHANNEL_ID =
+            "com.android.settings.development.PageAgnosticNotificationService";
+    private static final int NOTIFICATION_ID = 1;
+
+    private NotificationManager mNotificationManager;
+
+    @Nullable
+    @Override
+    public IBinder onBind(@NonNull Intent intent) {
+        return null;
+    }
+
+    // create a notification channel to post persistent notification
+    private void createNotificationChannel() {
+        NotificationChannel channel =
+                new NotificationChannel(
+                        NOTIFICATION_CHANNEL_ID,
+                        getString(R.string.page_agnostic_notification_channel_name),
+                        NotificationManager.IMPORTANCE_HIGH);
+        mNotificationManager = getSystemService(NotificationManager.class);
+        if (mNotificationManager != null) {
+            mNotificationManager.createNotificationChannel(channel);
+        }
+    }
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        createNotificationChannel();
+    }
+
+    private Notification buildNotification() {
+        // Get the title and text according to page size
+        boolean isIn16kbMode = Enable16kUtils.isUsing16kbPages();
+        String title =
+                isIn16kbMode
+                        ? getString(R.string.page_agnostic_16k_pages_title)
+                        : getString(R.string.page_agnostic_4k_pages_title);
+        String text =
+                isIn16kbMode
+                        ? getString(R.string.page_agnostic_16k_pages_text_short)
+                        : getString(R.string.page_agnostic_4k_pages_text_short);
+
+        Intent notifyIntent = new Intent(this, PageAgnosticWarningActivity.class);
+        // Set the Activity to start in a new, empty task.
+        notifyIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+
+        // Create the PendingIntent.
+        PendingIntent notifyPendingIntent =
+                PendingIntent.getActivity(
+                        this,
+                        0,
+                        notifyIntent,
+                        PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
+
+        Notification.Action action =
+                new Notification.Action.Builder(
+                                R.drawable.empty_icon,
+                                getString(R.string.page_agnostic_notification_action),
+                                notifyPendingIntent)
+                        .build();
+
+        Notification.Builder builder =
+                new Notification.Builder(this, NOTIFICATION_CHANNEL_ID)
+                        .setContentTitle(title)
+                        .setContentText(text)
+                        .setOngoing(true)
+                        .setSmallIcon(R.drawable.ic_settings_24dp)
+                        .setStyle(new Notification.BigTextStyle().bigText(text))
+                        .setContentIntent(notifyPendingIntent)
+                        .addAction(action);
+
+        return builder.build();
+    }
+
+    @Override
+    public int onStartCommand(@Nullable Intent intent, int flags, int startId) {
+        Notification notification = buildNotification();
+        if (mNotificationManager != null) {
+            mNotificationManager.notify(NOTIFICATION_ID, notification);
+        }
+
+        // When clicked on notification, show dialog with full text
+        return Service.START_NOT_STICKY;
+    }
+}
diff --git a/src/com/android/settings/development/PageAgnosticWarningActivity.java b/src/com/android/settings/development/PageAgnosticWarningActivity.java
new file mode 100644
index 00000000000..8fd6074b8c5
--- /dev/null
+++ b/src/com/android/settings/development/PageAgnosticWarningActivity.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.text.Html;
+import android.text.method.LinkMovementMethod;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+
+import com.android.settings.R;
+
+public class PageAgnosticWarningActivity extends Activity {
+
+    @Override
+    protected void onCreate(Bundle bundle) {
+        super.onCreate(bundle);
+
+        String title =
+                Enable16kUtils.isUsing16kbPages()
+                        ? getString(R.string.page_agnostic_16k_pages_title)
+                        : getString(R.string.page_agnostic_4k_pages_title);
+
+        String warningText =
+                Enable16kUtils.isUsing16kbPages()
+                        ? getString(R.string.page_agnostic_16k_pages_text)
+                        : getString(R.string.page_agnostic_4k_pages_text);
+        showWarningDialog(title, warningText);
+    }
+
+    // Create warning dialog and make links clickable
+    private void showWarningDialog(String title, String warningText) {
+
+        AlertDialog dialog =
+                new AlertDialog.Builder(this)
+                        .setTitle(title)
+                        .setMessage(Html.fromHtml(warningText, Html.FROM_HTML_MODE_COMPACT))
+                        .setCancelable(false)
+                        .setPositiveButton(
+                                android.R.string.ok,
+                                new DialogInterface.OnClickListener() {
+                                    public void onClick(
+                                            @NonNull DialogInterface dialog, int which) {
+                                        dialog.cancel();
+                                        finish();
+                                    }
+                                })
+                        .create();
+        dialog.show();
+
+        ((TextView) dialog.findViewById(android.R.id.message))
+                .setMovementMethod(LinkMovementMethod.getInstance());
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/Enable16kPagesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/Enable16kPagesPreferenceControllerTest.java
index 0c9906cdf72..e27e3a2205e 100644
--- a/tests/robotests/src/com/android/settings/development/Enable16kPagesPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/Enable16kPagesPreferenceControllerTest.java
@@ -62,13 +62,13 @@ public class Enable16kPagesPreferenceControllerTest {
 
     @Test
     public void onSystemPropertyDisabled_shouldDisablePreference() {
-        SystemProperties.set(Enable16kPagesPreferenceController.DEV_OPTION_PROPERTY, "false");
+        SystemProperties.set(Enable16kUtils.DEV_OPTION_PROPERTY, "false");
         assertThat(mController.isAvailable()).isEqualTo(false);
     }
 
     @Test
     public void onSystemPropertyEnabled_shouldEnablePreference() {
-        SystemProperties.set(Enable16kPagesPreferenceController.DEV_OPTION_PROPERTY, "true");
+        SystemProperties.set(Enable16kUtils.DEV_OPTION_PROPERTY, "true");
         assertThat(mController.isAvailable()).isEqualTo(true);
     }
 

From b98a8acf9bc4f53ecc2c51acc941cdcf2b6670ff Mon Sep 17 00:00:00 2001
From: Pawan Wagh <waghpawan@google.com>
Date: Fri, 3 May 2024 23:02:36 +0000
Subject: [PATCH 13/21] Turn off automatic updates in page-agnostic mode

Update global settings to disable updates in page-agnostic mode

Test: m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Bug: 295035851
Bug: 302391134
Change-Id: I170bb3ffd50a08a1399bffcde23e5f111d9a5a1d
---
 .../PageAgnosticNotificationService.java      | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/development/PageAgnosticNotificationService.java b/src/com/android/settings/development/PageAgnosticNotificationService.java
index 29bc7767084..bce1dd9e106 100644
--- a/src/com/android/settings/development/PageAgnosticNotificationService.java
+++ b/src/com/android/settings/development/PageAgnosticNotificationService.java
@@ -23,6 +23,7 @@ import android.app.PendingIntent;
 import android.app.Service;
 import android.content.Intent;
 import android.os.IBinder;
+import android.provider.Settings;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -35,6 +36,8 @@ public class PageAgnosticNotificationService extends Service {
             "com.android.settings.development.PageAgnosticNotificationService";
     private static final int NOTIFICATION_ID = 1;
 
+    static final int DISABLE_UPDATES_SETTING = 1;
+
     private NotificationManager mNotificationManager;
 
     @Nullable
@@ -106,6 +109,22 @@ public class PageAgnosticNotificationService extends Service {
         return builder.build();
     }
 
+    private void disableAutomaticUpdates() {
+        final int currentState =
+                Settings.Global.getInt(
+                        getApplicationContext().getContentResolver(),
+                        Settings.Global.OTA_DISABLE_AUTOMATIC_UPDATE,
+                        0 /* default */);
+        // 0 means enabled, 1 means disabled
+        if (currentState == 0) {
+            // automatic updates are enabled, disable them
+            Settings.Global.putInt(
+                    getApplicationContext().getContentResolver(),
+                    Settings.Global.OTA_DISABLE_AUTOMATIC_UPDATE,
+                    DISABLE_UPDATES_SETTING);
+        }
+    }
+
     @Override
     public int onStartCommand(@Nullable Intent intent, int flags, int startId) {
         Notification notification = buildNotification();
@@ -113,7 +132,8 @@ public class PageAgnosticNotificationService extends Service {
             mNotificationManager.notify(NOTIFICATION_ID, notification);
         }
 
-        // When clicked on notification, show dialog with full text
+        // No updates should be allowed in page-agnostic mode
+        disableAutomaticUpdates();
         return Service.START_NOT_STICKY;
     }
 }

From 4959e0fba0d0692893d24568add9b58d2bb6ad49 Mon Sep 17 00:00:00 2001
From: Chun-Ku Lin <chunkulin@google.com>
Date: Tue, 7 May 2024 01:07:25 +0000
Subject: [PATCH 14/21] Add null pointer check to prevent crash

Bug: 338082036
Test: atest EditShortcutsPreferenceFragmentTest
Flag: EXEMPT bugfix low risk
Change-Id: I70f00eb2912e4ddd6efbd298ae6b6885f28160de
---
 .../shortcuts/EditShortcutsPreferenceFragment.java        | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/com/android/settings/accessibility/shortcuts/EditShortcutsPreferenceFragment.java b/src/com/android/settings/accessibility/shortcuts/EditShortcutsPreferenceFragment.java
index a4eaf37939b..9e1290ec1f0 100644
--- a/src/com/android/settings/accessibility/shortcuts/EditShortcutsPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/shortcuts/EditShortcutsPreferenceFragment.java
@@ -182,8 +182,10 @@ public class EditShortcutsPreferenceFragment extends DashboardFragment {
                     refreshPreferenceController(QuickSettingsShortcutOptionController.class);
                 }
 
-                PreferredShortcuts.updatePreferredShortcutsFromSettings(
-                        getContext(), mShortcutTargets);
+                if (getContext() != null) {
+                    PreferredShortcuts.updatePreferredShortcutsFromSettings(
+                            getContext(), mShortcutTargets);
+                }
             }
         };
 
@@ -388,7 +390,7 @@ public class EditShortcutsPreferenceFragment extends DashboardFragment {
     private void refreshPreferenceController(
             Class<? extends AbstractPreferenceController> controllerClass) {
         AbstractPreferenceController controller = use(controllerClass);
-        if (controller != null) {
+        if (controller != null && getPreferenceScreen() != null) {
             controller.displayPreference(getPreferenceScreen());
             if (!TextUtils.isEmpty(controller.getPreferenceKey())) {
                 controller.updateState(findPreference(controller.getPreferenceKey()));

From 49d1fa359d5792c0890de2132651d04f9575e0f9 Mon Sep 17 00:00:00 2001
From: Chun-Ku Lin <chunkulin@google.com>
Date: Tue, 7 May 2024 02:29:25 +0000
Subject: [PATCH 15/21] Use system_ext as the container of the aconfig flags in
 Settings

Bug: 332723689
Test: Run `adb shell printflags` and verify the flags defined in aconfig
folders show up
Flags: EXEMPT aconfig file only changes

Change-Id: If0b497117c303a0bd0b366819c90bd11b41232c3
---
 aconfig/Android.bp                                        | 8 ++++----
 aconfig/accessibility/accessibility_flags.aconfig         | 2 +-
 .../development/settings_core_flag_declarations.aconfig   | 2 +-
 .../factory_reset/factory_reset_flag_declarations.aconfig | 2 +-
 .../media_drm/settings_mediadrm_flag_declarations.aconfig | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/aconfig/Android.bp b/aconfig/Android.bp
index f7b48818093..549ccc712e7 100644
--- a/aconfig/Android.bp
+++ b/aconfig/Android.bp
@@ -20,7 +20,7 @@ java_aconfig_library {
 aconfig_declarations {
     name: "factory_reset_flags",
     package: "com.android.settings.factory_reset",
-    container: "system",
+    container: "system_ext",
     srcs: ["factory_reset/*.aconfig"],
 }
 
@@ -32,7 +32,7 @@ java_aconfig_library {
 aconfig_declarations {
     name: "media_drm_flags",
     package: "com.android.settings.media_drm",
-    container: "system",
+    container: "system_ext",
     srcs: ["media_drm/*.aconfig"],
 }
 
@@ -44,7 +44,7 @@ java_aconfig_library {
 aconfig_declarations {
     name: "accessibility_flags",
     package: "com.android.settings.accessibility",
-    container: "system",
+    container: "system_ext",
     srcs: ["accessibility/*.aconfig"],
 }
 
@@ -56,7 +56,7 @@ java_aconfig_library {
 aconfig_declarations {
     name: "development_settings_flags",
     package: "com.android.settings.development",
-    container: "system",
+    container: "system_ext",
     srcs: [
         "development/**/*.aconfig",
     ],
diff --git a/aconfig/accessibility/accessibility_flags.aconfig b/aconfig/accessibility/accessibility_flags.aconfig
index 691999005cb..c9e1ece1b3a 100644
--- a/aconfig/accessibility/accessibility_flags.aconfig
+++ b/aconfig/accessibility/accessibility_flags.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.settings.accessibility"
-container: "system"
+container: "system_ext"
 
 # NOTE: Keep alphabetized to help limit merge conflicts from multiple simultaneous editors.
 
diff --git a/aconfig/development/settings_core_flag_declarations.aconfig b/aconfig/development/settings_core_flag_declarations.aconfig
index fec67f6b782..8a6b055a55c 100644
--- a/aconfig/development/settings_core_flag_declarations.aconfig
+++ b/aconfig/development/settings_core_flag_declarations.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.settings.development"
-container: "system"
+container: "system_ext"
 
 flag {
   name: "a2dp_offload_codec_extensibility_settings"
diff --git a/aconfig/factory_reset/factory_reset_flag_declarations.aconfig b/aconfig/factory_reset/factory_reset_flag_declarations.aconfig
index 7feebf54dcc..dc7d8d4e42a 100644
--- a/aconfig/factory_reset/factory_reset_flag_declarations.aconfig
+++ b/aconfig/factory_reset/factory_reset_flag_declarations.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.settings.factory_reset"
-container: "system"
+container: "system_ext"
 
 flag {
   name: "enable_factory_reset_wizard"
diff --git a/aconfig/media_drm/settings_mediadrm_flag_declarations.aconfig b/aconfig/media_drm/settings_mediadrm_flag_declarations.aconfig
index 4697a11db9c..10579ebd3dd 100644
--- a/aconfig/media_drm/settings_mediadrm_flag_declarations.aconfig
+++ b/aconfig/media_drm/settings_mediadrm_flag_declarations.aconfig
@@ -1,9 +1,9 @@
 package: "com.android.settings.media_drm"
-container: "system"
+container: "system_ext"
 
 flag {
     name: "force_l3_enabled"
     namespace: "media_drm"
     description: "Feature flag of forcing L3"
     bug: "301669353"
-}
\ No newline at end of file
+}

From e4b9c69442e796105dcbec2b6f13252969e9d2bb Mon Sep 17 00:00:00 2001
From: Pawan Wagh <waghpawan@google.com>
Date: Sat, 4 May 2024 00:14:20 +0000
Subject: [PATCH 16/21] Disallow turning off developer options in page-agnostic
 mode

When device is in page-agnostic mode, it would be OEM unlocked and
filesystem will be different than production. Don't allow to turn
off developer options in that state.

Bug: 329657279
Bug: 295035851
Test: m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Change-Id: I9b8a9dbaf8192bb3758c53501450eb45e2fe8d9c
---
 .../DevelopmentSettingsDashboardFragment.java          |  9 +++++++++
 .../android/settings/development/Enable16kUtils.java   | 10 ++++++++++
 2 files changed, 19 insertions(+)

diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
index 35b011a0a61..4038f4d8f0e 100644
--- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
+++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
@@ -577,6 +577,15 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
         if (Utils.isMonkeyRunning()) {
             return;
         }
+
+        // Disabling developer options in page-agnostic mode isn't supported as device isn't in
+        // production state
+        if (Enable16kUtils.isPageAgnosticModeOn(getContext())) {
+            Enable16kUtils.showPageAgnosticWarning(getContext());
+            onDisableDevelopmentOptionsRejected();
+            return;
+        }
+
         DevelopmentSettingsEnabler.setDevelopmentSettingsEnabled(getContext(), false);
         final SystemPropPoker poker = SystemPropPoker.getInstance();
         poker.blockPokes();
diff --git a/src/com/android/settings/development/Enable16kUtils.java b/src/com/android/settings/development/Enable16kUtils.java
index 7b6ab68bdce..00b7ee9fd3b 100644
--- a/src/com/android/settings/development/Enable16kUtils.java
+++ b/src/com/android/settings/development/Enable16kUtils.java
@@ -17,6 +17,7 @@
 package com.android.settings.development;
 
 import android.content.Context;
+import android.content.Intent;
 import android.os.SystemProperties;
 import android.os.UserHandle;
 import android.os.UserManager;
@@ -116,4 +117,13 @@ public class Enable16kUtils {
     public static boolean isUsing16kbPages() {
         return PAGE_SIZE == PAGE_SIZE_16KB;
     }
+
+    /**
+     * show page-agnostic mode warning dialog to user
+     * @param context to start activity
+     */
+    public static void showPageAgnosticWarning(@NonNull Context context) {
+        Intent intent = new Intent(context, PageAgnosticWarningActivity.class);
+        context.startActivityAsUser(intent, UserHandle.SYSTEM);
+    }
 }

From 03fdbbe50430abc72ea716728fbe88035a7d3582 Mon Sep 17 00:00:00 2001
From: mxyyiyi <mxyyiyi@google.com>
Date: Tue, 7 May 2024 13:25:36 +0800
Subject: [PATCH 17/21] Use material color res from settingslib for battery
 tips card

Settings Anomaly Card
[Before-Dark] 	https://screenshot.googleplex.com/5PZC6mbWjqunvuv
[Before-Light] 	https://screenshot.googleplex.com/7eoF6yLX6t3JeHz
[After-Dark]  	https://screenshot.googleplex.com/5j4mQFDXjkVcxHs
[After-Light] 	https://screenshot.googleplex.com/5ySzfzft9293GXb

App Anomaly Card
[Before-Dark] 	https://screenshot.googleplex.com/JKkcqCiAKxkPZds
[Before-Light] 	https://screenshot.googleplex.com/ASB4CnDhPjsQohH
[After-Dark]  	https://screenshot.googleplex.com/5y3LVvng54vndi9
[After-Light] 	https://screenshot.googleplex.com/NCJeuViCtDcNhiV

Bug: 339130556
Test: atest SettingsRoboTests:com.android.settings.fuelgauge.batteryusage
Change-Id: I29d68713c14068fd9961082a148dd02ad38289a6
---
 res/color/color_accent_selector.xml          | 2 +-
 res/drawable/battery_hints_chip_bg.xml       | 3 +--
 res/drawable/battery_tips_all_rounded_bg.xml | 2 +-
 res/layout/battery_tips_card.xml             | 4 ++--
 res/layout/power_anomaly_hints.xml           | 2 +-
 res/values-night/colors.xml                  | 1 -
 res/values/colors.xml                        | 3 +--
 7 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/res/color/color_accent_selector.xml b/res/color/color_accent_selector.xml
index 3ccb64068ec..2b4a6b84f60 100644
--- a/res/color/color_accent_selector.xml
+++ b/res/color/color_accent_selector.xml
@@ -14,5 +14,5 @@
      limitations under the License.
 -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?android:attr/colorAccent"/>
+    <item android:color="@color/settingslib_materialColorPrimary"/>
 </selector>
diff --git a/res/drawable/battery_hints_chip_bg.xml b/res/drawable/battery_hints_chip_bg.xml
index c2b662c2719..e025419e6c0 100644
--- a/res/drawable/battery_hints_chip_bg.xml
+++ b/res/drawable/battery_hints_chip_bg.xml
@@ -16,8 +16,7 @@
   -->
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
     android:shape="rectangle">
-    <solid android:color="?androidprv:attr/materialColorPrimaryContainer" />
+    <solid android:color="@color/settingslib_materialColorPrimaryContainer" />
     <corners android:radius="@dimen/battery_hints_chip_corner_radius" />
 </shape>
\ No newline at end of file
diff --git a/res/drawable/battery_tips_all_rounded_bg.xml b/res/drawable/battery_tips_all_rounded_bg.xml
index 4f61f544074..ba164b97023 100644
--- a/res/drawable/battery_tips_all_rounded_bg.xml
+++ b/res/drawable/battery_tips_all_rounded_bg.xml
@@ -17,6 +17,6 @@
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="@color/settingslib_dialog_background" />
+    <solid android:color="@color/settingslib_materialColorSurfaceBright" />
     <corners android:radius="@dimen/battery_tips_card_corner_radius_normal" />
 </shape>
\ No newline at end of file
diff --git a/res/layout/battery_tips_card.xml b/res/layout/battery_tips_card.xml
index 1a121ba34ea..18c326f8b85 100644
--- a/res/layout/battery_tips_card.xml
+++ b/res/layout/battery_tips_card.xml
@@ -25,7 +25,7 @@
         android:layout_marginTop="8dp"
         android:textAlignment="viewStart"
         android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
-        android:textColor="?android:attr/textColorPrimary" />
+        android:textColor="@color/settingslib_materialColorOnSurface" />
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -55,7 +55,7 @@
             android:paddingHorizontal="16dp"
             android:text="@string/battery_tips_card_action_button"
             android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle2"
-            android:textColor="@color/power_anomaly_primary_button_text_color"
+            android:textColor="@color/settingslib_materialColorOnPrimary"
             app:backgroundTint="@color/color_accent_selector" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/power_anomaly_hints.xml b/res/layout/power_anomaly_hints.xml
index 3781046e626..7ee419e4dcb 100644
--- a/res/layout/power_anomaly_hints.xml
+++ b/res/layout/power_anomaly_hints.xml
@@ -38,6 +38,6 @@
         android:paddingHorizontal="8dp"
         android:textAlignment="viewStart"
         android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle2"
-        android:textColor="?androidprv:attr/materialColorOnSurface"/>
+        android:textColor="@color/settingslib_materialColorOnSurface"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml
index a27fbaacefc..fb73e6ecc44 100644
--- a/res/values-night/colors.xml
+++ b/res/values-night/colors.xml
@@ -58,7 +58,6 @@
 
     <!-- Power anomaly color for icons, button and text -->
     <color name="power_anomaly_app_warning_hint_color">#FDD663</color>
-    <color name="power_anomaly_primary_button_text_color">#2E3300</color>
 
     <!-- UDFPS colors -->
     <color name="udfps_enroll_icon">#7DA7F1</color>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 03225a5c447..6d925261979 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -171,9 +171,8 @@
     <!-- Icon tint color for battery usage system icon -->
     <color name="battery_usage_system_icon_color">?android:attr/textColorPrimary</color>
 
-    <!-- Power anomaly color for icons, button and text -->
+    <!-- Power anomaly color for icons, button -->
     <color name="power_anomaly_app_warning_hint_color">#D56E0C</color>
-    <color name="power_anomaly_primary_button_text_color">#FFFFFF</color>
 
     <!-- UDFPS colors -->
     <color name="udfps_enroll_icon">#699FF3</color>

From 7b77729db6b5b9b350cebffb15ac8ecf2242ce9c Mon Sep 17 00:00:00 2001
From: Yiling Chuang <emilychuang@google.com>
Date: Mon, 6 May 2024 03:57:22 +0000
Subject: [PATCH 18/21] Update strings for charging optimization mode.

Update the battery settings summary and the charging string on the Battery settings page if charging optimization mode is applied.

Bug: 329020954
Test: atest SettingsRoboTests
Change-Id: Ie906a010d70bcef7fafe235f0287b289ea934705
---
 .../BatteryHeaderPreferenceController.java    | 28 ++++---
 .../settings/fuelgauge/BatteryInfo.java       | 39 +++++++--
 .../BatterySettingsFeatureProvider.java       | 16 ++++
 .../BatterySettingsFeatureProviderImpl.java   | 22 +++++
 .../settings/fuelgauge/BatteryInfoTest.java   | 80 +++++++++++++++++++
 ...atterySettingsFeatureProviderImplTest.java | 16 ++++
 6 files changed, 182 insertions(+), 19 deletions(-)

diff --git a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
index 5872e814b4d..06c3ceeca14 100644
--- a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
@@ -78,6 +78,21 @@ public class BatteryHeaderPreferenceController extends BasePreferenceController
     }
 
     private CharSequence generateLabel(BatteryInfo info) {
+        if (Utils.containsIncompatibleChargers(mContext, TAG)) {
+            return mContext.getString(
+                    com.android.settingslib.R.string.battery_info_status_not_charging);
+        }
+        if (BatteryUtils.isBatteryDefenderOn(info)) {
+            return mContext.getString(
+                    com.android.settingslib.R.string.battery_info_status_charging_on_hold);
+        }
+        if (info.remainingLabel == null
+                || info.batteryStatus == BatteryManager.BATTERY_STATUS_NOT_CHARGING) {
+            return info.statusLabel;
+        }
+        if (mBatterySettingsFeatureProvider.isChargingOptimizationMode(mContext)) {
+            return info.remainingLabel;
+        }
         if (info.pluggedStatus == BatteryManager.BATTERY_PLUGGED_WIRELESS) {
             final CharSequence wirelessChargingLabel =
                     mBatterySettingsFeatureProvider.getWirelessChargingLabel(mContext, info);
@@ -85,18 +100,7 @@ public class BatteryHeaderPreferenceController extends BasePreferenceController
                 return wirelessChargingLabel;
             }
         }
-
-        if (Utils.containsIncompatibleChargers(mContext, TAG)) {
-            return mContext.getString(
-                    com.android.settingslib.R.string.battery_info_status_not_charging);
-        } else if (BatteryUtils.isBatteryDefenderOn(info)) {
-            return mContext.getString(
-                    com.android.settingslib.R.string.battery_info_status_charging_on_hold);
-        } else if (info.remainingLabel == null
-                || info.batteryStatus == BatteryManager.BATTERY_STATUS_NOT_CHARGING) {
-            // Present status only if no remaining time or status anomalous
-            return info.statusLabel;
-        } else if (info.statusLabel != null && !info.discharging) {
+        if (info.statusLabel != null && !info.discharging) {
             // Charging state
             if (com.android.settingslib.fuelgauge.BatteryUtils.isChargingStringV2Enabled()) {
                 return info.isFastCharging
diff --git a/src/com/android/settings/fuelgauge/BatteryInfo.java b/src/com/android/settings/fuelgauge/BatteryInfo.java
index 66ce8b82d4d..c333a33d67f 100644
--- a/src/com/android/settings/fuelgauge/BatteryInfo.java
+++ b/src/com/android/settings/fuelgauge/BatteryInfo.java
@@ -319,6 +319,12 @@ public class BatteryInfo {
         info.isFastCharging =
                 BatteryStatus.getChargingSpeed(context, batteryBroadcast)
                         == BatteryStatus.CHARGING_FAST;
+        if (info.isBatteryDefender) {
+            info.isBatteryDefender =
+                    FeatureFactory.getFeatureFactory()
+                            .getPowerUsageFeatureProvider()
+                            .isBatteryDefend(info);
+        }
         if (!info.mCharging) {
             updateBatteryInfoDischarging(context, shortString, estimate, info);
         } else {
@@ -388,9 +394,10 @@ public class BatteryInfo {
                         && status != BatteryManager.BATTERY_STATUS_FULL
                         && dockDefenderMode == BatteryUtils.DockDefenderMode.DISABLED)
                 || dockDefenderMode == BatteryUtils.DockDefenderMode.TEMPORARILY_BYPASSED) {
+            final BatterySettingsFeatureProvider featureProvider =
+                    FeatureFactory.getFeatureFactory().getBatterySettingsFeatureProvider();
             // Battery is charging to full
             info.remainingTimeUs = PowerUtil.convertMsToUs(chargeTimeMs);
-
             int resId = getChargingDurationResId(info.isFastCharging);
             info.remainingLabel =
                     chargeTimeMs <= 0
@@ -400,7 +407,8 @@ public class BatteryInfo {
                                     chargeTimeMs,
                                     info.isFastCharging,
                                     info.pluggedStatus,
-                                    currentTimeMs);
+                                    currentTimeMs,
+                                    featureProvider);
 
             info.chargeLabel =
                     chargeTimeMs <= 0
@@ -411,7 +419,8 @@ public class BatteryInfo {
                                     info.batteryPercentString,
                                     chargeTimeMs,
                                     info.isFastCharging,
-                                    currentTimeMs);
+                                    currentTimeMs,
+                                    featureProvider);
         } else if (dockDefenderMode == BatteryUtils.DockDefenderMode.FUTURE_BYPASS) {
             // Dock defender will be triggered in the future, charging will be optimized.
             info.chargeLabel =
@@ -436,10 +445,17 @@ public class BatteryInfo {
             long chargeRemainingTimeMs,
             boolean isFastCharging,
             int pluggedStatus,
-            long currentTimeMs) {
+            long currentTimeMs,
+            BatterySettingsFeatureProvider featureProvider) {
+        if (featureProvider.isChargingOptimizationMode(context)) {
+            final CharSequence chargingOptimizationRemainingLabel =
+                    featureProvider.getChargingOptimizationRemainingLabel(
+                            context, chargeRemainingTimeMs, currentTimeMs);
+            if (chargingOptimizationRemainingLabel != null) {
+                return chargingOptimizationRemainingLabel;
+            }
+        }
         if (pluggedStatus == BatteryManager.BATTERY_PLUGGED_WIRELESS) {
-            BatterySettingsFeatureProvider featureProvider =
-                    FeatureFactory.getFeatureFactory().getBatterySettingsFeatureProvider();
             final CharSequence wirelessChargingRemainingLabel =
                     featureProvider.getWirelessChargingRemainingLabel(
                             context, chargeRemainingTimeMs, currentTimeMs);
@@ -472,7 +488,16 @@ public class BatteryInfo {
             String batteryPercentString,
             long chargeTimeMs,
             boolean isFastCharging,
-            long currentTimeMs) {
+            long currentTimeMs,
+            BatterySettingsFeatureProvider featureProvider) {
+        if (featureProvider.isChargingOptimizationMode(context)) {
+            final CharSequence chargingOptimizationChargeLabel =
+                    featureProvider.getChargingOptimizationChargeLabel(
+                            context, batteryPercentString, chargeTimeMs, currentTimeMs);
+            if (chargingOptimizationChargeLabel != null) {
+                return chargingOptimizationChargeLabel;
+            }
+        }
         if (com.android.settingslib.fuelgauge.BatteryUtils.isChargingStringV2Enabled()) {
             var timeString =
                     PowerUtil.getTargetTimeShortString(context, chargeTimeMs, currentTimeMs);
diff --git a/src/com/android/settings/fuelgauge/BatterySettingsFeatureProvider.java b/src/com/android/settings/fuelgauge/BatterySettingsFeatureProvider.java
index a1a220d986c..ab6d5acc1eb 100644
--- a/src/com/android/settings/fuelgauge/BatterySettingsFeatureProvider.java
+++ b/src/com/android/settings/fuelgauge/BatterySettingsFeatureProvider.java
@@ -53,4 +53,20 @@ public interface BatterySettingsFeatureProvider {
     @Nullable
     CharSequence getWirelessChargingRemainingLabel(
             @NonNull Context context, long remainingTimeMs, long currentTimeMs);
+
+    /** Return true if it's in the charging optimization mode. */
+    boolean isChargingOptimizationMode(@NonNull Context context);
+
+    /** Return a charging remaining time label for charging optimization mode. */
+    @Nullable
+    CharSequence getChargingOptimizationRemainingLabel(
+            @NonNull Context context, long chargeRemainingTimeMs, long currentTimeMs);
+
+    /** Return a charge label for charging optimization mode. */
+    @Nullable
+    CharSequence getChargingOptimizationChargeLabel(
+            @NonNull Context context,
+            @NonNull String batteryPercentageString,
+            long chargeRemainingTimeMs,
+            long currentTimeMs);
 }
diff --git a/src/com/android/settings/fuelgauge/BatterySettingsFeatureProviderImpl.java b/src/com/android/settings/fuelgauge/BatterySettingsFeatureProviderImpl.java
index 49db450bc58..b2db3470fa9 100644
--- a/src/com/android/settings/fuelgauge/BatterySettingsFeatureProviderImpl.java
+++ b/src/com/android/settings/fuelgauge/BatterySettingsFeatureProviderImpl.java
@@ -67,4 +67,26 @@ public class BatterySettingsFeatureProviderImpl implements BatterySettingsFeatur
             @NonNull Context context, long remainingTimeMs, long currentTimeMs) {
         return null;
     }
+
+    @Override
+    public boolean isChargingOptimizationMode(@NonNull Context context) {
+        return false;
+    }
+
+    @Nullable
+    @Override
+    public CharSequence getChargingOptimizationRemainingLabel(
+            @NonNull Context context, long chargeRemainingTimeMs, long currentTimeMs) {
+        return null;
+    }
+
+    @Nullable
+    @Override
+    public CharSequence getChargingOptimizationChargeLabel(
+            @NonNull Context context,
+            @NonNull String batteryPercentageString,
+            long chargeRemainingTimeMs,
+            long currentTimeMs) {
+        return null;
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java
index ba17d8ec8d8..a1081f4519e 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java
@@ -21,6 +21,7 @@ import static com.google.common.truth.Truth.assertWithMessage;
 
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.doAnswer;
@@ -307,6 +308,9 @@ public class BatteryInfoTest {
     @Test
     public void getBatteryInfo_chargingWithDefender_updateChargeLabel() {
         doReturn(TEST_CHARGE_TIME_REMAINING).when(mBatteryUsageStats).getChargeTimeRemainingMs();
+        doReturn(true)
+                .when(mFeatureFactory.powerUsageFeatureProvider)
+                .isBatteryDefend(any(BatteryInfo.class));
         mChargingBatteryBroadcast.putExtra(
                 BatteryManager.EXTRA_CHARGING_STATUS,
                 BatteryManager.CHARGING_POLICY_ADAPTIVE_LONGLIFE);
@@ -363,6 +367,9 @@ public class BatteryInfoTest {
                 .when(mBatteryUsageStats)
                 .getChargeTimeRemainingMs();
         doReturn(true).when(mFeatureFactory.powerUsageFeatureProvider).isExtraDefend();
+        doReturn(true)
+                .when(mFeatureFactory.powerUsageFeatureProvider)
+                .isBatteryDefend(any(BatteryInfo.class));
         Intent intent =
                 createBatteryIntent(
                                 BatteryManager.BATTERY_PLUGGED_DOCK,
@@ -709,6 +716,79 @@ public class BatteryInfoTest {
                 expectedChargeLabel);
     }
 
+    @Test
+    public void getBatteryInfo_chargeOptimizationMode_updateRemainingAndStatusLabel() {
+        prepareTestGetBatteryInfoEnvironment(
+                /* remainingTimeMs= */ Duration.ofMinutes(130).toMillis(),
+                /* chargingStringV2Enabled= */ false);
+        Intent batteryIntent =
+                createIntentForGetBatteryInfoTest(
+                        ChargingType.WIRED, ChargingSpeed.REGULAR, /* batteryLevel= */ 65);
+        var expectedRemainingLabel = "Done charging by";
+        var expectedChargeLabel = "65% - " + expectedRemainingLabel;
+        when(mFeatureFactory.batterySettingsFeatureProvider.isChargingOptimizationMode(mContext))
+                .thenReturn(true);
+        when(mFeatureFactory.batterySettingsFeatureProvider.getChargingOptimizationRemainingLabel(
+                        eq(mContext), anyLong(), anyLong()))
+                .thenReturn(expectedRemainingLabel);
+        when(mFeatureFactory.batterySettingsFeatureProvider.getChargingOptimizationChargeLabel(
+                        eq(mContext), anyString(), anyLong(), anyLong()))
+                .thenReturn(expectedChargeLabel);
+        var expectedStatusLabel = "Charging";
+
+        assertGetBatteryInfo(
+                batteryIntent,
+                /* currentTimeMillis= */ UNUSED_TIME_MS,
+                expectedStatusLabel,
+                expectedRemainingLabel,
+                expectedChargeLabel);
+    }
+
+    @Test
+    public void getBatteryInfo_notChargeOptimizationModeWithV1_updateRemainingAndStatusLabel() {
+        prepareTestGetBatteryInfoEnvironment(
+                /* remainingTimeMs= */ Duration.ofMinutes(130).toMillis(),
+                /* chargingStringV2Enabled= */ false);
+        Intent batteryIntent =
+                createIntentForGetBatteryInfoTest(
+                        ChargingType.WIRED, ChargingSpeed.REGULAR, /* batteryLevel= */ 65);
+        when(mFeatureFactory.batterySettingsFeatureProvider.isChargingOptimizationMode(mContext))
+                .thenReturn(false);
+        var expectedStatusLabel = "Charging";
+        var expectedRemainingLabel = "2 hr, 10 min left until full";
+        var expectedChargeLabel = "65% - " + expectedRemainingLabel;
+
+        assertGetBatteryInfo(
+                batteryIntent,
+                /* currentTimeMillis= */ UNUSED_TIME_MS,
+                expectedStatusLabel,
+                expectedRemainingLabel,
+                expectedChargeLabel);
+    }
+
+    @Test
+    public void getBatteryInfo_notChargeOptimizationModeWithV2_updateRemainingAndStatusLabel() {
+        prepareTestGetBatteryInfoEnvironment(
+                /* remainingTimeMs= */ Duration.ofMinutes(130).toMillis(),
+                /* chargingStringV2Enabled= */ true);
+        Intent batteryIntent =
+                createIntentForGetBatteryInfoTest(
+                        ChargingType.WIRED, ChargingSpeed.REGULAR, /* batteryLevel= */ 65);
+        when(mFeatureFactory.batterySettingsFeatureProvider.isChargingOptimizationMode(mContext))
+                .thenReturn(false);
+        var expectedStatusLabel = "Charging";
+        var expectedRemainingLabel = "Fully charged by";
+        var expectedChargeLabel = "65% - " + expectedRemainingLabel;
+        var currentTimeMillis = Instant.parse("2024-04-01T15:00:00Z").toEpochMilli();
+
+        assertGetBatteryInfo(
+                batteryIntent,
+                currentTimeMillis,
+                expectedStatusLabel,
+                expectedRemainingLabel,
+                expectedChargeLabel);
+    }
+
     private enum ChargingSpeed {
         FAST,
         REGULAR,
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatterySettingsFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatterySettingsFeatureProviderImplTest.java
index c6241abf5c2..c55a121785e 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatterySettingsFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatterySettingsFeatureProviderImplTest.java
@@ -79,4 +79,20 @@ public class BatterySettingsFeatureProviderImplTest {
     public void getWirelessChargingRemainingLabel_returnNull() {
         assertThat(mImpl.getWirelessChargingRemainingLabel(mContext, 1000L, 1000L)).isNull();
     }
+
+    @Test
+    public void isChargingOptimizationMode_default_returnFalse() {
+        assertThat(mImpl.isChargingOptimizationMode(mContext)).isFalse();
+    }
+
+    @Test
+    public void getChargingOptimizationRemainingLabel_default_returnNull() {
+        assertThat(mImpl.getChargingOptimizationRemainingLabel(mContext, 1000L, 1000L)).isNull();
+    }
+
+    @Test
+    public void getChargingOptimizationChargeLabel_default_returnNull() {
+        assertThat(mImpl.getChargingOptimizationChargeLabel(mContext, "70%", 1000L, 1000L))
+                .isNull();
+    }
 }

From 9b68d1b5fb94af2513806abfaf5c9ed9536213e1 Mon Sep 17 00:00:00 2001
From: Wesley Wang <wesleycwwang@google.com>
Date: Tue, 7 May 2024 16:32:22 +0800
Subject: [PATCH 19/21] Fix AppStateAppBatteryUsageBridge test fail

 - Remove mock context to fix the component cast issue

Bug: 337417563
Fix: 337417563
Test: atest SettingsUnitTests
Change-Id: I2d375a4828d2a7b020f15535383c07e4f017bb84
---
 .../AppStateAppBatteryUsageBridgeTest.java    | 99 ++++++++++---------
 1 file changed, 52 insertions(+), 47 deletions(-)

diff --git a/tests/unit/src/com/android/settings/applications/AppStateAppBatteryUsageBridgeTest.java b/tests/unit/src/com/android/settings/applications/AppStateAppBatteryUsageBridgeTest.java
index 4b9753c33f6..8d90905bf68 100644
--- a/tests/unit/src/com/android/settings/applications/AppStateAppBatteryUsageBridgeTest.java
+++ b/tests/unit/src/com/android/settings/applications/AppStateAppBatteryUsageBridgeTest.java
@@ -6,7 +6,9 @@ import static org.mockito.Mockito.when;
 
 import android.app.AppOpsManager;
 import android.content.Context;
+import android.content.pm.ApplicationInfo;
 
+import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import com.android.settingslib.applications.ApplicationsState.AppEntry;
@@ -15,64 +17,67 @@ import com.android.settingslib.fuelgauge.PowerAllowlistBackend;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
 @RunWith(AndroidJUnit4.class)
 public final class AppStateAppBatteryUsageBridgeTest {
-  private static final String TEST_PACKAGE_1 = "com.example.test.pkg1";
-  private static final String TEST_PACKAGE_2 = "com.example.test.pkg2";
-  private static final int UID_1 = 12345;
-  private static final int UID_2 = 7654321;
+    private static final String TEST_PACKAGE_1 = "com.example.test.pkg1";
+    private static final String TEST_PACKAGE_2 = "com.example.test.pkg2";
+    private static final int UID_1 = 12345;
+    private static final int UID_2 = 7654321;
 
-  @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-  private Context mContext;
-  @Mock
-  private AppOpsManager mAppOpsManager;
-  @Mock
-  private PowerAllowlistBackend mPowerAllowlistBackend;
+    private Context mContext;
+    private ApplicationInfo mApplicationInfo;
 
-  @Before
-  public void initMocks() {
-      MockitoAnnotations.initMocks(this);
-  }
+    @Mock
+    private AppOpsManager mAppOpsManager;
+    @Mock
+    private PowerAllowlistBackend mPowerAllowlistBackend;
 
-  @Test
-  public void updateExtraInfo_updatesRestricted() {
-    when(mPowerAllowlistBackend.isAllowlisted(TEST_PACKAGE_1, UID_1)).thenReturn(false);
-    when(mAppOpsManager.checkOpNoThrow(AppOpsManager.OP_RUN_ANY_IN_BACKGROUND,
-            UID_1, TEST_PACKAGE_1)).thenReturn(AppOpsManager.MODE_IGNORED);
-    AppStateAppBatteryUsageBridge bridge =
-            new AppStateAppBatteryUsageBridge(mContext, null, null);
-    bridge.mAppOpsManager = mAppOpsManager;
-    bridge.mPowerAllowlistBackend = mPowerAllowlistBackend;
-    AppEntry entry = new AppEntry(mContext, null, 0);
+    @Before
+    public void initMocks() {
+        MockitoAnnotations.initMocks(this);
+        mContext = ApplicationProvider.getApplicationContext();
+        mApplicationInfo = new ApplicationInfo();
+        mApplicationInfo.sourceDir = "test_dir";
+    }
 
-    bridge.updateExtraInfo(entry, TEST_PACKAGE_1, UID_1);
+    @Test
+    public void updateExtraInfo_updatesRestricted() {
+        when(mPowerAllowlistBackend.isAllowlisted(TEST_PACKAGE_1, UID_1)).thenReturn(false);
+        when(mAppOpsManager.checkOpNoThrow(AppOpsManager.OP_RUN_ANY_IN_BACKGROUND,
+                UID_1, TEST_PACKAGE_1)).thenReturn(AppOpsManager.MODE_IGNORED);
+        AppStateAppBatteryUsageBridge bridge =
+                new AppStateAppBatteryUsageBridge(mContext, null, null);
+        bridge.mAppOpsManager = mAppOpsManager;
+        bridge.mPowerAllowlistBackend = mPowerAllowlistBackend;
+        AppEntry entry = new AppEntry(mContext, mApplicationInfo, 0);
 
-    assertThat(entry.extraInfo.getClass())
-            .isEqualTo(AppStateAppBatteryUsageBridge.AppBatteryUsageDetails.class);
-    assertThat(AppStateAppBatteryUsageBridge.getAppBatteryUsageDetailsMode(entry))
-            .isEqualTo(AppStateAppBatteryUsageBridge.MODE_RESTRICTED);
-  }
+        bridge.updateExtraInfo(entry, TEST_PACKAGE_1, UID_1);
 
-  @Test
-  public void updateExtraInfo_updatesUnrestricted() {
-    when(mPowerAllowlistBackend.isAllowlisted(TEST_PACKAGE_1, UID_1)).thenReturn(true);
-    when(mAppOpsManager.checkOpNoThrow(AppOpsManager.OP_RUN_ANY_IN_BACKGROUND,
-            UID_2, TEST_PACKAGE_2)).thenReturn(AppOpsManager.MODE_ALLOWED);
-    AppStateAppBatteryUsageBridge bridge =
-            new AppStateAppBatteryUsageBridge(mContext, null, null);
-    bridge.mAppOpsManager = mAppOpsManager;
-    bridge.mPowerAllowlistBackend = mPowerAllowlistBackend;
-    AppEntry entry = new AppEntry(mContext, null, 0);
+        assertThat(entry.extraInfo.getClass())
+                .isEqualTo(AppStateAppBatteryUsageBridge.AppBatteryUsageDetails.class);
+        assertThat(AppStateAppBatteryUsageBridge.getAppBatteryUsageDetailsMode(entry))
+                .isEqualTo(AppStateAppBatteryUsageBridge.MODE_RESTRICTED);
+    }
 
-    bridge.updateExtraInfo(entry, TEST_PACKAGE_2, UID_2);
+    @Test
+    public void updateExtraInfo_updatesUnrestricted() {
+        when(mPowerAllowlistBackend.isAllowlisted(TEST_PACKAGE_2, UID_2)).thenReturn(true);
+        when(mAppOpsManager.checkOpNoThrow(AppOpsManager.OP_RUN_ANY_IN_BACKGROUND,
+                UID_2, TEST_PACKAGE_2)).thenReturn(AppOpsManager.MODE_ALLOWED);
+        AppStateAppBatteryUsageBridge bridge =
+                new AppStateAppBatteryUsageBridge(mContext, null, null);
+        bridge.mAppOpsManager = mAppOpsManager;
+        bridge.mPowerAllowlistBackend = mPowerAllowlistBackend;
+        AppEntry entry = new AppEntry(mContext, mApplicationInfo, 0);
 
-    assertThat(entry.extraInfo.getClass())
-            .isEqualTo(AppStateAppBatteryUsageBridge.AppBatteryUsageDetails.class);
-    assertThat(AppStateAppBatteryUsageBridge.getAppBatteryUsageDetailsMode(entry))
-            .isEqualTo(AppStateAppBatteryUsageBridge.MODE_UNRESTRICTED);
-  }
+        bridge.updateExtraInfo(entry, TEST_PACKAGE_2, UID_2);
+
+        assertThat(entry.extraInfo.getClass())
+                .isEqualTo(AppStateAppBatteryUsageBridge.AppBatteryUsageDetails.class);
+        assertThat(AppStateAppBatteryUsageBridge.getAppBatteryUsageDetailsMode(entry))
+                .isEqualTo(AppStateAppBatteryUsageBridge.MODE_UNRESTRICTED);
+    }
 }

From c63f06d4c8012ca43e8705e99cf012a1614bff94 Mon Sep 17 00:00:00 2001
From: Chaohui Wang <chaohuiw@google.com>
Date: Tue, 7 May 2024 16:37:11 +0800
Subject: [PATCH 20/21] Fix isInCallFlow when no active subscription

Direct emit false in this case to fix.

Fix: 338484668
Test: manual - on SIMs
Test: unit test
Change-Id: I5286701160d95b1c06e577db6232f7e70f040cdb
---
 .../network/telephony/CallStateRepository.kt         |  9 +++++++--
 .../network/telephony/CallStateRepositoryTest.kt     | 12 ++++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/network/telephony/CallStateRepository.kt b/src/com/android/settings/network/telephony/CallStateRepository.kt
index 1c93af32b19..4b6cdc83975 100644
--- a/src/com/android/settings/network/telephony/CallStateRepository.kt
+++ b/src/com/android/settings/network/telephony/CallStateRepository.kt
@@ -26,6 +26,7 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.conflate
 import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.onEach
 
@@ -50,8 +51,12 @@ class CallStateRepository(private val context: Context) {
     fun isInCallFlow(): Flow<Boolean> = context.subscriptionsChangedFlow()
         .flatMapLatest {
             val subIds = subscriptionManager.activeSubscriptionIdList
-            combine(subIds.map(::callStateFlow)) { states ->
-                states.any { it != TelephonyManager.CALL_STATE_IDLE }
+            if (subIds.isEmpty()) {
+                flowOf(false)
+            } else {
+                combine(subIds.map(::callStateFlow)) { states ->
+                    states.any { it != TelephonyManager.CALL_STATE_IDLE }
+                }
             }
         }
         .conflate()
diff --git a/tests/spa_unit/src/com/android/settings/network/telephony/CallStateRepositoryTest.kt b/tests/spa_unit/src/com/android/settings/network/telephony/CallStateRepositoryTest.kt
index 8213ecf4842..55d520fd214 100644
--- a/tests/spa_unit/src/com/android/settings/network/telephony/CallStateRepositoryTest.kt
+++ b/tests/spa_unit/src/com/android/settings/network/telephony/CallStateRepositoryTest.kt
@@ -35,6 +35,7 @@ import org.mockito.kotlin.doAnswer
 import org.mockito.kotlin.doReturn
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.spy
+import org.mockito.kotlin.stub
 
 @RunWith(AndroidJUnit4::class)
 class CallStateRepositoryTest {
@@ -86,6 +87,17 @@ class CallStateRepositoryTest {
             .inOrder()
     }
 
+    @Test
+    fun isInCallFlow_noActiveSubscription() = runBlocking {
+        mockSubscriptionManager.stub {
+            on { activeSubscriptionIdList } doReturn intArrayOf()
+        }
+
+        val isInCall = repository.isInCallFlow().firstWithTimeoutOrNull()
+
+        assertThat(isInCall).isFalse()
+    }
+
     @Test
     fun isInCallFlow_initial() = runBlocking {
         val isInCall = repository.isInCallFlow().firstWithTimeoutOrNull()

From 37edeb1219dd9a721e5cff44a312c2267b424cce Mon Sep 17 00:00:00 2001
From: Ahmad Khalil <khalilahmad@google.com>
Date: Tue, 7 May 2024 13:59:15 +0000
Subject: [PATCH 21/21] Make haptics team owners on vibration files in Settings

Updating owners file in settings/accessibility to make the haptics team owners on the vibration files in Settings.

No flag for changing owners, no UI changes.

Fix: 339187294
Test: N/A
Change-Id: I962040b509f40393101eadc76ca46afc2b0696ef
---
 src/com/android/settings/accessibility/OWNERS | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/accessibility/OWNERS b/src/com/android/settings/accessibility/OWNERS
index 633e9c74aec..268e46777bb 100644
--- a/src/com/android/settings/accessibility/OWNERS
+++ b/src/com/android/settings/accessibility/OWNERS
@@ -15,5 +15,5 @@ menghanli@google.com #{LAST_RESORT_SUGGESTION}
 cipson@google.com #{LAST_RESORT_SUGGESTION}
 
 # Partner-team files
-per-file HapticFeedbackIntensityPreferenceController.java = michaelwr@google.com
-per-file *Vibration* = michaelwr@google.com
+per-file HapticFeedbackIntensityPreferenceController.java = file:platform/frameworks/base:/services/core/java/com/android/server/vibrator/OWNERS
+per-file *Vibration* = file:platform/frameworks/base:/services/core/java/com/android/server/vibrator/OWNERS