ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 4 Pull Requests Releases Wiki Activity
42,677 Commits 2 Branches 0 Tags 54 MiB
a753afa801
Commit Graph

42677 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Open Source Project
f344925464 am 20090b30: Reconcile with ics-mr1-release 
* commit '20090b30340f9382a2eca6a9bed21117f7a27d7e':
 2012-01-06 18:18:36 -08:00
The Android Open Source Project
82f71fb38b Reconcile with ics-mr1-release 
Change-Id: Id0aeb30eb75c6c4aee7abbc9877aa5b16389778c
 2012-01-06 18:15:14 -08:00
Marco Nelissen
b9175095e8 Merge "New UX calls for dialogs without titles." 2012-01-06 16:40:02 -08:00
The Android Automerger
5b03a1a835 merge in ics-mr1-release history after reset to ics-mr1 2012-01-06 16:32:11 -08:00
John Reck
6802be192b Merge "Update WebSettings.PREVIOUS_VERSION" 2012-01-06 16:03:59 -08:00
Eino-Ville Talvala
7f52e90aea am 4bc873e6: am 7944704e: Merge "Switch camera sounds to always use the system enforced audio stream." into ics-mr1 
* commit '4bc873e6ff73200af866f8c9efca66ad8ed23682':
  Switch camera sounds to always use the system enforced audio stream.
 2012-01-06 15:51:44 -08:00
Bart Sears
79efd563cc am c2eaee53: (-s ours) am a476eed6: Merge "getDuration can be only called after prepared. DO NOT MERGE" into ics-mr1 
* commit 'c2eaee533fe25cd9a0781f349e9c8c7ef02bd648':
  getDuration can be only called after prepared. DO NOT MERGE
 2012-01-06 15:49:26 -08:00
Eino-Ville Talvala
0981b259c7 am 7944704e: Merge "Switch camera sounds to always use the system enforced audio stream." into ics-mr1 
* commit '7944704e6c4cc10105838b78d3d8403bf66a066b':
  Switch camera sounds to always use the system enforced audio stream.
 2012-01-06 15:49:17 -08:00
Bart Sears
fd76796d29 am a476eed6: Merge "getDuration can be only called after prepared. DO NOT MERGE" into ics-mr1 
* commit 'a476eed6b291d06f5e571597b928b7b2f0b3f257':
  getDuration can be only called after prepared. DO NOT MERGE
 2012-01-06 15:47:04 -08:00
Eino-Ville Talvala
456a9c2dc5 Merge "Switch camera sounds to always use the system enforced audio stream." into ics-mr1 2012-01-06 15:46:36 -08:00
Bart Sears
4dc1cbe06f Merge "getDuration can be only called after prepared. DO NOT MERGE" into ics-mr1 2012-01-06 15:45:13 -08:00
Nick Kralevich
087876ffa4 Merge "Don't allow reading of packagelist files." 2012-01-06 14:50:53 -08:00
Dan Morrill
2a9afd1fa4 Merge "Minor tweak to console output." 2012-01-06 14:39:11 -08:00
Wink Saville
52f11b6d4a am f817e941: am 2f143a96: Merge "Fix an RuntimeExcpetion in GsmDCT.onDataSetupComplete" into ics-mr1 
* commit 'f817e9413356de2a303e14709e67457190e976c9':
  Fix an RuntimeExcpetion in GsmDCT.onDataSetupComplete
 2012-01-06 14:32:37 -08:00
Wink Saville
5d98eb7e1b am 2f143a96: Merge "Fix an RuntimeExcpetion in GsmDCT.onDataSetupComplete" into ics-mr1 
* commit '2f143a966ccfec71de2c3a9785f5f3f47d418acb':
  Fix an RuntimeExcpetion in GsmDCT.onDataSetupComplete
 2012-01-06 14:30:20 -08:00
