Squashed commit of the following:

commit 429cf07ee6feb08a6217a95f8400e81fbbe2c5f7
Author: Robert Greenwalt <rgreenwalt@google.com>
Date:   Tue May 21 17:04:09 2013 -0700

    Allow MMS queries without permission.

    If you ask for results other than type, mmsc, mmsproxy or mmsport
    you'll need permissions to do so.

    bug:7632229
    Change-Id: I02d8ce8427dd21d9fd1fe17d225de16a88d2e617

commit 4cf7d104bce51c3fed721f4ea9af318d9bf7ecf9
Merge: 7205b1b a681205
Author: Wink Saville <wink@google.com>
Date:   Wed Mar 27 13:01:47 2013 -0700

    am a6812051: am 1695fa59: Merge "modify fail fast mode for loading apns"

    * commit 'a68120512c3930e30912379385a11502931dfcaf':
      modify fail fast mode for loading apns

commit a68120512c3930e30912379385a11502931dfcaf
Merge: 0314742 1695fa5
Author: Wink Saville <wink@google.com>
Date:   Wed Mar 27 11:12:23 2013 -0700

    am 1695fa59: Merge "modify fail fast mode for loading apns"

    * commit '1695fa599191f6f8edc7ed4d3824f482b827d3cb':
      modify fail fast mode for loading apns

commit 1695fa599191f6f8edc7ed4d3824f482b827d3cb
Merge: 569167e 7e7c274
Author: Wink Saville <wink@google.com>
Date:   Wed Mar 27 17:12:09 2013 +0000

    Merge "modify fail fast mode for loading apns"

commit 7205b1b5c176825d3513c9bcb10353115967e7ac
Merge: bc91932 0314742
Author: Robert Greenwalt <rgreenwalt@google.com>
Date:   Fri Mar 15 18:02:30 2013 -0700

    am 03147422: am 569167ec: Merge "read MVNO config and insert DB"

    * commit '03147422e8ba952de0b9f4de334f68f3ba0f2c35':
      read MVNO config and insert DB

commit 03147422e8ba952de0b9f4de334f68f3ba0f2c35
Merge: 606e8c8 569167e
Author: Robert Greenwalt <rgreenwalt@google.com>
Date:   Fri Mar 15 18:00:24 2013 -0700

    am 569167ec: Merge "read MVNO config and insert DB"

    * commit '569167ec35fa4f27e9a617dea3f34db9d4c46101':
      read MVNO config and insert DB

commit 569167ec35fa4f27e9a617dea3f34db9d4c46101
Merge: 69dff54 27045ef
Author: Robert Greenwalt <rgreenwalt@google.com>
Date:   Sat Mar 16 00:18:31 2013 +0000

    Merge "read MVNO config and insert DB"

commit 7e7c2741e74b80daec9012aa1c766d7bc8b0c6b1
Author: Hyejin Kim <hyejin.kim@lge.com>
Date:   Mon Feb 11 20:02:18 2013 +0900

    modify fail fast mode for loading apns

    Change-Id: Ie3e5773a6b62db12c6a7ea8b582a6deb85774322

commit 27045ef347d730e30d751ceef34e4d6145f9ce39
Author: Sungmin Choi <sungmin.choi@lge.com>
Date:   Fri Jan 25 17:48:06 2013 +0900

    read MVNO config and insert DB

    Update DB version because of using new field for MVNO.
    If there is config of MVNO, insert MVNO data to telephony.db.
    Default value of fields related to MVNO sets empty value('').

    Bug: 8143480

    Change-Id: Idfa06c6f39a2c15ff4f0815724823f44b76ac819

commit bc91932e8dd2949914b0dff078c92e684ede5c8f
Merge: 438403e 606e8c8
Author: Tom Taylor <tomtaylor@google.com>
Date:   Fri Feb 22 09:59:34 2013 -0800

    am 606e8c82: am dd5e16cc: am c72280d2: am 49e29575: am 21cf95e7: Don\'t allow clients to update or insert _data column data

    * commit '606e8c82b5195a3f81c6c952a0e83eeaa96386ff':
      Don't allow clients to update or insert _data column data

commit 606e8c82b5195a3f81c6c952a0e83eeaa96386ff
Merge: a4ea7c9 dd5e16c
Author: Tom Taylor <tomtaylor@google.com>
Date:   Fri Feb 22 09:57:09 2013 -0800

    am dd5e16cc: am c72280d2: am 49e29575: am 21cf95e7: Don\'t allow clients to update or insert _data column data

    * commit 'dd5e16ccb3a6226ac4b6b34d98d97683bb543314':
      Don't allow clients to update or insert _data column data

