Dianne Hackborn
b56e98da8b
am 84adc43a: Merge "Fix issue #18706195 : Improve label names of memory types" into lmp-mr1-dev
...
automerge: 0f050ea#18706195 : Improve label names of memory types
2014-12-11 02:10:23 +00:00
Dianne Hackborn
0f050ea402
am 84adc43a: Merge "Fix issue #18706195 : Improve label names of memory types" into lmp-mr1-dev
...
* commit '84adc43a70302278eea4d9c198e14c88d6432f9c':
Fix issue #18706195 : Improve label names of memory types
2014-12-11 02:05:11 +00:00
Dianne Hackborn
1353df5655
Fix issue #18706195 : Improve label names of memory types
...
Change-Id: Ia11153300e04aecd56baca9d4316ac362688d594
2014-12-10 16:54:13 -08:00
Alan Viverette
9e8fbe42e9
am 7171bf40: am 6c42ee47: Merge "Always call onDateChanged() when the date picker selection changes" into lmp-mr1-dev
...
* commit '7171bf40eca7dc0a044f0378082d7f7c1dfa2348':
Always call onDateChanged() when the date picker selection changes
2014-12-11 00:07:32 +00:00
Alan Viverette
7171bf40ec
am 6c42ee47: Merge "Always call onDateChanged() when the date picker selection changes" into lmp-mr1-dev
...
* commit '6c42ee470307eee56a21062ad67b67878aa9392d':
Always call onDateChanged() when the date picker selection changes
2014-12-10 22:12:04 +00:00
Alan Viverette
e6ec07fc5d
Always call onDateChanged() when the date picker selection changes
...
BUG: 18703635
Change-Id: I2f71aa2e3e053cc8afd1bb84641a9fb29de89c72
2014-12-10 11:24:27 -08:00
Dianne Hackborn
9b287368b0
am 6bdbae07: Merge "Fix issue #18665625 CTS:android.app.cts.InstrumentationTest#..." into lmp-mr1-dev
...
automerge: 7557ec1#18665625 CTS:android.app.cts.InstrumentationTest#...
2014-12-10 19:21:58 +00:00
Craig Mautner
647130baac
am 7a17e0b6: Merge "Add put/getBoolean/Array to PersistableBundle" into lmp-mr1-dev
...
automerge: 8642803
2014-12-10 19:17:53 +00:00
Erik Kline
34b3b53f9c
am 33cd463b: Merge "Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions." into lmp-mr1-dev
...
automerge: 56d2e8f
2014-12-10 19:06:50 +00:00
Andre Eisenbach
f60f29d060
am c9149984: Merge "Prevent NullPointerException in getStringValue if no value is set" into lmp-mr1-dev
...
automerge: e832393
2014-12-10 18:49:41 +00:00
Dianne Hackborn
7557ec128f
am 6bdbae07: Merge "Fix issue #18665625 CTS:android.app.cts.InstrumentationTest#..." into lmp-mr1-dev
...
* commit '6bdbae07cf9b3929dca471072bea7001f7996efb':
Fix issue #18665625 CTS:android.app.cts.InstrumentationTest#...
2014-12-10 17:29:35 +00:00
Dianne Hackborn
6bdbae07cf
Merge "Fix issue #18665625 CTS:android.app.cts.InstrumentationTest#..." into lmp-mr1-dev
2014-12-10 17:23:07 +00:00
Craig Mautner
864280369c
am 7a17e0b6: Merge "Add put/getBoolean/Array to PersistableBundle" into lmp-mr1-dev
...
* commit '7a17e0b601c7f65a2ae0b53d8494ae1722c7a28b':
Add put/getBoolean/Array to PersistableBundle
2014-12-10 17:02:10 +00:00
Craig Mautner
7a17e0b601
Merge "Add put/getBoolean/Array to PersistableBundle" into lmp-mr1-dev
2014-12-10 16:56:15 +00:00
Erik Kline
56d2e8fb7b
am 33cd463b: Merge "Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions." into lmp-mr1-dev
...
* commit '33cd463bbbbe47010ed44815fbfd0ab5e8fbf825':
Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions.
2014-12-10 07:36:35 +00:00
Erik Kline
33cd463bbb
Merge "Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions." into lmp-mr1-dev
2014-12-10 07:29:47 +00:00
Dianne Hackborn
80b1c5608e
Fix issue #18665625 CTS:android.app.cts.InstrumentationTest#...
...
...testCallActivityOnNewIntent test fails with LMP-MR1 Release.
Check for null.
Also fix some small issues with converting intents to/from intents.
Change-Id: Ic391cc57552635935af9a271b2d09353257f6d14
2014-12-09 20:22:08 -08:00
Andre Eisenbach
e8323934c7
am c9149984: Merge "Prevent NullPointerException in getStringValue if no value is set" into lmp-mr1-dev
...
* commit 'c91499842fed63c55326e7e2a71b491f7c9315c1':
Prevent NullPointerException in getStringValue if no value is set
2014-12-10 02:36:10 +00:00
Craig Mautner
73bdf9761b
Add put/getBoolean/Array to PersistableBundle
...
Due to popular demand the methods putBoolean(), getBoolean(),
putBooleanArray() and getBooleanArray() have been added to
PersistableBundle.
Fixes bug 18390436.
Change-Id: Id133ba902aca774f98529e36ce560e873b88ad5b
2014-12-09 18:10:20 -08:00
Andre Eisenbach
0fd06a19bd
Prevent NullPointerException in getStringValue if no value is set
...
Bug: 18686365
Change-Id: I5f5d07ef49500e0d8118ba04aaf373ae4514f034
2014-12-09 16:42:14 -08:00
John Reck
3bae94d78e
resolved conflicts for merge of fe11126d to lmp-mr1-dev-plus-aosp
...
Change-Id: I60bf82ff71d9af0d80e7da8856efb4641c85885b
2014-12-09 15:38:38 -08:00
Ruben Brunk
28089cc39b
Merge "Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode." into lmp-mr1-dev automerge: 3ef5033
...
automerge: 6d98265
2014-12-09 23:20:39 +00:00
John Reck
fe11126d23
am 4f1942d9: Merge "Teach AssetAtlas about more drawables" into lmp-mr1-dev
...
* commit '4f1942d999c60fd91cb826651b6d978d47a74321':
Teach AssetAtlas about more drawables
2014-12-09 23:18:08 +00:00
Ruben Brunk
6d9826546d
Merge "Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode." into lmp-mr1-dev
...
automerge: 3ef5033
2014-12-09 23:13:06 +00:00
John Reck
4f1942d999
Merge "Teach AssetAtlas about more drawables" into lmp-mr1-dev
2014-12-09 23:12:42 +00:00
Ruben Brunk
3ef5033cda
Merge "Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode." into lmp-mr1-dev
2014-12-09 23:09:52 +00:00
John Reck
dad7d84c04
Teach AssetAtlas about more drawables
...
Bug: 18317479
Change-Id: I16868ee204d24af72af9a2efc987f7e9eb1d266b
2014-12-09 14:18:33 -08:00
John Reck
389baa3951
am 7d74cb6c: am 14c43689: Merge "Fix issue with RNA destruction mid-animation" into lmp-mr1-dev
...
* commit '7d74cb6c6139d42aad65fe1466ab4c5f8e029539':
Fix issue with RNA destruction mid-animation
2014-12-09 22:18:27 +00:00
Elliott Hughes
a04cd35da0
am 0aac16bb: am b034de7e: am 12f100de: am e8f6cb06: Merge "Fix typo." into lmp-docs
...
* commit '0aac16bbf1fd122302f8e58b7d4d5ee9d6afebc5':
Fix typo.
2014-12-09 22:09:25 +00:00
John Reck
7d74cb6c61
am 14c43689: Merge "Fix issue with RNA destruction mid-animation" into lmp-mr1-dev
...
* commit '14c436897ca56800a3758008f0631c559a898967':
Fix issue with RNA destruction mid-animation
2014-12-09 22:08:42 +00:00
Elliott Hughes
0aac16bbf1
am b034de7e: am 12f100de: am e8f6cb06: Merge "Fix typo." into lmp-docs
...
* commit 'b034de7eefc82a951bbf36a65b304f9475e1b44c':
Fix typo.
2014-12-09 21:34:06 +00:00
John Reck
14c436897c
Merge "Fix issue with RNA destruction mid-animation" into lmp-mr1-dev
2014-12-09 20:37:17 +00:00
John Reck
c47c98be04
Fix issue with RNA destruction mid-animation
...
Bug: 18521508
Fix an issue where an RNA's native object was destroyed
before the java-side object was started
Change-Id: I487fb476e0ecdf7000515f4f7320e8cfbc50a52b
2014-12-09 12:35:12 -08:00
Ruben Brunk
f4a637d0be
Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode.
...
Bug: 16030677
Change-Id: Ida04e04f41983b9126609522dd12064a7bf9645f
2014-12-09 11:56:22 -08:00
Elliott Hughes
b034de7eef
am 12f100de: am e8f6cb06: Merge "Fix typo." into lmp-docs
...
* commit '12f100def9e34a554df07f47badc259028ac4c68':
Fix typo.
2014-12-09 19:30:26 +00:00
Elliott Hughes
12f100def9
am e8f6cb06: Merge "Fix typo." into lmp-docs
...
* commit 'e8f6cb065c33c21dfefe0039739dc38fde5cff6d':
Fix typo.
2014-12-09 19:22:33 +00:00
Adrian Roos
4816e1c519
am a7065ea3: am c3642ef5: Merge "Revert "Add overscan insets to surface frame dimensions in WallpaperService."" into lmp-mr1-dev
...
* commit 'a7065ea363bd2bcebd31cccf114f36c8f578a22b':
Revert "Add overscan insets to surface frame dimensions in WallpaperService."
2014-12-09 18:59:29 +00:00
Adrian Roos
a7065ea363
am c3642ef5: Merge "Revert "Add overscan insets to surface frame dimensions in WallpaperService."" into lmp-mr1-dev
...
* commit 'c3642ef5c8582193f26b3875cebd902253709d5e':
Revert "Add overscan insets to surface frame dimensions in WallpaperService."
2014-12-09 18:52:13 +00:00
Adrian Roos
c3642ef5c8
Merge "Revert "Add overscan insets to surface frame dimensions in WallpaperService."" into lmp-mr1-dev
2014-12-09 18:44:31 +00:00
Adrian Roos
2ae3805efb
Revert "Add overscan insets to surface frame dimensions in WallpaperService."
...
This reverts commit a2838dfc2c
2014-12-09 18:32:07 +00:00
Elliott Hughes
547b0acae1
Fix typo.
...
Bug: https://code.google.com/p/android/issues/detail?id=78422
(cherry picked from commit 0adcf15ad8
2014-12-09 10:31:37 -08:00
Wink Saville
7a4df2b7d8
am 2f5cb843: am 15b29ac7: Merge "Add subId as parameter for get/setDataEnabled." into lmp-mr1-dev
...
* commit '2f5cb843553a596d314596c2bb776541db864d63':
Add subId as parameter for get/setDataEnabled.
2014-12-09 18:06:03 +00:00
Wink Saville
2f5cb84355
am 15b29ac7: Merge "Add subId as parameter for get/setDataEnabled." into lmp-mr1-dev
...
* commit '15b29ac7faf3b8b7845e6623f68ae7a7391dab78':
Add subId as parameter for get/setDataEnabled.
2014-12-09 17:58:37 +00:00
Wink Saville
15b29ac7fa
Merge "Add subId as parameter for get/setDataEnabled." into lmp-mr1-dev
2014-12-09 17:52:27 +00:00
Elliott Hughes
d50a5e7486
am afc5b22c: am da30b545: Merge "Fix typo."
...
* commit 'afc5b22c229b94228aa5ae1ff20117c9c76ba2ad':
Fix typo.
2014-12-09 16:17:34 +00:00
Elliott Hughes
da30b545f9
Merge "Fix typo."
2014-12-09 16:02:57 +00:00
Sebastien Hertz
70acd9b36a
resolved conflicts for merge of beb84982 to lmp-mr1-dev-plus-aosp
...
Change-Id: Ib420549f3e20c149c15966dfece980b4f150177d
2014-12-09 10:16:46 +01:00
Elliott Hughes
0adcf15ad8
Fix typo.
...
Bug: https://code.google.com/p/android/issues/detail?id=78422
Change-Id: I0dfbb74334e126062660831a4e01817dde068b56
2014-12-08 20:50:00 -08:00
Mathieu Chartier
fb5c932dbb
Merge "Add more -d dalvik details to dumpsys"
2014-12-09 02:05:45 +00:00
Dianne Hackborn
beb84982a1
am 8b33cf4d: Merge "Work on issue #18640385 : Add procstats test mode" into lmp-mr1-dev
...
* commit '8b33cf4d34a9ea75e1121ee2f1d829b21f3cb5d6':
Work on issue #18640385 : Add procstats test mode
2014-12-09 01:57:26 +00:00
