drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
65,140 Commits 1 Branch 0 Tags
Commit Graph

65140 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Sams
c3cff15b90 Add more fill tests. 
Change-Id: I43ae760cdac391580e4af590e212b38afd183d1e
 2012-01-06 17:56:33 -08:00
Marco Nelissen
2443e25aef am 2ef4b663: Merge "New UX calls for dialogs without titles." 
* commit '2ef4b6630bb0fc6213df09ab6a58c5c8195c035a':
  New UX calls for dialogs without titles.
 2012-01-06 16:42:30 -08:00
Marco Nelissen
2ef4b6630b Merge "New UX calls for dialogs without titles." 2012-01-06 16:40:02 -08:00
John Reck
d09a6b3b8b am 1986ed76: Merge "Update WebSettings.PREVIOUS_VERSION" 
* commit '1986ed76d25d7c38049df4125c9d19d6626d03a8':
  Update WebSettings.PREVIOUS_VERSION
 2012-01-06 16:05:59 -08:00
John Reck
1986ed76d2 Merge "Update WebSettings.PREVIOUS_VERSION" 2012-01-06 16:03:59 -08:00
Eino-Ville Talvala
bcfefd7f4b am 143c7c88: am 4bc873e6: am 7944704e: Merge "Switch camera sounds to always use the system enforced audio stream." into ics-mr1 
* commit '143c7c885487ff665ad87c259d4b3b089d0bfec4':
  Switch camera sounds to always use the system enforced audio stream.
 2012-01-06 15:53:33 -08:00
Eino-Ville Talvala
143c7c8854 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
c4be307fbf am 9f0dfcd6: am c2eaee53: (-s ours) am a476eed6: Merge "getDuration can be only called after prepared. DO NOT MERGE" into ics-mr1 
* commit '9f0dfcd64a764126359553933fdd6a766f6565d8':
  getDuration can be only called after prepared. DO NOT MERGE
 2012-01-06 15:51:12 -08:00
Bart Sears
9f0dfcd64a 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
4bc873e6ff 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
c2eaee533f 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
7944704e6c 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
a476eed6b2 Merge "getDuration can be only called after prepared. DO NOT MERGE" into ics-mr1 2012-01-06 15:45:13 -08:00
Marco Nelissen
9cd7bde1ff New UX calls for dialogs without titles. 
b/5753055

Change-Id: I86ba0f937f71db56b3ea77752b2b30929b791a04
 2012-01-06 15:42:02 -08:00
Nick Kralevich
44de65c1f0 am cdc6b16f: Merge "Don\'t allow reading of packagelist files." 
* commit 'cdc6b16f1bece7cd07b283b9b273f05fe895010e':
  Don't allow reading of packagelist files.
 2012-01-06 14:52:26 -08:00
Nick Kralevich
cdc6b16f1b Merge "Don't allow reading of packagelist files." 2012-01-06 14:50:53 -08:00
Dan Morrill
c6360187cb am 74366c06: Merge "Minor tweak to console output." 
* commit '74366c06ff6cad7038c17c9041d25979975ce55e':
  Minor tweak to console output.
 2012-01-06 14:42:44 -08:00
Dan Morrill
74366c06ff Merge "Minor tweak to console output." 2012-01-06 14:39:11 -08:00
Wink Saville
bd21325180 am bbfec33d: am f817e941: am 2f143a96: Merge "Fix an RuntimeExcpetion in GsmDCT.onDataSetupComplete" into ics-mr1 
* commit 'bbfec33d946aa66a2f1414d4f1ec69a5f2b80134':
  Fix an RuntimeExcpetion in GsmDCT.onDataSetupComplete
 2012-01-06 14:35:20 -08:00
Wink Saville
bbfec33d94 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
f817e94133 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
2f143a966c Merge "Fix an RuntimeExcpetion in GsmDCT.onDataSetupComplete" into ics-mr1 2012-01-06 14:27:56 -08:00
Fabrice Di Meglio
c4c5ceb704 am 5c9fe80e: 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 '5c9fe80e7ad05de5da0c4ef753280b4f2507cf98':
  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:26:04 -08:00
Fabrice Di Meglio
5c9fe80e7a 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
42e231bf4a 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
c1d03cff27 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
fad2ddc701 am 1317108e: am bc72272c: am beb8be60: Merge "Fixing crash when taking screenshot over secure window." into ics-mr1 
* commit '1317108e18f40e5b5925d3f4a51789832cb17069':
  Fixing crash when taking screenshot over secure window.
 2012-01-06 14:16:33 -08:00
