OSDN Git Service

android-x86/frameworks-native.git
12 years agoam b4afb9a8: am 8125b0b4: am dcc910ea: Merge "docs: fix bug 5878445" into ics-mr1
Robert Ly [Fri, 2 Mar 2012 00:46:55 +0000 (16:46 -0800)]
am b4afb9a8: am 8125b0b4: am dcc910ea: Merge "docs: fix bug 5878445" into ics-mr1

* commit 'b4afb9a89e1a2131ac273f0452fa89b83090b05a':
  docs: fix bug 5878445

12 years agoam efa49439: am 4f306bec: Reconcile with ics-mr1-release
The Android Open Source Project [Fri, 2 Mar 2012 00:46:44 +0000 (16:46 -0800)]
am efa49439: am 4f306bec: Reconcile with ics-mr1-release

* commit 'efa4943952f81a5cb5a5d410cc4b53ca665d7065':

12 years agoMerge "Shouldn't catch Throwable in AsyncTask."
Jeff Brown [Fri, 2 Mar 2012 00:43:41 +0000 (16:43 -0800)]
Merge "Shouldn't catch Throwable in AsyncTask."

12 years agoMerge "Fix WifiManager async API"
Irfan Sheriff [Fri, 2 Mar 2012 00:26:52 +0000 (16:26 -0800)]
Merge "Fix WifiManager async API"

12 years agoMerge "Make layoutDirection API public"
Fabrice Di Meglio [Fri, 2 Mar 2012 00:23:29 +0000 (16:23 -0800)]
Merge "Make layoutDirection API public"

12 years agoMerge "Remove obsolete KeyChain references to USE_CREDENTIALS (2 of 2)"
Brian Carlstrom [Fri, 2 Mar 2012 00:22:13 +0000 (16:22 -0800)]
Merge "Remove obsolete KeyChain references to USE_CREDENTIALS (2 of 2)"

12 years agoMerge "Allow webview to delete GL resource in a valid EGL context"
Teng-Hui Zhu [Fri, 2 Mar 2012 00:04:18 +0000 (16:04 -0800)]
Merge "Allow webview to delete GL resource in a valid EGL context"

12 years agoam 956abc30: am f8e58c8b: Reconcile with ics-mr1-release
The Android Open Source Project [Thu, 1 Mar 2012 23:51:34 +0000 (15:51 -0800)]
am 956abc30: am f8e58c8b: Reconcile with ics-mr1-release

* commit '956abc304f6e03f20f4342988cbba9ac1c27a03b':

12 years agoMerge "Remove hacks that worked around issues in OMX components several releases...
Andreas Huber [Thu, 1 Mar 2012 23:46:19 +0000 (15:46 -0800)]
Merge "Remove hacks that worked around issues in OMX components several releases back."

12 years agoam 55fbbce4: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform...
Android Git Automerger [Thu, 1 Mar 2012 23:35:49 +0000 (15:35 -0800)]
am 55fbbce4: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp

* commit '55fbbce495723a5b17f1b4684d0f9826c75caa97':

12 years agoam da0c4a3e: am d12347b2: am eb4f3256: Set the video encoding bit rate for the media...
Yu Shan Emily Lau [Thu, 1 Mar 2012 23:35:47 +0000 (15:35 -0800)]
am da0c4a3e: am d12347b2: am eb4f3256: Set the video encoding bit rate for the media recorder stress test.

* commit 'da0c4a3ea653a866d6a8fe00bc52f27d0841874b':

12 years agoam 353b61a8: am 0ddfe24a: am eb4f3256: Set the video encoding bit rate for the media...
Yu Shan Emily Lau [Thu, 1 Mar 2012 23:35:43 +0000 (15:35 -0800)]
am 353b61a8: am 0ddfe24a: am eb4f3256: Set the video encoding bit rate for the media recorder stress test.

* commit '353b61a87d9eb0ee223bdda76c30a1364441d962':
  Set the video encoding bit rate for the media recorder stress test.

12 years agoam f73222a3: am 964955e0: am 8a9b14d8: am 5aeb8587: Merge "DRM framwork bug fix:...
Jean-Baptiste Queru [Thu, 1 Mar 2012 23:35:39 +0000 (15:35 -0800)]
am f73222a3: am 964955e0: am 8a9b14d8: am 5aeb8587: Merge "DRM framwork bug fix: add an API to release resources"

