filab/packages_apps_Messaging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
428 Commits 1 Branch 0 Tags
62f573f1efb7f8d9304ad2c3e77b273badb0906c
Commit Graph

428 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
android-build-team Robot
7e3b13bac4 Snap for 4628106 from 737093efd3 to pi-release 
Change-Id: I5fcca2e24b47b09043103e7256c2afa14bfdf794
 2018-03-01 08:27:18 +00: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
android-build-team Robot
d55337e178 Snap for 4620899 from 4c9320a8e4 to pi-release 
Change-Id: Ib1545e416b63188de92daf0089ae3cede50ad040
 2018-02-25 08:23:00 +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
android-build-team Robot
9b36178728 Snap for 4615953 from b6e11d33bb to pi-release 
Change-Id: Iea7fdaf0ffdf74f9160f5e88b8602f423aab3b6e
 2018-02-22 08:27:07 +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
android-build-team Robot
ad08ef8705 Snap for 4521654 from f5db1f5e3f to pi-release 
Change-Id: I052a3f0aac2851f90b885bea4e45a9e3d35b8440
 2017-12-31 08:25:54 +00: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
android-build-team Robot
739aec86d2 Snap for 4507345 from 85fb9ddccc to pi-release 
Change-Id: I0428292b2ec44253f65f80114cd63b2876193911
 2017-12-17 08:21:33 +00:00
TreeHugger Robot
85fb9ddccc Merge "Add android.test.base/stubs dependency" 2017-12-15 14:00:38 +00:00
Philip P. Moltmann
dab728b9cd Switch to modern ArgumentMatchers am: 13ade30481 am: 4825219c58 
am: aac55283be

Change-Id: I2d60912d3e54cfb69c57c2bba17ef4c594835507
 2017-12-15 11:37:41 +00:00
Philip P. Moltmann
aac55283be Switch to modern ArgumentMatchers am: 13ade30481 
am: 4825219c58

Change-Id: I36cc4d4c4a21024cf85f407426d4cbe09eaeaca7
 2017-12-15 11:16:30 +00:00
Philip P. Moltmann
4825219c58 Switch to modern ArgumentMatchers 
am: 13ade30481

Change-Id: I179e84cc63294062f158813685a03dfa326431fb
 2017-12-15 10:55:57 +00:00
Paul Duffin
3a14dd0aa8 Add android.test.base/stubs dependency 
In preparation for the removal of the non-junit classes in the
android.test.base library from the android.jar this adds a dependency
on android.test.base/stubs to ensure this code will continue to
compile.

The following change descriptions were generated automatically and so
may be a little repetitive. They are provided to give the reviewer
enough information to check the comments match what has actually been
changed and check the reasoning behind the changes.

* tests/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    messagingtests's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

Bug: 30188076
Test: make dist
Change-Id: Iabfb3c655897781ab3aee2b0dbf574d6048954a9
 2017-12-15 07:22:38 +00:00
Philip P. Moltmann
13ade30481 Switch to modern ArgumentMatchers 
Test: - adb shell am instrument -w -e class com.android.messaging.ui.attachmentchooser.AttachmentChooserFragmentTest com.android.messaging.test/android.test.InstrumentationTestRunner
      - adb shell am instrument -w -e class com.android.messaging.ui.conversation.ComposeMessageViewTest com.android.messaging.test/android.test.InstrumentationTestRunner
      - adb shell am instrument -w -e class com.android.messaging.ui.conversationlist.ConversationListItemViewTest com.android.messaging.test/android.test.InstrumentationTestRunner
Change-Id: Ic3f29ed0e13b392d5687934f25d99c2a0e8c4dac
 2017-12-14 09:48:05 -08:00
android-build-team Robot
613144092f Snap for 4502278 from f6aa0ff80e to pi-release 
Change-Id: Iff6e3d39f3b2c29fd9a04a9206c4b4f03cc397bc
 2017-12-14 08:33:18 +00:00
Philip P. Moltmann
f6aa0ff80e Merge "Switch to modern ArgumentMatchers" 2017-12-13 23:40:20 +00:00
android-build-team Robot
2bbefa816b Snap for 4500033 from dc6414be65 to pi-release 
Change-Id: I7b2e7c6aaec549c1106da289f89b4bc19aec1f8a
 2017-12-13 08:33:07 +00:00
Paul Duffin
dc6414be65 Use a.t.mock.stubs instead of a.t.mock.sdk am: 13c0cbe2c6 am: 79fbe99445 
am: f18ac489da  -s ours

Change-Id: I771681a6d2479b44034a377d4f6bc2cd27c698f3
 2017-12-13 01:57:22 +00:00
Paul Duffin
f18ac489da Use a.t.mock.stubs instead of a.t.mock.sdk am: 13c0cbe2c6 
am: 79fbe99445

Change-Id: Ic556f9fccca1051830d428985d36cc4126602b63
 2017-12-13 01:43:58 +00:00
Paul Duffin
79fbe99445 Use a.t.mock.stubs instead of a.t.mock.sdk 
am: 13c0cbe2c6

Change-Id: I41c4cf94c3aba9c259a55d2fc3a6b207069944ee
 2017-12-13 01:11:53 +00:00
Philip P. Moltmann
ea5d77fa38 Switch to modern ArgumentMatchers 
Test: - adb shell am instrument -w -e class com.android.messaging.ui.attachmentchooser.AttachmentChooserFragmentTest com.android.messaging.test/android.test.InstrumentationTestRunner
      - adb shell am instrument -w -e class com.android.messaging.ui.conversation.ComposeMessageViewTest com.android.messaging.test/android.test.InstrumentationTestRunner
      - adb shell am instrument -w -e class com.android.messaging.ui.conversationlist.ConversationListItemViewTest com.android.messaging.test/android.test.InstrumentationTestRunner
Change-Id: Ic3f29ed0e13b392d5687934f25d99c2a0e8c4dac
 2017-12-12 13:07:12 -08:00
Paul Duffin
13c0cbe2c6 Use a.t.mock.stubs instead of a.t.mock.sdk 
Remove dependencies on android.test.mock.sdk as it is a duplicate of
android.test.mock.stubs and will be removed.

The following change descriptions were generated automatically and so
may be a little repetitive. They are provided to give the reviewer
enough information to check the comments match what has actually been
changed and check the reasoning behind the changes.

* tests/Android.mk
    Replaced 'android.test.mock.sdk' with 'android.test.mock.stubs' in
    LOCAL_JAVA_LIBRARIES because android.test.mock.sdk has been
    deprecated.

Bug: 30188076
Test: make checkbuild
Change-Id: I40d388f5e07293f7d958b563bc8ab94f89ff9f8d
Merged-In: I40d388f5e07293f7d958b563bc8ab94f89ff9f8d
(cherry picked from commit ea59fb8c73)
 2017-12-07 13:33:09 -08:00
android-build-team Robot
559aa3cd3f Snap for 4489599 from 2e86be170a to pi-release 
Change-Id: I9531c95031542fdc87efc5e3ee310381d3094d2b
 2017-12-07 08:21:05 +00:00