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

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

Merge "Change page size app warning dialog" into main

parents d725b772 2eb82b07

core/res/res/values/strings.xml

+1 −0
Original line number Diff line number Diff line
@@ -249,6 +249,7 @@ 
    </string>

    <!--Confirmation text for page size mismatch dialog to never show-->

    <string name="page_size_compat_never_show"> Don\'t Show Again</string>

    <string name="page_size_compat_title">Android App Compatibility</string>















    <string name="page_size_compat_elf_not_aligned">&amp;#8226; %1$s : LOAD segment not aligned</string>















    <string name="page_size_compat_apk_not_aligned">&amp;#8226; %1$s : Uncompressed library not aligned</string>

































core/res/res/values/symbols.xml



+1
−0




























Original line number
Diff line number
Diff line








@@ -3412,6 +3412,7 @@













  <java-symbol type="string" name="page_size_compat_apk_not_aligned" />















  <java-symbol type="string" name="page_size_compat_apk_and_elf_not_aligned" />















  <java-symbol type="string" name="page_size_compat_unknown" />













  <java-symbol type="string" name="page_size_compat_title" />































  <!--  Work profile unlaunchable app alert dialog-->















  <java-symbol type="style" name="AlertDialogWithEmergencyButton"/>

































core/tests/FileSystemUtilsTest/app_warnings_test/src/android/content/pm/tests/AppWarningsTest.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -51,7 +51,7 @@ public class AppWarningsTest {













            "/data/local/tmp/pagesizewarnings/app_with_4kb_elf_no_override.apk";















    private static final String PACKAGE_INSTALLED_ACTION =















            "com.example.android.testing.PACKAGE_INSTALLED";













    private static final String WARNING_TEXT = "PageSizeCompatTestApp";













    private static final String WARNING_TEXT = "Android App Compatibility";















    private static final long TIMEOUT = 5000;















    private static final String TEST_APP_PACKAGE = "android.test.pagesizecompat";

















































core/tests/FileSystemUtilsTest/app_with_4kb_elf/src/android/test/pagesizecompat/PageSizeCompatTest.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -39,7 +39,7 @@ import java.util.concurrent.TimeUnit;





























@RunWith(AndroidJUnit4.class)















public class PageSizeCompatTest {













    private static final String WARNING_TEXT = "PageSizeCompatTestApp";













    private static final String WARNING_TEXT = "Android App Compatibility";















    private static final long TIMEOUT = 5000;































    public void testPageSizeCompat_appLaunch(boolean shouldPass) throws Exception {

































services/core/java/com/android/server/wm/PageSizeMismatchDialog.java



+2
−9




























Original line number
Diff line number
Diff line








@@ -21,7 +21,6 @@ import static android.text.Html.FROM_HTML_MODE_COMPACT;













import android.app.AlertDialog;















import android.content.Context;















import android.content.pm.ApplicationInfo;













import android.content.pm.PackageItemInfo;















import android.content.pm.PackageManager;















import android.text.Html;















import android.text.method.LinkMovementMethod;










@@ -50,13 +49,6 @@ class PageSizeMismatchDialog extends AppWarnings.BaseDialog {













        super(manager, context, appInfo.packageName, userId);































        final PackageManager pm = context.getPackageManager();













        final CharSequence label =













                appInfo.loadSafeLabel(













                        pm,













                        PackageItemInfo.DEFAULT_MAX_LABEL_SIZE_PX,













                        PackageItemInfo.SAFE_LABEL_FLAG_FIRST_LINE













                                | PackageItemInfo.SAFE_LABEL_FLAG_TRIM);





























        final AlertDialog.Builder builder =















                new AlertDialog.Builder(context)















                        .setPositiveButton(R.string.page_size_compat_never_show, (dialog, which) ->









@@ -64,8 +56,9 @@ class PageSizeMismatchDialog extends AppWarnings.BaseDialog {













                                                mUserId, mPackageName,















                                                AppWarnings.FLAG_HIDE_PAGE_SIZE_MISMATCH,















                                                true))













                        .setNegativeButton(R.string.ok, null)















                        .setMessage(Html.fromHtml(warning, FROM_HTML_MODE_COMPACT))













                        .setTitle(label);













                        .setTitle(R.string.page_size_compat_title);































        mDialog = builder.create();















        mDialog.create();