* commit 'f73222a39e0fa294d9105fd7464943aed6e77cd7':
  DRM framwork bug fix: add an API to release resources

12 years agoam f09c0c7f: am 93920d79: am a66be970: am 11aa4cc3: Merge "Set width of spinner\...
Jean-Baptiste Queru [Thu, 1 Mar 2012 23:35:37 +0000 (15:35 -0800)]
am f09c0c7f: am 93920d79: am a66be970: am 11aa4cc3: Merge "Set width of spinner\'s dropdown to fit on device"

* commit 'f09c0c7f31e72611d91b4ac91ce5a9f019b16083':
  Set width of spinner's dropdown to fit on device

12 years agoam dbc591e2: am c69d6134: am 6ae4fe94: am 9303919d: Merge "Adds documentation for...
Jean-Baptiste Queru [Thu, 1 Mar 2012 23:35:33 +0000 (15:35 -0800)]
am dbc591e2: am c69d6134: am 6ae4fe94: am 9303919d: Merge "Adds documentation for ContentResolver notifyChange()"

* commit 'dbc591e27686486c732fca2f94fde645e3487b7a':
  Adds documentation for ContentResolver notifyChange()

12 years agoam 9de7793b: am 4f906362: am 97348431: am 704131cb: Merge changes I46c81dba,If1f40e9c...
Jean-Baptiste Queru [Thu, 1 Mar 2012 23:35:25 +0000 (15:35 -0800)]
am 9de7793b: am 4f906362: am 97348431: am 704131cb: Merge changes I46c81dba,If1f40e9c,I652eaaa5

* commit '9de7793b425be89889412f3a86466d7b19055c3c':
  stagefright aacenc: Use QDADD/QDSUB instructions
  stagefright aacenc: Remove useless inline asm for simple right shift
  stagefright aacenc: Use ARMv6 SSAT instruction

12 years agoam 715c78b9: am 225eec8d: am f9d4ba77: am 69aae36e: Merge "stagefright aacenc: Safegu...
Jean-Baptiste Queru [Thu, 1 Mar 2012 23:35:23 +0000 (15:35 -0800)]
am 715c78b9: am 225eec8d: am f9d4ba77: am 69aae36e: Merge "stagefright aacenc: Safeguard against overwriting bits"

* commit '715c78b933f8dec04882ebb73acd61fdd42c6c64':
  stagefright aacenc: Safeguard against overwriting bits

12 years agoam 4917bc10: am d31da0a6: am fb393f8b: Mark configuration strings as not translatable.
Eric Fischer [Thu, 1 Mar 2012 23:32:24 +0000 (15:32 -0800)]
am 4917bc10: am d31da0a6: am fb393f8b: Mark configuration strings as not translatable.

* commit '4917bc104da1725d7ba093713de3802dec1515e5':

12 years agoam b145e363: (-s ours) am ba62da99: am fb393f8b: Mark configuration strings as not...
Eric Fischer [Thu, 1 Mar 2012 23:32:22 +0000 (15:32 -0800)]
am b145e363: (-s ours) am ba62da99: am fb393f8b: Mark configuration strings as not translatable.

* commit 'b145e363ff4e00048cdc9035300a6db05aa0fbb5':
  Mark configuration strings as not translatable.

12 years agoMerge "Fix 5797764: fix crash on tablets"
Jim Miller [Thu, 1 Mar 2012 23:01:53 +0000 (15:01 -0800)]
Merge "Fix 5797764: fix crash on tablets"

12 years agoMerge "Fix 5797764: don't hold PowerManager lock when changing native brightness"
Jim Miller [Thu, 1 Mar 2012 22:30:21 +0000 (14:30 -0800)]
Merge "Fix 5797764: don't hold PowerManager lock when changing native brightness"

12 years agoMerge "Prevent a 'TODO' from appearing in the JavaDoc"
Steve Block [Thu, 1 Mar 2012 22:21:25 +0000 (14:21 -0800)]
Merge "Prevent a 'TODO' from appearing in the JavaDoc"

12 years agoam 8125b0b4: am dcc910ea: Merge "docs: fix bug 5878445" into ics-mr1
Robert Ly [Thu, 1 Mar 2012 20:47:44 +0000 (12:47 -0800)]
am 8125b0b4: am dcc910ea: Merge "docs: fix bug 5878445" into ics-mr1

