OSDN Git Service

android-x86/frameworks-native.git
13 years agoMerge "When using O_CREAT, the mode should be specified."
Marco Nelissen [Mon, 9 May 2011 20:03:43 +0000 (13:03 -0700)]
Merge "When using O_CREAT, the mode should be specified."

13 years agoMerge "Refactor MPEG4Writer::writeTrackHeader() method"
James Dong [Mon, 9 May 2011 18:27:51 +0000 (11:27 -0700)]
Merge "Refactor MPEG4Writer::writeTrackHeader() method"

13 years agoam bdaa3abd: (-s ours) am 44e39d60: Merge remote branch \'goog/honeycomb-mr2\' into...
The Android Automerger [Mon, 9 May 2011 17:53:40 +0000 (10:53 -0700)]
am bdaa3abd: (-s ours) am 44e39d60: Merge remote branch \'goog/honeycomb-mr2\' into honeycomb-LTE

* commit 'bdaa3abdf264372f337cfa9236e53b1e3cfde525':
  DO NOT MERGE Handle GET_POWER failures
  DO NOT MERGE: Don't send pause again when coming back from full screen
  DO NOT MERGE MediaScanner: Add special casing of WMP album art files to isNoMediaPath()
  DO NOT MERGE MediaScanner: Fix bug in "no media" handling logic
  DO NOT MERGE MTP: Implement GetThumb command
  DO NOT MERGE MTP: Fix file descriptor leak in file editing extensions
  DO NOT MERGE MTP: Add extended operations to support in-place editing of files
  DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding files from the media provider
  DO NOT MERGE Fix media scanner uri handling.
  DO NOT MERGE Revert "Remove permission android.permission.WRITE_MEDIA_STORAGE"
  DO NOT MERGE MTP and media provider support for multiple storage devices:
  DO NOT MERGE MountService: Fix running media scanner at boot.
  DO NOT MERGE Fix deadlock in MountService
  DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methods
  DO NOT MERGE MountService: Add support for multiple volumes

13 years agoam 44e39d60: Merge remote branch \'goog/honeycomb-mr2\' into honeycomb-LTE
The Android Automerger [Mon, 9 May 2011 17:40:14 +0000 (10:40 -0700)]
am 44e39d60: Merge remote branch \'goog/honeycomb-mr2\' into honeycomb-LTE

* commit '44e39d608cfddcbf56123480123822f26f20f259':
  DO NOT MERGE Handle GET_POWER failures
  DO NOT MERGE: Don't send pause again when coming back from full screen
  DO NOT MERGE MediaScanner: Add special casing of WMP album art files to isNoMediaPath()
  DO NOT MERGE MediaScanner: Fix bug in "no media" handling logic
  DO NOT MERGE MTP: Implement GetThumb command
  DO NOT MERGE MTP: Fix file descriptor leak in file editing extensions
  DO NOT MERGE MTP: Add extended operations to support in-place editing of files
  DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding files from the media provider
  DO NOT MERGE Fix media scanner uri handling.
  DO NOT MERGE Revert "Remove permission android.permission.WRITE_MEDIA_STORAGE"
  DO NOT MERGE MTP and media provider support for multiple storage devices:
  DO NOT MERGE MountService: Fix running media scanner at boot.
  DO NOT MERGE Fix deadlock in MountService
  DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methods
  DO NOT MERGE MountService: Add support for multiple volumes

13 years agoMerge remote branch 'goog/honeycomb-mr2' into honeycomb-LTE
The Android Automerger [Mon, 9 May 2011 05:38:02 +0000 (22:38 -0700)]
Merge remote branch 'goog/honeycomb-mr2' into honeycomb-LTE

13 years agoMerge remote branch 'goog/honeycomb-mr1' into honeycomb-mr2
The Android Automerger [Mon, 9 May 2011 05:11:52 +0000 (22:11 -0700)]
Merge remote branch 'goog/honeycomb-mr1' into honeycomb-mr2

13 years agoMerge "clear boot-animation background with black (not transparent) pixels"
Mathias Agopian [Sat, 7 May 2011 02:23:16 +0000 (19:23 -0700)]
Merge "clear boot-animation background with black (not transparent) pixels"

13 years agoam 5033d2b5: am 5de8226c: am 5cf78ecd: docs: update sdk tools sums and sizes based...
Scott Main [Sat, 7 May 2011 00:27:39 +0000 (17:27 -0700)]
am 5033d2b5: am 5de8226c: am 5cf78ecd: docs: update sdk tools sums and sizes based on candidate 5

* commit '5033d2b5287c48ac46a368ea85f080cfba0ccc8d':
  docs: update sdk tools sums and sizes based on candidate 5

13 years agoam 5de8226c: am 5cf78ecd: docs: update sdk tools sums and sizes based on candidate 5
Scott Main [Sat, 7 May 2011 00:25:38 +0000 (17:25 -0700)]
am 5de8226c: am 5cf78ecd: docs: update sdk tools sums and sizes based on candidate 5

* commit '5de8226cc7caea7a52d9f2538f87d2cc34214ad0':
  docs: update sdk tools sums and sizes based on candidate 5

