filab/packages_apps_Messaging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
125 Commits 1 Branch 0 Tags
991c2e5ab8be3638116a335f6ddc9e13aac4912c
Commit Graph

125 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul Duffin
991c2e5ab8 Use com.android.messaging.util.Assert instead of junit.framework.Assert 
Bug: 35234379
Bug: 30188076
Test: make checkbuild
Change-Id: I3aa9b72393d128877c86c9a116495f76f3e50e18
 2017-02-21 11:23:14 +00:00
Tony Mak
4b73fb0532 Merge \\"Merge remote-tracking branch \\'goog/nyc-mr1-dev\\' into aosp/master\\" into stage-aosp-master am: c3b3f3d8f1 
am: 323fb1e22f

Change-Id: I23d0312277b2204ec7eccb5204024fbd42979dbf
 2016-06-30 23:10:05 +00:00
Tony Mak
323fb1e22f Merge \"Merge remote-tracking branch \'goog/nyc-mr1-dev\' into aosp/master\" into stage-aosp-master 
am: c3b3f3d8f1

Change-Id: Ia7a15a8fa54b6d995f3a65f04ca4413f930d03d2
 2016-06-30 23:06:22 +00:00
Tony Mak
c3b3f3d8f1 Merge "Merge remote-tracking branch 'goog/nyc-mr1-dev' into aosp/master" into stage-aosp-master 2016-06-30 22:56:11 +00:00
Tony Mak
e4e982add9 Merge remote-tracking branch 'goog/nyc-mr1-dev' into aosp/master 2016-06-29 20:11:17 +00:00
Tony Mak
abff43da92 Show badge icon if any participant in the conversation is work contact 
am: 7ad7ac27f1

Change-Id: I65217f3af52910a3d93b240e2308d0e176497cc5
 2016-06-29 20:05:17 +00:00
Tony Mak
0ff0cdd425 Set the background of linearlayout to be transparent 
am: dec1aca348

Change-Id: I3335bf634ec9e4664543d5241eb13adb8ff9e130
 2016-06-29 20:05:16 +00:00
Tony Mak
3c2cbaa2a0 Add badge in conversation view if the participant is a work contact 
am: 2a50ffe57c

Change-Id: Ib2a1eb8e89ea5de74b7976507b95733abcb8fcdc
 2016-06-29 20:05:16 +00:00
Tony Mak
7ad7ac27f1 Show badge icon if any participant in the conversation is work contact 
Precompute is_enterprise and stored the value in conversation table.
Include is_enterprise in the ConversationList view.

Change-Id: I2e31bd61c08d25a296aaa3e99cb24631ae2e7976
 2016-06-29 10:58:33 +01:00
Tony Mak
dec1aca348 Set the background of linearlayout to be transparent 
Change-Id: Iffe33b61ec8d5caca6007c39be02bdaa2f1cb028
 2016-06-28 15:48:59 +01:00
Tony Mak
2a50ffe57c Add badge in conversation view if the participant is a work contact 
TODO: To handle conversation having more than one participants.

Bug: 29065176
Change-Id: I3820454bf2b76c151dc3a13d9be270502029160d
 2016-06-28 15:44:27 +01:00
Tavis Bohne
69e2c494bb Merge \\"Messenger refuses all file:///data/ uris\\" into nyc-dev am: 9de3ed279b 
am: d112c795ac

Change-Id: Ia88956bea9f0b93e57a9ad4b21c54097409d41b6
 2016-06-08 17:14:27 +00:00
Tavis Bohne
63a0e39806 Merge \\"Messenger refuses all file:///data/ uris\\" into nyc-dev am: 9de3ed279b 
am: f0a36952dc

Change-Id: I674e2feb8e4d5378765c6ebec371d76cef7d769a
 2016-06-08 17:09:03 +00:00
Tavis Bohne
f0a36952dc Merge \"Messenger refuses all file:///data/ uris\" into nyc-dev 
am: 9de3ed279b

Change-Id: I767e29fcbf808a84354b15a511a65f0a4a8a04ae
 2016-06-08 17:03:13 +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
