filab/packages_apps_Messaging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
385 Commits 1 Branch 0 Tags
bdedf3439ce937bee7c9a63ae33f3e15e6a32348
Commit Graph
385 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Xin Li bdedf3439c Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: 268d3c8ccc 
am: 8fb99c8d81

Change-Id: I2d9ff9702b6e0568750d774dd08f4f6a134f75bb
 2018-06-09 06:47:44 -07:00
Xin Li 8fb99c8d81 Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master 
am: 268d3c8ccc

Change-Id: I9783d2c9fa432af7d528727e7fed215cb1cee4dd
 2018-06-09 03:18:04 -07:00
Xin Li 268d3c8ccc Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master 
Bug: 79597307
Change-Id: Ie77e61094c5a4ec4c46c88e5d9659baab61dfd8b
 2018-06-08 11:08:01 -07:00
Atanas Kirilov dd1d5852f6 Merge changes from topic "am-d8363787-88bb-4e45-b57c-b18d9d8290cb" into oc-dev am: f7bdc8fd87 am: 24fba8cf55 am: 8f2f5671b0 am: dc683fa0fd 
am: b6e222ec21

Change-Id: I1db1e411fcd7ee11dd7e8a0f345546ab2f75392a
 2018-06-01 07:02:48 -07:00
David Smith 125d06d822 [automerger skipped] [automerger] RESTRICT AUTOMERGE: Messaging ignores file URIs shared via intent am: 0ee4c0e33b am: a04af950ce am: b40c396122 skipped: 520012db02 am: f53801c86c am: 4fc4f4e215 am: 7ad8e75fdb am: 4ef3ac9534 skipped: 69535177c6 am: 7459ff44a0 am: 26ae608af3 am: 999910ca54 -s ours am: a3a85140b6 
am: 923cb12ba3  -s ours

Change-Id: Icf279ad4733357d77ebea2e51a3fe2009453a871
 2018-06-01 06:53:05 -07:00
Atanas Kirilov b6e222ec21 Merge changes from topic "am-d8363787-88bb-4e45-b57c-b18d9d8290cb" into oc-dev am: f7bdc8fd87 am: 24fba8cf55 am: 8f2f5671b0 
am: dc683fa0fd

Change-Id: I223ab91c15f919c996efa0ab4e10117dcf41253f
 2018-06-01 05:51:09 -07:00
David Smith 923cb12ba3 [automerger skipped] [automerger] RESTRICT AUTOMERGE: Messaging ignores file URIs shared via intent am: 0ee4c0e33b am: a04af950ce am: b40c396122 skipped: 520012db02 am: f53801c86c am: 4fc4f4e215 am: 7ad8e75fdb am: 4ef3ac9534 skipped: 69535177c6 am: 7459ff44a0 am: 26ae608af3 am: 999910ca54 -s ours 
am: a3a85140b6

Change-Id: Idf8e1eafdd8defcec751d22f0fea459f35a6e8a1
 2018-06-01 05:50:43 -07:00
Atanas Kirilov dc683fa0fd Merge changes from topic "am-d8363787-88bb-4e45-b57c-b18d9d8290cb" into oc-dev am: f7bdc8fd87 am: 24fba8cf55 
am: 8f2f5671b0

Change-Id: If409352ed52e8b4a1bf92b2bceedf5f032e8a7ed
 2018-06-01 03:47:45 -07:00
David Smith a3a85140b6 [automerger skipped] [automerger] RESTRICT AUTOMERGE: Messaging ignores file URIs shared via intent am: 0ee4c0e33b am: a04af950ce am: b40c396122 skipped: 520012db02 am: f53801c86c am: 4fc4f4e215 am: 7ad8e75fdb am: 4ef3ac9534 skipped: 69535177c6 am: 7459ff44a0 am: 26ae608af3 
am: 999910ca54  -s ours

Change-Id: I53237656bc4305a920e016552403018ba491c210
 2018-06-01 03:47:21 -07:00
Atanas Kirilov 8f2f5671b0 Merge changes from topic "am-d8363787-88bb-4e45-b57c-b18d9d8290cb" into oc-dev am: f7bdc8fd87 
am: 24fba8cf55

Change-Id: I77568438ff1c7b548256488f88f0291ab5780fd3
 2018-06-01 00:36:07 -07:00
David Smith 999910ca54 [automerger] RESTRICT AUTOMERGE: Messaging ignores file URIs shared via intent am: 0ee4c0e33b am: a04af950ce am: b40c396122 skipped: 520012db02 am: f53801c86c am: 4fc4f4e215 am: 7ad8e75fdb am: 4ef3ac9534 skipped: 69535177c6 am: 7459ff44a0 
am: 26ae608af3