13 years agoam 5cf78ecd: docs: update sdk tools sums and sizes based on candidate 5
Scott Main [Sat, 7 May 2011 00:22:34 +0000 (17:22 -0700)]
am 5cf78ecd: docs: update sdk tools sums and sizes based on candidate 5

* commit '5cf78ecd2c523be442f52888ca613b9a92325a6c':
  docs: update sdk tools sums and sizes based on candidate 5

13 years agoam dcb6bd62: am 71a73dab: am b6451228: docs: update screens dashboard and add opengl...
Scott Main [Sat, 7 May 2011 00:10:58 +0000 (17:10 -0700)]
am dcb6bd62: am 71a73dab: am b6451228: docs: update screens dashboard and add opengl dashboard

* commit 'dcb6bd62cd4d7874d17a4f1b47b343dd88c4546a':
  docs: update screens dashboard and add opengl dashboard

13 years agoam 71a73dab: am b6451228: docs: update screens dashboard and add opengl dashboard
Scott Main [Sat, 7 May 2011 00:08:06 +0000 (17:08 -0700)]
am 71a73dab: am b6451228: docs: update screens dashboard and add opengl dashboard

* commit '71a73dab704df2c536bbd4c16454cdcdc472fce2':
  docs: update screens dashboard and add opengl dashboard

13 years agoam b6451228: docs: update screens dashboard and add opengl dashboard
Scott Main [Sat, 7 May 2011 00:05:42 +0000 (17:05 -0700)]
am b6451228: docs: update screens dashboard and add opengl dashboard

* commit 'b6451228526288b158c3b0bf0c5abbd5b072d51c':
  docs: update screens dashboard and add opengl dashboard

13 years agoam 56e8e0bc: am 2b48ca07: Merge "Fix 2 functions getting connections up by apnType...
Robert Greenwalt [Fri, 6 May 2011 23:29:39 +0000 (16:29 -0700)]
am 56e8e0bc: am 2b48ca07: Merge "Fix 2 functions getting connections up by apnType" into honeycomb-LTE

* commit '56e8e0bc8008d2bd60f04fc78ff036236a44f598':
  Fix 2 functions getting connections up by apnType

13 years agoam 2b48ca07: Merge "Fix 2 functions getting connections up by apnType" into honeycomb-LTE
Robert Greenwalt [Fri, 6 May 2011 23:25:39 +0000 (16:25 -0700)]
am 2b48ca07: Merge "Fix 2 functions getting connections up by apnType" into honeycomb-LTE

* commit '2b48ca07efd7f499ff01a3eeb17a4f5c40106dbe':
  Fix 2 functions getting connections up by apnType

13 years agoMerge "Fix 2 functions getting connections up by apnType" into honeycomb-LTE
Robert Greenwalt [Fri, 6 May 2011 23:21:06 +0000 (16:21 -0700)]
Merge "Fix 2 functions getting connections up by apnType" into honeycomb-LTE

13 years agoMerge "Remove MediaStore.Audio.AudioColumns.ALBUM_ART"
Marco Nelissen [Fri, 6 May 2011 22:13:44 +0000 (15:13 -0700)]
Merge "Remove MediaStore.Audio.AudioColumns.ALBUM_ART"

13 years agoam 04f2ad1c: am 2499da83: Merge "Mark a disable apn so we don\'t reconnect." into...
Robert Greenwalt [Fri, 6 May 2011 22:07:52 +0000 (15:07 -0700)]
am 04f2ad1c: am 2499da83: Merge "Mark a disable apn so we don\'t reconnect." into honeycomb-LTE

* commit '04f2ad1ce1378e115940ecc7ab49ed3b929795dc':
  Mark a disable apn so we don't reconnect.

13 years agoam 2499da83: Merge "Mark a disable apn so we don\'t reconnect." into honeycomb-LTE
Robert Greenwalt [Fri, 6 May 2011 21:57:08 +0000 (14:57 -0700)]
am 2499da83: Merge "Mark a disable apn so we don\'t reconnect." into honeycomb-LTE

* commit '2499da83cb3db5f1d87a52e3e390139c98ff4210':
  Mark a disable apn so we don't reconnect.

13 years agoMerge "Mark a disable apn so we don't reconnect." into honeycomb-LTE
Robert Greenwalt [Fri, 6 May 2011 21:52:45 +0000 (14:52 -0700)]
Merge "Mark a disable apn so we don't reconnect." into honeycomb-LTE

13 years agoMerge "Fix for scaled AA lines"
Chet Haase [Fri, 6 May 2011 20:51:09 +0000 (13:51 -0700)]
Merge "Fix for scaled AA lines"

13 years agoMerge "All SuggestionSpans are removed when the window loses focus."
Gilles Debunne [Fri, 6 May 2011 17:52:23 +0000 (10:52 -0700)]
Merge "All SuggestionSpans are removed when the window loses focus."

13 years agoMerge "Moving samplers behind the hal."
Alex Sakhartchouk [Fri, 6 May 2011 17:40:49 +0000 (10:40 -0700)]
Merge "Moving samplers behind the hal."

