Commit Graph
43 Commits
Author SHA1 Message Date
Tavis Bohne ca5fc9fa7d Merge "Messaging doesn't allow sharing of its own files" into nyc-dev 2016-05-16 18:14:20 +00:00
Tony Mak c4073ff4ce Add badge icon for work contact in search result
BUG=26021888
BUG=28016344
(cherry picked from commit 6e00763823cd1b27ff88d25d0eb11f8addc3b2e6)

Change-Id: If0e2f7b1c58cd064ebfdae8a9b735b391c5009fc
2016-05-16 16:35:06 +01:00
Tony Mak e2ccf8bff5 Cleanup enterprise feature in ContactUtil
1. Remove isWorkProfileSupported checking, api level checking is enough.
2. Replace the hardcoded uri with the corresponding api.

BUG=26797244
BUG=28016344
(cherry picked from commit 0d7a1cce157e4ffb26d5fefb9908bbeffcb1d03c)

Change-Id: I76edad19dc6a19aa77b523cb960f716fca08944d
2016-05-16 16:34:58 +01:00
Tony Mak 9045160771 Separate work and personal contacts search result
This change allows sms app to show search result of different directories
in different partitions.
Currently, only personal default and enterprise default directory are
searched.

BUG=26021888
BUG=28016344
(cherry picked from commit 59666b32c192bd28807ccd2f9153c796668bdf13)

Change-Id: I733ceaae806d13661861126ce61c34108ac7e662
2016-05-16 16:34:43 +01:00
Tony Mak b7fc988f23 Search enterprise directory as well in SMS app
TODO: Update the UI to show enterprise result separately (b/26021888)

Bug: 28016344, 25977180
(cherry picked from commit 5c621e57256f5068a43f1456f9bab1194f0d27b2)

Change-Id: I7130ae5e057ed750a29f64c5497a04b868613579
2016-05-16 16:34:24 +01:00
Victor Chang 0a85b81c9f Add isAtLeastN in OsUtil
Bug: 28016344
Change-Id: I431b4fed3f2114d1f1b311416a892f608a846e4c
2016-05-11 18:07:38 +01:00
Tavis Bohne 30fb338539 Messaging doesn't allow sharing of its own files
-Previously, Messaging allowed sharing of any file it had permission
 to reach. This meant that bad apps could share a link to
 file:///data/data/com.android.messaging/databases/bugle_db
 and Messaging would happily send all this sensitive information to
 the target. Worse, a bad app could share a softlink to this file,
 where the symlink was picture.jpg with the image/jpg type.
-Now, when sanitizing attachments, we make sure any filepaths don't
 lead to any Bugle-specific directories.
-getApplicationInfo().dataDir is a symlink to
 /data/data/com.android.messaging, and appears to be the
 only directory where we store personal data.
-Most apps share as contentUris, including Messaging, so Messaging
 can still share to itself.

Change-Id: Ic464bc1f099029a030793c478aaf88b957d8bad1
Fixes:28076752
2016-04-29 14:39:59 -07:00
Tom Taylor 7fe2fc9b2f Messaging app ClassCastException (DecorContext -> Activity) when SMSoIMS is initiated
Bug 27649619

Change-Id: I1c0de7c14abd255ceb9d61a377db3276c32fede0
2016-03-21 13:44:13 -07:00
Yohann Roussel 49528d492f Revert "Pin messaging to use Jack with 1.7 language"
This reverts commit 445d7baabc.

Bug: 27333568
Bug: 27305482
Bug: 26753820
Change-Id: I44c126c3a54de332c0032e1d7d158f95099bfc03
2016-02-26 15:26:55 +00:00
Neil Fuller 445d7baabc Pin messaging to use Jack with 1.7 language
There is a bug in the current version of Jack
that causes problems when the default is changed to
1.8. Pinning to 1.7 appears to help.

Bug: 27305482
Bug: 26753820
Change-Id: Ia29bf5cb14c754be4c4b453aa89a9d9c369d9e52
2016-02-23 12:00:42 +00:00
Yohann Roussel 280a2fbe41 Re-enable Jack for Messaging and its tests
Jack was disabled because of bugs in Jack and missing support for testing
obfuscated applications. Both are now fixed so Jack can be enabled.