Android Build Merger (Role)
6b96f314a3 Merge "Bump targetSdkVersion to 24 am: f1210c127a am: 4e106215ed" into nyc-mr1-dev-plus-aosp 2016-06-03 01:14:44 +00:00
Bill Yi
514b607a10 Bump targetSdkVersion to 24 am: f1210c127a 
am: 5159305b99

* commit '5159305b99d1b1e88687b4b17abb694fa884c8c2':
  Bump targetSdkVersion to 24

Change-Id: I32beacc80deacd958cc191f249638085d6a5b9af
 2016-06-03 01:14:33 +00:00
Bill Yi
b3b3b18b4f Bump targetSdkVersion to 24 am: f1210c127a 
am: 4e106215ed

* commit '4e106215eda80700eb52c911111ec2e270c4114f':
  Bump targetSdkVersion to 24

Change-Id: Ib27bc29f75d428c39c8094182d42fcaa83f38ca0
 2016-06-03 01:14:33 +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
4e106215ed Bump targetSdkVersion to 24 
am: f1210c127a

* commit 'f1210c127a4288aa53ec8dd3936a0077c63022eb':
  Bump targetSdkVersion to 24

Change-Id: I856f624362f64374ca8aa20186c665984d652657
 2016-06-03 01:10:04 +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
Android Build Merger (Role)
d935ffe467 Merge "Merge "Messaging doesn\'t allow sharing of its own files" into nyc-dev am: ca5fc9fa7d am: 0566cc6b9a" into nyc-mr1-dev-plus-aosp 2016-05-16 18:21:28 +00:00
Tavis Bohne
22e3fb6074 Merge "Messaging doesn\'t allow sharing of its own files" into nyc-dev am: ca5fc9fa7d 
am: 65e8a2d330

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

Change-Id: I5b3a6ffadacd8da1c8db1a626f78ca2bc65a2f7e
 2016-05-16 18:21:17 +00:00
Tavis Bohne
505f79c39b Merge "Messaging doesn\'t allow sharing of its own files" into nyc-dev am: ca5fc9fa7d 
am: 0566cc6b9a

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

Change-Id: Ia4e2da91fa6479011d1966dd5d604211af416745
 2016-05-16 18:21:17 +00: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
0566cc6b9a 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: I812ae5e1b37611a69090e024a858c5813a4a155f
 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
Android Build Merger (Role)
d67bcb8597 Merge "Add badge icon for work contact in search result am: c4073ff4ce am: 722c058dcc" into nyc-mr1-dev-plus-aosp 2016-05-16 15:48:06 +00:00
Android Build Merger (Role)
2672c4df38 Merge "Add badge icon for work contact in search result am: c4073ff4ce am: b5fcc65e0d" into nyc-mr1-dev-plus-aosp 2016-05-16 15:48:05 +00:00
Android Build Merger (Role)
d5c6997677 Merge "Cleanup enterprise feature in ContactUtil am: e2ccf8bff5 am: 9cd2bdf010" into nyc-mr1-dev-plus-aosp 2016-05-16 15:48:02 +00:00
Android Build Merger (Role)
f921d2f265 Merge "Cleanup enterprise feature in ContactUtil am: e2ccf8bff5 am: 50357f8877" into nyc-mr1-dev-plus-aosp 2016-05-16 15:48:01 +00:00
Android Build Merger (Role)
a4a666c991 Merge "Separate work and personal contacts search result am: 9045160771 am: 47037f9fef" into nyc-mr1-dev-plus-aosp 2016-05-16 15:47:50 +00:00
Android Build Merger (Role)
ce8c016b14 Merge "Separate work and personal contacts search result am: 9045160771 am: 0ecb6b9a9b" into nyc-mr1-dev-plus-aosp 2016-05-16 15:47:46 +00:00
Android Build Merger (Role)
2b7f72f705 Merge "Search enterprise directory as well in SMS app am: b7fc988f23 am: f302d0cd2f" into nyc-mr1-dev-plus-aosp 2016-05-16 15:47:43 +00:00
Android Build Merger (Role)
62eb09d89e Merge "Search enterprise directory as well in SMS app am: b7fc988f23 am: 3a1468db12" into nyc-mr1-dev-plus-aosp 2016-05-16 15:47:41 +00:00
Android Build Merger (Role)
9b8c9555e6 Merge "Add isAtLeastN in OsUtil am: 0a85b81c9f am: 0e2ee3d3e6" into nyc-mr1-dev-plus-aosp 2016-05-16 15:47:40 +00:00
Tony Mak
4f8f430421 Add badge icon for work contact in search result am: c4073ff4ce 
am: b5fcc65e0d

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