13 years agoam 8f95753c: am 6c6b62e0: am 223a94d2: docs: de-new the dev guide toc
Scott Main [Fri, 6 May 2011 17:13:07 +0000 (10:13 -0700)]
am 8f95753c: am 6c6b62e0: am 223a94d2: docs: de-new the dev guide toc

* commit '8f95753c35d66c74caef99aaf15c2e0b79fef413':
  docs: de-new the dev guide toc

13 years agoam 6c6b62e0: am 223a94d2: docs: de-new the dev guide toc
Scott Main [Fri, 6 May 2011 17:09:04 +0000 (10:09 -0700)]
am 6c6b62e0: am 223a94d2: docs: de-new the dev guide toc

* commit '6c6b62e04d1953916637be7fc96d83dde68da801':
  docs: de-new the dev guide toc

13 years agoam 223a94d2: docs: de-new the dev guide toc
Scott Main [Fri, 6 May 2011 17:05:56 +0000 (10:05 -0700)]
am 223a94d2: docs: de-new the dev guide toc

* commit '223a94d2effd0ba9ef205d0bb790a5bdfb4d54c0':
  docs: de-new the dev guide toc

13 years agoam 9603fdee: am 0d560d45: am 9f7054fe: Merge "docs: add package description for mtp...
Scott Main [Fri, 6 May 2011 16:01:13 +0000 (09:01 -0700)]
am 9603fdee: am 0d560d45: am 9f7054fe: Merge "docs: add package description for mtp and a little more info to MtpDevice" into honeycomb-mr1

* commit '9603fdeecdf5417041aa68cc61a0373f33b74daa':
  docs: add package description for mtp and a little more info to MtpDevice

13 years agoam 0d560d45: am 9f7054fe: Merge "docs: add package description for mtp and a little...
Scott Main [Fri, 6 May 2011 15:50:50 +0000 (08:50 -0700)]
am 0d560d45: am 9f7054fe: Merge "docs: add package description for mtp and a little more info to MtpDevice" into honeycomb-mr1

* commit '0d560d454b88d52a3b48cbc3c3be27e563b7f098':
  docs: add package description for mtp and a little more info to MtpDevice

13 years agoam 9f7054fe: Merge "docs: add package description for mtp and a little more info...
Scott Main [Fri, 6 May 2011 15:41:57 +0000 (08:41 -0700)]
am 9f7054fe: Merge "docs: add package description for mtp and a little more info to MtpDevice" into honeycomb-mr1

* commit '9f7054fea28e65ae1bf8bc1114090306979ba657':
  docs: add package description for mtp and a little more info to MtpDevice

13 years agoMerge "docs: add package description for mtp and a little more info to MtpDevice...
Scott Main [Fri, 6 May 2011 15:31:40 +0000 (08:31 -0700)]
Merge "docs: add package description for mtp and a little more info to MtpDevice" into honeycomb-mr1

13 years agoMerge "Improve camera javadoc."
Wu-cheng Li [Fri, 6 May 2011 07:13:47 +0000 (00:13 -0700)]
Merge "Improve camera javadoc."

13 years agoMerge "Fix bug 4383987 - animate action modes with split action bars"
Adam Powell [Fri, 6 May 2011 01:44:30 +0000 (18:44 -0700)]
Merge "Fix bug 4383987 - animate action modes with split action bars"

13 years agoam 4739144b: am 8ce58e50: am f88b52fb: Merge "docs: version notes for tools 11" into...
Scott Main [Fri, 6 May 2011 01:39:15 +0000 (18:39 -0700)]
am 4739144b: am 8ce58e50: am f88b52fb: Merge "docs: version notes for tools 11" into honeycomb-mr1

* commit '4739144b1ccdd97598bf99dbddb4db4c41150d74':
  docs: version notes for tools 11

13 years agoam 8ce58e50: am f88b52fb: Merge "docs: version notes for tools 11" into honeycomb-mr1
Scott Main [Fri, 6 May 2011 01:36:59 +0000 (18:36 -0700)]
am 8ce58e50: am f88b52fb: Merge "docs: version notes for tools 11" into honeycomb-mr1

* commit '8ce58e5062288c95887bd56fc959527814052b56':
  docs: version notes for tools 11

13 years agoam f88b52fb: Merge "docs: version notes for tools 11" into honeycomb-mr1
Scott Main [Fri, 6 May 2011 01:34:42 +0000 (18:34 -0700)]
am f88b52fb: Merge "docs: version notes for tools 11" into honeycomb-mr1

* commit 'f88b52fbf693d8b17e57a9d2fdda5a29e1bfa8d9':
  docs: version notes for tools 11

13 years agoMerge "docs: version notes for tools 11" into honeycomb-mr1
Scott Main [Fri, 6 May 2011 01:32:42 +0000 (18:32 -0700)]
Merge "docs: version notes for tools 11" into honeycomb-mr1

