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

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

Snap for 12304452 from 9260350b to 24Q4-release 

Change-Id: Ie73095ed17de92e1ff31742174db2b6446f9fdad
parents 92ee44ac 9260350b

aconfig/settings_biometrics_framework_flag_declarations.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -14,3 +14,10 @@ flag { 
  description: "This flag enables or disables the Fingerprint v2 enrollment"

  bug: "295206723"

}



flag {

  name: "active_unlock_finish_parent"

  namespace: "biometrics_framework"

  description: "This flag enables the Active Unlock settings activity to finish its parent activity"

  bug: "343576960"

}

aconfig/settings_experience_flag_declarations.aconfig

+0 −10
Original line number Diff line number Diff line
@@ -17,13 +17,3 @@ flag { 
        purpose: PURPOSE_BUGFIX

    }

}
 


flag {

    name: "internet_preference_controller_v2"

    namespace: "settings_experience"

    description: "New InternetPreferenceControllerV2."

    bug: "339884322"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}

res/values/arrays.xml

+2 −2
Original line number Diff line number Diff line
@@ -1536,6 +1536,7 @@ 
        <item>@*android:drawable/ic_zen_mode_icon_group_of_people</item>

        <item>@*android:drawable/ic_zen_mode_icon_lightbulb</item>

        <item>@*android:drawable/ic_zen_mode_type_schedule_calendar</item>

        <item>@*android:drawable/ic_zen_mode_type_special_dnd</item>

        <!-- Sports -->

        <item>@*android:drawable/ic_zen_mode_icon_running</item>

        <item>@*android:drawable/ic_zen_mode_icon_golf</item>
@@ -1561,7 +1562,6 @@ 
        <!-- Other activities -->

        <item>@*android:drawable/ic_zen_mode_icon_train</item>

        <item>@*android:drawable/ic_zen_mode_type_driving</item> <!-- Car -->

        <item>@*android:drawable/ic_zen_mode_icon_croissant</item>

        <item>@*android:drawable/ic_zen_mode_icon_fork_and_knife</item>

        <item>@*android:drawable/ic_zen_mode_icon_shopping_cart</item>

        <item>@*android:drawable/ic_zen_mode_icon_child</item>
@@ -1587,6 +1587,7 @@ 
        <item>Group of people</item>

        <item>Lightbulb</item>

        <item>Calendar</item>

        <item>Do Not Disturb</item>

        <!-- Sports -->

        <item>Person running</item>

        <item>Golf</item>
@@ -1612,7 +1613,6 @@ 
        <!-- Other activities -->

        <item>Train</item>

        <item>Car</item>

        <item>Croissant</item>

        <item>Fork and knife</item>

        <item>Shopping cart</item>

        <item>Child</item>

res/xml/network_provider_internet.xml

+2 −1
Original line number Diff line number Diff line
@@ -29,7 +29,8 @@ 
        android:order="-30"

        settings:allowDividerAbove="true"

        settings:keywords="@string/keywords_internet"

        settings:useAdminDisabledSummary="true" />

        settings:useAdminDisabledSummary="true"

        settings:controller="com.android.settings.network.InternetPreferenceControllerV2" />



    <com.android.settingslib.RestrictedPreference

        android:key="calls_and_sms"

src/com/android/settings/applications/AppInfoBase.java

+8 −8
Original line number Diff line number Diff line
@@ -136,14 +136,14 @@ public abstract class AppInfoBase extends SettingsPreferenceFragment 
                mPackageName = intent.getData().getSchemeSpecificPart();

            }

        }

        if (!hasInteractAcrossUsersPermission()) {

        if (intent != null && intent.hasExtra(Intent.EXTRA_USER_HANDLE)) {

            mUserId = ((UserHandle) intent.getParcelableExtra(Intent.EXTRA_USER_HANDLE))

                    .getIdentifier();

            if (mUserId != UserHandle.myUserId() && !hasInteractAcrossUsersFullPermission()) {

                Log.w(TAG, "Intent not valid.");

                finish();

                return "";

            }

        if (intent != null && intent.hasExtra(Intent.EXTRA_USER_HANDLE)) {

            mUserId = ((UserHandle) intent.getParcelableExtra(

                    Intent.EXTRA_USER_HANDLE)).getIdentifier();

        } else {

            mUserId = UserHandle.myUserId();

        }
@@ -171,7 +171,7 @@ public abstract class AppInfoBase extends SettingsPreferenceFragment 
    }



    @VisibleForTesting

    protected boolean hasInteractAcrossUsersPermission() {

    protected boolean hasInteractAcrossUsersFullPermission() {

        Activity activity = getActivity();

        if (!(activity instanceof SettingsActivity)) {

            return false;