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

64184 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Steve Block
ec193dec4d Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGE 
See https://android-git.corp.google.com/g/157519

Bug: 5449033
Change-Id: I8ceb2dba1b031a0fd68d15d146960d9ced62bbf3
 2012-01-09 21:36:22 +00:00
Glenn Kasten
5c17a820f9 Audio Java doc comment typos and minor changes 
Change-Id: Id6ea6dccb8054c9f05db9a9c045387ce813659e6
 2012-01-09 12:15:18 -08:00
Glenn Kasten
13f94dc5bd Merge "Fix race conditions related to ringer mode" 2012-01-09 12:01:37 -08:00
Glenn Kasten
4e7191448d Merge "By convention const goes before the type specifier" 2012-01-09 11:59:17 -08:00
Glenn Kasten
26f260a167 Use cached reference to media.player service 
This save unnecessary binder calls

Change-Id: I93a60efc54d9c8fb8fab706cd4477bbfd00ffec8
 2012-01-09 11:57:07 -08:00
Fabrice Di Meglio
7d5178e9fb Merge "Add textDirection="locale"" 2012-01-09 10:46:03 -08:00
Ben Murdoch
3d00578529 Merge "Prompt the user to terminate unresponsive pages." 2012-01-09 10:41:45 -08:00
Glenn Kasten
07d7d5a22d Merge "Replace loop by __builtin_ctz" 2012-01-09 10:25:00 -08:00
Glenn Kasten
8cf6d6f148 Merge "Clean up AudioTrack::mActive and stopped()" 2012-01-09 10:24:40 -08:00
Glenn Kasten
f5c491651f Merge "suspended() and isSuspended() are const" 2012-01-09 10:24:09 -08:00
Steve Block
08289f55ea Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE" 2012-01-09 10:13:41 -08:00
George Mount
c0c3025cf2 Fix delete key with ContentEditable fields. 
Bug 5806859
 Bug 5795341
 Add a custom InputConnection to capture the deleteSurroundingText
 command and use it to send delete key codes to the WebView for
 single deletes or calling into WebViewCore to delete contents for
 more complex changes.
 Also makes the IME options "normal text" for webkit-based text
 entry.
 Webkit change: Ic938d6fa

Change-Id: I18606014a034194928a61981dc3e2400a7db5fac
 2012-01-09 09:19:29 -08:00
Ben Murdoch
e2e2083583 Prompt the user to terminate unresponsive pages. 
Run a background "watchdog" thread that will check for
the WebCore thread stopping processing messages (this
can happen if a piece of JavaScript goes into an infinite
loop, for example) and offer to close the WebView app when
it detects such a case, much like the normal system ANR.

Bug: 2563868
Change-Id: Ic74813b1e630d657c340a7017a4b0814071eb041
 2012-01-09 17:00:09 +00:00
Steve Block
3762c31172 Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE 
See https://android-git.corp.google.com/g/#/c/157220

Bug: 5449033
Change-Id: Ic9c19d30693bd56755f55906127cd6bd7126096c
 2012-01-08 13:19:13 +00:00
Wink Saville
7a939077bd Merge "Add use of net.tethering.noprovisioning to fetchDunApn" 2012-01-06 23:43:37 -08:00
The Android Open Source Project
b33eb3f077 am 20090b30: Reconcile with ics-mr1-release 
* commit '20090b30340f9382a2eca6a9bed21117f7a27d7e':
 2012-01-06 18:18:36 -08:00
The Android Open Source Project
20090b3034 Reconcile with ics-mr1-release 
Change-Id: Id0aeb30eb75c6c4aee7abbc9877aa5b16389778c
 2012-01-06 18:15:14 -08:00
Romain Guy
bc5d876df0 Avoid allocating when performing the measure/layout passes 
Change-Id: I94faa9167d632ff5a1d05f795a2c4dcc0f02348c
 2012-01-06 18:06:58 -08:00
Wink Saville
43420a49f9 Add use of net.tethering.noprovisioning to fetchDunApn 
To make it easier to test tethering, have fetchDunApn
return null when the system property
net.tethering.noprovisioning is true.

Change-Id: Id6162967c6b8b25f04380fe009961c150fa714ef
 2012-01-06 17:24:27 -08:00
Marco Nelissen
2ef4b6630b Merge "New UX calls for dialogs without titles." 2012-01-06 16:40:02 -08:00
The Android Automerger
ecf524ce0a merge in ics-mr1-release history after reset to ics-mr1 2012-01-06 16:32:11 -08:00
John Reck
1986ed76d2 Merge "Update WebSettings.PREVIOUS_VERSION" 2012-01-06 16:03:59 -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
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
cdc6b16f1b Merge "Don't allow reading of packagelist files." 2012-01-06 14:50:53 -08:00
Dan Morrill
74366c06ff Merge "Minor tweak to console output." 2012-01-06 14:39:11 -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
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
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
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
Fabrice Di Meglio
4c1e00a8c2 Add textDirection="locale" 
- also fix and update unit tests
- see bug #5242821

Change-Id: I29e029bab8ade336a430f9a2a5073caaf11b8dda
 2012-01-06 11:29:18 -08:00
Guang Zhu
128386ca9a Merge "Small tweaks to Tile Benchmark test" 2012-01-06 11:21:07 -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