13 years agoam d81214da: am a7a9c4cb: am 46524f83: Merge "docs: add package description for RTP...
Scott Main [Fri, 6 May 2011 01:04:28 +0000 (18:04 -0700)]
am d81214da: am a7a9c4cb: am 46524f83: Merge "docs: add package description for RTP" into honeycomb-mr1

* commit 'd81214dae45a4b38919296af41bf756e3931675a':
  docs: add package description for RTP

13 years agoam a7a9c4cb: am 46524f83: Merge "docs: add package description for RTP" into honeycom...
Scott Main [Fri, 6 May 2011 01:02:47 +0000 (18:02 -0700)]
am a7a9c4cb: am 46524f83: Merge "docs: add package description for RTP" into honeycomb-mr1

* commit 'a7a9c4cbbc2315a59ad27b43c83c66e272dcc2f2':
  docs: add package description for RTP

13 years agoam 46524f83: Merge "docs: add package description for RTP" into honeycomb-mr1
Scott Main [Fri, 6 May 2011 01:00:57 +0000 (18:00 -0700)]
am 46524f83: Merge "docs: add package description for RTP" into honeycomb-mr1

* commit '46524f83a55731cd96c9df8a87be6dacb1db1a37':
  docs: add package description for RTP

13 years agoam 2cd90733: am 7bf1c661: am 034d89d9: docs: cherrypick Change-Id: I3d871d494cf1f626d...
Scott Main [Fri, 6 May 2011 00:59:27 +0000 (17:59 -0700)]
am 2cd90733: am 7bf1c661: am 034d89d9: docs: cherrypick Change-Id: I3d871d494cf1f626df701efaa43058b66893259e docs: add info about customizing the density of an AVD from command line; and a few editorial things like fix the TOCs

* commit '2cd90733cc17dcebb682d82f9dcf847877627043':
  docs: cherrypick Change-Id: I3d871d494cf1f626df701efaa43058b66893259e docs: add info about customizing the density of an AVD from command line; and a few editorial things like fix the TOCs

13 years agoMerge "docs: add package description for RTP" into honeycomb-mr1
Scott Main [Fri, 6 May 2011 00:59:24 +0000 (17:59 -0700)]
Merge "docs: add package description for RTP" into honeycomb-mr1

13 years agoam 7bf1c661: am 034d89d9: docs: cherrypick Change-Id: I3d871d494cf1f626df701efaa43058...
Scott Main [Fri, 6 May 2011 00:56:50 +0000 (17:56 -0700)]
am 7bf1c661: am 034d89d9: docs: cherrypick Change-Id: I3d871d494cf1f626df701efaa43058b66893259e docs: add info about customizing the density of an AVD from command line; and a few editorial things like fix the TOCs

* commit '7bf1c661f1a43236dd075616f4f04a776710dcb0':
  docs: cherrypick Change-Id: I3d871d494cf1f626df701efaa43058b66893259e docs: add info about customizing the density of an AVD from command line; and a few editorial things like fix the TOCs

13 years agoam 034d89d9: docs: cherrypick Change-Id: I3d871d494cf1f626df701efaa43058b66893259e...
Scott Main [Fri, 6 May 2011 00:53:57 +0000 (17:53 -0700)]
am 034d89d9: docs: cherrypick Change-Id: I3d871d494cf1f626df701efaa43058b66893259e docs: add info about customizing the density of an AVD from command line; and a few editorial things like fix the TOCs

* commit '034d89d9a4b56014ea198bcdeaa5ad922608ae40':
  docs: cherrypick Change-Id: I3d871d494cf1f626df701efaa43058b66893259e docs: add info about customizing the density of an AVD from command line; and a few editorial things like fix the TOCs

13 years agoMerge "Consolidate notification layouts by removing xlarge versions."
Daniel Sandler [Fri, 6 May 2011 00:07:59 +0000 (17:07 -0700)]
Merge "Consolidate notification layouts by removing xlarge versions."

13 years agoam 3bebae43: am d237d05c: Merge "Add Delay for data connection retry." into honeycomb-LTE
Wink Saville [Thu, 5 May 2011 23:24:58 +0000 (16:24 -0700)]
am 3bebae43: am d237d05c: Merge "Add Delay for data connection retry." into honeycomb-LTE

* commit '3bebae4332144004db9f774bfde1abcd6c656b2c':
  Add Delay for data connection retry.

13 years agoam 0b45723f: am 8bc60413: Merge "DataConnection: Fix handling of PDP setup failure...
Wink Saville [Thu, 5 May 2011 23:24:55 +0000 (16:24 -0700)]
am 0b45723f: am 8bc60413: Merge "DataConnection: Fix handling of PDP setup failure." into honeycomb-LTE

* commit '0b45723f80ecb6038b15d791650d46f60f70f45f':
  DataConnection: Fix handling of PDP setup failure.

13 years agoam d237d05c: Merge "Add Delay for data connection retry." into honeycomb-LTE
Wink Saville [Thu, 5 May 2011 23:22:31 +0000 (16:22 -0700)]
am d237d05c: Merge "Add Delay for data connection retry." into honeycomb-LTE

