Aurimas Liutikas
441c8b85a6
Remove usages of ActionBarActivity. am: d3b23f568a
...
am: 10244bf817
Change-Id: I8a59c98cd83c19aaa373fa1c38b26de6da1a8046
2017-06-06 21:27:52 +00:00
Aurimas Liutikas
10244bf817
Remove usages of ActionBarActivity.
...
am: d3b23f568a
Change-Id: Ia3525872e1a635f787ac6836ea961d95cc76d57f
2017-06-06 21:24:03 +00:00
Aurimas Liutikas
d3b23f568a
Remove usages of ActionBarActivity.
...
ActionBarActivity has been deprecated for 2+ years and has been
extending AppCompatActivity for all that time. These changes
should be no-ops.
Bug: 35253513
Test: None
Change-Id: I699f327aaa99b26a0a0b562cf425203e4b625c33
(cherry picked from commit 11224977e7 )
2017-06-06 15:13:49 +00:00
Aurimas Liutikas
11224977e7
Remove usages of ActionBarActivity.
...
ActionBarActivity has been deprecated for 2+ years and has been
extending AppCompatActivity for all that time. These changes
should be no-ops.
Bug: 35253513
Test: None
Change-Id: I699f327aaa99b26a0a0b562cf425203e4b625c33
2017-05-18 11:16:47 -07:00
Tom Taylor
33e6be1db8
Merge "37544704 PduPersister is not doing a safe Uri comparison" into oc-dev am: 7ffdc9c333
...
am: a25e716645
Change-Id: I8f77c67dfc3002b2b6d5e20049e0cf715f6ff81e
2017-05-01 18:29:30 +00:00
Tom Taylor
a25e716645
Merge "37544704 PduPersister is not doing a safe Uri comparison" into oc-dev
...
am: 7ffdc9c333
Change-Id: Ibfe8a044ae6dd12fbd4c204150fa410fa6867220
2017-05-01 18:21:56 +00:00
Tom Taylor
7ffdc9c333
Merge "37544704 PduPersister is not doing a safe Uri comparison" into oc-dev
2017-05-01 18:09:08 +00:00
Tom Taylor
db45a19fe5
37544704 PduPersister is not doing a safe Uri comparison
...
* The PduPersister had some code where it checked uris for
equality, but didn't use the safe .equals method.
Test: manual test of sending and receiving mms's.
Bug: 37544704
Change-Id: I6dfd037068b4eff04c34cd9d41760e36e11915d6
2017-05-01 09:21:52 -07:00
Malcolm Chen
7eb0aa9da9
Re-define ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED, and ACTION_DEFAULT_SUBSCRIPTION_CHANGED with proper contents. am: 5aa1187f86
...
am: 54abffd219
Change-Id: Ia086b18fa15351d274a07f33b48a670dbd6fa257
2017-05-01 16:19:47 +00:00
Malcolm Chen
54abffd219
Re-define ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED, and ACTION_DEFAULT_SUBSCRIPTION_CHANGED with proper contents.
...
am: 5aa1187f86
Change-Id: Ibad3f2aa34f89e75ace317a6a7945a79da8e5684
2017-05-01 16:11:07 +00:00
Malcolm Chen
5aa1187f86
Re-define ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED, and
...
ACTION_DEFAULT_SUBSCRIPTION_CHANGED with proper contents.
Bug: 37497166
Test: Manual
Change-Id: I3fb7d33fc45634ff3e9d2240e822a8945285fad2
2017-04-28 11:36:15 -07:00
Sanket Padawe
7424571ac4
Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'. am: 56eaeedbb4 am: efad207abc
...
am: dd192a650b -s ours
Change-Id: I286766be1fc7bf035996e3ddd21744f1334f743b
2017-03-23 01:07:04 +00:00
Sanket Padawe
dd192a650b
Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'. am: 56eaeedbb4
...
am: efad207abc
Change-Id: Ia56cbe2705ca7db11773cb79373e64cefed56d2a
2017-03-23 00:58:09 +00:00
Sanket Padawe
efad207abc
Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'.
...
am: 56eaeedbb4
Change-Id: I6ff74db8a3bcc83768418293a4410e1b05daa732
2017-03-23 00:45:48 +00:00
Sanket Padawe
56eaeedbb4
Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'.
...
Bug: 35767068
Test: No build failure on update.
Change-Id: Iab619e80da63685212043f88d30c171a013f8925
Merged-in: Iab619e80da63685212043f88d30c171a013f8925
2017-03-21 22:32:23 +00:00
Sanket Padawe
616dc26461
Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'.
...
Bug: 35767068
Test: No build failure on update.
Change-Id: Iab619e80da63685212043f88d30c171a013f8925
2017-03-21 11:25:10 -07:00
Matt Sarett
09f7cfd826
Update callers *GifCloseFile for new GIFLIB DO NOT MERGE am: 60519c717e am: 0cf3a7d3ec am: 93facf6314 am: cc1dbfc497 -s ours am: 7fb08c55f5 am: 172aeda52b am: d7b191a016 am: ffa6f9ac89 am: ebe4ce865f
...
am: 06dbece4c5 -s ours
Change-Id: I61df8ade67a8b9ef527a89f695c1b4ee27f8303f
2017-03-15 17:19:34 +00:00
Matt Sarett
06dbece4c5
Update callers *GifCloseFile for new GIFLIB DO NOT MERGE am: 60519c717e am: 0cf3a7d3ec am: 93facf6314 am: cc1dbfc497 -s ours am: 7fb08c55f5 am: 172aeda52b am: d7b191a016 am: ffa6f9ac89
...
am: ebe4ce865f
Change-Id: I33a345152cc1c2eebc1ac7be4ee8c9649f4794a1
2017-03-15 17:14:33 +00:00
Matt Sarett
ebe4ce865f
Update callers *GifCloseFile for new GIFLIB DO NOT MERGE am: 60519c717e am: 0cf3a7d3ec am: 93facf6314 am: cc1dbfc497 -s ours am: 7fb08c55f5 am: 172aeda52b am: d7b191a016
...
am: ffa6f9ac89
Change-Id: Ib6053a2965920cb2487f1d697ba51d26a275eea4
2017-03-15 17:10:03 +00:00
Matt Sarett
ffa6f9ac89
Update callers *GifCloseFile for new GIFLIB DO NOT MERGE am: 60519c717e am: 0cf3a7d3ec am: 93facf6314 am: cc1dbfc497 -s ours am: 7fb08c55f5 am: 172aeda52b
...
am: d7b191a016
Change-Id: I1637b3f32e85d91c16d64ccfcb7227fb55b8dbd7
2017-03-15 17:05:02 +00:00
Matt Sarett
d7b191a016
Update callers *GifCloseFile for new GIFLIB DO NOT MERGE am: 60519c717e am: 0cf3a7d3ec am: 93facf6314 am: cc1dbfc497 -s ours am: 7fb08c55f5
...
am: 172aeda52b
Change-Id: I0b3f11dfc15470583a2890ed54406d96dd0cbfe9
2017-03-15 16:59:32 +00:00
Matt Sarett
172aeda52b
Update callers *GifCloseFile for new GIFLIB DO NOT MERGE am: 60519c717e am: 0cf3a7d3ec am: 93facf6314 am: cc1dbfc497 -s ours
...
am: 7fb08c55f5
Change-Id: I3b3a5e591427010eb9814bc8bbf49ff472024b61
2017-03-15 16:54:02 +00:00
Matt Sarett
7fb08c55f5
Update callers *GifCloseFile for new GIFLIB DO NOT MERGE am: 60519c717e am: 0cf3a7d3ec am: 93facf6314
...
am: cc1dbfc497 -s ours
Change-Id: I15259006a672182c3d5abab0172eb51d94e64c2b
2017-03-15 16:49:25 +00:00
Matt Sarett
cc1dbfc497
Update callers *GifCloseFile for new GIFLIB DO NOT MERGE am: 60519c717e am: 0cf3a7d3ec
...
am: 93facf6314
Change-Id: Ib851a4d150690cc4959455dc0f7bc249fbd784c6
2017-03-15 16:45:22 +00:00
Matt Sarett
93facf6314
Update callers *GifCloseFile for new GIFLIB DO NOT MERGE am: 60519c717e
...
am: 0cf3a7d3ec
Change-Id: I17c2d833878a9e60efc9b65eb5c8d91299d5ea42
2017-03-15 16:39:46 +00:00
Matt Sarett
0cf3a7d3ec
Update callers *GifCloseFile for new GIFLIB DO NOT MERGE
...
am: 60519c717e
Change-Id: I6f3b4664585a35d3177aea9371e283d567044e6e
2017-03-15 16:34:47 +00:00
Matt Sarett
60519c717e
Update callers *GifCloseFile for new GIFLIB DO NOT MERGE
...
Bug:34697653
Test: build; existing CTS tests
Original commit message:
Fix build breakage caused by updating giflib
Change-Id: I085379470620ec4db13f8baf7a9eb069747270b7
2017-03-15 10:15:32 -04:00
Paul Duffin
ee40b6007d
Refactor code incompatible with Mockito 2.7.13 am: d529415c68 am: 65a7c6845d
...
am: 0188c2ac3e
Change-Id: Ie8464f8b26188b12837d3eaead36eb94bf150a64
2017-03-10 00:08:31 +00:00
Paul Duffin
0188c2ac3e
Refactor code incompatible with Mockito 2.7.13 am: d529415c68
...
am: 65a7c6845d
Change-Id: Ic09f2a1f08441c9e44612b2f2a63902f7e12764c
2017-03-09 23:59:31 +00:00
Paul Duffin
65a7c6845d
Refactor code incompatible with Mockito 2.7.13
...
am: d529415c68
Change-Id: I9c5f55ea1e7b9224033435159b19ef81fa9832e3
2017-03-09 23:56:06 +00:00
Paul Duffin
d529415c68
Refactor code incompatible with Mockito 2.7.13
...
Bug: 32912773
Test: make checkbuild
Change-Id: I252a7e8ae8473f0ce7e177f691aac7dfeb67e7d8
2017-03-09 18:49:41 +00:00
Paul Duffin
3dd54cd669
Prepare for removal of junit and android.test classes from Android API (step 1) am: e98e557469 am: 3fc616a742
...
am: 872137e536
Change-Id: I5a98e76df88ad9524916b5b8757755f58df3e849
2017-03-03 14:47:08 +00:00
Paul Duffin
872137e536
Prepare for removal of junit and android.test classes from Android API (step 1) am: e98e557469
...
am: 3fc616a742
Change-Id: Ib4ed27bf723799aede7d198939c5e22def4af5a5
2017-03-03 14:44:15 +00:00
Paul Duffin
3fc616a742
Prepare for removal of junit and android.test classes from Android API (step 1)
...
am: e98e557469
Change-Id: I9cf742acbfeda8755f8b0c41be0088617d3d3025
2017-03-03 14:41:46 +00:00
Paul Duffin
e98e557469
Prepare for removal of junit and android.test classes from Android API (step 1)
...
In preparation for removing junit and android.test classes from
the Android API this change adds explicit dependencies on junit
and/or legacy-android-test to ensure that modules will compile
properly once it is removed.
Care was taken to ensure that any targets that depended,
directly or indirectly, on android-support-test did not also
depend on junit or hamcrest as they conflict with the versions
embedded within android-support-test.
Bug: 30188076
Test: make checkbuild
Change-Id: Ic5b5b771dbc3cb5a1902cf5eb4e838a2f22c8f87
2017-03-01 13:21:11 +00:00
Tom Taylor
e0f37bb8e1
22851197 Messaging Application crash with unsupported type's URI
...
This bug and AOSP patch arrived last July. Supposedly, I
merged the change, but it's certainly not fixed in bugler, nor in various
copies of PduPersister in Android's master. Fixing all the locations
now.
Test: manual - sent/received MMS's to verify the change didn't break
existing behavior.
Bug: 22851197
Change-Id: Ia79bd9951b1820ebc42baf0eef38667753d77ab9
2017-02-23 10:41:40 -08:00
Paul Duffin
5a41083bb4
Use com.android.messaging.util.Assert instead of junit.framework.Assert am: 991c2e5ab8 am: 3cce9e3644
...
am: 613ba55900
Change-Id: I563bd41bf19d58268fa82194c58880a329fbdbc7
2017-02-21 18:20:20 +00:00
Paul Duffin
613ba55900
Use com.android.messaging.util.Assert instead of junit.framework.Assert am: 991c2e5ab8
...
am: 3cce9e3644
Change-Id: Id61aac4365d076ee036fa9845f0b8e10718deff9
2017-02-21 18:10:13 +00:00
Paul Duffin
3cce9e3644
Use com.android.messaging.util.Assert instead of junit.framework.Assert
...
am: 991c2e5ab8
Change-Id: Ifb50be13961d566c58c25c3f9f6e7a4ac4b6a260
2017-02-21 18:01:15 +00:00
Paul Duffin
991c2e5ab8
Use com.android.messaging.util.Assert instead of junit.framework.Assert
...
Bug: 35234379
Bug: 30188076
Test: make checkbuild
Change-Id: I3aa9b72393d128877c86c9a116495f76f3e50e18
2017-02-21 11:23:14 +00:00
Tom Taylor
5d2ab59dcd
32764144 Security Vulnerability - heap buffer overflow in libgiftranscode.so in colorMap->Colors[colorIndex] am: 6f763fef7a am: 9f00add2fb am: 71d4913462 am: 82fa311e9a am: cc649e4e1e am: 657379f51c am: fb324f89bf am: eece1bd759 am: 984688e992
...
am: 103c8bdb63
Change-Id: I693dd05d0ce05117dc249bc6dac412a86800b528
2017-01-17 20:11:26 +00:00
Tom Taylor
8ff9c6abce
32764144 Security Vulnerability - heap buffer overflow in libgiftranscode.so in colorMap->Colors[colorIndex] am: 6f763fef7a am: 9f00add2fb am: 71d4913462 am: 82fa311e9a am: cc649e4e1e am: 657379f51c am: fb324f89bf am: eece1bd759 am: 8495e582a1
...
am: 8bace8dbea
Change-Id: I526b39e57f55282c77c74e26f61fd06211303c69
2017-01-17 20:11:18 +00:00
Tom Taylor
103c8bdb63
32764144 Security Vulnerability - heap buffer overflow in libgiftranscode.so in colorMap->Colors[colorIndex] am: 6f763fef7a am: 9f00add2fb am: 71d4913462 am: 82fa311e9a am: cc649e4e1e am: 657379f51c am: fb324f89bf am: eece1bd759
...
am: 984688e992
Change-Id: I5232bd8c0db4c17084a4c108f2c4aed4f1ceffdd
2017-01-17 20:05:11 +00:00
Tom Taylor
8bace8dbea
32764144 Security Vulnerability - heap buffer overflow in libgiftranscode.so in colorMap->Colors[colorIndex] am: 6f763fef7a am: 9f00add2fb am: 71d4913462 am: 82fa311e9a am: cc649e4e1e am: 657379f51c am: fb324f89bf am: eece1bd759
...
am: 8495e582a1
Change-Id: I92091dcb75ea3289cb875d27bc8fa28c3028c33b
2017-01-17 20:02:06 +00:00
Tom Taylor
8495e582a1
32764144 Security Vulnerability - heap buffer overflow in libgiftranscode.so in colorMap->Colors[colorIndex] am: 6f763fef7a am: 9f00add2fb am: 71d4913462 am: 82fa311e9a am: cc649e4e1e am: 657379f51c am: fb324f89bf
...
am: eece1bd759
Change-Id: I5b978323dc12e67a3ea2b27a71d1bf1de27e1c0a
2017-01-17 19:59:54 +00:00
Tom Taylor
984688e992
32764144 Security Vulnerability - heap buffer overflow in libgiftranscode.so in colorMap->Colors[colorIndex] am: 6f763fef7a am: 9f00add2fb am: 71d4913462 am: 82fa311e9a am: cc649e4e1e am: 657379f51c am: fb324f89bf
...
am: eece1bd759
Change-Id: Ib27dbe626b08898bc88063292a8b7750ffa39f9d
2017-01-17 19:59:54 +00:00
Tom Taylor
eece1bd759
32764144 Security Vulnerability - heap buffer overflow in libgiftranscode.so in colorMap->Colors[colorIndex] am: 6f763fef7a am: 9f00add2fb am: 71d4913462 am: 82fa311e9a am: cc649e4e1e am: 657379f51c
...
am: fb324f89bf
Change-Id: I8e57243cac35d74a28e5af1fd23800d5cb7cb080
2017-01-17 19:57:24 +00:00
Tom Taylor
fb324f89bf
32764144 Security Vulnerability - heap buffer overflow in libgiftranscode.so in colorMap->Colors[colorIndex] am: 6f763fef7a am: 9f00add2fb am: 71d4913462 am: 82fa311e9a am: cc649e4e1e
...
am: 657379f51c
Change-Id: I1533f159aa2ae92a6db094722475d2d5f527bb6d
2017-01-17 19:55:43 +00:00
Tom Taylor
657379f51c
32764144 Security Vulnerability - heap buffer overflow in libgiftranscode.so in colorMap->Colors[colorIndex] am: 6f763fef7a am: 9f00add2fb am: 71d4913462 am: 82fa311e9a
...
am: cc649e4e1e
Change-Id: Ibd12cb39d3abb95bacdfd0461927f5bd57b0c2c4
2017-01-17 19:53:24 +00:00
Tom Taylor
cc649e4e1e
32764144 Security Vulnerability - heap buffer overflow in libgiftranscode.so in colorMap->Colors[colorIndex] am: 6f763fef7a am: 9f00add2fb am: 71d4913462
...
am: 82fa311e9a
Change-Id: Ifd7c99312f526e379268f5f12a5ff61d95a90996
2017-01-17 19:51:36 +00:00