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

Commit 51146bc7 authored by Vadim Tryshev's avatar Vadim Tryshev Committed by Android (Google) Code Review
Browse files

Merge "Adding temporary logging to diagnose testPendingWidget_autoRestored"... 

Merge "Adding temporary logging to diagnose testPendingWidget_autoRestored" into ub-launcher3-master
parents acc9bbef c052e4e6

src/com/android/launcher3/LauncherModel.java

+5 −0
Original line number Diff line number Diff line
@@ -212,6 +212,11 @@ public class LauncherModel extends BroadcastReceiver 


    static void checkItemInfoLocked(

            final long itemId, final ItemInfo item, StackTraceElement[] stackTrace) {

        if (com.android.launcher3.Utilities.IS_RUNNING_IN_TEST_HARNESS

                && com.android.launcher3.Utilities.IS_DEBUG_DEVICE) {

            android.util.Log.d("b/117332845",

                    "Checking item: " + android.util.Log.getStackTraceString(new Throwable()));

        }

        ItemInfo modelItem = sBgDataModel.itemsIdMap.get(itemId);

        if (modelItem != null && item != modelItem) {

            // check all the data is consistent

src/com/android/launcher3/model/LoaderResults.java

+5 −0
Original line number Diff line number Diff line
@@ -296,6 +296,11 @@ public class LoaderResults { 
            final ArrayList<LauncherAppWidgetInfo> appWidgets,

            final Executor executor) {



        if (com.android.launcher3.Utilities.IS_RUNNING_IN_TEST_HARNESS

                && com.android.launcher3.Utilities.IS_DEBUG_DEVICE) {

            android.util.Log.d("b/117332845",

                    android.util.Log.getStackTraceString(new Throwable()));

        }

        // Bind the workspace items

        int N = workspaceItems.size();

        for (int i = 0; i < N; i += ITEMS_CHUNK) {

src/com/android/launcher3/model/LoaderTask.java

+5 −0
Original line number Diff line number Diff line
@@ -124,6 +124,11 @@ public class LoaderTask implements Runnable { 
        mPackageInstaller = PackageInstallerCompat.getInstance(mApp.getContext());

        mAppWidgetManager = AppWidgetManagerCompat.getInstance(mApp.getContext());

        mIconCache = mApp.getIconCache();

        if (com.android.launcher3.Utilities.IS_RUNNING_IN_TEST_HARNESS

                && com.android.launcher3.Utilities.IS_DEBUG_DEVICE) {

            android.util.Log.d("b/117332845",

                    android.util.Log.getStackTraceString(new Throwable()));

        }

    }



    protected synchronized void waitForIdle() {

src/com/android/launcher3/model/ModelWriter.java

+10 −0
Original line number Diff line number Diff line
@@ -109,6 +109,11 @@ public class ModelWriter { 
    }



    private void checkItemInfoLocked(long itemId, ItemInfo item, StackTraceElement[] stackTrace) {

        if (com.android.launcher3.Utilities.IS_RUNNING_IN_TEST_HARNESS

                && com.android.launcher3.Utilities.IS_DEBUG_DEVICE) {

            android.util.Log.d("b/117332845",

                    "Checking item: " + android.util.Log.getStackTraceString(new Throwable()));

        }

        ItemInfo modelItem = mBgDataModel.itemsIdMap.get(itemId);

        if (modelItem != null && item != modelItem) {

            // check all the data is consistent
@@ -358,6 +363,11 @@ public class ModelWriter { 
        private final long mItemId;



        UpdateItemRunnable(ItemInfo item, ContentWriter writer) {

            if (com.android.launcher3.Utilities.IS_RUNNING_IN_TEST_HARNESS

                    && com.android.launcher3.Utilities.IS_DEBUG_DEVICE) {

                android.util.Log.d("b/117332845",

                        android.util.Log.getStackTraceString(new Throwable()));

            }

            mItem = item;

            mWriter = writer;

            mItemId = item.id;

tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java

+19 −0
Original line number Diff line number Diff line
@@ -144,6 +144,10 @@ public class BindWidgetTest extends AbstractLauncherUiTest { 


    @Test

    public void testPendingWidget_autoRestored() {

        if (com.android.launcher3.Utilities.IS_RUNNING_IN_TEST_HARNESS && com.android.launcher3.Utilities.IS_DEBUG_DEVICE) {

            android.util.Log.d("b/117332845",

                    "Test Started @ " + android.util.Log.getStackTraceString(new Throwable()));

        }

        // A non-restored widget with no config screen gets restored automatically.

        LauncherAppWidgetProviderInfo info = findWidgetProvider(false);
@@ -152,10 +156,20 @@ public class BindWidgetTest extends AbstractLauncherUiTest { 
        item.restoreStatus = LauncherAppWidgetInfo.FLAG_ID_NOT_VALID;



        setupAndVerifyContents(item, LauncherAppWidgetHostView.class, info.label);

        if (com.android.launcher3.Utilities.IS_RUNNING_IN_TEST_HARNESS

                && com.android.launcher3.Utilities.IS_DEBUG_DEVICE) {

            android.util.Log.d("b/117332845",

                    "Test Ended @ " + android.util.Log.getStackTraceString(new Throwable()));

        }

    }



    @Test

    public void testPendingWidget_withConfigScreen() throws Exception {

        if (com.android.launcher3.Utilities.IS_RUNNING_IN_TEST_HARNESS

                && com.android.launcher3.Utilities.IS_DEBUG_DEVICE) {

            android.util.Log.d("b/117332845",

                    "Test Started @ " + android.util.Log.getStackTraceString(new Throwable()));

        }

        // A non-restored widget with config screen get bound and shows a 'Click to setup' UI.

        LauncherAppWidgetProviderInfo info = findWidgetProvider(true);
@@ -176,6 +190,11 @@ public class BindWidgetTest extends AbstractLauncherUiTest { 
        assertNotNull(AppWidgetManager.getInstance(mTargetContext)

                .getAppWidgetInfo(mCursor.getInt(mCursor.getColumnIndex(

                        LauncherSettings.Favorites.APPWIDGET_ID))));

        if (com.android.launcher3.Utilities.IS_RUNNING_IN_TEST_HARNESS

                && com.android.launcher3.Utilities.IS_DEBUG_DEVICE) {

            android.util.Log.d("b/117332845",

                    "Test Ended @ " + android.util.Log.getStackTraceString(new Throwable()));

        }

    }



    @Test @Ignore