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

Commit 84b9c301 authored by Roshan Pius's avatar Roshan Pius Committed by Android Git Automerger
Browse files

am 0d49a97e: am 31ab86f8: am 06179c75: am 4e9c63cb: Merge "Handle exceptions... 

am 0d49a97e: am 31ab86f8: am 06179c75: am 4e9c63cb: Merge "Handle exceptions when accessing Content providers." into mnc-dev

* commit '0d49a97e':
  Handle exceptions when accessing Content providers.
parents 7ef4daa2 0d49a97e

telephony/java/android/telephony/PhoneNumberUtils.java

+10 −6
Original line number Original line Diff line number Diff line
@@ -177,15 +177,19 @@ public class PhoneNumberUtils 
            phoneColumn = ContactsContract.CommonDataKinds.Phone.NUMBER;

            phoneColumn = ContactsContract.CommonDataKinds.Phone.NUMBER;

        }

        }





        final Cursor c = context.getContentResolver().query(uri, new String[] {

        Cursor c = null;

            phoneColumn

        }, null, null, null);

        if (c != null) {

        try {

        try {

            c = context.getContentResolver().query(uri, new String[] { phoneColumn },

                    null, null, null);

            if (c != null) {

                if (c.moveToFirst()) {

                if (c.moveToFirst()) {

                    number = c.getString(c.getColumnIndex(phoneColumn));

                    number = c.getString(c.getColumnIndex(phoneColumn));

                }

                }

            }

        } catch (RuntimeException e) {

            Rlog.e(LOG_TAG, "Error getting phone number.", e);

        } finally {

        } finally {

            if (c != null) {

                c.close();

                c.close();

            }

            }

        }

        }

telephony/java/com/android/internal/telephony/CallerInfo.java

+12 −4
Original line number Original line Diff line number Diff line
@@ -16,6 +16,7 @@ 




package com.android.internal.telephony;

package com.android.internal.telephony;





import android.content.ContentResolver;

import android.content.Context;

import android.content.Context;

import android.database.Cursor;

import android.database.Cursor;

import android.graphics.Bitmap;

import android.graphics.Bitmap;
@@ -282,10 +283,17 @@ public class CallerInfo { 
     * number. The returned CallerInfo is null if no number is supplied.

     * number. The returned CallerInfo is null if no number is supplied.

     */

     */

    public static CallerInfo getCallerInfo(Context context, Uri contactRef) {

    public static CallerInfo getCallerInfo(Context context, Uri contactRef) {



        CallerInfo info = null;

        return getCallerInfo(context, contactRef,

        ContentResolver cr = CallerInfoAsyncQuery.getCurrentProfileContentResolver(context);

                CallerInfoAsyncQuery.getCurrentProfileContentResolver(context)

        if (cr != null) {

                        .query(contactRef, null, null, null, null));

            try {

                info = getCallerInfo(context, contactRef,

                        cr.query(contactRef, null, null, null, null));

            } catch (RuntimeException re) {

                Rlog.e(TAG, "Error getting caller info.", re);

            }

        }

        return info;

    }

    }





    /**

    /**