* commit 'd237d05c6f36d4e514eac95a9bcc07106c3d97eb':
  Add Delay for data connection retry.

13 years agoam 8bc60413: Merge "DataConnection: Fix handling of PDP setup failure." into honeycom...
Wink Saville [Thu, 5 May 2011 23:22:29 +0000 (16:22 -0700)]
am 8bc60413: Merge "DataConnection: Fix handling of PDP setup failure." into honeycomb-LTE

* commit '8bc60413b9840c7fa724e52f1271936640e97736':
  DataConnection: Fix handling of PDP setup failure.

13 years agoMerge "Add Delay for data connection retry." into honeycomb-LTE
Wink Saville [Thu, 5 May 2011 23:20:11 +0000 (16:20 -0700)]
Merge "Add Delay for data connection retry." into honeycomb-LTE

13 years agoMerge "DataConnection: Fix handling of PDP setup failure." into honeycomb-LTE
Wink Saville [Thu, 5 May 2011 23:20:02 +0000 (16:20 -0700)]
Merge "DataConnection: Fix handling of PDP setup failure." into honeycomb-LTE

13 years agoam 821ec8ed: am 48f472f7: am 0369cf98: Cherry pick from Honeycomb Change ID I8d57d128...
Bill Gruber [Thu, 5 May 2011 23:13:03 +0000 (16:13 -0700)]
am 821ec8ed: am 48f472f7: am 0369cf98: Cherry pick from Honeycomb Change ID I8d57d12828afab700d76f9b19195817a0adfe080 IAB docs: adds best practices for pending transaction UI

* commit '821ec8edeee7d59396cbee3a370e5cf3d6c7b8b6':
  Cherry pick from Honeycomb Change ID I8d57d12828afab700d76f9b19195817a0adfe080 IAB docs: adds best practices for pending transaction UI

13 years agoam 48f472f7: am 0369cf98: Cherry pick from Honeycomb Change ID I8d57d12828afab700d76f...
Bill Gruber [Thu, 5 May 2011 23:09:42 +0000 (16:09 -0700)]
am 48f472f7: am 0369cf98: Cherry pick from Honeycomb Change ID I8d57d12828afab700d76f9b19195817a0adfe080 IAB docs: adds best practices for pending transaction UI

* commit '48f472f748e9404bdb93a93f20a530794f6cdc2f':
  Cherry pick from Honeycomb Change ID I8d57d12828afab700d76f9b19195817a0adfe080 IAB docs: adds best practices for pending transaction UI

13 years agoam 0369cf98: Cherry pick from Honeycomb Change ID I8d57d12828afab700d76f9b19195817a0a...
Bill Gruber [Thu, 5 May 2011 23:05:41 +0000 (16:05 -0700)]
am 0369cf98: Cherry pick from Honeycomb Change ID I8d57d12828afab700d76f9b19195817a0adfe080 IAB docs: adds best practices for pending transaction UI

* commit '0369cf98743e72d052eb5542125f58d1ad2f7f61':
  Cherry pick from Honeycomb Change ID I8d57d12828afab700d76f9b19195817a0adfe080 IAB docs: adds best practices for pending transaction UI

13 years agoMerge "Color conversion now supports YUV420p->RGB565 conversion even if the width...
Andreas Huber [Thu, 5 May 2011 22:51:25 +0000 (15:51 -0700)]
Merge "Color conversion now supports YUV420p->RGB565 conversion even if the width is odd."

13 years agoam cda9fda4: am 4c8fa6d1: am 1c71fffe: update platform version number for docs
Scott Main [Thu, 5 May 2011 22:27:30 +0000 (15:27 -0700)]
am cda9fda4: am 4c8fa6d1: am 1c71fffe: update platform version number for docs

* commit 'cda9fda4fdeac3c3ce24df27e1c24c72d5b70960':
  update platform version number for docs

13 years agoMerge "Refactor to share code between MediaPlayer and MediaMetadataRetriever JNI"
James Dong [Thu, 5 May 2011 22:24:45 +0000 (15:24 -0700)]
Merge "Refactor to share code between MediaPlayer and MediaMetadataRetriever JNI"

13 years agoam 4c8fa6d1: am 1c71fffe: update platform version number for docs
Scott Main [Thu, 5 May 2011 22:24:12 +0000 (15:24 -0700)]
am 4c8fa6d1: am 1c71fffe: update platform version number for docs

* commit '4c8fa6d13500a7921601e098b47e2eb34aa18024':
  update platform version number for docs

13 years agoam 1c71fffe: update platform version number for docs
Scott Main [Thu, 5 May 2011 22:18:19 +0000 (15:18 -0700)]
am 1c71fffe: update platform version number for docs

* commit '1c71fffeb5d6a241ccbe7f035ce0d030eaeef562':
  update platform version number for docs

13 years agoMerge "Only delay pressed feedback for Views inside a scrolling parent"
Patrick Dubroy [Thu, 5 May 2011 21:59:35 +0000 (14:59 -0700)]
Merge "Only delay pressed feedback for Views inside a scrolling parent"

