Commit Graph

65 Commits

Author SHA1 Message Date
Tony Mak
e4e982add9 Merge remote-tracking branch 'goog/nyc-mr1-dev' into aosp/master 2016-06-29 20:11:17 +00:00
Tavis Bohne
d112c795ac Merge \"Messenger refuses all file:///data/ uris\" into nyc-dev
am: 9de3ed279b

Change-Id: I2cd79e2d428e421b9159a9e7a665d536ee9b741b
2016-06-08 17:03:13 +00:00
Tavis Bohne
9de3ed279b Merge "Messenger refuses all file:///data/ uris" into nyc-dev 2016-06-08 16:46:45 +00:00
Bill Yi
5159305b99 Bump targetSdkVersion to 24
am: f1210c127a

* commit 'f1210c127a4288aa53ec8dd3936a0077c63022eb':
  Bump targetSdkVersion to 24

Change-Id: I6481ab755cacb41adf9924f9d319afda4e28a293
2016-06-03 01:10:05 +00:00
Bill Yi
f1210c127a Bump targetSdkVersion to 24
This will only affect AOSP build.

BUG:28621267
Change-Id: I13f47b838c743674d371901bed2bb7b0e2cfcfc2
2016-06-02 16:23:08 -07:00
Tavis Bohne
41f3b673f1 Messenger refuses all file:///data/ uris
We've been informed it's possible for an app to create a world
readable hardlink in L in its own /data directory that links to
another apps private data, including Messenger data. The hardlink
bypassed our existing checks. So now we simply refuse all file: uris
in the /data/ directory.
Other apps shouldn't be sending file uris anyway, and we dont know
of any that send file:///data/ uris.

Bug: 28793303
Change-Id: I778bb2bcb9e11185357093c59fc1fa3f6caa26a1
2016-05-17 17:36:51 -07:00
Tavis Bohne
65e8a2d330 Merge "Messaging doesn\'t allow sharing of its own files" into nyc-dev
am: ca5fc9fa7d

* commit 'ca5fc9fa7dbba6cbab625d4a80f812b7206f0676':
  Messaging doesn't allow sharing of its own files

Change-Id: Ice1aa04a938f9ff14ac3b321344c34bfd152b1dc
2016-05-16 18:18:56 +00:00
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
722c058dcc Add badge icon for work contact in search result
am: c4073ff4ce

* commit 'c4073ff4ce1a342daad01a99d3fce84c54bc4776':
  Add badge icon for work contact in search result

Change-Id: I8a9556c786697c69af468c62a7d5a658ba87100d
2016-05-16 15:43:55 +00:00
Tony Mak
9cd2bdf010 Cleanup enterprise feature in ContactUtil
am: e2ccf8bff5

* commit 'e2ccf8bff59da2b54fb037557ad93fc4c317c506':
  Cleanup enterprise feature in ContactUtil

Change-Id: I49fb7f06d7d1bb6f78fb4f17eb8ae3d572d76778
2016-05-16 15:43:54 +00:00
Tony Mak
47037f9fef Separate work and personal contacts search result
am: 9045160771

* commit '904516077182cce4ce71a51b27a3ab418ed0f225':
  Separate work and personal contacts search result

Change-Id: I302cac2ded10c1945fb708996809a15cc8cebd28
2016-05-16 15:43:54 +00:00
Tony Mak
3a1468db12 Search enterprise directory as well in SMS app
am: b7fc988f23

* commit 'b7fc988f231394077c08b5ede4d1a7310da57406':
  Search enterprise directory as well in SMS app

Change-Id: Ie22b0b974985251ce6fd34c57b8316e9529a1057
2016-05-16 15:43:53 +00:00
Victor Chang
53103d0433 Add isAtLeastN in OsUtil
am: 0a85b81c9f

* commit '0a85b81c9f15f72e7284a8ff40f1ba73d7469b58':
  Add isAtLeastN in OsUtil

Change-Id: I1228ea3876d08e69e438c87809a08bbd9ea60cc9
2016-05-16 15:43:53 +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
Shinichiro Hamaji
6cedb6134f Let Messaging dex depend on proguard flag file
am: aa7dc68

* commit 'aa7dc685efb6ce80633b88d30f3b788a2c849452':
  Let Messaging dex depend on proguard flag file

Change-Id: I94d0d52cd46a8d77d00619b79d00fd21eea22982
2016-04-15 04:34:38 +00:00
Shinichiro Hamaji
aa7dc685ef Let Messaging dex depend on proguard flag file
The dex file will have the proguard flag file as an input
after this change.

Bug: 27954979
Change-Id: Ib584a38a6e8c6b744d604392de955cc3e928a040
2016-04-14 15:21:51 +09:00
Dan Albert
0a0a7cf815 Match the minimum version in the manifest.
am: fc922a1

* commit 'fc922a1f53193535d16cdb6c50d24bb1ad862229':
  Match the minimum version in the manifest.

Change-Id: Ia21710004fd08a0c57c77301045c910fe27c5353
2016-03-30 18:41:31 +00:00
Dan Albert
fc922a1f53 Match the minimum version in the manifest.
Change-Id: Iab7d34552df5cf3830ec03c36872879b9ba28d7e
2016-03-22 14:20:17 -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
Delphine Martin
f774983a5d Merge "Put back @interface in proguard flags" 2016-03-15 08:36:07 +00:00
Dan Albert
374af0d0d0 Stop targeting Froyo.
Froyo isn't supported any more.

Change-Id: I0008ad0273b2aa31ca523fdedd64437bf76c5cbe
2016-03-11 11:57:05 -08:00
Delphine Martin
83eba641b2 Put back @interface in proguard flags
This was a workaround when @interface was not supported.
Bug: 27217036

Change-Id: Iaa96fd9ffc2a39994a3177caa8d9da5dcfc6c91e
2016-03-11 16:29:28 +01: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
Yohann Roussel
f77da20064 Revert "Pin messaging to use Jack with 1.7 language"
This reverts commit ef3cc713d4.

Bug: 27333568
Bug: 27305482
Bug: 26753820
Change-Id: I696102ce7aba6ba01f95abd2c9705fb448499856
2016-02-26 15:26:22 +00:00
Neil Fuller
ef3cc713d4 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
(cherry picked from commit 445d7baabc)

Change-Id: I178ef57bc29cb49064db08d06d501d6aed09c26f
2016-02-23 15:01: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
Yohann Roussel
bf6bd40faa 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

Change-Id: I7c437906fe78e1a97204f5e26059966198b15ac1
2016-02-17 16:36:07 +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