Raman Tenneti
a302369720
Revert "AOSP/Messaging - update the Messaging version to target P (28) or higher. Fixed tests in messagingtests. All tests pass/work."
...
This reverts commit 9752cda535https://sponge.corp.google.com/target?id=3b9a97f0-48bc-410d-94ce-0971c2f75361&target=com.android.devicehealthchecks&searchFor=&show=FAILED&sortBy=STATUS
Change-Id: I82d337b1d859083169ac6057b408f7e920f06609
2018-12-03 23:26:08 +00:00
Raman Tenneti
9752cda535
AOSP/Messaging - update the Messaging version to target P (28) or higher. Fixed tests in messagingtests. All tests pass/work.
...
+ ParticipantRefreshTest - Added UIIntents and FakeDataModel. Fixed the errors in the data verification.
+ GetOrCreateConversationActionTest - conversation already exists (changed the assert).
+ ConversationFragmentTest - Return mockDraftMessageData even if createDraftMessageData is called with null argument.
These tests weren't passing witout any changes (they weren't even starting without the target version update).
Bug: 119503204
Bug: 115499280
Test: manual - Ran the following CTS tests on Pixel phone. Tested the messaging UI.
$ make -j 40
$ make messagingtests -j
$ ls -l out/target/product/marlin/system/app/messaging/messaging.apk
-rw-r--r-- 1 rtenneti primarygroup 8716364 Nov 30 15:43 out/target/product/marlin/system/app/messaging/messaging.apk
$ ls -l out/target/product/marlin/testcases/messagingtests/messagingtests.apk
-rw-r--r-- 1 rtenneti primarygroup 627313 Nov 30 15:45 out/target/product/marlin/testcases/messagingtests/messagingtests.apk
$ adb install -r -d out/target/product/marlin/system/app/messaging/messaging.apk
$ adb install -r -d out/target/product/marlin/testcases/messagingtests/messagingtests.apk
$ adb shell am instrument -w com.android.messaging.test
Test results for InstrumentationTestRunner=.........................................
Time: 12.921
OK (113 tests)
The following is from logcat output:
11-30 23:47:31.861 6569 6590 I TestRunner: passed: testBindingReference(com.android.messaging.datamodel.BindingTest)
11-30 23:47:31.868 6569 6590 I TestRunner: passed: testBindingStartsUnbound(com.android.messaging.datamodel.BindingTest)
...
11-30 23:47:44.705 6569 6590 I TestRunner: passed: testGServiceGet(com.android.messaging.util.BugleGservicesTest)
Change-Id: I8f67da024d86f15f7430b803237ae4cff4d8e2c2
2018-11-30 19:53:43 -08:00
Xin Li
8b483ba642
Merge Android Pie into master am: 35e712c85b
...
am: e6fe1592b3
2018-08-07 18:32:11 -07:00
Xin Li
e6fe1592b3
Merge Android Pie into master
...
am: 35e712c85b
2018-08-07 15:01:25 -07:00
Xin Li
35e712c85b
Merge Android Pie into master
...
Bug: 112104996
Change-Id: Ia50af15c2dbe544047e806de7d0ecff91385bf2c
2018-08-06 16:51:20 -07:00
Xin Li
8fb99c8d81
Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
...
am: 268d3c8ccc
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
b6e222ec21
Merge changes from topic "am-d8363787-88bb-4e45-b57c-b18d9d8290cb" into oc-dev am: f7bdc8fd87 am: 24fba8cf55 am: 8f2f5671b0
...
am: dc683fa0fd
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
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
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
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
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
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
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
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: 9deefdf182ea03db3303cd770765969c69271a580c211938639deefdf182ea03db3303cd770765969c69271a589deefdf182ea03db3303cd770765969deefdf182ea03db33039deefdf182
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
Aurimas Liutikas
c6bbabd464
[automerger skipped] Migrate messaging to aapt2. am: a75d7022fc
...
am: d037073df0
2018-05-07 13:34:51 -07:00
Aurimas Liutikas
d037073df0
Migrate messaging to aapt2.
...
am: a75d7022fc
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
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
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
2018-02-22 02:36:45 +00:00
Nan Zhang
9b793ee396
Use HAS_BUILD_NUMBER to check engineering build am: 3dd036dc99
...
am: 38dea40340
2018-02-22 02:29:34 +00:00
Nan Zhang
38dea40340
Use HAS_BUILD_NUMBER to check engineering build
...
am: 3dd036dc99
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
2017-12-28 19:04:00 +00:00
Colin Cross
11447d4c1a
Don't use LOCAL_PROGUARD_ENABLED := nosystem am: 86e0cae74b
...
am: 2be03391bb
2017-12-28 18:55:58 +00:00
Colin Cross
2be03391bb
Don't use LOCAL_PROGUARD_ENABLED := nosystem
...
am: 86e0cae74b
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
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
2017-12-15 11:37:41 +00:00
Philip P. Moltmann
aac55283be
Switch to modern ArgumentMatchers am: 13ade30481
...
am: 4825219c58
2017-12-15 11:16:30 +00:00
