OSDN Git Service
Romain Guy [Thu, 15 Dec 2011 03:25:20 +0000 (19:25 -0800)]
Merge "Generate even fewer GL commands"
Dianne Hackborn [Thu, 15 Dec 2011 02:21:29 +0000 (18:21 -0800)]
am
13299a33: am
399f1df3: Merge "Fix some java docs." into ics-mr1
* commit '
13299a33e14562a5de14c89ad058d28ab0cd9f37':
Fix some java docs.
Dianne Hackborn [Thu, 15 Dec 2011 02:19:42 +0000 (18:19 -0800)]
am
399f1df3: Merge "Fix some java docs." into ics-mr1
* commit '
399f1df38594ea8bc927ad23bfbde996a9dc161d':
Fix some java docs.
Dianne Hackborn [Thu, 15 Dec 2011 02:18:29 +0000 (18:18 -0800)]
Merge "Fix some java docs." into ics-mr1
Glenn Kasten [Thu, 15 Dec 2011 01:35:36 +0000 (17:35 -0800)]
Merge "Fix indentation and whitespace"
Glenn Kasten [Thu, 15 Dec 2011 01:35:23 +0000 (17:35 -0800)]
Merge "Improve AudioFlinger error logging"
Glenn Kasten [Thu, 15 Dec 2011 01:35:14 +0000 (17:35 -0800)]
Merge "AudioMixer uninitialized simple fields"
Dirk Dougherty [Thu, 15 Dec 2011 01:24:46 +0000 (17:24 -0800)]
am
41d90f39: am
26bd66df: Merge "Doc change: add MR1 API summary and updated highlights." into ics-mr1
* commit '
41d90f39a5c40e3036e15efef5b07789296c8bb9':
Doc change: add MR1 API summary and updated highlights.
Dirk Dougherty [Thu, 15 Dec 2011 01:22:59 +0000 (17:22 -0800)]
am
26bd66df: Merge "Doc change: add MR1 API summary and updated highlights." into ics-mr1
* commit '
26bd66df4fc8caa7885fe3a4e78e379389a24a94':
Doc change: add MR1 API summary and updated highlights.
Dirk Dougherty [Thu, 15 Dec 2011 01:21:13 +0000 (17:21 -0800)]
Merge "Doc change: add MR1 API summary and updated highlights." into ics-mr1
Glenn Kasten [Thu, 15 Dec 2011 00:56:31 +0000 (16:56 -0800)]
Merge "Audio C++ comments"
The Android Open Source Project [Thu, 15 Dec 2011 00:08:46 +0000 (16:08 -0800)]
am
b14436d0: Reconcile with ics-mr1-release
* commit '
b14436d0700f6e837e4d6066ddcf672c61d7f033':
Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck 1. Revert "Fix drm flag setting missed in false drm recognition fix." This reverts commit
9f704f6c46a171357e49c411c83458b9d4565f3b.
The Android Open Source Project [Thu, 15 Dec 2011 00:05:32 +0000 (16:05 -0800)]
Reconcile with ics-mr1-release
Change-Id: I1b745b11729a3fda14ffe44f1f44854e087318c7
Glenn Kasten [Wed, 14 Dec 2011 23:40:43 +0000 (15:40 -0800)]
Merge "Remove unnecessary this->"
Glenn Kasten [Wed, 14 Dec 2011 23:40:35 +0000 (15:40 -0800)]
Merge "Use const char correctly in AudioFlinger"
Glenn Kasten [Wed, 14 Dec 2011 23:40:27 +0000 (15:40 -0800)]
Merge "Use units after all times"
Glenn Kasten [Wed, 14 Dec 2011 23:40:18 +0000 (15:40 -0800)]
Merge "Fix typo in error message, missing space"
Glenn Kasten [Wed, 14 Dec 2011 23:40:11 +0000 (15:40 -0800)]
Merge "Delete obsolete includes"
Glenn Kasten [Wed, 14 Dec 2011 23:40:01 +0000 (15:40 -0800)]
Merge "Remove redundant clear()"
Glenn Kasten [Wed, 14 Dec 2011 23:39:52 +0000 (15:39 -0800)]
Merge "Fix includes"
Jaikumar Ganesh [Wed, 14 Dec 2011 23:25:25 +0000 (15:25 -0800)]
Merge "Change the fd to be blocking for health profile."
Glenn Kasten [Wed, 14 Dec 2011 23:05:56 +0000 (15:05 -0800)]
Merge "AudioTrack::setVolume check range"
Scott Main [Wed, 14 Dec 2011 23:00:59 +0000 (15:00 -0800)]
am
5ebf8fbb: am
d1f2b7cc: am
56a3e326: Merge "docs: add Android U class for "Improving Performance of Layouts"" into ics-mr0
* commit '
5ebf8fbb1e925d411d928757712c41a7cafe8231':
docs: add Android U class for "Improving Performance of Layouts"
Scott Main [Wed, 14 Dec 2011 22:58:02 +0000 (14:58 -0800)]
am
d1f2b7cc: am
56a3e326: Merge "docs: add Android U class for "Improving Performance of Layouts"" into ics-mr0
* commit '
d1f2b7ccb7e8672f0af9f940864111c8dbe1ff80':
docs: add Android U class for "Improving Performance of Layouts"
Scott Main [Wed, 14 Dec 2011 22:57:50 +0000 (14:57 -0800)]
am
d8dec142: am
b8ea1f93: am
4dc763c7: Merge "doc change: Android U lessons for audio and battery" into ics-mr0
* commit '
d8dec14201250055fe9bcccead361168c839d9f9':
doc change: Android U lessons for audio and battery
Scott Main [Wed, 14 Dec 2011 22:56:02 +0000 (14:56 -0800)]
am
b8ea1f93: am
4dc763c7: Merge "doc change: Android U lessons for audio and battery" into ics-mr0
* commit '
b8ea1f93bb97c2aa0a3fffaa12aaaa8923449b4c':
doc change: Android U lessons for audio and battery
Scott Main [Wed, 14 Dec 2011 22:55:44 +0000 (14:55 -0800)]
am
56a3e326: Merge "docs: add Android U class for "Improving Performance of Layouts"" into ics-mr0
* commit '
56a3e326192c7496b67666b29071dc9f38c59da9':
docs: add Android U class for "Improving Performance of Layouts"
Scott Main [Wed, 14 Dec 2011 22:53:40 +0000 (14:53 -0800)]
am
4dc763c7: Merge "doc change: Android U lessons for audio and battery" into ics-mr0
* commit '
4dc763c700f79e33030e96eefabf8e5047cb9cb1':
doc change: Android U lessons for audio and battery
Scott Main [Wed, 14 Dec 2011 22:53:04 +0000 (14:53 -0800)]
Merge "docs: add Android U class for "Improving Performance of Layouts"" into ics-mr0
Scott Main [Wed, 14 Dec 2011 22:51:30 +0000 (14:51 -0800)]
Merge "doc change: Android U lessons for audio and battery" into ics-mr0
Scott Main [Wed, 14 Dec 2011 22:45:46 +0000 (14:45 -0800)]
am
fd24af66: am
691fea72: am
70645e36: Docs: Add class for Sharing Content
* commit '
fd24af6620ee346bfbbc29a62290f67141a79245':
Docs: Add class for Sharing Content
Scott Main [Wed, 14 Dec 2011 22:42:57 +0000 (14:42 -0800)]
am
691fea72: am
70645e36: Docs: Add class for Sharing Content
* commit '
691fea726dbefe2a7142b403bfc47f5c9029f61a':
Docs: Add class for Sharing Content
Scott Main [Wed, 14 Dec 2011 22:40:19 +0000 (14:40 -0800)]
am
70645e36: Docs: Add class for Sharing Content
* commit '
70645e363e8601550468b726251f4f52f383b9fc':
Docs: Add class for Sharing Content
Brian Colonna [Wed, 14 Dec 2011 22:14:24 +0000 (14:14 -0800)]
Merge "Added Face Unlock to tablet lockscreen layouts"
James Dong [Wed, 14 Dec 2011 21:53:31 +0000 (13:53 -0800)]
am
3f6a7d1e: am
d70c64db: Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck 1. Revert "Fix drm flag setting missed in false drm recognition fix." This reverts commit
9f704f6c46a171357e49c411c83458b9d4565f3b.
* commit '
3f6a7d1ee961a4544563932b7499535dc1cac1ec':
Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck 1. Revert "Fix drm flag setting missed in false drm recognition fix." This reverts commit
9f704f6c46a171357e49c411c83458b9d4565f3b.
James Dong [Wed, 14 Dec 2011 21:50:08 +0000 (13:50 -0800)]
am
d70c64db: Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck 1. Revert "Fix drm flag setting missed in false drm recognition fix." This reverts commit
9f704f6c46a171357e49c411c83458b9d4565f3b.
* commit '
d70c64db9f67dbe8f888de6b1bdcc835226ec526':
Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck 1. Revert "Fix drm flag setting missed in false drm recognition fix." This reverts commit
9f704f6c46a171357e49c411c83458b9d4565f3b.
Fabrice Di Meglio [Wed, 14 Dec 2011 21:47:00 +0000 (13:47 -0800)]
Merge "Fix bug #
5674155 Segmentation issue for Thai"
Irfan Sheriff [Wed, 14 Dec 2011 20:06:00 +0000 (12:06 -0800)]
Merge "Track scan count by UID"
Jeff Sharkey [Wed, 14 Dec 2011 18:12:17 +0000 (10:12 -0800)]
Merge "Avoid reading network stats when disabled."
Romain Guy [Wed, 14 Dec 2011 06:11:45 +0000 (22:11 -0800)]
Merge "Reduce the number of active texture changes"
The Android Open Source Project [Wed, 14 Dec 2011 03:13:18 +0000 (19:13 -0800)]
am
16bdd1e6: Reconcile with ics-mr1-release
* commit '
16bdd1e65ef19379bbede40c38de2e9f816ba35b':
The Android Open Source Project [Wed, 14 Dec 2011 03:10:19 +0000 (19:10 -0800)]
Reconcile with ics-mr1-release
Change-Id: I27a7b110d3c376fd3b90b29d028b6678507955a8
Fabrice Di Meglio [Wed, 14 Dec 2011 02:43:04 +0000 (18:43 -0800)]
Merge "Fix bug #
5727213 Rendering issues with Bengali in Textview in IML63B"
Romain Guy [Wed, 14 Dec 2011 02:41:58 +0000 (18:41 -0800)]
Merge "<Insert something improper about OpenGL>"
Dirk Dougherty [Wed, 14 Dec 2011 02:37:34 +0000 (18:37 -0800)]
am
1451f598: am
2e335cb0: Merge "Doc change: API diff report for 15." into ics-mr1
* commit '
1451f598ae5da5b8f0e24b4714f7321c2e6f59f5':
Doc change: API diff report for 15.
Dirk Dougherty [Wed, 14 Dec 2011 02:35:10 +0000 (18:35 -0800)]
am
2e335cb0: Merge "Doc change: API diff report for 15." into ics-mr1
* commit '
2e335cb02891d3653b938340a11698844e2c3d6d':
Doc change: API diff report for 15.
Dirk Dougherty [Wed, 14 Dec 2011 02:33:04 +0000 (18:33 -0800)]
Merge "Doc change: API diff report for 15." into ics-mr1
Romain Guy [Wed, 14 Dec 2011 01:29:42 +0000 (17:29 -0800)]
Merge "Further reduce the number of GL commands sent to the driver"
Dianne Hackborn [Wed, 14 Dec 2011 00:31:43 +0000 (16:31 -0800)]
resolved conflicts for merge of
a80bab37 to master
Change-Id: Id71cc68a617e1ea0dd2f3932d454be6dba336eef
The Android Automerger [Wed, 14 Dec 2011 00:03:26 +0000 (16:03 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Gilles Debunne [Tue, 13 Dec 2011 23:59:26 +0000 (15:59 -0800)]
am
2450b36a: am
19636dc4: Merge "Do not spell check the foreground ExtractEditText." into ics-mr1
* commit '
2450b36a3696bc5afdf2a0f2af8b2008efb8a7b0':
Do not spell check the foreground ExtractEditText.
Dianne Hackborn [Tue, 13 Dec 2011 23:41:54 +0000 (15:41 -0800)]
am
caa8e69a: Merge "Fix issue #
5756204: Crespo IME briefly appears shortened when..." into ics-mr1
* commit '
caa8e69a65e15ce2d9e52b18c7caa547eb9a2f48':
Fix issue #
5756204: Crespo IME briefly appears shortened when...
Fabrice Di Meglio [Tue, 13 Dec 2011 23:41:47 +0000 (15:41 -0800)]
Merge "TextLayoutCache - fix diacritics composition"
Dianne Hackborn [Tue, 13 Dec 2011 23:40:18 +0000 (15:40 -0800)]
Merge "Fix issue #
5756204: Crespo IME briefly appears shortened when..." into ics-mr1
Amith Yamasani [Tue, 13 Dec 2011 23:39:17 +0000 (15:39 -0800)]
Merge "Dump system and secure settings in bugreport."
Gilles Debunne [Tue, 13 Dec 2011 23:38:43 +0000 (15:38 -0800)]
am
19636dc4: Merge "Do not spell check the foreground ExtractEditText." into ics-mr1
* commit '
19636dc4217078a3bfd4b3909b5ac05f8a9aca8f':
Do not spell check the foreground ExtractEditText.
Gilles Debunne [Tue, 13 Dec 2011 23:36:48 +0000 (15:36 -0800)]
Merge "Do not spell check the foreground ExtractEditText." into ics-mr1
Chet Haase [Tue, 13 Dec 2011 22:03:43 +0000 (14:03 -0800)]
Merge "Make glyph cache more flexible"
Dianne Hackborn [Tue, 13 Dec 2011 21:44:14 +0000 (13:44 -0800)]
am
0be53567: am
19a06fe9: Merge "Fix issue #
5755172: Soft menu key disappears when menu is open" into ics-mr1
* commit '
0be53567c1c2299c548d3204d2b9240108fbd53a':
Fix issue #
5755172: Soft menu key disappears when menu is open
Dianne Hackborn [Tue, 13 Dec 2011 21:42:07 +0000 (13:42 -0800)]
am
19a06fe9: Merge "Fix issue #
5755172: Soft menu key disappears when menu is open" into ics-mr1
* commit '
19a06fe93cccb4b1dd224b8456969821a19b07ef':
Fix issue #
5755172: Soft menu key disappears when menu is open
Gilles Debunne [Tue, 13 Dec 2011 21:42:07 +0000 (13:42 -0800)]
am
0d3a5e4c: am
67d54ac0: Merge "NPE in GMail / TextLine" into ics-mr1
* commit '
0d3a5e4cbddc9a6a0a551698b5152c815842952a':
NPE in GMail / TextLine
Gilles Debunne [Tue, 13 Dec 2011 21:40:00 +0000 (13:40 -0800)]
am
67d54ac0: Merge "NPE in GMail / TextLine" into ics-mr1
* commit '
67d54ac017494229eed27a184159461d63201a9f':
NPE in GMail / TextLine
Dianne Hackborn [Tue, 13 Dec 2011 21:38:56 +0000 (13:38 -0800)]
Merge "Fix issue #
5755172: Soft menu key disappears when menu is open" into ics-mr1
Gilles Debunne [Tue, 13 Dec 2011 21:37:29 +0000 (13:37 -0800)]
Merge "NPE in GMail / TextLine" into ics-mr1
Scott Main [Tue, 13 Dec 2011 21:15:27 +0000 (13:15 -0800)]
am
9a8e7afc: am
c9295b20: am
fc279e51: Merge "Created Android University lesson for Multiple APKs." into ics-mr0
* commit '
9a8e7afc53e39e22664c77b3ca6f1a59aac36ee3':
Created Android University lesson for Multiple APKs.
Scott Main [Tue, 13 Dec 2011 21:15:25 +0000 (13:15 -0800)]
am
04c6e62c: am
37191e1d: am
801fda54: AndroidU lesson on designing for multiple screens.
* commit '
04c6e62ce4750beb617eb6e4e9cadfd631bfe824':
AndroidU lesson on designing for multiple screens.
Romain Guy [Tue, 13 Dec 2011 21:13:31 +0000 (13:13 -0800)]
Merge "Reduce the number of GL commands generated by the UI"
Scott Main [Tue, 13 Dec 2011 21:13:15 +0000 (13:13 -0800)]
am
c9295b20: am
fc279e51: Merge "Created Android University lesson for Multiple APKs." into ics-mr0
* commit '
c9295b2069af6530fba37a16c88757acaaff63e8':
Created Android University lesson for Multiple APKs.
Scott Main [Tue, 13 Dec 2011 21:13:07 +0000 (13:13 -0800)]
am
37191e1d: am
801fda54: AndroidU lesson on designing for multiple screens.
* commit '
37191e1dc783a5558eb8ee4f096bd8350c34415d':
AndroidU lesson on designing for multiple screens.
Scott Main [Tue, 13 Dec 2011 21:10:45 +0000 (13:10 -0800)]
am
fc279e51: Merge "Created Android University lesson for Multiple APKs." into ics-mr0
* commit '
fc279e51c0bca8086b87bd49e95367c400cb61b4':
Created Android University lesson for Multiple APKs.
Scott Main [Tue, 13 Dec 2011 21:10:42 +0000 (13:10 -0800)]
am
801fda54: AndroidU lesson on designing for multiple screens.
* commit '
801fda548c719a8618e7f4cd64cad8404b0970b9':
AndroidU lesson on designing for multiple screens.
Scott Main [Tue, 13 Dec 2011 20:25:38 +0000 (12:25 -0800)]
Merge "Created Android University lesson for Multiple APKs." into ics-mr0
Andreas Huber [Tue, 13 Dec 2011 20:04:35 +0000 (12:04 -0800)]
am
22e50edd: (-s ours) am
3ab63008: Merge "DO NOT MERGE: Support for parsing of "folded" RTSP header values" into ics-mr1
* commit '
22e50edddc2a13fa9cc00f7cc5a5f6471cbece24':
DO NOT MERGE: Support for parsing of "folded" RTSP header values
Andreas Huber [Tue, 13 Dec 2011 20:01:46 +0000 (12:01 -0800)]
am
3ab63008: Merge "DO NOT MERGE: Support for parsing of "folded" RTSP header values" into ics-mr1
* commit '
3ab630084071eb5dc7f92b4a8a617f8cef10c514':
DO NOT MERGE: Support for parsing of "folded" RTSP header values
Andreas Huber [Tue, 13 Dec 2011 19:59:50 +0000 (11:59 -0800)]
Merge "DO NOT MERGE: Support for parsing of "folded" RTSP header values" into ics-mr1
Amith Yamasani [Tue, 13 Dec 2011 18:43:47 +0000 (10:43 -0800)]
Merge "Manual merge: Update VIBRATE_ON to a supported value when upgrading from GB."
Gilles Debunne [Tue, 13 Dec 2011 18:31:38 +0000 (10:31 -0800)]
Merge "Re-synced MR1 and master for SpellChecker"
Selim Gurun [Tue, 13 Dec 2011 18:25:18 +0000 (10:25 -0800)]
Merge "Move ssl callbacks to webcore thread."
Chris Craik [Tue, 13 Dec 2011 16:53:06 +0000 (08:53 -0800)]
Merge "Update tilebenchmark to work with current drawing infrastructure"
Brian Colonna [Tue, 13 Dec 2011 14:38:13 +0000 (06:38 -0800)]
Merge "Changed how Face Unlock coordinates are specified"
The Android Open Source Project [Tue, 13 Dec 2011 13:40:57 +0000 (05:40 -0800)]
am
da296533: Reconcile with ics-mr1-release
* commit '
da29653305f299d6390492333a6360cfa78665d9':
The Android Open Source Project [Tue, 13 Dec 2011 13:11:43 +0000 (05:11 -0800)]
Reconcile with ics-mr1-release
Change-Id: I96fd9c00680c7ff0e5c9fba04f8c08a31cf1cfa8
Ashish Sharma [Tue, 13 Dec 2011 08:31:53 +0000 (00:31 -0800)]
Merge "Add a command option to display installerPackageName"
The Android Automerger [Tue, 13 Dec 2011 06:08:59 +0000 (22:08 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Romain Guy [Tue, 13 Dec 2011 04:36:22 +0000 (20:36 -0800)]
Merge "Optimize state changes"
Jeff Sharkey [Tue, 13 Dec 2011 04:23:47 +0000 (20:23 -0800)]
am
f0213bf1: am
f0bbc494: Merge "Avoid NPE when missing network stats." into ics-mr1
* commit '
f0213bf1833e49744b29be97e44c3e9eaad9449d':
Avoid NPE when missing network stats.
Jeff Sharkey [Tue, 13 Dec 2011 04:21:34 +0000 (20:21 -0800)]
am
f0bbc494: Merge "Avoid NPE when missing network stats." into ics-mr1
* commit '
f0bbc494d638f4c77e688bf9410027f453301559':
Avoid NPE when missing network stats.
Jeff Sharkey [Tue, 13 Dec 2011 04:19:27 +0000 (20:19 -0800)]
Merge "Avoid NPE when missing network stats." into ics-mr1
Mike Cleron [Tue, 13 Dec 2011 03:27:36 +0000 (19:27 -0800)]
am
3f69fad9: (-s ours) am
840201d6: Merge "Update VIBRATE_ON to a supported value when upgrading from GB." into ics-mr1
* commit '
3f69fad9e958f867ceaab9c370b97959e3337c50':
Update VIBRATE_ON to a supported value when upgrading from GB.
Romain Guy [Tue, 13 Dec 2011 03:04:40 +0000 (19:04 -0800)]
Merge "Minimize the amount of data uploaded to draw text"
Romain Guy [Tue, 13 Dec 2011 03:04:32 +0000 (19:04 -0800)]
Merge "Various OpenGL optimizations"
Mike Cleron [Tue, 13 Dec 2011 02:17:46 +0000 (18:17 -0800)]
am
840201d6: Merge "Update VIBRATE_ON to a supported value when upgrading from GB." into ics-mr1
* commit '
840201d6e2d7d53e42a31ffeb2ef454982882d12':
Update VIBRATE_ON to a supported value when upgrading from GB.
Mike Cleron [Tue, 13 Dec 2011 02:15:59 +0000 (18:15 -0800)]
Merge "Update VIBRATE_ON to a supported value when upgrading from GB." into ics-mr1
Katherine Kuan [Tue, 13 Dec 2011 02:12:37 +0000 (18:12 -0800)]
Merge "Add logging to country detector logic"
Dianne Hackborn [Tue, 13 Dec 2011 02:01:26 +0000 (18:01 -0800)]
Dianne Hackborn [Tue, 13 Dec 2011 02:01:22 +0000 (18:01 -0800)]
am
2ad8a89b: am
a1279586: Merge "SDK only: now that support lib is in SDK, we can link to it." into ics-mr1
* commit '
2ad8a89b4b55f1cf8994e5b044d496d889839403':
SDK only: now that support lib is in SDK, we can link to it.
Gilles Debunne [Tue, 13 Dec 2011 01:49:31 +0000 (17:49 -0800)]
am
8e22ec9b: am
a1277de3: Merge "Prevent a memory leak in TextLine." into ics-mr1
* commit '
8e22ec9bc6c59d9e54a6b48f1133881be97af1a7':
Prevent a memory leak in TextLine.
Gilles Debunne [Tue, 13 Dec 2011 01:49:29 +0000 (17:49 -0800)]
am
7ffadba5: am
1fb90497: Merge "Text blinking cursor hard to see." into ics-mr1
* commit '
7ffadba5dfbeeaa93a9559ca3eaf1a7719426a5f':
Text blinking cursor hard to see.
Adam Powell [Tue, 13 Dec 2011 01:49:21 +0000 (17:49 -0800)]
am
bffe0be3: am
9c92fcd9: Merge "Bug
5727679 - CTS test ViewGroupTest#testGetChildVisibleRect" into ics-mr1
* commit '
bffe0be3af2bd19a392e7d332cbfda9a60b8e057':
Bug
5727679 - CTS test ViewGroupTest#testGetChildVisibleRect
Dianne Hackborn [Tue, 13 Dec 2011 01:04:04 +0000 (17:04 -0800)]
OSDN Git Service