commit dd5e16ccb3a6226ac4b6b34d98d97683bb543314
Merge: 2c34481 c72280d
Author: Tom Taylor <tomtaylor@google.com>
Date:   Fri Feb 22 09:50:17 2013 -0800

    am c72280d2: am 49e29575: am 21cf95e7: Don\'t allow clients to update or insert _data column data

    * commit 'c72280d2f2d5c0cb91bb75fc8892fe9fc7bb88b5':
      Don't allow clients to update or insert _data column data

commit c72280d2f2d5c0cb91bb75fc8892fe9fc7bb88b5
Merge: 7c24d43 49e2957
Author: Tom Taylor <tomtaylor@google.com>
Date:   Fri Feb 22 09:48:04 2013 -0800

    am 49e29575: am 21cf95e7: Don\'t allow clients to update or insert _data column data

    * commit '49e295750690ab11c178c368fbfcd24686962b3d':
      Don't allow clients to update or insert _data column data

commit 49e295750690ab11c178c368fbfcd24686962b3d
Merge: 8d4bb29 21cf95e
Author: Tom Taylor <tomtaylor@google.com>
Date:   Fri Feb 22 09:45:54 2013 -0800

    am 21cf95e7: Don\'t allow clients to update or insert _data column data

    * commit '21cf95e716daac40f4da452f46f235b6b414dc12':
      Don't allow clients to update or insert _data column data

commit 21cf95e716daac40f4da452f46f235b6b414dc12
Author: Tom Taylor <tomtaylor@google.com>
Date:   Thu Feb 21 16:56:01 2013 -0800

    Don't allow clients to update or insert _data column data

    Bug 8214355

    Change-Id: I45c93047ced465277a46c6a33d6ef590ab0bf8bb

commit 438403eab51611bd92050e64eba56efe00c613da
Author: Tom Taylor <tomtaylor@google.com>
Date:   Thu Feb 21 16:56:01 2013 -0800

    Don't allow clients to update or insert _data column data

    Bug 8214355

    Change-Id: I45c93047ced465277a46c6a33d6ef590ab0bf8bb

commit bf925845027f471ead845417ded90686c836cac4
Merge: 7ab2b8c a4ea7c9
Author: Wink Saville <wink@google.com>
Date:   Thu Feb 21 15:19:29 2013 -0800

    am a4ea7c9d: am 69dff541: Merge "avoid stopping app in case of accessing empty db"

    * commit 'a4ea7c9d0811080d318cdd712582038a91699459':
      avoid stopping app in case of accessing empty db

commit a4ea7c9d0811080d318cdd712582038a91699459
Merge: a3e079e 69dff54
Author: Wink Saville <wink@google.com>
Date:   Thu Feb 21 14:17:08 2013 -0800

    am 69dff541: Merge "avoid stopping app in case of accessing empty db"

    * commit '69dff54168cd680ae7c4825c96b0f3cda4ccf0f8':
      avoid stopping app in case of accessing empty db

commit 7ab2b8c5d6a5a830df3881237563f742a603a3d8
Merge: 8168ff8 a3e079e
Author: Tom Taylor <tomtaylor@google.com>
Date:   Wed Feb 20 17:02:31 2013 -0800

    am a3e079e4: am 2c34481d: am 7c24d433: am 8d4bb29c: am 0ffb2dda: Android MMS api allows arbitrary file access as the radio user

    * commit 'a3e079e42abd4bebf134c4c96d594a4734a80228':
      Android MMS api allows arbitrary file access as the radio user

commit a3e079e42abd4bebf134c4c96d594a4734a80228
Merge: 16117fa 2c34481
Author: Tom Taylor <tomtaylor@google.com>
Date:   Wed Feb 20 16:56:32 2013 -0800

    am 2c34481d: am 7c24d433: am 8d4bb29c: am 0ffb2dda: Android MMS api allows arbitrary file access as the radio user

    * commit '2c34481dc7f8e412b02492ddab57de216db7fdae':
      Android MMS api allows arbitrary file access as the radio user

commit 2c34481dc7f8e412b02492ddab57de216db7fdae
Merge: 15156cd 7c24d43
Author: Tom Taylor <tomtaylor@google.com>
Date:   Wed Feb 20 16:50:15 2013 -0800

    am 7c24d433: am 8d4bb29c: am 0ffb2dda: Android MMS api allows arbitrary file access as the radio user

    * commit '7c24d433ed2175dfb9b75f3beeb4283aa21d94e6':
      Android MMS api allows arbitrary file access as the radio user