Justin Ho
08217489ec am fe3eb938: am 7db47a42: am 3116b7a7: Merge "Updating default image wallpaper for tablet." into ics-mr1 
* commit 'fe3eb938ca0b6e6ac44b5571f628b8a8f5721804':
  Updating default image wallpaper for tablet.
 2012-01-06 14:16:31 -08:00
Justin Ho
1317108e18 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
fe3eb938ca 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
Dan Morrill
e74763e26f Minor tweak to console output. 
Change-Id: I494910eda1d02f6bcff945b9a13c83767f2248b6
 2012-01-06 14:10:45 -08:00
Justin Ho
bc72272cc0 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
7db47a42f1 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
beb8be60d1 Merge "Fixing crash when taking screenshot over secure window." into ics-mr1 2012-01-06 14:07:51 -08:00
Justin Ho
3116b7a7ca Merge "Updating default image wallpaper for tablet." into ics-mr1 2012-01-06 14:07:37 -08:00
George Mount
a340e1db78 am 5755d01d: Merge "Remove GET_NATIVE_VIEW from WebViewCore to reduce JNI." 
* commit '5755d01d2cb017e19fed94ffde6122301460133f':
  Remove GET_NATIVE_VIEW from WebViewCore to reduce JNI.
 2012-01-06 14:02:47 -08:00
George Mount
5755d01d2c Merge "Remove GET_NATIVE_VIEW from WebViewCore to reduce JNI." 2012-01-06 14:00:30 -08:00
George Mount
427f2e5ac5 Remove GET_NATIVE_VIEW from WebViewCore to reduce JNI. 
Bug 5827817
 Added a nativeClass parameter to all appropriate JNI methods
 and used it instead of GET_NATIVE_VIEW to reduce JNI overhead.

 Webkit Change: I02004fe1

Change-Id: I49c7ecfd598826ffe78067aab393a24860ce10ef
 2012-01-06 13:58:27 -08:00
Nick Kralevich
70522addd0 Don't allow reading of packagelist files. 
Ensure that all requests to read the list of installed packages
go through the PackageManager directly. Don't allow non-system
program to directly read the raw package list files.

Change-Id: Id083e6b3de4dd9173abfdc741ebf3f60997a1052
 2012-01-06 13:58:01 -08:00
Alex Sakhartchouk
f882004f67 Merge "Adding getters to rs program obejcts." into graphics-dev 2012-01-06 13:07:01 -08:00
Guang Zhu
96c8e198e6 am 128386ca: Merge "Small tweaks to Tile Benchmark test" 
* commit '128386ca9a32a4bbce094c30fec8bc6522f04d03':
  Small tweaks to Tile Benchmark test
 2012-01-06 11:24:00 -08:00
Guang Zhu
128386ca9a Merge "Small tweaks to Tile Benchmark test" 2012-01-06 11:21:07 -08:00
Alex Sakhartchouk
d5a62bb802 Adding getters to rs program obejcts. 
Change-Id: Iff8ccc1835109d303201d6a1adb6e5cbde8ba634
 2012-01-06 10:36:06 -08:00
Steve Block
262a37f71b am f4c2294b: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE" 
* commit 'f4c2294b0156ca5a6919479142aa319963fdb727':
  Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)  DO NOT MERGE
 2012-01-06 10:33:23 -08:00
Steve Block
f4c2294b01 Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE" 2012-01-06 10:30:56 -08:00
Eino-Ville Talvala
b7feb1c91f Switch camera sounds to always use the system enforced audio stream. 
Instead of picking between the music stream and the enforced audio
stream, change the camera service to always play sounds through
enforced system stream. Also update the currently-hidden CameraSound
API to match.

Bug: 5778365
Change-Id: I3cc64b1d1ff567dbac8020a665d5b19846197ff3
 2012-01-06 10:24:01 -08:00
George Mount
3722131338 am d88f26e3: Merge "Clean up code using eclipse\'s automatic cleanup feature." 
* commit 'd88f26e3aa11e09706211c88babbf09b5a214e93':
  Clean up code using eclipse's automatic cleanup feature.
 2012-01-06 09:55:58 -08:00
George Mount
d88f26e3aa Merge "Clean up code using eclipse's automatic cleanup feature." 2012-01-06 09:53:01 -08:00
Alex Sakhartchouk
95853e4e2b Merge "Cleanup based on comments." into graphics-dev 2012-01-06 09:41:52 -08:00
Marco Nelissen
68c019e4c2 am 18c6afa0: Merge "Also accept non-parenthesized genre numbers" 
* commit '18c6afa0c57074e08b8856dde306d3302834b1a9':
  Also accept non-parenthesized genre numbers
 2012-01-06 08:09:54 -08:00