Commit Graph
404 Commits
Author SHA1 Message Date
Aurimas Liutikas 1b693ea7df Migrate Messaging to androidx.
Test: make messaging
Bug: 76692459
Change-Id: I9103450622f129311545648ac75f5b2f9fc2d04a
Merged-In: I9103450622f129311545648ac75f5b2f9fc2d04a
2019-02-14 22:59:57 +00:00
calvinpan 7ea2a930be Migrate to TelephonyProvider new URI when query the current sim APN
Since MCC, MNC and MVNO is deprecated in the TelephonyProvider and
query based on SIM_APN_URI will return all matching APNs from current
subscription carrier, so migrate to the new URI.

Bug: 115709816
Test: Build pass.
Change-Id: I260f2da2677564f37ef6a7711d45040a61215ddc
Merged-In: I260f2da2677564f37ef6a7711d45040a61215ddc
2019-01-18 03:25:55 +00:00
Dan Willemsen 88c7bd15a8 Replace USER with BUILD_USERNAME
USER may be "nobody" if the build is sandboxed. BUILD_USERNAME will have
the original value in all cases.

Bug: 122270019
Test: none
Change-Id: Id7122113f1764cb2e676e96e255f47675f831f83
2019-01-10 17:16:24 -08:00
Zach Riggle a48eac716c 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
Merged-In: I2eeda1e9dd51a56bf0783f427b4fcf5a1f489254
2019-01-10 17:16:18 -08:00
Chih-Hung Hsieh ebf6b1c285 Correct some errors in owners list.
Bug: 33166666
Test: gerrit uploader
Change-Id: I2483e2afc4f6c89e7b59095b950160ffa4c7c874
2019-01-09 09:43:14 -08:00
Chih-Hung Hsieh 40ad6823a7 Add default code reviewers into OWNERS
Bug: 33166666
Test: gerrit uploader
Change-Id: I6f35e1234694c4ac91b77bbbb9acd0da7ea80cba
2019-01-08 11:36:29 -08:00
Xin Li c020ac4b78 DO NOT MERGE
Merge pie-platform-release (PPRL.181205.001, history only) into master

Bug: 120502534
Change-Id: Id931c19bd78c83aa24c821f12691f92925fdafbe
2018-12-07 16:14:49 -08:00
Raman Tenneti c188adbeaa AOSP/Messaging - updated tests target version to 24 to match the Messaing app's targetSdkVersion. All messagingtests tests pass/work.
+ ParticipantRefreshTest - Added UIIntents and FakeDataModel. Fixed the errors in the data verification.
+ GetOrCreateConversationActionTest - changed the blankId assert to assertEquals because 10 conversations were inserted when database was created.
+ ConversationFragmentTest - Return mockDraftMessageData even if createDraftMessageData is called with null argument.

Bug: 119503204

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 8974412 Dec  3 17:21 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 709233 Dec  3 17:25 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: 13.376
  OK (113 tests)

Change-Id: Ib5784b9ed0b9086f153dd438b2b791ae0bca2621
2018-12-03 17:34:14 -08:00
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 9752cda535.

Reason for revert: com.android.devicehealthchecks are failing https://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

Change-Id: Ic03ccbe728a5251e5f6947c6b3fe04cb3f29f094
2018-08-07 18:32:11 -07:00
Xin Li e6fe1592b3 Merge Android Pie into master
am: 35e712c85b

Change-Id: I0b3e50462003eb0c0ea77059b3e671812b9a447e
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

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
android-build-team Robot 3bc028fb6d Snap for 4818534 from dc683fa0fd to pi-release
Change-Id: I2ca2f87c529031742b5a4baddfb5653e96ccd8ac
2018-06-03 07:24:32 +00: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
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