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

64165 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Greenwalt
bcf1276830 Ignore case on apn type strings. 
Found that if the type were not lowercase it wouldn't match.
That's silly.  Do case-insensitive compares.

bug:5525764
Change-Id: Ibfe6be6c34116e00931594ec317fe192e1756ade
 2012-01-11 17:01:50 -08: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
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
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
d88f26e3aa Merge "Clean up code using eclipse's automatic cleanup feature." 2012-01-06 09:53:01 -08:00
Marco Nelissen
18c6afa0c5 Merge "Also accept non-parenthesized genre numbers" 2012-01-06 08:08:15 -08:00
Jonathan Dixon
5883520fd7 Merge "Make WebView.HitTestResult static" 2012-01-06 02:19:31 -08:00
Steve Block
8564c8da81 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
c42e6a0bed Merge "Comment clean up for InputMethodSubtype." 2012-01-05 19:45:30 -08:00
Rajdeep Dua
3dc5a2eacf Merge "Bug fix for android.animation.LayoutTransition getStartDelay (int transitionType) Bug Id : 5813366" 2012-01-05 19:41:23 -08:00
Ken Wakasa
9a74476c0a Comment clean up for InputMethodSubtype. 
Change-Id: I50bca715f4caa669cb341b36a3d46358e1ad1ded
 2012-01-06 12:32:15 +09:00
Wink Saville
17907a7b74 Fix an RuntimeExcpetion in GsmDCT.onDataSetupComplete 
Instead of throwing an exception when the connection between
the DCT and a DC is broken (i.e. its null) it is treated as
an error with a new cause. And thus will be handled as other
typical errors.

Bug: 5798643
Change-Id: I46f1660ae78f118b54ab62504809723ca302b2ef
 2012-01-05 17:21:46 -08:00
Fabrice Di Meglio
d4a69b4a1c Merge "Fix bug #5753006 Garbled Labels in Maps" 2012-01-05 15:18:52 -08:00
Guang Zhu
57420bf883 Small tweaks to Tile Benchmark test 
* tag the module as 'tests' so the apk gets includes in test build
* merge the instrumentation into TileBenchmark app and eliminate
  the test apk entirely
* changed the default test suite to 'alexa25_2011' which is a suite
  of pages based on top 25 news sites from alexa, includes primarily
  english sites, and 3 CJK sites

Change-Id: Icd40a70b560bfd7c521adf8ad4b1068483698103
 2012-01-05 15:16:42 -08:00
Marco Nelissen
ad35f9165e Also accept non-parenthesized genre numbers 
b/5790684

Change-Id: Ia13feebeaadd45d9196486c012538c5b80840163
 2012-01-05 15:15:53 -08:00
Teng-Hui Zhu
149537cb70 getDuration can be only called after prepared. DO NOT MERGE 
bug:5816130
Change-Id: Ia740a1a4da7f321356f24c35067f9499955289a9
 2012-01-05 15:15:47 -08:00
George Mount
fab67a1532 Clean up code using eclipse's automatic cleanup feature. 
Bug 5826249

Change-Id: Iacd233625e144cdc522644aafee424aabd6a7f5d
 2012-01-05 15:08:27 -08:00