Change-Id: I4f4a114035b95e5bc3d25c1f825520fb4f0f0a70
 2018-06-01 00:35:46 -07:00
Atanas Kirilov 24fba8cf55 Merge changes from topic "am-d8363787-88bb-4e45-b57c-b18d9d8290cb" into oc-dev 
am: f7bdc8fd87

Change-Id: Id3fd43caf91de165169d1b3f2af2f1218c658d8d
 2018-05-31 20:13:28 -07:00
David Smith 26ae608af3 [automerger] RESTRICT AUTOMERGE: Messaging ignores file URIs shared via intent am: 0ee4c0e33b am: a04af950ce am: b40c396122 skipped: 520012db02 am: f53801c86c am: 4fc4f4e215 am: 7ad8e75fdb am: 4ef3ac9534 skipped: 69535177c6 
am: 7459ff44a0

Change-Id: Ie788e84d696b51b66553a0d5b7179899f7936817
 2018-05-31 20:13:01 -07:00
Atanas Kirilov f7bdc8fd87 Merge changes from topic "am-d8363787-88bb-4e45-b57c-b18d9d8290cb" into oc-dev 
* changes:
  [automerger] Messaging ignores file URIs shared via intent am: 9deefdf182 am: ea03db3303 am: cd77076596 am: 9c69271a58 am: 0c21193863
  [automerger] Messaging ignores file URIs shared via intent am: 9deefdf182 am: ea03db3303 am: cd77076596 am: 9c69271a58
  [automerger] Messaging ignores file URIs shared via intent am: 9deefdf182 am: ea03db3303 am: cd77076596
  [automerger] Messaging ignores file URIs shared via intent am: 9deefdf182 am: ea03db3303
  [automerger] Messaging ignores file URIs shared via intent am: 9deefdf182
  Messaging ignores file URIs shared via intent
 2018-06-01 00:19:17 +00:00
Android Build Merger (Role) 7459ff44a0 [automerger] RESTRICT AUTOMERGE: Messaging ignores file URIs shared via intent am: 0ee4c0e33b am: a04af950ce am: b40c396122 skipped: 520012db02 am: f53801c86c am: 4fc4f4e215 am: 7ad8e75fdb am: 4ef3ac9534 skipped: 69535177c6 
Change-Id: I176da39a08831aba3f188951f9b63c81a88efa1c
 2018-05-25 23:49:56 +00:00
Android Build Merger (Role) 69535177c6 [automerger] RESTRICT AUTOMERGE: Messaging ignores file URIs shared via intent am: 0ee4c0e33b am: a04af950ce am: b40c396122 skipped: 520012db02 am: f53801c86c am: 4fc4f4e215 am: 7ad8e75fdb am: 4ef3ac9534 
Change-Id: I4b6d4b8cf2eb61e3732fc57050fde9baffa47f6d
 2018-05-25 23:49:56 +00:00
Android Build Merger (Role) 4ef3ac9534 [automerger] RESTRICT AUTOMERGE: Messaging ignores file URIs shared via intent am: 0ee4c0e33b am: a04af950ce am: b40c396122 skipped: 520012db02 am: f53801c86c am: 4fc4f4e215 am: 7ad8e75fdb 
Change-Id: Ie8f46ce60509d742a3afb5eb441b19e956a750cd
 2018-05-25 23:49:55 +00:00
Android Build Merger (Role) 7ad8e75fdb [automerger] RESTRICT AUTOMERGE: Messaging ignores file URIs shared via intent am: 0ee4c0e33b am: a04af950ce am: b40c396122 skipped: 520012db02 am: f53801c86c am: 4fc4f4e215 
Change-Id: I30f1daa381ac737923716cca1a8a1e2e4ec24b56
 2018-05-25 23:49:54 +00:00
Android Build Merger (Role) 4fc4f4e215 [automerger] RESTRICT AUTOMERGE: Messaging ignores file URIs shared via intent am: 0ee4c0e33b am: a04af950ce am: b40c396122 skipped: 520012db02 am: f53801c86c 
Change-Id: I22bb03f544ba866554334a7d23e74e24cece0fb4
 2018-05-25 23:49:53 +00:00
Android Build Merger (Role) f53801c86c [automerger] RESTRICT AUTOMERGE: Messaging ignores file URIs shared via intent am: 0ee4c0e33b am: a04af950ce am: b40c396122 skipped: 520012db02 
Change-Id: I92e620f57f6922f41227ec1a90021083e7deb388
 2018-05-25 23:49:52 +00:00