Wink Saville
8676933648 Merge "Fix an RuntimeExcpetion in GsmDCT.onDataSetupComplete" into ics-mr1 2012-01-06 14:27:56 -08:00
Fabrice Di Meglio
b56f002ee2 am 42e231bf: (-s ours) am c1d03cff: Merge "Fix bug #5822825 Paint.measureText (char[] text, int index, int count) cannot handle text more than 32K long - DO NOT MERGE" into ics-mr1 
* commit '42e231bf4a9995c334fa134aa21f859fa1f719fc':
  Fix bug #5822825 Paint.measureText (char[] text, int index, int count) cannot handle text more than 32K long - DO NOT MERGE
 2012-01-06 14:23:29 -08:00
Fabrice Di Meglio
5fb50802d3 am c1d03cff: Merge "Fix bug #5822825 Paint.measureText (char[] text, int index, int count) cannot handle text more than 32K long - DO NOT MERGE" into ics-mr1 
* commit 'c1d03cff271d81fc9948648583e9e07c0c624dc1':
  Fix bug #5822825 Paint.measureText (char[] text, int index, int count) cannot handle text more than 32K long - DO NOT MERGE
 2012-01-06 14:20:41 -08:00
Fabrice Di Meglio
9735559b6d Merge "Fix bug #5822825 Paint.measureText (char[] text, int index, int count) cannot handle text more than 32K long - DO NOT MERGE" into ics-mr1 2012-01-06 14:19:20 -08:00
Justin Ho
1537df7484 am bc72272c: am beb8be60: Merge "Fixing crash when taking screenshot over secure window." into ics-mr1 
* commit 'bc72272cc07398a5dd6d7c76fb3eac91ad3e2bd8':
  Fixing crash when taking screenshot over secure window.
 2012-01-06 14:13:47 -08:00
Justin Ho
e96e8ff793 am 7db47a42: am 3116b7a7: Merge "Updating default image wallpaper for tablet." into ics-mr1 
* commit '7db47a42f1211befb015a7a9640f0c447b477228':
  Updating default image wallpaper for tablet.
 2012-01-06 14:13:38 -08:00
Justin Ho
67ad74d334 am beb8be60: Merge "Fixing crash when taking screenshot over secure window." into ics-mr1 
* commit 'beb8be60d157e4812e0195c2e445aa0abb82d9a2':
  Fixing crash when taking screenshot over secure window.
 2012-01-06 14:10:01 -08:00
Justin Ho
a87c42e2c4 am 3116b7a7: Merge "Updating default image wallpaper for tablet." into ics-mr1 
* commit '3116b7a7ca6681daabbdac55e71203995e7a7afe':
  Updating default image wallpaper for tablet.
 2012-01-06 14:09:59 -08:00
Justin Ho
52b68583c8 Merge "Fixing crash when taking screenshot over secure window." into ics-mr1 2012-01-06 14:07:51 -08:00
Justin Ho
2e296aeed7 Merge "Updating default image wallpaper for tablet." into ics-mr1 2012-01-06 14:07:37 -08:00
George Mount
cb6927de6a Merge "Remove GET_NATIVE_VIEW from WebViewCore to reduce JNI." 2012-01-06 14:00:30 -08:00
Guang Zhu
e4ce0fbbb9 Merge "Small tweaks to Tile Benchmark test" 2012-01-06 11:21:07 -08:00
Steve Block
e9ed8cb6c3 Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE" 2012-01-06 10:30:56 -08:00
George Mount
e11e6b7cce Merge "Clean up code using eclipse's automatic cleanup feature." 2012-01-06 09:53:01 -08:00
Marco Nelissen
1f1a0fc2eb Merge "Also accept non-parenthesized genre numbers" 2012-01-06 08:08:15 -08:00
Jonathan Dixon
d5e8af0ce6 Merge "Make WebView.HitTestResult static" 2012-01-06 02:19:31 -08:00
Steve Block
32397c1cd3 Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE 
See https://android-git.corp.google.com/g/157065

Bug: 5449033
Change-Id: I00a4b904f9449e6f93b7fd35eac28640d7929e69
 2012-01-06 10:07:54 +00:00