* commit '8125b0b4343b7f480196ce73103ca00cdf64f9e5':
  docs: fix bug 5878445

12 years agoam dcc910ea: Merge "docs: fix bug 5878445" into ics-mr1
Robert Ly [Thu, 1 Mar 2012 20:44:36 +0000 (12:44 -0800)]
am dcc910ea: Merge "docs: fix bug 5878445" into ics-mr1

* commit 'dcc910ea6eb724fe7e0a415afcdf1a5aefc42f06':
  docs: fix bug 5878445

12 years agoMerge "docs: fix bug 5878445" into ics-mr1
Robert Ly [Thu, 1 Mar 2012 20:42:24 +0000 (12:42 -0800)]
Merge "docs: fix bug 5878445" into ics-mr1

12 years agoMerge "Instead of hardcoding OMX component names in our code, support"
Andreas Huber [Thu, 1 Mar 2012 20:41:10 +0000 (12:41 -0800)]
Merge "Instead of hardcoding OMX component names in our code, support"

12 years agoMerge "Small tweak to Canvas.drawPath() GL implementation"
Romain Guy [Thu, 1 Mar 2012 20:11:59 +0000 (12:11 -0800)]
Merge "Small tweak to Canvas.drawPath() GL implementation"

12 years agoMerge "Clean up Surface Texture on Java side"
Teng-Hui Zhu [Thu, 1 Mar 2012 19:32:59 +0000 (11:32 -0800)]
Merge "Clean up Surface Texture on Java side"

12 years agoInstead of hardcoding OMX component names in our code, support
Andreas Huber [Wed, 29 Feb 2012 23:47:17 +0000 (15:47 -0800)]
Instead of hardcoding OMX component names in our code, support

a config file instead.

Change-Id: I5835903ab9f1c4a22ccc605ca99ed966767adf57

12 years agoMerge "[maguro] Add Cheers' MCCMNC in SIMRecords.java"
John Wang [Thu, 1 Mar 2012 18:52:47 +0000 (10:52 -0800)]
Merge "[maguro] Add Cheers' MCCMNC in SIMRecords.java"

12 years agoam 4f306bec: Reconcile with ics-mr1-release
The Android Open Source Project [Thu, 1 Mar 2012 18:46:52 +0000 (10:46 -0800)]
am 4f306bec: Reconcile with ics-mr1-release

* commit '4f306becef17ea986522202cc8c90b0e32e2ded1':

12 years agoReconcile with ics-mr1-release
The Android Open Source Project [Thu, 1 Mar 2012 18:40:12 +0000 (10:40 -0800)]
Reconcile with ics-mr1-release

Change-Id: If1919ebd98b63a6380de01d761107ee78e2bda9a

12 years agoMerge "If no NITZ information use Country Code to set TimeZone."
Wink Saville [Thu, 1 Mar 2012 18:28:56 +0000 (10:28 -0800)]
Merge "If no NITZ information use Country Code to set TimeZone."

12 years agoMerge "Improve documentation of SQLite debugging options."
Jeff Brown [Thu, 1 Mar 2012 18:23:51 +0000 (10:23 -0800)]
Merge "Improve documentation of SQLite debugging options."

12 years agoMerge "renamed audio policy output flag."
Eric Laurent [Thu, 1 Mar 2012 18:17:21 +0000 (10:17 -0800)]
Merge "renamed audio policy output flag."

12 years agoam f8e58c8b: Reconcile with ics-mr1-release
The Android Open Source Project [Thu, 1 Mar 2012 18:14:27 +0000 (10:14 -0800)]
am f8e58c8b: Reconcile with ics-mr1-release

* commit 'f8e58c8b4e8e2ef84e7213401ab595ce084f5612':

12 years agoReconcile with ics-mr1-release
The Android Open Source Project [Thu, 1 Mar 2012 18:11:47 +0000 (10:11 -0800)]
Reconcile with ics-mr1-release

Change-Id: I0dd6896813e61ae5168134d6018dc96bd41008e8

12 years agoMerge "Allocation sampling api prototypes."
Alex Sakhartchouk [Thu, 1 Mar 2012 17:43:43 +0000 (09:43 -0800)]
Merge "Allocation sampling api prototypes."