13 years agoMerge "Clean up JNI code"
James Dong [Thu, 5 May 2011 19:49:37 +0000 (12:49 -0700)]
Merge "Clean up JNI code"

13 years agoMerge "Off by one bug in TextView's suggestions popup."
Gilles Debunne [Thu, 5 May 2011 17:08:59 +0000 (10:08 -0700)]
Merge "Off by one bug in TextView's suggestions popup."

13 years agoMerge "Code Cleanup and better Sampler creation method"
Alex Sakhartchouk [Thu, 5 May 2011 16:38:00 +0000 (09:38 -0700)]
Merge "Code Cleanup and better Sampler creation method"

13 years agoMerge "save benchmark results"
Alex Sakhartchouk [Thu, 5 May 2011 16:37:07 +0000 (09:37 -0700)]
Merge "save benchmark results"

13 years agoam 4f034f70: am 475917c7: am e6746acd: Merge "docs: update homepage to announce 3...
Scott Main [Thu, 5 May 2011 16:02:35 +0000 (09:02 -0700)]
am 4f034f70: am 475917c7: am e6746acd: Merge "docs: update homepage to announce 3.1" into honeycomb-mr1

* commit '4f034f70d473c8c737977898f18d54caccf99a17':
  docs: update homepage to announce 3.1

13 years agoam 475917c7: am e6746acd: Merge "docs: update homepage to announce 3.1" into honeycom...
Scott Main [Thu, 5 May 2011 15:54:07 +0000 (08:54 -0700)]
am 475917c7: am e6746acd: Merge "docs: update homepage to announce 3.1" into honeycomb-mr1

* commit '475917c7e4002c42cdf668eabc1a04f604a82005':
  docs: update homepage to announce 3.1

13 years agoam e6746acd: Merge "docs: update homepage to announce 3.1" into honeycomb-mr1
Scott Main [Thu, 5 May 2011 15:43:42 +0000 (08:43 -0700)]
am e6746acd: Merge "docs: update homepage to announce 3.1" into honeycomb-mr1

* commit 'e6746acde2a0cc4faad9bdec026a9554797e2f94':
  docs: update homepage to announce 3.1

13 years agoMerge "docs: update homepage to announce 3.1" into honeycomb-mr1
Scott Main [Thu, 5 May 2011 15:33:03 +0000 (08:33 -0700)]
Merge "docs: update homepage to announce 3.1" into honeycomb-mr1

13 years agoMerge "Log an error message if WebView methods are called on the wrong thread."
Steve Block [Thu, 5 May 2011 11:36:27 +0000 (04:36 -0700)]
Merge "Log an error message if WebView methods are called on the wrong thread."

13 years agoam 86654eda: am 8a14d8b9: am 1a5b6098: Handle GET_POWER failures
Irfan Sheriff [Thu, 5 May 2011 04:22:29 +0000 (21:22 -0700)]
am 86654eda: am 8a14d8b9: am 1a5b6098: Handle GET_POWER failures

* commit '86654eda96b005ea21bfe4d29cd042187e497a8f':
  Handle GET_POWER failures

13 years agoam 8a14d8b9: am 1a5b6098: Handle GET_POWER failures
Irfan Sheriff [Thu, 5 May 2011 04:19:19 +0000 (21:19 -0700)]
am 8a14d8b9: am 1a5b6098: Handle GET_POWER failures

* commit '8a14d8b9c03c611cabde5743cfdcc9ff51314550':
  Handle GET_POWER failures

13 years agoam 1a5b6098: Handle GET_POWER failures
Irfan Sheriff [Thu, 5 May 2011 04:14:47 +0000 (21:14 -0700)]
am 1a5b6098: Handle GET_POWER failures

* commit '1a5b6098d5002ae07ce3f9bc514400a87c2b64fa':
  Handle GET_POWER failures

13 years agoMerge "Fix race conditions in WakeLocks."
Joe Onorato [Thu, 5 May 2011 01:13:10 +0000 (18:13 -0700)]
Merge "Fix race conditions in WakeLocks."

13 years agoMerge "Add basic walled garden check"
Irfan Sheriff [Thu, 5 May 2011 00:58:04 +0000 (17:58 -0700)]
Merge "Add basic walled garden check"

13 years agoMerge "Return NetworkStats bundle from NM service."
Jeff Sharkey [Thu, 5 May 2011 00:49:01 +0000 (17:49 -0700)]
Merge "Return NetworkStats bundle from NM service."

13 years agoMerge "Add ability for hierarchyviewer to output displaylist info"
Chet Haase [Thu, 5 May 2011 00:30:30 +0000 (17:30 -0700)]
Merge "Add ability for hierarchyviewer to output displaylist info"

13 years agoam ece6eb56: am 676db0d3: Merge "Fix 4379712 NPE in GsmDataConnectionTracker" into...
Wink Saville [Thu, 5 May 2011 00:06:46 +0000 (17:06 -0700)]
am ece6eb56: am 676db0d3: Merge "Fix 4379712 NPE in GsmDataConnectionTracker" into honeycomb-LTE

