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

Commit 2f67950e authored by Josh Gargus's avatar Josh Gargus
Browse files

Fix crash when entering ContactDetailFragment. 

Apparently due to framework changes, an unguarded division that had been
working fine started to throw divide-by-zero errors (and then stopped again).
Guard against this, as should have been done originally.

Bug: 6339058
Change-Id: Ic7aed53e74d6c333c9f251c7aec336e03bd93d10
parent a04dc9c9

src/com/android/contacts/detail/ContactDetailTabCarousel.java

+12 −1
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ import android.widget.HorizontalScrollView; 
import android.widget.ImageView;

import android.widget.TextView;



import android.util.Log;



/**

 * This is a horizontally scrolling carousel with 2 tabs: one to see info about the contact and

 * one to see updates from the contact.
@@ -161,7 +163,16 @@ public class ContactDetailTabCarousel extends HorizontalScrollView implements On 
        // Scrolling by mAllowedHorizontalScrollLength causes listeners to

        // scroll by the entire screen amount; compute the scale-factor

        // necessary to make this so.

        if (mAllowedHorizontalScrollLength == 0) {

            // Guard against divide-by-zero.

            // Note: this hard-coded value prevents a crash, but won't result in the

            // desired scrolling behavior.  We rely on the framework calling onMeasure()

            // again with a non-zero screen width.

            mScrollScaleFactor = 1.0f;

            Log.w(TAG, "set scale-factor to 1.0 to avoid divide-by-zero");

        } else {

            mScrollScaleFactor = screenWidth / mAllowedHorizontalScrollLength;

        }



        int tabHeight = Math.round(screenWidth * mTabHeightScreenWidthFraction) + mTabShadowHeight;

        // Set the child {@link LinearLayout} to be TAB_COUNT * the computed tab width so that the