commit 7c24d433ed2175dfb9b75f3beeb4283aa21d94e6
Merge: 1a45ce5 8d4bb29
Author: Tom Taylor <tomtaylor@google.com>
Date:   Wed Feb 20 16:46:39 2013 -0800

    am 8d4bb29c: am 0ffb2dda: Android MMS api allows arbitrary file access as the radio user

    * commit '8d4bb29c80e424afe597b130c2e701feccb79a68':
      Android MMS api allows arbitrary file access as the radio user

commit 8d4bb29c80e424afe597b130c2e701feccb79a68
Merge: 8c15b8c 0ffb2dd
Author: Tom Taylor <tomtaylor@google.com>
Date:   Wed Feb 20 16:42:49 2013 -0800

    am 0ffb2dda: Android MMS api allows arbitrary file access as the radio user

    * commit '0ffb2ddacbc0764a81a53f2636c07c39c78db131':
      Android MMS api allows arbitrary file access as the radio user

commit 69dff54168cd680ae7c4825c96b0f3cda4ccf0f8
Merge: 16117fa cfdb743
Author: Wink Saville <wink@google.com>
Date:   Wed Feb 20 23:11:07 2013 +0000

    Merge "avoid stopping app in case of accessing empty db"

commit 0ffb2ddacbc0764a81a53f2636c07c39c78db131
Author: Tom Taylor <tomtaylor@google.com>
Date:   Tue Feb 19 14:30:23 2013 -0800

    Android MMS api allows arbitrary file access as the radio user

    Bug 8214355

    Only allow files in mms's app_parts directory to be opened.
    Tested with the code found in the bug, before and after this
    change.

    (cherry picked from commit 8168ff8cebcd1b51ef9d97f2a50f9c91ee8aa562)

    Change-Id: Ieab4cf20f6191aba5c2118d454dcf69f5e268308

commit 8168ff8cebcd1b51ef9d97f2a50f9c91ee8aa562
Author: Tom Taylor <tomtaylor@google.com>
Date:   Tue Feb 19 14:30:23 2013 -0800

    Android MMS api allows arbitrary file access as the radio user

    Bug 8214355

    Only allow files in mms's app_parts directory to be opened.
    Tested with the code found in the bug, before and after this
    change.

    Change-Id: Ifce883caf1631d352ae264266614d58d125964bf

commit cfdb743efa6b0cb5aafaaafbc7687ae41d761d65
Author: Hyejin Kim <hyejin.kim@lge.com>
Date:   Sat Feb 16 00:58:37 2013 +0900

    avoid stopping app in case of accessing empty db

    Empty database is made by exception for loading apns.
    When accessing empty database, Setting App is stopped, sometimes.
    To avoid stopping app, check null if occuring SQLException

    Change-Id: I36e6676c54bd8b182fb16f896e04b8e051d3bf2d

commit f22cd11870827032dbb35ca069d1a128cc9f7123
Merge: f27792f 16117fa
Author: Wink Saville <wink@google.com>
Date:   Wed Feb 6 11:24:04 2013 -0800

    am 16117fa1: am 457ba902: Merge "fix typo for exception message"

    # By Sungmin Choi
    # Via Android Git Automerger (1) and others
    * commit '16117fa197f7dccb73ad7f710cb6e09f1abef20a':
      fix typo for exception message

commit 16117fa197f7dccb73ad7f710cb6e09f1abef20a
Merge: e133b2f 457ba90
Author: Wink Saville <wink@google.com>
Date:   Wed Feb 6 11:19:43 2013 -0800

    am 457ba902: Merge "fix typo for exception message"

    # By Sungmin Choi
    # Via Gerrit Code Review (1) and Sungmin Choi (1)
    * commit '457ba902e2bd504a51f2c18034452cf2d85c844b':
      fix typo for exception message

commit 457ba902e2bd504a51f2c18034452cf2d85c844b
Merge: aca9f9c 1a4f2bf
Author: Wink Saville <wink@google.com>
Date:   Wed Feb 6 18:31:29 2013 +0000

    Merge "fix typo for exception message"

commit 1a4f2bf059546593d0c689e75b95ba85f21cc5f6
Author: Sungmin Choi <sungmin.choi@lge.com>
Date:   Wed Feb 6 17:11:56 2013 +0900

    fix typo for exception message

    Currently, if occurs exception as loading apn, it shows message
    about time zone. So fix it as showing about loading apns.

    Change-Id: I7fbc0d7053edfd37cdeae24f41f806b9a8c20a44