12 years agoam 62b4e4a8: am 86ca108c: am a53b3bfa: docs: Android Design downloads section, linkab...
Roman Nurik [Thu, 1 Mar 2012 17:26:24 +0000 (09:26 -0800)]
am 62b4e4a8: am 86ca108c: am a53b3bfa: docs: Android Design downloads section, linkable H2s.

* commit '62b4e4a83ea949537ca4bb1f56074d63a17bf87a':

12 years agoam b96ad49a: am c47369d7: am a53b3bfa: docs: Android Design downloads section, linkab...
Roman Nurik [Thu, 1 Mar 2012 17:08:33 +0000 (09:08 -0800)]
am b96ad49a: am c47369d7: am a53b3bfa: docs: Android Design downloads section, linkable H2s.

* commit 'b96ad49a3a898b741f7c4d6854e599116546e2ac':
  docs: Android Design downloads section, linkable H2s.

12 years agoMerge "Don't forget to turn off mobile_dun"
Robert Greenwalt [Thu, 1 Mar 2012 16:13:24 +0000 (08:13 -0800)]
Merge "Don't forget to turn off mobile_dun"

12 years agoMerge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks...
Android Git Automerger [Thu, 1 Mar 2012 15:35:22 +0000 (07:35 -0800)]
Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp

12 years agoMerge "Handle sentence level spell checking hidden APIs"
satok [Thu, 1 Mar 2012 08:25:03 +0000 (00:25 -0800)]
Merge "Handle sentence level spell checking hidden APIs"

12 years agoMerge "Use SINGLE_TOP and CLEAR_TOP when starting camera from lock scren."
Wu-cheng Li [Thu, 1 Mar 2012 06:49:10 +0000 (22:49 -0800)]
Merge "Use SINGLE_TOP and CLEAR_TOP when starting camera from lock scren."

12 years agoMerge "Externalize more SQLite configuration options."
Jeff Brown [Thu, 1 Mar 2012 05:29:22 +0000 (21:29 -0800)]
Merge "Externalize more SQLite configuration options."

12 years agoMerge "Improve Wi-Fi hand-off"
Irfan Sheriff [Thu, 1 Mar 2012 03:33:06 +0000 (19:33 -0800)]
Merge "Improve Wi-Fi hand-off"

12 years agoMerge "Full implementation of Canvas.drawPath()"
Romain Guy [Thu, 1 Mar 2012 03:16:15 +0000 (19:16 -0800)]
Merge "Full implementation of Canvas.drawPath()"

12 years agoam d12347b2: am eb4f3256: Set the video encoding bit rate for the media recorder...
Yu Shan Emily Lau [Thu, 1 Mar 2012 03:04:11 +0000 (19:04 -0800)]
am d12347b2: am eb4f3256: Set the video encoding bit rate for the media recorder stress test.

* commit 'd12347b2b4dba77b9b0b7cc33ea32f8b5a54b388':
  Set the video encoding bit rate for the media recorder stress test.

12 years agoam 0ddfe24a: am eb4f3256: Set the video encoding bit rate for the media recorder...
Yu Shan Emily Lau [Thu, 1 Mar 2012 03:03:40 +0000 (19:03 -0800)]
am 0ddfe24a: am eb4f3256: Set the video encoding bit rate for the media recorder stress test.

* commit '0ddfe24a19882bb355313b6c5c14dcb0c6608365':
  Set the video encoding bit rate for the media recorder stress test.

12 years agoam eb4f3256: Set the video encoding bit rate for the media recorder stress test.
Yu Shan Emily Lau [Thu, 1 Mar 2012 03:00:08 +0000 (19:00 -0800)]
am eb4f3256: Set the video encoding bit rate for the media recorder stress test.

* commit 'eb4f3256b77fe7fd783297a550a64ea441c41169':
  Set the video encoding bit rate for the media recorder stress test.

12 years agoam eb4f3256: Set the video encoding bit rate for the media recorder stress test.
Yu Shan Emily Lau [Thu, 1 Mar 2012 03:00:00 +0000 (19:00 -0800)]
am eb4f3256: Set the video encoding bit rate for the media recorder stress test.

* commit 'eb4f3256b77fe7fd783297a550a64ea441c41169':
  Set the video encoding bit rate for the media recorder stress test.

12 years agoMerge "Fix bug #3389545 android:ellipsize="end" doesn't work without using android...
Fabrice Di Meglio [Thu, 1 Mar 2012 02:45:54 +0000 (18:45 -0800)]
Merge "Fix bug #3389545 android:ellipsize="end" doesn't work without using android:singleLine="true" which is deprecated"