Android Build Merger (Role) 520012db02 [automerger] RESTRICT AUTOMERGE: Messaging ignores file URIs shared via intent am: 0ee4c0e33b am: a04af950ce am: b40c396122 
Change-Id: Ib4958d367e4e2297154af56b477121f1c8420746
 2018-05-25 23:49:51 +00:00
Android Build Merger (Role) b40c396122 [automerger] RESTRICT AUTOMERGE: Messaging ignores file URIs shared via intent am: 0ee4c0e33b am: a04af950ce 
Change-Id: Ic0cdad15c75212af17359979c9f6ee36c816c0a6
 2018-05-25 23:49:50 +00:00
Android Build Merger (Role) a04af950ce [automerger] RESTRICT AUTOMERGE: Messaging ignores file URIs shared via intent am: 0ee4c0e33b 
Change-Id: I5895fca2ea4aff3f0de20f30ebefc9d19d9d6052
 2018-05-25 23:49:49 +00:00
David Smith 0ee4c0e33b RESTRICT AUTOMERGE: Messaging ignores file URIs shared via intent 
Fixes b/37629504 by not creating attachments from file URIs shared via
intent. Sharing file URIs is disallowed by Android N and later and is no
longer supported for this app.

Test: manual using the Debug command added in this change
Change-Id: Iaecff745aca76381d387ab057ffa1f2024aebfcf
 2018-05-25 23:49:48 +00:00
Android Build Merger (Role) 870a173e43 [automerger] Messaging ignores file URIs shared via intent am: 9deefdf182 am: ea03db3303 am: cd77076596 am: 9c69271a58 am: 0c21193863 
Change-Id: Ifd8f26ed2cfc372c039fffa192a49293f234890b
 2018-05-25 23:24:07 +00:00
Android Build Merger (Role) 0c21193863 [automerger] Messaging ignores file URIs shared via intent am: 9deefdf182 am: ea03db3303 am: cd77076596 am: 9c69271a58 
Change-Id: I065b687f72fdb648e9713b5cb9a2f66bac69670b
 2018-05-25 23:24:06 +00:00
Android Build Merger (Role) 9c69271a58 [automerger] Messaging ignores file URIs shared via intent am: 9deefdf182 am: ea03db3303 am: cd77076596 
Change-Id: Ic9ff8359dbaf3dbfeaffec4c6e2247dab1592fa3
 2018-05-25 23:24:05 +00:00
Android Build Merger (Role) cd77076596 [automerger] Messaging ignores file URIs shared via intent am: 9deefdf182 am: ea03db3303 
Change-Id: Id7cb823cf94fc1d52b278264355c47043e12b0d6
 2018-05-25 23:24:04 +00:00
Android Build Merger (Role) ea03db3303 [automerger] Messaging ignores file URIs shared via intent am: 9deefdf182 
Change-Id: Ieaca25fa19b578953f88da445e2ecbd4b15f3a98
 2018-05-25 23:24:03 +00:00
David Smith 9deefdf182 Messaging ignores file URIs shared via intent 
Fixes b/37629504 by not creating attachments from file URIs shared via
intent. Sharing file URIs is disallowed by Android N and later and is no
longer supported for this app.

Test: manual using the Debug command added in this change

Change-Id: Ibff486c94ac703a9a4c5a80e33b934a460804a8f
Merged-In: Ibff486c94ac703a9a4c5a80e33b934a460804a8f
 2018-05-25 23:24:02 +00:00
TreeHugger Robot 0a365bf7cf Merge "Fix 'date' so that it does not cause regeneration for unbundled builds" 2018-05-15 20:19:28 +00:00
Aurimas Liutikas 5b52455e8f [automerger skipped] Migrate messaging to aapt2. am: a75d7022fc am: d037073df0 -s ours 
am: c6bbabd464  -s ours

Change-Id: I964af5abcfa8c0e257f74e8b102add753ad5f46b
 2018-05-07 14:24:55 -07:00
Aurimas Liutikas c6bbabd464 [automerger skipped] Migrate messaging to aapt2. am: a75d7022fc 
am: d037073df0  -s ours

Change-Id: I3194bd112e91c694cd4d231a62c36305e396452e
 2018-05-07 13:34:51 -07:00
Aurimas Liutikas d037073df0 Migrate messaging to aapt2. 
am: a75d7022fc

Change-Id: Ic26d9617805b93d0e4770ebde6913432ddb2fbaf
 2018-05-07 12:32:04 -07:00
Aurimas Liutikas a75d7022fc Migrate messaging to aapt2. 
Test: make messaging
Change-Id: I460554bc92244feeca6e28081daf66d0dc2e6281
Merged-In: I460554bc92244feeca6e28081daf66d0dc2e6281
(cherry picked from commit 9812a75c01)
 2018-04-25 22:30:18 -07:00