commit f27792fb80c6f533a250ec75867c9f2351ff9f04
Author: Dianne Hackborn <hackbod@google.com>
Date:   Mon Feb 4 18:26:53 2013 -0800

    App ops: new ops for reading/writing SMS/MMS.

    Change-Id: I17b5154c2eb53cbde9d562fb23a9ce047fe41327

commit ce2cbcfb524c125883ff1b30fc67010a9ad22343
Merge: b0daca7 e133b2f
Author: Wink Saville <wink@google.com>
Date:   Mon Jan 28 11:44:06 2013 -0800

    am e133b2f8: am aca9f9cd: Merge "fix typo for comment"

    # By Sungmin Choi
    # Via Android Git Automerger (1) and others
    * commit 'e133b2f87214d54f9732e9f90d0388bf3cb0d681':
      fix typo for comment

commit e133b2f87214d54f9732e9f90d0388bf3cb0d681
Merge: 8641d72 aca9f9c
Author: Wink Saville <wink@google.com>
Date:   Mon Jan 28 11:37:49 2013 -0800

    am aca9f9cd: Merge "fix typo for comment"

    # By Sungmin Choi
    # Via Gerrit Code Review (1) and Sungmin Choi (1)
    * commit 'aca9f9cdb66f806baac6529ee0963462ebb8727e':
      fix typo for comment

commit aca9f9cdb66f806baac6529ee0963462ebb8727e
Merge: 6b35f44 22b6306
Author: Wink Saville <wink@google.com>
Date:   Mon Jan 28 19:02:58 2013 +0000

    Merge "fix typo for comment"

commit 22b630668cf2db058322f0e85eba8daeea690f75
Author: Sungmin Choi <sungmin.choi@lge.com>
Date:   Fri Jan 25 15:53:15 2013 +0900

    fix typo for comment

    About version 7, change comment from protocol to bearer.
    And change file permission

    Change-Id: Ia09403a46a0c800f84c612713f020a9f31bf0205

commit b0daca77267869d82c921041d3d24be11e32650c
Merge: 66ce8af 8641d72
Author: Wink Saville <wink@google.com>
Date:   Wed Jan 23 20:52:30 2013 -0800

    am 8641d721: am 6b35f44d: Merge "data: enhanced Telephony Carrier DB transaction time"

    # By jewon.lee
    # Via Android Git Automerger (1) and others
    * commit '8641d7215feff3e71b18c11ca8ec7722357fde8e':
      data: enhanced Telephony Carrier DB transaction time

commit 8641d7215feff3e71b18c11ca8ec7722357fde8e
Merge: 15156cd 6b35f44
Author: Wink Saville <wink@google.com>
Date:   Wed Jan 23 17:35:20 2013 -0800

    am 6b35f44d: Merge "data: enhanced Telephony Carrier DB transaction time"

    # By jewon.lee
    # Via Gerrit Code Review (1) and Sungmin Choi (1)
    * commit '6b35f44d9c1c1e293d658b60cecc74244236ec3c':
      data: enhanced Telephony Carrier DB transaction time

commit 6b35f44d9c1c1e293d658b60cecc74244236ec3c
Merge: 1a45ce5 4167fcc
Author: Wink Saville <wink@google.com>
Date:   Thu Jan 24 01:04:54 2013 +0000

    Merge "data: enhanced Telephony Carrier DB transaction time"

commit 4167fcc61e42c74ea9554153299c3392cd9339bc
Author: jewon.lee <jewon.lee@lge.com>
Date:   Thu Jan 17 13:10:37 2013 +0900

    data: enhanced Telephony Carrier DB transaction time

    APN reset to default time is faster than old.

    Change-Id: Iddf2b36d358d210bdb55893246f06389c3f89d3e

commit 66ce8af13a5ab59f38c0741c82ac146816c0a8b9
Author: Baligh Uddin <baligh@google.com>
Date:   Fri Nov 16 13:24:48 2012 -0800

    Import translations. DO NOT MERGE

    Change-Id: Ic61d0e120464910f433df477e2126570ff71ca6d
    Auto-generated-cl: translation import

commit 15156cd6afcc7ed57ac7be40ef2d32a615e83599
Author: Tom Taylor <tomtaylor@google.com>
Date:   Thu Nov 15 14:15:46 2012 -0800

    App crashed as it was moving to foreground and message was received

    Bug 7540115

    In the MmsSmsProvider, wrap the code that creates a new thread in a transaction.
    Creating a new thread requires multiple database operations. It's possible
    for the newly created thread to be deleted part of the way through the
    operation.

    Change-Id: I3cbf8ba4ad3f3f30b513280ac3defc276b4a70a0

Change-Id: Ie2e8330cee50f7b55db2646d320d05d538959123