Change-Id: Ib1ab14584de17ccccafb965656bccb27fc711310
 2016-05-16 15:47:13 +00:00
Tony Mak
a7a3397f79 Add badge icon for work contact in search result am: c4073ff4ce 
am: 722c058dcc

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

Change-Id: Ic0f03c0da15ed8c4107790ba50cdca073ddee5dc
 2016-05-16 15:47:12 +00:00
Tony Mak
2a97575950 Cleanup enterprise feature in ContactUtil am: e2ccf8bff5 
am: 50357f8877

* commit '50357f88777b53df966da225f38eec1af65dfde9':
  Cleanup enterprise feature in ContactUtil

Change-Id: I4feefa7d568db67a852b2d9a0c51d7fa7bb0c9a4
 2016-05-16 15:47:12 +00:00
Tony Mak
3287960748 Separate work and personal contacts search result am: 9045160771 
am: 0ecb6b9a9b

* commit '0ecb6b9a9be10c711de753432c1a9f4f8e65eacc':
  Separate work and personal contacts search result

Change-Id: Ia900e937e25d10370a8d4eb2d6f08b793594aac3
 2016-05-16 15:47:12 +00:00
Tony Mak
d03b45a161 Cleanup enterprise feature in ContactUtil am: e2ccf8bff5 
am: 9cd2bdf010

* commit '9cd2bdf010086e5b2bd1f4a4f5edaac77da1e101':
  Cleanup enterprise feature in ContactUtil

Change-Id: I8db4a01a1a9981682344ebebb8c87f4b4fb70aff
 2016-05-16 15:47:11 +00:00
Tony Mak
6c9f3ea029 Separate work and personal contacts search result am: 9045160771 
am: 47037f9fef

* commit '47037f9fef1abf08c513983e9f73e39d82bcd32d':
  Separate work and personal contacts search result

Change-Id: Ib1f05e7e9876991e765fbe0c69c89bccecdc5e7a
 2016-05-16 15:47:11 +00:00
Tony Mak
ebf0a2c115 Search enterprise directory as well in SMS app am: b7fc988f23 
am: f302d0cd2f

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

Change-Id: I7b5dff608263837be8fa8d342bab2d00a4a9ab1f
 2016-05-16 15:47:11 +00:00
Victor Chang
d720dde345 Add isAtLeastN in OsUtil am: 0a85b81c9f 
am: 0e2ee3d3e6

* commit '0e2ee3d3e6d4f03249eafae3ac92f11d729cea34':
  Add isAtLeastN in OsUtil

Change-Id: I352f7b2366410def5759e29e09e9e9aaf80d384a
 2016-05-16 15:47:11 +00:00
Tony Mak
79865afd38 Search enterprise directory as well in SMS app am: b7fc988f23 
am: 3a1468db12

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

Change-Id: Icde0b42786cf8b7e7149af4d81f9237ae6c6ddee
 2016-05-16 15:47:10 +00:00
Victor Chang
07ceb80aa7 Add isAtLeastN in OsUtil am: 0a85b81c9f 
am: 53103d0433

* commit '53103d043362668e4773ed45cae5777fef24bfbb':
  Add isAtLeastN in OsUtil

Change-Id: I3a2530cdbfa0b34610e6c58a011d89e15e993df9
 2016-05-16 15:47:08 +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
b5fcc65e0d Add badge icon for work contact in search result 
am: c4073ff4ce

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

Change-Id: Ie4a51a7aa9951de718f8ea7fe5c10f345ae5163c
 2016-05-16 15:43:54 +00:00