Commit Graph

355 Commits

Author SHA1 Message Date
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
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
Philip P. Moltmann
f6aa0ff80e Merge "Switch to modern ArgumentMatchers" 2017-12-13 23:40:20 +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
Paul Duffin
2e86be170a Flatten dependency hierarchy of legacy-android-test
Previous changes statically included legacy-android-test in preparation
for removing android.test.* and junit.* classes from the android.jar.
Unfortunately, that lead to duplicate classes between APKs and the
bootclasspath which caused build problems (Proguard) and also runtime
problems (when targeting and running on older releases).

Switching from statically including the classes to using the runtime
libraries cannot be done in one step because legacy-android-test is
statically included in libraries which are used in many APKs and so
removing it from those libraries requires that all APKs be updated at
once. Doing that atomically across dozens of projects is not practical.

This change modifies APKS that statically include the
legacy-android-test library indirectly.

* If the APK manifest uses the android.test.runner library then the APK
  is modified to stop statically including legacy-android-test and
  instead build against android.test.base/mock/runner libraries instead.

* Otherwise, the APK statically includes legacy-android-test.

Also, any libraries that statically include are modified to stop
statically including it and if it has source dependencies on the classes
is changed to build against the android.test.base/mock/runner libraries.

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 'legacy-android-test' with 'android.test.runner.stubs' in
    LOCAL_JAVA_LIBRARIES because messagingtests's source depends on its
    classes. The classes do not need to be statically included because
    the classes will be provided by the runtime, either from the
    default bootclasspath or from the android.test.runner library that
    messagingtests specifies in its manifest.

Bug: 30188076
Test: make checkbuild
Change-Id: I7fa5bcf37c3b003c84ba5e493c6d675a619b6bcd
2017-12-05 18:36:57 +00:00
Aurimas Liutikas
9812a75c01 Migrate messaging to aapt2.
Test: make messaging
Change-Id: I460554bc92244feeca6e28081daf66d0dc2e6281
2017-11-21 12:50:18 -08:00
Paul Duffin
ea59fb8c73 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
2017-11-16 12:57:30 +00:00
Xin Li
6337883a56 Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am: cd9ba9e128

Change-Id: I1d26b974d483b727ff1f023838cd3ac121ffa86c
2017-11-15 02:36:20 +00:00
Xin Li
cd9ba9e128 Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
Change-Id: Ieafa1d7163c3b586f9daa34a8b8239ea57db6636
2017-11-14 16:38:23 -08:00
Xin Li
8f6c644d6f Merge commit 'b2dd6a8ef54b233843b463204ec4e3b67148a7e8' into HEAD
Change-Id: Id7e29d1428552414abd16ac7cd17d86b51e61658
2017-11-13 14:35:43 -08:00
Chih-Hung Hsieh
14dbcbcee7 Use -Werror in packages/apps/Messaging/jni am: cd6efe25a4 am: dfd8a9187f
am: ea2d2ad395

Change-Id: I20efed71a86dbee07b0f7edf2831393e1147ed89
2017-11-02 19:48:29 +00:00
Chih-Hung Hsieh
ea2d2ad395 Use -Werror in packages/apps/Messaging/jni am: cd6efe25a4
am: dfd8a9187f

Change-Id: Ic4f431bbe8c918b7f15f26d06553917e2a8ddfbc
2017-11-02 19:17:18 +00:00
Chih-Hung Hsieh
dfd8a9187f Use -Werror in packages/apps/Messaging/jni
am: cd6efe25a4

Change-Id: I56f5bee51ab4a56b11fc4e639b063728735f31e0
2017-11-02 19:03:25 +00:00
Chih-Hung Hsieh
cd6efe25a4 Use -Werror in packages/apps/Messaging/jni
Bug: 66996870
Test: build with WITH_TIDY=1
Change-Id: I3d7f5b98523c9fee08f2d1c29178ae050923617c
2017-11-01 15:56:01 -07:00
Tom Taylor
467361dbcf 37742976 - Catch bad gifs
* A security researcher crafted a gif that would cause the Android
Bitmap code to throw an NPE. That would cause messaging to crash when
decoding the NPE. The frameworks team is changing the underlying code to
throw an OutOfMemoryError instead of a NullPointerException.
In order to catch both errors, the code needs to catch Throwable.

Test: I added code to GifImageResource.getDrawable to throw a new
OutOfMemoryError and then used the debugger to verify it was caught by the
new catch Throwable statement. I did the same test with NullPointerException.
I tested attaching gif images and sending them to verify the gif path still
worked.

BUG=37742976

Change-Id: If71a7e65f8c0b083fe6c4b79f78358666338d59d
2017-10-05 11:27:21 -07:00
Tom Taylor
b2dd6a8ef5 37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: 7a6b99a4a4 am: 6ea30b87b1 am: a072033ce4 am: 93d52cb5e2 am: cbed68f73b am: f9b9dc3d2f am: c12af8d012 am: 3f22a4820c
am: 443a8888f2

Change-Id: I85c47a8571a609321e2c3e0dd4f2a2b57015e839
2017-07-12 19:33:47 +00:00
Tom Taylor
9a643d5c1c 37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: 7a6b99a4a4 am: 6ea30b87b1 am: a072033ce4 am: 93d52cb5e2 am: cbed68f73b am: f9b9dc3d2f am: c12af8d012 am: 7ace2d5308
am: cb822ae902

Change-Id: I0b28ce9619853b280cd93af783b93d6aff92bc4f
2017-07-12 19:33:39 +00:00
Tom Taylor
443a8888f2 37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: 7a6b99a4a4 am: 6ea30b87b1 am: a072033ce4 am: 93d52cb5e2 am: cbed68f73b am: f9b9dc3d2f am: c12af8d012
am: 3f22a4820c

Change-Id: I3007cf14803262bbb6f28db602b16252ebc4a62c
2017-07-12 19:29:21 +00:00
Tom Taylor
cb822ae902 37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: 7a6b99a4a4 am: 6ea30b87b1 am: a072033ce4 am: 93d52cb5e2 am: cbed68f73b am: f9b9dc3d2f am: c12af8d012
am: 7ace2d5308

Change-Id: I1872889b944cdffa63bafd7a125315d2fe2d7917
2017-07-12 19:28:15 +00:00
Tom Taylor
7ace2d5308 37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: 7a6b99a4a4 am: 6ea30b87b1 am: a072033ce4 am: 93d52cb5e2 am: cbed68f73b am: f9b9dc3d2f
am: c12af8d012

Change-Id: I70465c2290a2ba08d7647acab20bdfb25e8b3ecd
2017-07-12 19:24:50 +00:00
Tom Taylor
3f22a4820c 37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: 7a6b99a4a4 am: 6ea30b87b1 am: a072033ce4 am: 93d52cb5e2 am: cbed68f73b am: f9b9dc3d2f
am: c12af8d012

Change-Id: I5c9fd14d532b95caaceb8ca8b5e70feee77c34a0
2017-07-12 19:24:29 +00:00
Tom Taylor
c12af8d012 37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: 7a6b99a4a4 am: 6ea30b87b1 am: a072033ce4 am: 93d52cb5e2 am: cbed68f73b
am: f9b9dc3d2f

Change-Id: Ica8bedeb18ee6604e1382f54f0ad910b7cfa8c40
2017-07-12 19:20:09 +00:00