OSDN Git Service
Dianne Hackborn [Tue, 24 Jan 2012 19:12:37 +0000 (11:12 -0800)]
Merge "Add new test for showing very slow animations."
Dianne Hackborn [Mon, 9 Jan 2012 20:05:26 +0000 (12:05 -0800)]
Add new test for showing very slow animations.
Change-Id: Ibcc3e46a72210cf8a8e4cf5a932e2c9a7995f0f1
Scott Main [Tue, 24 Jan 2012 19:05:02 +0000 (11:05 -0800)]
am
e7dc2898: am
4809f09f: docs: update fujitsu id, capitalize
* commit '
e7dc2898c099bb1673f4bb0074b4d3b697699176':
docs: update fujitsu id, capitalize
Scott Main [Tue, 24 Jan 2012 19:02:25 +0000 (11:02 -0800)]
am
b790d1aa: am
cdf14454: docs: add fujitsu/toshiba USB vendor id
* commit '
b790d1aa2f741813b1556b71875dc453bc8c8010':
docs: add fujitsu/toshiba USB vendor id
Scott Main [Tue, 24 Jan 2012 19:01:49 +0000 (11:01 -0800)]
am
4809f09f: docs: update fujitsu id, capitalize
* commit '
4809f09f55a6177bd69303630dc42cc738f71116':
docs: update fujitsu id, capitalize
Scott Main [Tue, 24 Jan 2012 18:59:23 +0000 (10:59 -0800)]
am
cdf14454: docs: add fujitsu/toshiba USB vendor id
* commit '
cdf14454326dcb2f43ae0da208a8ed65a38f2897':
docs: add fujitsu/toshiba USB vendor id
Scott Main [Tue, 24 Jan 2012 18:58:06 +0000 (10:58 -0800)]
docs: update fujitsu id, capitalize
Change-Id: I776bdf0af37baa98b2b2dd70c5950ea1e98d36ec
Scott Main [Tue, 24 Jan 2012 18:54:50 +0000 (10:54 -0800)]
docs: add fujitsu/toshiba USB vendor id
Change-Id: I7917035d8c3f4b0fc80b7c992fcdf085aa984b4f
Gilles Debunne [Tue, 24 Jan 2012 18:46:58 +0000 (10:46 -0800)]
Merge "Fix for AOOB in MeasuredText"
Gilles Debunne [Tue, 24 Jan 2012 18:42:09 +0000 (10:42 -0800)]
Merge "Restored selectAllOnFocus"
Jean-Baptiste Queru [Tue, 24 Jan 2012 16:46:26 +0000 (08:46 -0800)]
am
10c4641c: am
2ae5805c: am
164a9842: Merge "stagefright aacenc: Properly terminate a comment"
* commit '
10c4641c2e2f747f8fef7d217d550b7f9a6de588':
stagefright aacenc: Properly terminate a comment
Jean-Baptiste Queru [Tue, 24 Jan 2012 16:43:14 +0000 (08:43 -0800)]
am
2ae5805c: am
164a9842: Merge "stagefright aacenc: Properly terminate a comment"
* commit '
2ae5805cf18ad6bdbea5def03a488e14c1a8804c':
stagefright aacenc: Properly terminate a comment
Jean-Baptiste Queru [Tue, 24 Jan 2012 16:40:50 +0000 (08:40 -0800)]
am
164a9842: Merge "stagefright aacenc: Properly terminate a comment"
* commit '
164a984224f5d430757628028f2522329987350f':
stagefright aacenc: Properly terminate a comment
Jean-Baptiste Queru [Tue, 24 Jan 2012 15:51:11 +0000 (07:51 -0800)]
Merge "stagefright aacenc: Properly terminate a comment"
Adam Cohen [Tue, 24 Jan 2012 03:23:06 +0000 (19:23 -0800)]
Merge "Fix issue
5905210, AdapterViewAnimator sending negative index to Adapter"
Adam Cohen [Tue, 24 Jan 2012 03:12:22 +0000 (19:12 -0800)]
Fix issue
5905210, AdapterViewAnimator sending negative index to Adapter
Change-Id: I6c1a3c17f1009d9512328f5844e17025f95a216c
Fabrice Di Meglio [Tue, 24 Jan 2012 02:59:17 +0000 (18:59 -0800)]
Merge "Fix bug #
5863709 API request: Change param names of deleteSurroundingText to "before" and "after""
Chia-chi Yeh [Tue, 24 Jan 2012 02:40:52 +0000 (18:40 -0800)]
Merge "VpnDialogs: fix screen flickering when popping up dialogs."
Gilles Debunne [Tue, 24 Jan 2012 02:35:32 +0000 (18:35 -0800)]
Restored selectAllOnFocus
Bug introduced in recent refactoring
https://android-git.corp.google.com/g/#/c/158896/
Do not move cursor when selectAllOnFocus and focus just happened.
The didTouchFocusSelect() condition was not copied over from ArrowKeyMM.
Change-Id: Id01d225c436ae3dd97c5d77d5dac5d0690d7de76
Chia-chi Yeh [Tue, 24 Jan 2012 02:33:26 +0000 (18:33 -0800)]
VpnDialogs: fix screen flickering when popping up dialogs.
Bug:
5699057
Change-Id: Iad1b32cafa32f98b27b6c96a63e1e9d97908983a
Jeff Brown [Tue, 24 Jan 2012 01:36:06 +0000 (17:36 -0800)]
Merge "Inform ContentObservers about the changed content Uri."
Jeff Brown [Tue, 24 Jan 2012 01:35:50 +0000 (17:35 -0800)]
Merge "Clean up content observer code."
Jeff Brown [Mon, 23 Jan 2012 23:51:41 +0000 (15:51 -0800)]
Inform ContentObservers about the changed content Uri.
Added a new method ContentObserver.onChange(boolean, Uri) that
receives the changed content Uri. This can help applications make
better decisions about how to interpret a change notification.
Change-Id: I8e35378b6485fe22c5bc240ba07557d269af0836
Romain Guy [Tue, 24 Jan 2012 01:10:42 +0000 (17:10 -0800)]
Merge "Add full support for Canvas.setDrawFilter()"
Romain Guy [Tue, 24 Jan 2012 01:09:05 +0000 (17:09 -0800)]
Add full support for Canvas.setDrawFilter()
Change-Id: I0ad35d0603c4eeda469014803be14c1dcdde918c
Gilles Debunne [Tue, 24 Jan 2012 00:36:33 +0000 (16:36 -0800)]
Fix for AOOB in MeasuredText
Bug
5707593
Change-Id: I3c21343b2938119d7ae9d7892733dc83a209c991
Romain Guy [Tue, 24 Jan 2012 00:27:50 +0000 (16:27 -0800)]
Merge "Update hardware acceleration doc"
Romain Guy [Tue, 24 Jan 2012 00:26:46 +0000 (16:26 -0800)]
Update hardware acceleration doc
Change-Id: I3bed77b3c4e1eff96fa462e4849f25f38784c415
Jim Miller [Mon, 23 Jan 2012 23:53:17 +0000 (15:53 -0800)]
am
9f080e2a: am
44760b10: Merge "Revert "Fix
5797764: Increase lock screen\'s thread priority"" into ics-mr1
* commit '
9f080e2a5bc6a268934e32201c69ea8a86900396':
Revert "Fix
5797764: Increase lock screen's thread priority"
Jim Miller [Mon, 23 Jan 2012 23:51:23 +0000 (15:51 -0800)]
am
44760b10: Merge "Revert "Fix
5797764: Increase lock screen\'s thread priority"" into ics-mr1
* commit '
44760b106a4bafcf83fb356bf91683db40e0e5a2':
Revert "Fix
5797764: Increase lock screen's thread priority"
Jim Miller [Mon, 23 Jan 2012 23:49:32 +0000 (15:49 -0800)]
Merge "Revert "Fix
5797764: Increase lock screen's thread priority"" into ics-mr1
Fabrice Di Meglio [Mon, 23 Jan 2012 23:46:58 +0000 (15:46 -0800)]
Merge "Fix bug #
5846413 "phone" keyboard layout is broken on master"
Romain Guy [Mon, 23 Jan 2012 23:35:24 +0000 (15:35 -0800)]
Merge "Fix API typo"
Romain Guy [Mon, 23 Jan 2012 23:34:25 +0000 (15:34 -0800)]
Fix API typo
Change-Id: Iac6de947b0d550cc8dd4a3b5d88baa322c21bbb8
Jim Miller [Mon, 23 Jan 2012 23:24:42 +0000 (15:24 -0800)]
Revert "Fix
5797764: Increase lock screen's thread priority"
This reverts commit
6d6a70a33746ef5147ab146f1802f0db424dd2f1
This doesn't appear to have a measurable impact for this issue.
Justin Ho [Mon, 23 Jan 2012 23:16:00 +0000 (15:16 -0800)]
am
feb1d988: (-s ours) am
fee5a860: Merge "DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"" into ics-mr1
* commit '
feb1d988c8ea1a67a4edbf1914ea41ea73519e12':
DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"
Justin Ho [Mon, 23 Jan 2012 23:13:19 +0000 (15:13 -0800)]
am
fee5a860: Merge "DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"" into ics-mr1
* commit '
fee5a860a8355cda071ff23644e943414ba7f65d':
DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"
Justin Ho [Mon, 23 Jan 2012 23:11:00 +0000 (15:11 -0800)]
Merge "DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"" into ics-mr1
Fabrice Di Meglio [Mon, 23 Jan 2012 23:06:42 +0000 (15:06 -0800)]
Fix bug #
5863709 API request: Change param names of deleteSurroundingText to "before" and "after"
Change-Id: I727fad9a59cda915899674569bfabd29b9f5da60
John Reck [Mon, 23 Jan 2012 23:04:13 +0000 (15:04 -0800)]
Merge "Fix crash when scrolling a layer"
Justin Ho [Mon, 23 Jan 2012 22:01:15 +0000 (14:01 -0800)]
DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"
This reverts commit
71c4496a9757438afd30b4404824f296f6158a49.
Change-Id: Iff10c49ea728bb10023ddeb50a3b708db770fff2
John Reck [Mon, 23 Jan 2012 22:53:47 +0000 (14:53 -0800)]
Fix crash when scrolling a layer
Change-Id: I6e61f3b38c5d1291ceb36c9dfa87fcd78480c2f4
Dianne Hackborn [Mon, 23 Jan 2012 22:34:55 +0000 (14:34 -0800)]
Merge "New screen rotation animation design."
Gilles Debunne [Mon, 23 Jan 2012 22:10:44 +0000 (14:10 -0800)]
Merge "Double tap to select enabled on suggestions"
Fabrice Di Meglio [Sat, 21 Jan 2012 01:41:55 +0000 (17:41 -0800)]
Fix bug #
5846413 "phone" keyboard layout is broken on master
- was a subtle regression introduced when fixing bug #
5753006
- as we are now using SkPaint::kGlyphID_TextEncoding (glyph encoding)
instead of SkPaint::kUTF16_TextEncoding (UTF16 encoding), we need to
force the UTF16 encoding in some cases that are NOT going thru
the TextLayoutCache / Harfbuzz shaping
- fix also breakText() the same way
- also clean some old comment
- Warning: depends also on a CL from Skia for having getBaseGlyphCount() "const"
Change-Id: I3d1fc87f070884876c679b33541f810fbfb5df3f
Jeff Brown [Mon, 23 Jan 2012 21:01:18 +0000 (13:01 -0800)]
Clean up content observer code.
Improved the documentation a little bit.
Fixed a bug in ContentService wherein if a ContentObserver was
passed as an argument and its deliverSelfNotifications() method
returned true, then notifyChange would tell all observers that
the change was a self-change even though it was only a self-change
from the perspective of the provided observer.
Deprecated ContentObservable.notifyChange since it is never
used and in general it shouldn't be because we want the notification
to be posted to the handler.
Change-Id: Idde49eb40777e011a068f2adae8a32f779dfb923
Dianne Hackborn [Fri, 13 Jan 2012 21:09:16 +0000 (13:09 -0800)]
New screen rotation animation design.
We now have an animation that can start as soon as we detect to
rotate the screen, and have a different phase once the new UI
is ready to complete the transition into it.
Change-Id: I05b9c12a699232acbddc36b4a994a4452db71476
Dianne Hackborn [Mon, 23 Jan 2012 20:36:19 +0000 (12:36 -0800)]
Merge "New brightness setting to adjust auto-brightness mode."
Wink Saville [Mon, 23 Jan 2012 20:22:21 +0000 (12:22 -0800)]
Merge "Do not clear good TLVs when a error occurs decoding."
Andy McFadden [Mon, 23 Jan 2012 20:21:19 +0000 (12:21 -0800)]
Merge "Don't use bootstrap loader directly"
Wink Saville [Mon, 23 Jan 2012 20:19:20 +0000 (12:19 -0800)]
Do not clear good TLVs when a error occurs decoding.
In change Ief74d0e4f4f28dff7a435e9dab1fab1ca1d9bfaf with a sha1 of
e81932e92a773538e1ad1ad1d4bfd8f241860c8d it seemed like a good idea
to throw away all TLV's on errors. In retrospect that was probably
not a good idea. For example on the MTN Ghana SIM the error
occurs because of some 0 pad bytes at the end, all of the actual
TLV's are good, so throwing away everything is unreasonable. Instead
accepting what is valid seems a better approach.
Also, add a couple debug lines on error paths.
Change-Id: I4add0c9cd242f46e0ef8700229d0ec755b9e4c4c
Dianne Hackborn [Sat, 21 Jan 2012 02:36:40 +0000 (18:36 -0800)]
New brightness setting to adjust auto-brightness mode.
Change-Id: Icfec22be99d8c79e9ff5720b80fb9dacbba36134
Bill Gruber [Mon, 23 Jan 2012 18:41:43 +0000 (10:41 -0800)]
am
add87f99: am
5e5b57ae: Merge "DevDocs update: Publishing on Market" into ics-mr1
* commit '
add87f99d9ece26c776abe40297e9a49e08932d9':
DevDocs update: Publishing on Market
The Android Open Source Project [Mon, 23 Jan 2012 18:41:37 +0000 (10:41 -0800)]
am
961b1df3: Reconcile with ics-mr1-release
* commit '
961b1df3fcbf5c441555b69ac52a5aed7f91a94e':
Fix
5797764: Increase lock screen's thread priority
Bill Gruber [Mon, 23 Jan 2012 18:23:10 +0000 (10:23 -0800)]
am
5e5b57ae: Merge "DevDocs update: Publishing on Market" into ics-mr1
* commit '
5e5b57aef29b33d03965b4dc370cde9a39220adc':
DevDocs update: Publishing on Market
Bill Gruber [Mon, 23 Jan 2012 18:21:16 +0000 (10:21 -0800)]
Merge "DevDocs update: Publishing on Market" into ics-mr1
The Android Open Source Project [Mon, 23 Jan 2012 18:15:41 +0000 (10:15 -0800)]
Reconcile with ics-mr1-release
Change-Id: If1b58550b6ddf90a654f08e4add9012a15a7134a
Andy McFadden [Mon, 23 Jan 2012 17:48:53 +0000 (09:48 -0800)]
Don't use bootstrap loader directly
The VM is allowed to use null to represent the bootstrap class
loader, so attempting to call methods on it is a bad idea. Use
the system class loader instead.
Change-Id: I9190848945f679d546d5fb30aba10fd27c7e5404
Andy McFadden [Mon, 23 Jan 2012 17:34:17 +0000 (09:34 -0800)]
Merge "Use Map.Entry, not HashMap.Entry"
Jim Miller [Mon, 23 Jan 2012 17:18:36 +0000 (09:18 -0800)]
am
b1c7785c: am
eaa11a72: Merge "Fix
5797764: Increase lock screen\'s thread priority" into ics-mr1
* commit '
b1c7785c1110e171d3dd3deb259b1caeed0b9da6':
Fix
5797764: Increase lock screen's thread priority
Justin Ho [Mon, 23 Jan 2012 17:18:30 +0000 (09:18 -0800)]
am
e46f8696: am
b09f6f96: Merge "Update WiMAX assets to match new style Bug:
5724605" into ics-mr1
* commit '
e46f869629ef27afb149c771e69dbbefe1135f33':
Update WiMAX assets to match new style Bug:
5724605
Daniel Sandler [Mon, 23 Jan 2012 17:18:24 +0000 (09:18 -0800)]
am
aaa7b772: am
639ed754: Hide mobile RSSI on devices without mobile data.
* commit '
aaa7b7728f3ced062273b54e1fc3b9d7d815bdcd':
Hide mobile RSSI on devices without mobile data.
Justin Ho [Mon, 23 Jan 2012 17:18:20 +0000 (09:18 -0800)]
am
ffb0c0b3: am
70e21c92: Merge "New out-of-service RSSI." into ics-mr1
* commit '
ffb0c0b3ca2f8693a354aad17e21f1419d9f0379':
New out-of-service RSSI.
George Mount [Mon, 23 Jan 2012 15:30:26 +0000 (07:30 -0800)]
Merge "Add cut and paste to ContentEditable."
Michael Jurka [Mon, 23 Jan 2012 15:24:32 +0000 (07:24 -0800)]
Merge "Remove fastInvalidate and setFast* methods"
Michael Jurka [Mon, 23 Jan 2012 15:23:56 +0000 (07:23 -0800)]
Merge "Improve rapid-fire presses on system bar"
Dianne Hackborn [Sat, 21 Jan 2012 02:42:07 +0000 (18:42 -0800)]
resolved conflicts for merge of
892d11f4 to master
Change-Id: I21eca0002100d898e167a25aaa46d896deca2a11
Christopher Tate [Sat, 21 Jan 2012 01:59:06 +0000 (17:59 -0800)]
Merge "Fix shared-storage full backup"
Christopher Tate [Sat, 21 Jan 2012 01:11:31 +0000 (17:11 -0800)]
Fix shared-storage full backup
The special shared-storage step was mistakenly writing its data directly
to the USB output pipe rather than to the proper stacked data handling
chain that applies compression and encryption. Fix this by getting rid
of the custom handling of the shared-storage data, instead folding it
into the normal data handling flow [with a small amount of additional
management because e.g. it doesn't need a "manifest" pseudofile in the
archive stream].
Fixes bug
5897791
Change-Id: I3995b07963334d2f8cce49b247c87d3d3ff93bed
Glenn Kasten [Sat, 21 Jan 2012 01:16:36 +0000 (17:16 -0800)]
Merge "Remove AudioFlinger dependencies on client"
Glenn Kasten [Sat, 21 Jan 2012 01:00:00 +0000 (17:00 -0800)]
Remove AudioFlinger dependencies on client
Change-Id: Ibb591e41a3ca5d7015e2b66b98b8fef5f415fb37
Guang Zhu [Sat, 21 Jan 2012 01:06:42 +0000 (17:06 -0800)]
Merge "Revert "Use port 18000 instead of 8000 for layout tests""
Guang Zhu [Sat, 21 Jan 2012 01:06:11 +0000 (17:06 -0800)]
Revert "Use port 18000 instead of 8000 for layout tests"
port 8000 is no longer being occupied, plus this approach never worked 100% because some pages have access to port 8000 hard coded in HTML
This reverts commit
e2b9d7f2f027907c7dcdbfb9e99297ff799ce482
Daniel Sandler [Sat, 21 Jan 2012 00:38:24 +0000 (16:38 -0800)]
am
a64f899f: am
4d3161f3: Merge "Always show appropriate mobile service label." into ics-mr1
* commit '
a64f899fa6159a8839a769d3f107f6c502da58c8':
Always show appropriate mobile service label.
Jeff Brown [Sat, 21 Jan 2012 00:38:10 +0000 (16:38 -0800)]
am
1bc82792: (-s ours) am
ad1f4a2c: Merge "Implement a max time bound for rotation. (DO NOT MERGE)" into ics-mr1
* commit '
1bc82792b87c0aee65c53f84a6d7c6b5031a09bc':
Implement a max time bound for rotation. (DO NOT MERGE)
Jeff Brown [Sat, 21 Jan 2012 00:38:07 +0000 (16:38 -0800)]
am
06a0fb95: (-s ours) am
5d58eb06: Merge "Fix a few memory leaks in the input dispatcher. (DO NOT MERGE)" into ics-mr1
* commit '
06a0fb953ff1c544bdbef2618d20ec1ba551eb6e':
Fix a few memory leaks in the input dispatcher. (DO NOT MERGE)
The Android Open Source Project [Sat, 21 Jan 2012 00:38:02 +0000 (16:38 -0800)]
am
288cde7f: Reconcile with ics-mr1-release
* commit '
288cde7f0a17f47f7071168f442d19f703947cc9':
Jean-Baptiste Queru [Sat, 21 Jan 2012 00:37:52 +0000 (16:37 -0800)]
am
ee567e08: am
c3c36b4f: am
9d25b82d: Merge "Rename LOG_ASSERT to ALOG_ASSERT"
* commit '
ee567e08d973c0fad214889e8d980f9bfb535b34':
Rename LOG_ASSERT to ALOG_ASSERT
Jean-Baptiste Queru [Sat, 21 Jan 2012 00:37:49 +0000 (16:37 -0800)]
am
45470559: (-s ours) am
12b7da69: am
6df477be: Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)"
* commit '
45470559cd4a499fd5d38cf708f0b531dc081fed':
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)
Jean-Baptiste Queru [Sat, 21 Jan 2012 00:35:20 +0000 (16:35 -0800)]
am
db2b3930: (-s ours) am
f3f650db: am
a826f9e2: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)"
* commit '
db2b39300a8f763cf2d0c9808deb86db87d5492c':
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)
Jean-Baptiste Queru [Sat, 21 Jan 2012 00:32:45 +0000 (16:32 -0800)]
am
dde686e2: (-s ours) am
08d3c6e5: am
4f367f33: Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)"
* commit '
dde686e2bdf7ea679dae4fd4edbf94c71802dc28':
Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)
Jim Miller [Fri, 20 Jan 2012 22:35:56 +0000 (14:35 -0800)]
Fix
5797764: Increase lock screen's thread priority
This increases lock screen's thread priority from THREAD_PRIORITY_FOREGROUND
to THREAD_PRIORITY_DISPLAY to ensure it runs before other activities that
might stall lock screen when the screen turns on.
Change-Id: I14cf9f3f5c092817bc6cf2d0a254001a5d34f744
Jean-Baptiste Queru [Sat, 21 Jan 2012 00:30:21 +0000 (16:30 -0800)]
am
a1e87397: (-s ours) am
7ae84204: am
ba7f0d2a: Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)"
* commit '
a1e873975704814416ee4d5023bf0740ec195ec0':
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)
Jean-Baptiste Queru [Sat, 21 Jan 2012 00:28:04 +0000 (16:28 -0800)]
am
d6b5584b: (-s ours) am
97aa8ee8: Merge
ee4618bc
* commit '
d6b5584b67f8a2f3d8ea20d748652673d5761e33':
Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)
Jean-Baptiste Queru [Sat, 21 Jan 2012 00:25:45 +0000 (16:25 -0800)]
am
fd266b36: (-s ours) am
36b48c30: am
c318bbb0: Merge "Rename (IF_)LOG() to (IF_)ALOG()"
* commit '
fd266b36826aa6dd8cd3fa00c159a094423899fb':
Rename (IF_)LOG() to (IF_)ALOG()
Justin Ho [Sat, 21 Jan 2012 00:23:03 +0000 (16:23 -0800)]
am
abc90a7b: (-s ours) am
820b45c0: Merge "DO NOT MERGE Revert "Fix issue #
5823276: home repaints after full-screen app is exited"" into ics-mr1
* commit '
abc90a7b48b058379a50a426bd0d2769ac7229b6':
DO NOT MERGE Revert "Fix issue #
5823276: home repaints after full-screen app is exited"
Jeff Brown [Sat, 21 Jan 2012 00:20:24 +0000 (16:20 -0800)]
Merge "Delete dead code."
Jeff Brown [Sat, 21 Jan 2012 00:18:46 +0000 (16:18 -0800)]
Delete dead code.
This API has never been used or exposed, time for it to go away.
Change-Id: Ie199ed0731d0a620d6608b2adbea1083f87276cd
The Android Automerger [Sat, 21 Jan 2012 00:12:47 +0000 (16:12 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Wink Saville [Fri, 20 Jan 2012 23:56:56 +0000 (15:56 -0800)]
Merge "Additional logging information for Card Application Toolkit/SIM Toolkit"
Robert Ly [Fri, 20 Jan 2012 23:52:32 +0000 (15:52 -0800)]
am
cdc1ea03: am
4e552533: resolved conflicts for merge of
b078d942 to ics-mr1
* commit '
cdc1ea03130763963fe6c179ed1f5ec14d6c7750':
cherrypick from master docs: Renderscript changes Change-Id: Ic84b7d8c5c48e118f337e60c8bb5b8bc68b0da16
The Android Open Source Project [Fri, 20 Jan 2012 23:52:27 +0000 (15:52 -0800)]
am
5d0c713a: Reconcile with ics-mr1-release
* commit '
5d0c713a87e9fd3cc7a775092aef9fc1194c7440':
Robert Ly [Fri, 20 Jan 2012 23:52:07 +0000 (15:52 -0800)]
am
ab8f1ba0: am
12310ee8: am
9575a1ab: Merge "docs: wifi direct" into ics-mr0
* commit '
ab8f1ba0ec9d66db2f653b08f4caa24a27b3a996':
docs: wifi direct
Wink Saville [Fri, 20 Jan 2012 23:49:36 +0000 (15:49 -0800)]
Additional logging information for Card Application Toolkit/SIM Toolkit
Add an optional explanation field and toString to ResultException
Add toString to CommandDetails.
Add add a few more log statements on error paths.
Bug:
5852715
Change-Id: I8594178002a67798aa3fb38ce1ee15c1a41f1854
Jim Miller [Fri, 20 Jan 2012 23:48:21 +0000 (15:48 -0800)]
am
ab9601cd: am
230a7092: Merge "Fix
5863053: Add method to lock screen immediately." into ics-mr1
* commit '
ab9601cdbb95ae94088750eff9a926a572c1a4d6':
Fix
5863053: Add method to lock screen immediately.
Jim Miller [Fri, 20 Jan 2012 23:26:42 +0000 (15:26 -0800)]
am
eaa11a72: Merge "Fix
5797764: Increase lock screen\'s thread priority" into ics-mr1
* commit '
eaa11a723150f1ea79446d7ba4bf77eb47b73337':
Fix
5797764: Increase lock screen's thread priority
Jim Miller [Fri, 20 Jan 2012 23:24:20 +0000 (15:24 -0800)]
Merge "Fix
5797764: Increase lock screen's thread priority" into ics-mr1
Glenn Kasten [Fri, 20 Jan 2012 23:06:01 +0000 (15:06 -0800)]
Merge "Fix warning for redundant typedef"
Justin Ho [Fri, 20 Jan 2012 22:50:30 +0000 (14:50 -0800)]
am
b09f6f96: Merge "Update WiMAX assets to match new style Bug:
5724605" into ics-mr1
* commit '
b09f6f96e3583da320b69486869bc98fd463735e':
Update WiMAX assets to match new style Bug:
5724605
Justin Ho [Fri, 20 Jan 2012 22:48:51 +0000 (14:48 -0800)]
Merge "Update WiMAX assets to match new style Bug:
5724605" into ics-mr1