12 years agoMerge "Invalidate text display list on scroll"
Gilles Debunne [Thu, 1 Mar 2012 01:32:20 +0000 (17:32 -0800)]
Merge "Invalidate text display list on scroll"

12 years agoMerge "Fix alpha when swiping recents on tablets"
Michael Jurka [Thu, 1 Mar 2012 01:30:05 +0000 (17:30 -0800)]
Merge "Fix alpha when swiping recents on tablets"

12 years agoMerge "Don't throw if sqlite3_finalize returns an error."
Jeff Brown [Thu, 1 Mar 2012 01:06:23 +0000 (17:06 -0800)]
Merge "Don't throw if sqlite3_finalize returns an error."

12 years agoMerge "Refactor SQLiteOpenHelper."
Jeff Brown [Thu, 1 Mar 2012 01:06:08 +0000 (17:06 -0800)]
Merge "Refactor SQLiteOpenHelper."

12 years agoMerge "Fixed several 64-bit porting issues"
Andrew Hsieh [Thu, 1 Mar 2012 00:41:55 +0000 (16:41 -0800)]
Merge "Fixed several 64-bit porting issues"

12 years agoMerge "Added permission check for all sensitive drm API calls"
James Dong [Thu, 1 Mar 2012 00:32:10 +0000 (16:32 -0800)]
Merge "Added permission check for all sensitive drm API calls"

12 years agoMerge "Fix bug #5616520 When the device is set to Arabic, and the email application...
Fabrice Di Meglio [Thu, 1 Mar 2012 00:20:24 +0000 (16:20 -0800)]
Merge "Fix bug #5616520 When the device is set to Arabic, and the email application is launched, the guided text is not displayed"

12 years agoam 964955e0: am 8a9b14d8: am 5aeb8587: Merge "DRM framwork bug fix: add an API to...
Jean-Baptiste Queru [Wed, 29 Feb 2012 23:51:30 +0000 (15:51 -0800)]
am 964955e0: am 8a9b14d8: am 5aeb8587: Merge "DRM framwork bug fix: add an API to release resources"

* commit '964955e0bd98166c16f705811ce46d0151924cc8':
  DRM framwork bug fix: add an API to release resources

12 years agoam 93920d79: am a66be970: am 11aa4cc3: Merge "Set width of spinner\'s dropdown to...
Jean-Baptiste Queru [Wed, 29 Feb 2012 23:51:28 +0000 (15:51 -0800)]
am 93920d79: am a66be970: am 11aa4cc3: Merge "Set width of spinner\'s dropdown to fit on device"

* commit '93920d79b7fa57ad941f5dbf33cf15ead6cd7318':
  Set width of spinner's dropdown to fit on device

12 years agoam c69d6134: am 6ae4fe94: am 9303919d: Merge "Adds documentation for ContentResolver...
Jean-Baptiste Queru [Wed, 29 Feb 2012 23:51:25 +0000 (15:51 -0800)]
am c69d6134: am 6ae4fe94: am 9303919d: Merge "Adds documentation for ContentResolver notifyChange()"

* commit 'c69d61343913848b467022ef63f2c84cbc5ec34b':
  Adds documentation for ContentResolver notifyChange()

12 years agoam 4f906362: am 97348431: am 704131cb: Merge changes I46c81dba,If1f40e9c,I652eaaa5
Jean-Baptiste Queru [Wed, 29 Feb 2012 23:51:23 +0000 (15:51 -0800)]
am 4f906362: am 97348431: am 704131cb: Merge changes I46c81dba,If1f40e9c,I652eaaa5

* commit '4f9063622415ea083bbd639af06e98065ce7176d':
  stagefright aacenc: Use QDADD/QDSUB instructions
  stagefright aacenc: Remove useless inline asm for simple right shift
  stagefright aacenc: Use ARMv6 SSAT instruction

12 years agoam 225eec8d: am f9d4ba77: am 69aae36e: Merge "stagefright aacenc: Safeguard against...
Jean-Baptiste Queru [Wed, 29 Feb 2012 23:51:19 +0000 (15:51 -0800)]
am 225eec8d: am f9d4ba77: am 69aae36e: Merge "stagefright aacenc: Safeguard against overwriting bits"