Aurimas Liutikas f38a1bdc3c Migrate Messaging to androidx. 
Test: make messaging
Bug: 76692459
Change-Id: I9103450622f129311545648ac75f5b2f9fc2d04a
 2018-04-09 17:17:41 -07:00
Zach Riggle 058a0cb454 Fix 'date' so that it does not cause regeneration for unbundled builds 
Currently a 'tapas' build will regenerate each time with:

    $(shell date +%m%d%y_%H%M%S) was changed, regenerating...

Change-Id: I2eeda1e9dd51a56bf0783f427b4fcf5a1f489254
 2018-03-15 21:44:24 +00:00
Vasu Nori 49d1460b97 putback go/ag/3671714. 
Enable content observer notifications even for default SMS app, when the
build is for Android Auto

Bug: 71633682
Test: tested manually
Change-Id: If91f4f7b2a9b46cba4aa516304f0007a06852c50
 2018-02-28 16:25:02 -08:00
Vasu Nori 737093efd3 Merge "Revert "Enable content observer notifications even for default SMS app, when the"" 2018-02-28 19:43:34 +00:00
Vasu Nori 871938aa2c Revert "Enable content observer notifications even for default SMS app, when the" 
This reverts commit 2e0bf0af27.

Reason for revert: should not be in P

Change-Id: I457ebe79e66abb21a9d2fc1c168802b8505c5e9f
 2018-02-28 17:34:49 +00:00
Vasu Nori 4c9320a8e4 Merge "Enable content observer notifications even for default SMS app, when the build is for Android Auto" 2018-02-23 23:02:18 +00:00
Nan Zhang b6e11d33bb Use HAS_BUILD_NUMBER to check engineering build am: 3dd036dc99 am: 38dea40340 
am: 9b793ee396

Change-Id: I0f26d4487ef7392c1c5467d0b4a296a352c20a91
 2018-02-22 02:36:45 +00:00
Nan Zhang 9b793ee396 Use HAS_BUILD_NUMBER to check engineering build am: 3dd036dc99 
am: 38dea40340

Change-Id: Ia084b72f382a73d50d9d983f0df4c60cf7c9c3e4
 2018-02-22 02:29:34 +00:00
Nan Zhang 38dea40340 Use HAS_BUILD_NUMBER to check engineering build 
am: 3dd036dc99

Change-Id: I7385020f09ebcb876806cc82eca751c7f785c01c
 2018-02-22 02:21:28 +00:00
Nan Zhang 3dd036dc99 Use HAS_BUILD_NUMBER to check engineering build 
And use BUILD_NUMBER_FROM_FILE instead of BUILD_NUMBER to reduce build
reruns.

Test: m -j32
Bug: b/70351683
Change-Id: Ic5fcd5def203de9c3022039fbdbaa866935301e8
 2018-02-21 10:34:30 -08:00
Vasu Nori 2e0bf0af27 Enable content observer notifications even for default SMS app, when the 
build is for Android Auto

Bug: 71633682
Test: tested manually
Change-Id: Iee139fd7a65f60cd6c059f5c6d2ef78464e0dfce
 2018-02-15 16:00:01 -08:00
Colin Cross f5db1f5e3f Don't use LOCAL_PROGUARD_ENABLED := nosystem am: 86e0cae74b am: 2be03391bb 
am: 11447d4c1a

Change-Id: I6979b49eef9cc6143c6c21ef2b42c5edfa6acffc
 2017-12-28 19:04:00 +00:00
Colin Cross 11447d4c1a Don't use LOCAL_PROGUARD_ENABLED := nosystem am: 86e0cae74b 
am: 2be03391bb

Change-Id: I535d50a8e094fcffe4c175a1ec7b018819be75f7
 2017-12-28 18:55:58 +00:00
Colin Cross 2be03391bb Don't use LOCAL_PROGUARD_ENABLED := nosystem 
am: 86e0cae74b

Change-Id: I862ac79b88560dd51fd9f6cdb8ce2c0dbcc7016d
 2017-12-28 18:46:57 +00:00
Colin Cross 86e0cae74b Don't use LOCAL_PROGUARD_ENABLED := nosystem 
This is the only user of nosystem, and it doesn't seem to serve
any purpose since most of the system flags are then manually
included back again.  Switch to optimization + obfuscation and
let the build system provide the correct flags file.

Test: classes.dex is identical, classes-proguard.jar differs only
      in removed StackMapTable sections (from -dontpreverify?).

Change-Id: I6bae85d10311a982d68cc296a441196ee3115c3d
 2017-12-27 18:53:41 -08:00