* commit 'ece6eb5625ac8b597f60d67f30f431ea13f237a5':
  Fix 4379712 NPE in GsmDataConnectionTracker

13 years agoam 796ba68b: am 2246bc66: am 7157b7c3: Merge "doc change: a misplaced link removed...
Robert Ly [Thu, 5 May 2011 00:04:50 +0000 (17:04 -0700)]
am 796ba68b: am 2246bc66: am 7157b7c3: Merge "doc change: a misplaced link removed" into honeycomb-mr1

* commit '796ba68b73fa93ae290cf85b264183ffcfa45eba':
  doc change: a misplaced link removed

13 years agoam 676db0d3: Merge "Fix 4379712 NPE in GsmDataConnectionTracker" into honeycomb-LTE
Wink Saville [Thu, 5 May 2011 00:04:19 +0000 (17:04 -0700)]
am 676db0d3: Merge "Fix 4379712 NPE in GsmDataConnectionTracker" into honeycomb-LTE

* commit '676db0d301caf4fa64c2c1b8427fe2efd5cc7811':
  Fix 4379712 NPE in GsmDataConnectionTracker

13 years agoam 2246bc66: am 7157b7c3: Merge "doc change: a misplaced link removed" into honeycomb-mr1
Robert Ly [Thu, 5 May 2011 00:02:26 +0000 (17:02 -0700)]
am 2246bc66: am 7157b7c3: Merge "doc change: a misplaced link removed" into honeycomb-mr1

* commit '2246bc665d09e8f8e1dc35702fbe76e8bb270d56':
  doc change: a misplaced link removed

13 years agoMerge "Fix 4379712 NPE in GsmDataConnectionTracker" into honeycomb-LTE
Wink Saville [Thu, 5 May 2011 00:01:32 +0000 (17:01 -0700)]
Merge "Fix 4379712 NPE in GsmDataConnectionTracker" into honeycomb-LTE

13 years agoam 7157b7c3: Merge "doc change: a misplaced link removed" into honeycomb-mr1
Robert Ly [Thu, 5 May 2011 00:00:10 +0000 (17:00 -0700)]
am 7157b7c3: Merge "doc change: a misplaced link removed" into honeycomb-mr1

* commit '7157b7c31462e9340847d15d936bbb0b1117ecbb':
  doc change: a misplaced link removed

13 years agoam 5673c13b: am aacd80fd: Fix build break.
Robert Greenwalt [Wed, 4 May 2011 23:59:47 +0000 (16:59 -0700)]
am 5673c13b: am aacd80fd: Fix build break.

* commit '5673c13b51bc4719d9a1afceb1aeb4743e86e230':
  Fix build break.

13 years agoMerge "doc change: a misplaced link removed" into honeycomb-mr1
Robert Ly [Wed, 4 May 2011 23:55:59 +0000 (16:55 -0700)]
Merge "doc change: a misplaced link removed" into honeycomb-mr1

13 years agoam aacd80fd: Fix build break.
Robert Greenwalt [Wed, 4 May 2011 23:55:26 +0000 (16:55 -0700)]
am aacd80fd: Fix build break.

* commit 'aacd80fd87bc08c410853a044967c8f7b417f089':
  Fix build break.

13 years agoam cfb91777: am 7d513652: am 62922c36: Cherry pick from honeycomb. Change-Id: I542fc3...
Katie McCormick [Wed, 4 May 2011 22:51:53 +0000 (15:51 -0700)]
am cfb91777: am 7d513652: am 62922c36: Cherry pick from honeycomb. Change-Id: I542fc39ef017346694cd0b376421bfec03ebe340

* commit 'cfb917770a063174dc188c28200d31c206e0bbfc':
  Cherry pick from honeycomb. Change-Id: I542fc39ef017346694cd0b376421bfec03ebe340

13 years agoam 7d513652: am 62922c36: Cherry pick from honeycomb. Change-Id: I542fc39ef017346694c...
Katie McCormick [Wed, 4 May 2011 22:49:17 +0000 (15:49 -0700)]
am 7d513652: am 62922c36: Cherry pick from honeycomb. Change-Id: I542fc39ef017346694cd0b376421bfec03ebe340

* commit '7d513652380ec4e1760e1f253d3630e4fdeb0ee5':
  Cherry pick from honeycomb. Change-Id: I542fc39ef017346694cd0b376421bfec03ebe340

13 years agoam 62922c36: Cherry pick from honeycomb. Change-Id: I542fc39ef017346694cd0b376421bfec...
Katie McCormick [Wed, 4 May 2011 22:47:10 +0000 (15:47 -0700)]
am 62922c36: Cherry pick from honeycomb. Change-Id: I542fc39ef017346694cd0b376421bfec03ebe340

* commit '62922c361e0c1b36c3787d7f06d04c3a609c2b12':
  Cherry pick from honeycomb. Change-Id: I542fc39ef017346694cd0b376421bfec03ebe340

13 years agoMerge "If there is no hdmi available, still record that hdmi is not plugged in."
Joe Onorato [Wed, 4 May 2011 22:29:15 +0000 (15:29 -0700)]
Merge "If there is no hdmi available, still record that hdmi is not plugged in."