* commit '225eec8d2a1b63dfb57bcdcf3a72ab755f0e5525':
  stagefright aacenc: Safeguard against overwriting bits

12 years agoam 8a9b14d8: am 5aeb8587: Merge "DRM framwork bug fix: add an API to release resources"
Jean-Baptiste Queru [Wed, 29 Feb 2012 23:47:45 +0000 (15:47 -0800)]
am 8a9b14d8: am 5aeb8587: Merge "DRM framwork bug fix: add an API to release resources"

* commit '8a9b14d80530eccf801fa794bacf287813b5978f':
  DRM framwork bug fix: add an API to release resources

12 years agoam a66be970: am 11aa4cc3: Merge "Set width of spinner\'s dropdown to fit on device"
Jean-Baptiste Queru [Wed, 29 Feb 2012 23:47:42 +0000 (15:47 -0800)]
am a66be970: am 11aa4cc3: Merge "Set width of spinner\'s dropdown to fit on device"

* commit 'a66be970999c5eec1c8efb46e196f19ae563fc9b':
  Set width of spinner's dropdown to fit on device

12 years agoam 6ae4fe94: am 9303919d: Merge "Adds documentation for ContentResolver notifyChange()"
Jean-Baptiste Queru [Wed, 29 Feb 2012 23:47:38 +0000 (15:47 -0800)]
am 6ae4fe94: am 9303919d: Merge "Adds documentation for ContentResolver notifyChange()"

* commit '6ae4fe945b41d4bcb3ba7d931e34d6ef184b8b45':
  Adds documentation for ContentResolver notifyChange()

12 years agoam 97348431: am 704131cb: Merge changes I46c81dba,If1f40e9c,I652eaaa5
Jean-Baptiste Queru [Wed, 29 Feb 2012 23:47:35 +0000 (15:47 -0800)]
am 97348431: am 704131cb: Merge changes I46c81dba,If1f40e9c,I652eaaa5

* commit '9734843102c074c56ac72e221db0f51ae2fa79ec':
  stagefright aacenc: Use QDADD/QDSUB instructions
  stagefright aacenc: Remove useless inline asm for simple right shift
  stagefright aacenc: Use ARMv6 SSAT instruction

12 years agoam f9d4ba77: am 69aae36e: Merge "stagefright aacenc: Safeguard against overwriting...
Jean-Baptiste Queru [Wed, 29 Feb 2012 23:47:32 +0000 (15:47 -0800)]
am f9d4ba77: am 69aae36e: Merge "stagefright aacenc: Safeguard against overwriting bits"

* commit 'f9d4ba77f45d8f0efe97abb28247cbca12836dca':
  stagefright aacenc: Safeguard against overwriting bits

12 years agoam 5aeb8587: Merge "DRM framwork bug fix: add an API to release resources"
Jean-Baptiste Queru [Wed, 29 Feb 2012 23:44:41 +0000 (15:44 -0800)]
am 5aeb8587: Merge "DRM framwork bug fix: add an API to release resources"

* commit '5aeb85877a95cc12c0784757a9842983b04e8600':
  DRM framwork bug fix: add an API to release resources

12 years agoam 11aa4cc3: Merge "Set width of spinner\'s dropdown to fit on device"
Jean-Baptiste Queru [Wed, 29 Feb 2012 23:44:38 +0000 (15:44 -0800)]
am 11aa4cc3: Merge "Set width of spinner\'s dropdown to fit on device"

* commit '11aa4cc38b646f62eb22842d7510415b61c2ef84':
  Set width of spinner's dropdown to fit on device

12 years agoam 9303919d: Merge "Adds documentation for ContentResolver notifyChange()"
Jean-Baptiste Queru [Wed, 29 Feb 2012 23:44:34 +0000 (15:44 -0800)]
am 9303919d: Merge "Adds documentation for ContentResolver notifyChange()"

* commit '9303919d7d837dedf16f09ace0013e62670568e7':
  Adds documentation for ContentResolver notifyChange()

12 years agoam 704131cb: Merge changes I46c81dba,If1f40e9c,I652eaaa5
Jean-Baptiste Queru [Wed, 29 Feb 2012 23:44:31 +0000 (15:44 -0800)]
am 704131cb: Merge changes I46c81dba,If1f40e9c,I652eaaa5

