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

Commit 1bb6c292 authored by Walter Jang's avatar Walter Jang
Browse files

Check for null extras before accessing previous screen extra 

Bug 27389760
Bug 27341012
Bug 18388581

Change-Id: Ic1b4a98aa3d94c2fa29e25e9d3067affeee0cf21
parent 6b77ccf0

src/com/android/contacts/quickcontact/QuickContactActivity.java

+2 −2
Original line number Diff line number Diff line
@@ -924,8 +924,8 @@ public class QuickContactActivity extends ContactsActivity 
            return;

        }



        final int previousScreenType = getIntent().getExtras()

                .getInt(EXTRA_PREVIOUS_SCREEN_TYPE, ScreenType.UNKNOWN);

        final int previousScreenType = getIntent().getIntExtra

                (EXTRA_PREVIOUS_SCREEN_TYPE, ScreenType.UNKNOWN);

        Logger.logScreenView(this, ScreenType.QUICK_CONTACT, previousScreenType);



        if (CompatUtils.isLollipopCompatible()) {

tests/res/layout/quick_contact_tests.xml

+6 −0
Original line number Diff line number Diff line
@@ -91,5 +91,11 @@ 
            style="?android:attr/quickContactBadgeStyleSmallWindowLarge"

            android:layout_marginLeft="4dip" />

    </LinearLayout>

    <Button

        android:id="@android:id/button1"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:text="@string/quickContactIntent"

        android:enabled="false"/>

</LinearLayout>

tests/res/values/donottranslate_strings.xml

+1 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ 
    <string name="pinnedHeaderList">Pinned Headers</string>

    <string name="quickContactTests">Quick Contact modes</string>

    <string name="pickContact">Pick contact</string>

    <string name="quickContactIntent">Start with Intent</string>

    <string name="fillCallLogTest">Fill call log test</string>

    <string name="addToCallLogButton">Add</string>

    <string name="numberOfCallLogEntries">Number of call log entries to add:</string>

tests/src/com/android/contacts/tests/quickcontact/QuickContactTestsActivity.java

+12 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.content.SharedPreferences.Editor; 
import android.net.Uri;

import android.os.Bundle;

import android.provider.ContactsContract.Contacts;

import android.provider.ContactsContract.QuickContact;

import android.view.View;

import android.view.View.OnClickListener;

import android.view.Window;
@@ -45,6 +46,7 @@ public class QuickContactTestsActivity extends Activity { 
    private QuickContactBadge mMediumBadge2;

    private QuickContactBadge mLargeBadge1;

    private QuickContactBadge mLargeBadge2;

    private Button mButton;



    private Uri mContactUri;
@@ -63,6 +65,15 @@ public class QuickContactTestsActivity extends Activity { 
        mMediumBadge2 = (QuickContactBadge) findViewById(R.id.medium_badge2);

        mLargeBadge1 = (QuickContactBadge) findViewById(R.id.large_badge1);

        mLargeBadge2 = (QuickContactBadge) findViewById(R.id.large_badge2);

        mButton = (Button) findViewById(android.R.id.button1);

        mButton.setOnClickListener(new OnClickListener() {

            @Override

            public void onClick(View view) {

                final Intent intent = new Intent(QuickContact.ACTION_QUICK_CONTACT);

                intent.setData(mContactUri);

                startActivity(intent);

            }

        });



        mPickContact.setOnClickListener(new OnClickListener() {

            @Override
@@ -89,6 +100,7 @@ public class QuickContactTestsActivity extends Activity { 
            case REQUEST_CODE_PICK: {

                mContactUri = data.getData();

                assignUri();

                mButton.setEnabled(true);

                break;

            }

        }