Bug: 27215871

(cherry picked from commit bf6bd40faa)

Change-Id: I73d3c5a3599640932b2305ffe22bb5ef27814ba3
2016-02-22 11:54:35 +01:00
Ye Wen ec2fe3006b Remove "_" variable for Java 8
b/27045502

Change-Id: I7ce2bb262fdc2b64f2c6b3cb629a2ec93450b265
2016-02-09 23:33:14 +00:00
Ye Wen 372e48607e Change "Touch" to "Tap"
b/26749422

Change-Id: I2ca48f7534bf18344a4e6d85470543d23b3dfa5c
2016-01-29 14:39:34 -08:00
Dan Willemsen 1b16e2dc16 Don\'t add BUILD_NUMBER to version for platform builds am: cc3d547961
am: 0c38f114c1

* commit '0c38f114c11a3828a2a3c114720b4a62be391cf4':
  Don't add BUILD_NUMBER to version for platform builds
2015-10-29 21:42:04 +00:00
Dan Willemsen 0c38f114c1 Don\'t add BUILD_NUMBER to version for platform builds
am: cc3d547961

* commit 'cc3d547961bf9115821c50ab616286a261e5d4fc':
  Don't add BUILD_NUMBER to version for platform builds
2015-10-29 21:33:35 +00:00
Dan Willemsen cc3d547961 Don't add BUILD_NUMBER to version for platform builds
We're removing differences between two builds that have the same source.
These builds will have different BUILD_NUMBERs though, so it shouldn't
be embedded in the binary.

For eng builds, using the current date forces the APK to be rebuilt
every time the makefiles are read. Remove this for platform builds, but
keep it if building unbundled.

Bug: 24201956
Change-Id: I8c0ad93e817c74c69b8d8156d4727952b08024d4
2015-10-28 23:49:32 +00:00
Ye Wen 3e2d132d22 am 12fc4d9e: am 1bc27610: Theme colored ic_preview_pause and ic_preview_play icons
* commit '12fc4d9e781b613007d597b396ca221ca7d9944a':
  Theme colored ic_preview_pause and ic_preview_play icons
2015-09-03 04:34:46 +00:00
Ye Wen 12fc4d9e78 am 1bc27610: Theme colored ic_preview_pause and ic_preview_play icons
* commit '1bc276100f18e5092b4bc270add5902c1de29356':
  Theme colored ic_preview_pause and ic_preview_play icons
2015-09-03 04:23:17 +00:00
Ye Wen 1bc276100f Theme colored ic_preview_pause and ic_preview_play icons
b/23071029

Change-Id: I3cdd249a7e86fc351ee12620b2d3062eee91af57
2015-09-01 15:29:16 -07:00
Matt Sarett 8b71e49e5a am 7c64a2c8: am 2034020d: Fix build breakage caused by giflib update
* commit '7c64a2c808755362f3d0f002d4ecc3a2ed87cfb6':
  Fix build breakage caused by giflib update
2015-08-26 03:52:43 +00:00
Shri Borde 3ff3b35ad1 am 05f9cbf3: am 87c91b56: am fd80890f: Bug 23071029: Assets with the right color
* commit '05f9cbf3d141f3d397b999d4e9dfff646fb1a8ea':
2015-08-26 03:52:43 +00:00
Shri Borde 08b7b9d73c am ece795c3: am 3a0ddc3d: am eba0949b: Access incoming audio files after user taps Play
* commit 'ece795c3091f5e3de3f4ff39f3dd632afc201050':
2015-08-26 03:52:42 +00:00
Mike Dodd acf3051646 am 95903a86: am a358badf: Merge d4b7315d55 to mnc-dev-plus-aosp to fix build.
* commit '95903a86bf827a09d9bc7780a6e3b882745bd201':
2015-08-26 03:52:42 +00:00
Matt Sarett 7c64a2c808 am 2034020d: Fix build breakage caused by giflib update
* commit '2034020d8ea4eb7c5f92aaa79b2307d04766bfb3':
  Fix build breakage caused by giflib update