* commit '704131cb7e4f9cc682ea57ed569375f9f289368e':
  stagefright aacenc: Use QDADD/QDSUB instructions
  stagefright aacenc: Remove useless inline asm for simple right shift
  stagefright aacenc: Use ARMv6 SSAT instruction

12 years agoam 69aae36e: Merge "stagefright aacenc: Safeguard against overwriting bits"
Jean-Baptiste Queru [Wed, 29 Feb 2012 23:44:28 +0000 (15:44 -0800)]
am 69aae36e: Merge "stagefright aacenc: Safeguard against overwriting bits"

* commit '69aae36e900cf7114c5895618747906951a11730':
  stagefright aacenc: Safeguard against overwriting bits

12 years agoMerge "DRM framwork bug fix: add an API to release resources"
Jean-Baptiste Queru [Wed, 29 Feb 2012 23:12:47 +0000 (15:12 -0800)]
Merge "DRM framwork bug fix: add an API to release resources"

12 years agoMerge "Set width of spinner's dropdown to fit on device"
Jean-Baptiste Queru [Wed, 29 Feb 2012 23:09:16 +0000 (15:09 -0800)]
Merge "Set width of spinner's dropdown to fit on device"

12 years agoMerge "Shorten thread names"
Glenn Kasten [Wed, 29 Feb 2012 22:59:08 +0000 (14:59 -0800)]
Merge "Shorten thread names"

12 years agoMerge "Prepare for threadLoop merge - active tracks"
Glenn Kasten [Wed, 29 Feb 2012 22:56:30 +0000 (14:56 -0800)]
Merge "Prepare for threadLoop merge - active tracks"

12 years agoMerge "AudioRecord const methods"
Glenn Kasten [Wed, 29 Feb 2012 22:45:25 +0000 (14:45 -0800)]
Merge "AudioRecord const methods"

12 years agoMerge "Update AudioFlinger comments"
Glenn Kasten [Wed, 29 Feb 2012 22:44:39 +0000 (14:44 -0800)]
Merge "Update AudioFlinger comments"

12 years agoMerge "Pull in declaration of effectChains to inner block"
Glenn Kasten [Wed, 29 Feb 2012 22:43:19 +0000 (14:43 -0800)]
Merge "Pull in declaration of effectChains to inner block"

12 years agoMerge "Adds documentation for ContentResolver notifyChange()"
Jean-Baptiste Queru [Wed, 29 Feb 2012 22:38:57 +0000 (14:38 -0800)]
Merge "Adds documentation for ContentResolver notifyChange()"

12 years agoMerge "Fix simple_list_item_multiple_choice to use correct size and spacing."
Adam Powell [Wed, 29 Feb 2012 22:26:24 +0000 (14:26 -0800)]
Merge "Fix simple_list_item_multiple_choice to use correct size and spacing."

12 years agoMerge changes I46c81dba,If1f40e9c,I652eaaa5
Jean-Baptiste Queru [Wed, 29 Feb 2012 22:24:52 +0000 (14:24 -0800)]
Merge changes I46c81dba,If1f40e9c,I652eaaa5

* changes:
  stagefright aacenc: Use QDADD/QDSUB instructions
  stagefright aacenc: Remove useless inline asm for simple right shift
  stagefright aacenc: Use ARMv6 SSAT instruction

12 years agoMerge "stagefright aacenc: Safeguard against overwriting bits"
Jean-Baptiste Queru [Wed, 29 Feb 2012 22:23:38 +0000 (14:23 -0800)]
Merge "stagefright aacenc: Safeguard against overwriting bits"

12 years agoMerge "Merge: Introduce UpdateLocks"
Christopher Tate [Wed, 29 Feb 2012 22:08:46 +0000 (14:08 -0800)]
Merge "Merge: Introduce UpdateLocks"

12 years agoMerge "Update to allow passing empty string in a binding."
Svetoslav Ganov [Wed, 29 Feb 2012 22:08:13 +0000 (14:08 -0800)]
Merge "Update to allow passing empty string in a binding."

12 years agoMerge "Revert "Add support for CMAS warning notifications over CDMA." I'll submit...
Jake Hamby [Wed, 29 Feb 2012 22:04:48 +0000 (14:04 -0800)]
Merge "Revert "Add support for CMAS warning notifications over CDMA." I'll submit again when the app change is ready."

