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

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

Snap for 12991197 from 3d0d0f9d to 25Q2-release 

Change-Id: Ifc3a44c01d2dcc45bc5e8662685ada1248254f38
parents 35575b14 3d0d0f9d

proguard.flags

+8 −2
Original line number Diff line number Diff line
@@ -6,7 +6,10 @@ 
-keepattributes Exceptions



# Keep all Fragments in this package, which are used by reflection.

-keep public class com.android.settings*.** extends androidx.fragment.app.Fragment

# TODO(b/373579455): Evaluate if <init> needs to be kept.

-keep public class com.android.settings*.** extends androidx.fragment.app.Fragment {

    void <init>();

}



# Keep all preference controllers needed by slice and DashboardFragment.

-keep class * extends com.android.settings.core.BasePreferenceController {
@@ -49,7 +52,10 @@ 
    public static ** SEARCH_INDEX_DATA_PROVIDER;

    public static ** SUMMARY_PROVIDER_FACTORY;

}

-keep class androidx.core.app.CoreComponentFactory

# TODO(b/373579455): Evaluate if <init> needs to be kept.

-keep class androidx.core.app.CoreComponentFactory {

    void <init>();

}



# Keep classes that implements CustomSliceable, which are used by reflection.

-keepclasseswithmembers class * implements com.android.settings.slices.CustomSliceable {

res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -12027,6 +12027,9 @@ 
    <!-- Help URI, action disabled by restricted settings [DO NOT TRANSLATE] -->

    <string name="help_url_action_disabled_by_restricted_settings" translatable="false"></string>













    <!-- Help URI, action disabled by advanced protection [DO NOT TRANSLATE] -->













    <string name="help_url_action_disabled_by_advanced_protection" translatable="false"></string>



























    <!-- Title label for dnd suggestion, which is displayed in Settings homepage [CHAR LIMIT=100] -->















    <string name="zen_suggestion_title">Update Do Not Disturb</string>







































src/com/android/settings/biometrics/face/FaceSettings.java



+2
−0




























Original line number
Diff line number
Diff line








@@ -246,6 +246,8 @@ public class FaceSettings extends DashboardFragment {













            final PreferenceCategory category =















                    findPreference(PREF_KEY_USE_FACE_TO_CATEGORY);















            category.setVisible(true);













            use(FaceSettingsKeyguardUnlockPreferenceController.class).setUserId(mUserId);













            use(FaceSettingsAppsPreferenceController.class).setUserId(mUserId);















        }















    }

















































src/com/android/settings/network/CellularSecurityPreferenceController.java



+0
−1




























Original line number
Diff line number
Diff line








@@ -72,7 +72,6 @@ public class CellularSecurityPreferenceController extends BasePreferenceControll













    @Override















    public int getAvailabilityStatus() {















        if (!mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEPHONY)













                || !Flags.enableIdentifierDisclosureTransparencyUnsolEvents()















                || !Flags.enableModemCipherTransparencyUnsolEvents()















                || !Flags.enableModemCipherTransparency()) {















            return UNSUPPORTED_ON_DEVICE;

































src/com/android/settings/network/telephony/CellularSecurityNotificationsDividerController.java



+1
−2




























Original line number
Diff line number
Diff line








@@ -60,8 +60,7 @@ public class CellularSecurityNotificationsDividerController extends





























    @Override















    public int getAvailabilityStatus() {













        if (!Flags.enableIdentifierDisclosureTransparencyUnsolEvents()













                || !Flags.enableModemCipherTransparencyUnsolEvents()













        if (!Flags.enableModemCipherTransparencyUnsolEvents()















                || !Flags.enableModemCipherTransparency()) {















            return UNSUPPORTED_ON_DEVICE;















        }