2015-08-26 03:47:40 +00:00
Shri Borde 05f9cbf3d1 am 87c91b56: am fd80890f: Bug 23071029: Assets with the right color
* commit '87c91b56499854ff5a10f8d6b0c282393c7a0c3f':
2015-08-26 03:47:38 +00:00
Shri Borde ece795c309 am 3a0ddc3d: am eba0949b: Access incoming audio files after user taps Play
* commit '3a0ddc3d801f9e44960e9abe98bcaa9f8d78961d':
2015-08-26 03:47:37 +00:00
Mike Dodd 95903a86bf am a358badf: Merge d4b7315d55 to mnc-dev-plus-aosp to fix build.
* commit 'a358badf0266d5188b86aecdcf4f33e0d4491ae1':
2015-08-26 03:47:36 +00:00
Matt Sarett bb63508f61 am b0ef7745: Fix build breakage caused by updating giflib
* commit 'b0ef77450df6480941fd6c737c34a44ea29b1f21':
  Fix build breakage caused by updating giflib
2015-08-24 15:42:13 +00:00
Matt Sarett b0ef77450d Fix build breakage caused by updating giflib
Change-Id: I085379470620ec4db13f8baf7a9eb069747270b7
2015-08-24 11:35:24 -04:00
Matt Sarett 2034020d8e Fix build breakage caused by giflib update
Change-Id: I225c29f321e75bf2813c389ae3b7e9e888daa3cf
2015-08-24 11:21:56 -04:00
Shri Borde 8da1b15000 am fd80890f: Bug 23071029: Assets with the right color
* commit 'fd80890f7ffd2916cb79e35362f9c54a93017e5f':
  Bug 23071029: Assets with the right color
2015-08-22 00:50:56 +00:00
Shri Borde 4e724b6fb4 am eba0949b: Access incoming audio files after user taps Play
* commit 'eba0949bc60e9002adf0c96044677b4c281b2819':
  Access incoming audio files after user taps Play
2015-08-22 00:50:56 +00:00
Shri Borde 87c91b5649 am fd80890f: Bug 23071029: Assets with the right color
* commit 'fd80890f7ffd2916cb79e35362f9c54a93017e5f':
  Bug 23071029: Assets with the right color
2015-08-21 21:25:52 +00:00
Shri Borde fd80890f7f Bug 23071029: Assets with the right color
Change-Id: Ia20f275257ffb199910c08f8b5fba22339f8f8cf
2015-08-21 12:58:50 -07:00
Shri Borde 3a0ddc3d80 am eba0949b: Access incoming audio files after user taps Play
* commit 'eba0949bc60e9002adf0c96044677b4c281b2819':
  Access incoming audio files after user taps Play
2015-08-21 19:58:12 +00:00
Shri Borde eba0949bc6 Access incoming audio files after user taps Play
For platforms with insecure handling of media files, media files should
be opened only after the user chooses to play the media.

Change-Id: I5f9bbd1f8468a704a5962f0dddd3c8b11bba8bea
2015-08-21 10:17:46 -07:00
Mike Dodd 9fce46c0fc Merge build fix into Master. 2015-08-12 16:18:22 -07:00
Mike Dodd a358badf02 Merge d4b7315d55 to mnc-dev-plus-aosp to fix build. 2015-08-12 15:49:49 -07:00
Mike Dodd d4b7315d55 Fix build for latest Guava.
b/23110861

Change-Id: Iccd6e66f996fd00880cc3024085c838235da0adb
2015-08-12 15:11:43 -07:00
Mike Dodd d3b009ae55 Initial checkin of AOSP Messaging app.
b/23110861

Change-Id: I11db999bd10656801e618f78ab2b2ef74136fff1
2015-08-12 12:47:26 -07:00
Mike Dodd ef8c7abbcf Revert "Initial checkin of AOSP Messaging app."
This reverts commit 461a34b466.

Change-Id: Iac4ca77eeaa94989e91dead49a7959c905bd3078
2015-08-12 18:48:39 +00:00
Mike Dodd 461a34b466 Initial checkin of AOSP Messaging app.
b/23110861

Change-Id: I9aa980d7569247d6b2ca78f5dcb4502e1eaadb8a
2015-08-12 08:58:28 -07:00
Bill Rassieur 8b3e2b9c1b Initial empty repository 2015-07-23 10:52:29 -07:00