13 years agoam bcac77ec: am f9e9452c: am ad3b87aa: cherrypick from honeycomb cl 742100b0ff66bb2a6...
Scott Main [Wed, 4 May 2011 22:23:31 +0000 (15:23 -0700)]
am bcac77ec: am f9e9452c: am ad3b87aa: cherrypick from honeycomb cl 742100b0ff66bb2a6fec706931e9cfeee8035ad3 docs: update dashboard for platform versions

* commit 'bcac77ec5c86dda8bacf3ab7c2c5a5597bf6cbd2':
  cherrypick from honeycomb cl 742100b0ff66bb2a6fec706931e9cfeee8035ad3 docs: update dashboard for platform versions

13 years agoam f9e9452c: am ad3b87aa: cherrypick from honeycomb cl 742100b0ff66bb2a6fec706931e9cf...
Scott Main [Wed, 4 May 2011 22:20:03 +0000 (15:20 -0700)]
am f9e9452c: am ad3b87aa: cherrypick from honeycomb cl 742100b0ff66bb2a6fec706931e9cfeee8035ad3 docs: update dashboard for platform versions

* commit 'f9e9452c2d6482a8181f6edb32f5c53bff10aa59':
  cherrypick from honeycomb cl 742100b0ff66bb2a6fec706931e9cfeee8035ad3 docs: update dashboard for platform versions

13 years agoam ad3b87aa: cherrypick from honeycomb cl 742100b0ff66bb2a6fec706931e9cfeee8035ad3...
Scott Main [Wed, 4 May 2011 22:09:53 +0000 (15:09 -0700)]
am ad3b87aa: cherrypick from honeycomb cl 742100b0ff66bb2a6fec706931e9cfeee8035ad3 docs: update dashboard for platform versions

* commit 'ad3b87aa0d094c3e867ce44ec3f61e0b02090417':
  cherrypick from honeycomb cl 742100b0ff66bb2a6fec706931e9cfeee8035ad3 docs: update dashboard for platform versions

13 years agoMerge "Rename ViewRoot to ViewAncestor."
Joe Onorato [Wed, 4 May 2011 21:52:37 +0000 (14:52 -0700)]
Merge "Rename ViewRoot to ViewAncestor."

13 years agoam e9091efe: am bb4ffd45: am 41703766: docs: typo in menu doc
Scott Main [Wed, 4 May 2011 21:48:10 +0000 (14:48 -0700)]
am e9091efe: am bb4ffd45: am 41703766: docs: typo in menu doc

* commit 'e9091efe44f75795fdbad46ef9393d886de806d9':
  docs: typo in menu doc

13 years agoam bb4ffd45: am 41703766: docs: typo in menu doc
Scott Main [Wed, 4 May 2011 21:44:23 +0000 (14:44 -0700)]
am bb4ffd45: am 41703766: docs: typo in menu doc

* commit 'bb4ffd45c833a59882706bd53fde3b04bf4dc441':
  docs: typo in menu doc

13 years agoam fe4ce465: am d566dc19: am 7017c942: docs: fix issue 4383086
Scott Main [Wed, 4 May 2011 21:41:45 +0000 (14:41 -0700)]
am fe4ce465: am d566dc19: am 7017c942: docs: fix issue 4383086

* commit 'fe4ce4651a8412dfd9780f1078fc1533e4c4b41e':
  docs: fix issue 4383086

13 years agoam 41703766: docs: typo in menu doc
Scott Main [Wed, 4 May 2011 21:41:35 +0000 (14:41 -0700)]
am 41703766: docs: typo in menu doc

* commit '41703766815918c96fa0f45c6f27a29a0865846a':
  docs: typo in menu doc

13 years agoam d566dc19: am 7017c942: docs: fix issue 4383086
Scott Main [Wed, 4 May 2011 21:38:50 +0000 (14:38 -0700)]
am d566dc19: am 7017c942: docs: fix issue 4383086

* commit 'd566dc1906b83ff135743d757d87ab22aa6d391f':
  docs: fix issue 4383086

13 years agoam 7017c942: docs: fix issue 4383086
Scott Main [Wed, 4 May 2011 21:37:10 +0000 (14:37 -0700)]
am 7017c942: docs: fix issue 4383086

* commit '7017c94249f7d27643fefd242e9faf9e53ce986e':
  docs: fix issue 4383086

13 years agoMerge "Initial check-in for AACWriter"
James Dong [Wed, 4 May 2011 20:56:36 +0000 (13:56 -0700)]
Merge "Initial check-in for AACWriter"

13 years agoam 232ea51c: am 7c8be3a7: am 762481f0: Merge "adding the usb apis to the resources...
Robert Ly [Wed, 4 May 2011 20:20:11 +0000 (13:20 -0700)]
am 232ea51c: am 7c8be3a7: am 762481f0: Merge "adding the usb apis to the resources browser" into honeycomb-mr1

* commit '232ea51c9c1af7a56e2315de863d65382c7c9a67':
  adding the usb apis to the resources browser