Ken Wakasa
5f56dfec5a Merge "Comment clean up for InputMethodSubtype." 2012-01-05 19:45:30 -08:00
Rajdeep Dua
1f8f30c052 Merge "Bug fix for android.animation.LayoutTransition getStartDelay (int transitionType) Bug Id : 5813366" 2012-01-05 19:41:23 -08:00
Fabrice Di Meglio
90b3f113a8 Merge "Fix bug #5753006 Garbled Labels in Maps" 2012-01-05 15:18:52 -08:00
Teng-Hui Zhu
15f6b67fab Merge "getDuration can be only called after prepared." 2012-01-05 14:47:01 -08:00
David Hu
11d833d1db Merge "BandwidthTestRunner" 2012-01-05 14:39:45 -08:00
Marco Nelissen
93f39d8545 Merge "ThumbnailUtils: To fix misuse of FileInputStream." 2012-01-05 14:11:40 -08:00
Steve Block
c267bab3d1 Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE" 2012-01-05 14:07:02 -08:00
Fabrice Di Meglio
69b310000d Merge "Fix bug #5822825 Paint.measureText (char[] text, int index, int count) cannot handle text more than 32K long" 2012-01-05 13:55:01 -08:00
Scott Main
3032c5f44f am 47228cac: am dacbf67a: Merge changes I1df85b6a,I7c6a68b6 into ics-mr1 
* commit '47228cac900cd58d0687b6e6d980381cfc8010a1':
  docs: second set of diagram updates
  docs: Update lifecycle diagrams to use new omnigraffle designs; add corresponding graffle files update discussion of activity state restore for clarification
 2012-01-05 12:09:07 -08:00
The Android Open Source Project
d9f8d8b0af am d32ee5ba: Reconcile with ics-mr1-release 
* commit 'd32ee5baa057992431263907ec5cf8f19b43c043':
 2012-01-05 12:08:48 -08:00
Robert Greenwalt
75e4c00db5 Merge "Filter our v6 address from tethering dns." 2012-01-05 11:39:26 -08:00
Scott Main
b34baf5f6a am dacbf67a: Merge changes I1df85b6a,I7c6a68b6 into ics-mr1 
* commit 'dacbf67ab915fa8b987f6fb9f044160af92652cd':
  docs: second set of diagram updates
  docs: Update lifecycle diagrams to use new omnigraffle designs; add corresponding graffle files update discussion of activity state restore for clarification
 2012-01-05 09:45:19 -08:00
Scott Main
55ec71116f Merge changes I1df85b6a,I7c6a68b6 into ics-mr1 
* changes:
  docs: second set of diagram updates
  docs: Update lifecycle diagrams to use new omnigraffle designs; add corresponding graffle files update discussion of activity state restore for clarification
 2012-01-05 09:42:52 -08:00
Glenn Kasten
e2343842c6 Merge "Remove the notion of "active track" from mixer" 2012-01-05 08:20:10 -08:00
The Android Open Source Project
ddf6c13a12 Reconcile with ics-mr1-release 
Change-Id: I8a74c329fc7dd115e36d5180fab8e8680d6df4f8
 2012-01-05 07:45:28 -08:00
Glenn Kasten
2adea706d4 Merge "Use the standard CC_LIKELY and CC_UNLIKELY macros" 2012-01-05 07:38:29 -08:00
Glenn Kasten
99ed22412d Use the standard CC_LIKELY and CC_UNLIKELY macros 
Several source files privately defined macros LIKELY and UNLIKELY in terms
of __builtin_expect. But <cutils/compiler.h> already has CC_LIKELY and
CC_UNLIKELY which are intended for this purpose.  So rename the private
uses to use the standard names.

In addition, AudioFlinger was relying on the macro expanding to extra ( ).

Change-Id: I2494e087a0c0cac0ac998335f5e9c8ad02955873
 2012-01-05 07:33:45 -08:00
Wink Saville
e03e4949c0 am 3ed28036: am c697ebfd: Merge "Enhancement on ICS data stall polling logic" into ics-mr1 
* commit '3ed2803691cc271fe6b893dc46d49fca2fce61df':
  Enhancement on ICS data stall polling logic
 2012-01-04 21:52:13 -08:00