12 years agoam d31da0a6: am fb393f8b: Mark configuration strings as not translatable.
Eric Fischer [Wed, 29 Feb 2012 21:30:51 +0000 (13:30 -0800)]
am d31da0a6: am fb393f8b: Mark configuration strings as not translatable.

* commit 'd31da0a670a60722339faa18e1147adb9c14532d':

12 years agoam ba62da99: am fb393f8b: Mark configuration strings as not translatable.
Eric Fischer [Wed, 29 Feb 2012 21:28:52 +0000 (13:28 -0800)]
am ba62da99: am fb393f8b: Mark configuration strings as not translatable.

* commit 'ba62da99666c9ca590cde49ff00c06d3d50ca0a7':
  Mark configuration strings as not translatable.

12 years agoam fb393f8b: Mark configuration strings as not translatable.
Eric Fischer [Wed, 29 Feb 2012 21:26:13 +0000 (13:26 -0800)]
am fb393f8b: Mark configuration strings as not translatable.

* commit 'fb393f8bd79602c933dc829bd36070dd78be2872':
  Mark configuration strings as not translatable.

12 years agoam fb393f8b: Mark configuration strings as not translatable.
Eric Fischer [Wed, 29 Feb 2012 21:26:08 +0000 (13:26 -0800)]
am fb393f8b: Mark configuration strings as not translatable.

* commit 'fb393f8bd79602c933dc829bd36070dd78be2872':
  Mark configuration strings as not translatable.

12 years agoMerge "Import translations. DO NOT MERGE"
Eric Fischer [Wed, 29 Feb 2012 21:21:43 +0000 (13:21 -0800)]
Merge "Import translations. DO NOT MERGE"

12 years agoam 86ca108c: am a53b3bfa: docs: Android Design downloads section, linkable H2s.
Roman Nurik [Wed, 29 Feb 2012 20:49:31 +0000 (12:49 -0800)]
am 86ca108c: am a53b3bfa: docs: Android Design downloads section, linkable H2s.

* commit '86ca108c65c3f8400e750d639b71d6a3cef5b600':

12 years agoam c47369d7: am a53b3bfa: docs: Android Design downloads section, linkable H2s.
Roman Nurik [Wed, 29 Feb 2012 20:45:16 +0000 (12:45 -0800)]
am c47369d7: am a53b3bfa: docs: Android Design downloads section, linkable H2s.

* commit 'c47369d7c5d3a588d7b0c655878f0bc7dd2ffedc':
  docs: Android Design downloads section, linkable H2s.

12 years agoam a53b3bfa: docs: Android Design downloads section, linkable H2s.
Roman Nurik [Wed, 29 Feb 2012 20:43:29 +0000 (12:43 -0800)]
am a53b3bfa: docs: Android Design downloads section, linkable H2s.

* commit 'a53b3bfaadd14aa325c6d6dc2542d7cbea66fc85':
  docs: Android Design downloads section, linkable H2s.

12 years agoam a53b3bfa: docs: Android Design downloads section, linkable H2s.
Roman Nurik [Wed, 29 Feb 2012 20:42:39 +0000 (12:42 -0800)]
am a53b3bfa: docs: Android Design downloads section, linkable H2s.

* commit 'a53b3bfaadd14aa325c6d6dc2542d7cbea66fc85':
  docs: Android Design downloads section, linkable H2s.

12 years agoMerge "Add support for CMAS warning notifications over CDMA."
Jake Hamby [Wed, 29 Feb 2012 20:41:38 +0000 (12:41 -0800)]
Merge "Add support for CMAS warning notifications over CDMA."

12 years agoMerge "Fix bug #5180841 TextLayoutCache needs to support Indic"
Fabrice Di Meglio [Wed, 29 Feb 2012 20:38:44 +0000 (12:38 -0800)]
Merge "Fix bug #5180841 TextLayoutCache needs to support Indic"

12 years agoMerge "Fix bug #5217606 LocaleUtils constants TEXT_LAYOUT_DIRECTION_LTR_DO_NOT_USE...
Fabrice Di Meglio [Wed, 29 Feb 2012 20:37:13 +0000 (12:37 -0800)]
Merge "Fix bug #5217606 LocaleUtils constants TEXT_LAYOUT_DIRECTION_LTR_DO_NOT_USE and TEXT_LAYOUT_DIRECTION_RTL_DO_NOT_USE should be renamed"