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

Commit 0c9f32eb authored by Alex Buynytskyy's avatar Alex Buynytskyy Committed by Automerger Merge Worker
Browse files

Merge "Stop processing on IOException." into udc-dev am: d470717b am: 72addf8f 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21675441



Change-Id: Ia3ae55fba1ed567807bb321c5415ba7a86d34d30
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 42a4d003 72addf8f

services/core/java/com/android/server/pm/ShortcutPackage.java

+3 −0
Original line number Diff line number Diff line
@@ -2048,6 +2048,9 @@ class ShortcutPackage extends ShortcutPackageItem { 
                                        shortcutUser.getUserId(), fromBackup);

                                // Don't use addShortcut(), we don't need to save the icon.

                                ret.mShortcuts.put(si.getId(), si);

                            } catch (IOException e) {

                                // Don't ignore IO exceptions.

                                throw e;

                            } catch (Exception e) {

                                // b/246540168 malformed shortcuts should be ignored

                                Slog.e(TAG, "Failed parsing shortcut.", e);

services/tests/servicestests/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ android_test { 
        ":StubTestApp",

        ":SuspendTestApp",

        ":MediaButtonReceiverHolderTestHelperApp",

        "data/broken_shortcut.xml",

    ],



    java_resources: [

services/tests/servicestests/AndroidTest.xml

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ 
        <option name="cleanup" value="true" />

        <option name="push-file" key="SimpleServiceTestApp3.apk"

                value="/data/local/tmp/cts/content/SimpleServiceTestApp3.apk" />

        <option name="push-file" key="broken_shortcut.xml"

                value="/data/local/tmp/cts/content/broken_shortcut.xml" />

    </target_preparer>



    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">

services/tests/servicestests/data/broken_shortcut.xml

0 → 100644
+851 B

File added.

No diff preview for this file type.

View file

services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest1.java

+12 −0
Original line number Diff line number Diff line
@@ -4007,6 +4007,18 @@ public class ShortcutManagerTest1 extends BaseShortcutManagerTest { 
        // TODO Check all other fields

    }



    public void testLoadCorruptedShortcuts() throws Exception {

        initService();



        addPackage("com.android.chrome", 0, 0);



        ShortcutUser user = new ShortcutUser(mService, 0);



        File corruptedShortcutPackage = new File("/data/local/tmp/cts/content/",

                "broken_shortcut.xml");

        assertNull(ShortcutPackage.loadFromFile(mService, user, corruptedShortcutPackage, false));

    }



    public void testSaveCorruptAndLoadUser() throws Exception {

        // First, create some shortcuts and save.

        runWithCaller(CALLING_PACKAGE_1, UserHandle.USER_SYSTEM, () -> {