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

59054 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Laurent
ab7ed38d5f Merge "Fix issue 5373658: memory leak in AudioFlinger." 2011-09-27 14:07:45 -07:00
Scott Main
2d68a6ba3c docs: mix of BT and NFC javadoc updates 
Add Health profile to various discussions about profiles
Add descriptions to NFC interfaces, tweak some desciptions, and fix some broken links

Change-Id: Ib89434c78a4ad60b4358dca9a6c335451d1c4125
 2011-09-27 14:04:48 -07:00
Andreas Huber
d33b3881f7 Merge "Signal an appropriate error even if there are no active streams yet." 2011-09-27 13:36:22 -07:00
The Android Automerger
42670ff37e merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-09-27 13:32:06 -07:00
Alon Albert
553e547420 Merge "Add Detailed Sync Stats Section Also improve history formatting Here's a smaple of what it looks like:" 2011-09-27 13:29:11 -07:00
Alon Albert
e0bde33e0d Add Detailed Sync Stats Section 
Also improve history formatting
Here's a smaple of what it looks like:

Detailed Statistics (Recent history):  20  40s
-------------------------------------------------------------------------------------
  com.android.contacts                                        : 9/45%      11/27%
    aagmtest1@gmail.com/com.google                            :   3/15%      4/11%
    aagmtest2@gmail.com/com.google                            :   3/15%      3/9%
    aalbert@google.com/com.google                             :   3/15%      2/6%
-------------------------------------------------------------------------------------
  gmail-ls                                                    : 6/30%      22/56%
-------------------------------------------------------------------------------------
  com.android.calendar                                        : 3/15%      5/14%
    aagmtest1@gmail.com/com.google                            :   1/5%       4/12%
    aagmtest2@gmail.com/com.google                            :   1/5%       0/0%
    aalbert@google.com/com.google                             :   1/5%       0/0%
-------------------------------------------------------------------------------------
  com.google.android.apps.plus.content.EsGooglePhotoProvider  : 2/10%      0/1%
    aagmtest1@gmail.com/com.google                            :   1/5%       0/1%
    aagmtest2@gmail.com/com.google                            :   1/5%       0/0%
-------------------------------------------------------------------------------------

Recent Sync History
  #1  : 2011-09-23 15:18:35   SERVER    0.8s  aalbert@google.com/com.google   gmail-ls
  #2  : 2011-09-23 15:17:56   SERVER    1.3s  00:38
  #3  : 2011-09-23 15:17:52   SERVER    4.6s  00:04
  #4  : 2011-09-23 15:17:45   SERVER    1.7s  00:06
  #5  : 2011-09-23 15:16:51    LOCAL    0.8s  aagmtest2@gmail.com/com.google  com.android.contacts
  #6  : 2011-09-23 15:16:51    LOCAL    0.7s  aalbert@google.com/com.google   com.android.contacts
  #7  : 2011-09-23 15:16:50    LOCAL    0.7s  aagmtest1@gmail.com/com.google  com.android.contacts
  #8  : 2011-09-23 15:15:35    LOCAL    0.7s  aalbert@google.com/com.google   com.android.contacts
  #9  : 2011-09-23 15:15:34    LOCAL    0.8s  aagmtest2@gmail.com/com.google  com.android.contacts
  #10 : 2011-09-23 15:15:33    LOCAL    1.9s  aagmtest1@gmail.com/com.google  com.android.contacts
  #11 : 2011-09-23 15:14:37    LOCAL    1.3s  aalbert@google.com/com.google   com.android.contacts
  #12 : 2011-09-23 15:14:35    LOCAL    2.0s  aagmtest1@gmail.com/com.google  com.android.contacts
  #13 : 2011-09-23 15:14:32    LOCAL    2.2s  aagmtest2@gmail.com/com.google  com.android.contacts
  #14 : 2011-09-23 15:13:41   SERVER    1.3s  aalbert@google.com/com.google   gmail-ls
  #15 : 2011-09-23 15:13:34    LOCAL    0.3s  aalbert@google.com/com.google   com.android.calendar
  #16 : 2011-09-23 15:13:34    LOCAL    0.4s  aagmtest2@gmail.com/com.google  com.android.calendar
  #17 : 2011-09-23 15:13:33   SERVER    0.1s  aagmtest2@gmail.com/com.google  com.google.android.apps.plus.content.EsGooglePhotoProvider
  #18 : 2011-09-23 15:13:33   SERVER    0.5s  aagmtest1@gmail.com/com.google  com.google.android.apps.plus.content.EsGooglePhotoProvider
  #19 : 2011-09-23 15:13:29    LOCAL    4.9s  aagmtest1@gmail.com/com.google  com.android.calendar
  #20 : 2011-09-23 15:13:28   SERVER   13.1s  aalbert@google.com/com.google   gmail-ls

Change-Id: Idc904e2e18a373b6d2d10af65b02683c11fd8d90
 2011-09-27 13:15:30 -07:00
Daniel Sandler
097a35b441 am 25bb73eb: Merge "Remove "excessive sync" icon." into ics-factoryrom 
* commit '25bb73eb1bc16921cc013b9b150c2d440d650c39':
  Remove "excessive sync" icon.
 2011-09-27 13:08:54 -07:00
Daniel Sandler
25bb73eb1b Merge "Remove "excessive sync" icon." into ics-factoryrom 2011-09-27 13:06:01 -07:00
David 'Digit' Turner
53a7af36f5 am 45c65741: am be49703e: am d51ecafa: opengl: Ensure we only load the GLES emulation library when the emulator supports it. 
* commit '45c657411774f900c79f6cb611bc1dc7887a1865':
  opengl: Ensure we only load the GLES emulation library when the emulator supports it.
 2011-09-27 12:36:15 -07:00
Jamie Gennis
d7b3c64717 am da42e0fa: Merge "SurfaceFlinger: fix setting default buffer size" into ics-factoryrom 
* commit 'da42e0faaa95c796dc49f3b38023562dab6584a7':
  SurfaceFlinger: fix setting default buffer size
 2011-09-27 12:32:17 -07:00
Jamie Gennis
da42e0faaa Merge "SurfaceFlinger: fix setting default buffer size" into ics-factoryrom 2011-09-27 12:28:59 -07:00
Andreas Huber
7922619e9c Signal an appropriate error even if there are no active streams yet. 
Change-Id: I3ac1053ad288558b62ee18056dfd0a9ce0da8f49
related-to-bug: 5372901
 2011-09-27 12:13:37 -07:00
Eric Laurent
4a64a6e32c Fix issue 5373658: memory leak in AudioFlinger. 
Unlink PowerManagerService binder interface death recipient
in ThreadBase destructor.

Change-Id: Iab06ae9a8a6737bb002b6416a157b0fb50c11ad5
 2011-09-27 12:07:15 -07:00
Adam Powell
2b2adbdda0 Merge "Improve docs in BaseAdapter." 2011-09-27 12:06:33 -07:00
Adam Powell
f5d412a0c7 Improve docs in BaseAdapter. 
Change-Id: Idbe19f9b01132c28b4960515c23bd28e3729fd5d
 2011-09-27 11:32:59 -07:00
Tsu Chiang Chuang
14b4c769be Merge "adding packet count and removing extra uid stats that were used for debugging." 2011-09-27 11:18:13 -07:00
Steve Block
a3b06ff933 Merge changes If97c4d76,I1cd975b1 
* changes:
  Always update the WebView's SSL certificate, regardless of whether a WebViewClient has been set
  Remove superfluous synchronized modifier on SslCertLookupTable.getInstance()
 2011-09-27 10:52:50 -07:00
Eric Laurent
53719fc4c5 Merge "Fix issue 5373048: AudioCache decode errors" 2011-09-27 10:32:17 -07:00
Peter Ng
6ce9dfd8a4 Merge "Fixed jaggy circles in pattern unlock" 2011-09-27 10:24:54 -07:00
Eric Laurent
9968a36f29 Fix issue 5373048: AudioCache decode errors 
When decoding a file for the SoundPool, do not
reject the entire file in case of error but
return what was decoded so far instead.

Change-Id: Iff199a1b6a4c8e064e42a0dfe0704e0ae36a27fd
 2011-09-27 10:23:38 -07:00
The Android Open Source Project
5bc305dc1e Reconcile with ics-factoryrom-release 
Change-Id: I9c75782f72a7da6e1e9de183146841f8f4bebc6b
 2011-09-27 10:10:44 -07:00
Justin Ho
6e17d8799b am 5fd141c2: Merge "Updated stat_sys icons" into ics-factoryrom 
* commit '5fd141c245051f2fa84bf2559a417577391e40df':
  Updated stat_sys icons
 2011-09-27 09:56:25 -07:00
Justin Ho
5fd141c245 Merge "Updated stat_sys icons" into ics-factoryrom 2011-09-27 09:54:40 -07:00
Brian Colonna
267cb2b284 Fix 5323545 - FaceLock no longer appears when taking a call 
Prior to this fix if the screen was off and a call was received, the
onScreenTurnedOn() callback would bring up the FaceLock service,
which would cover the phone interface.  It now requires the call state
to be CALL_STATE_IDLE to start FaceLock.  When the phone interface
closes, the user is left at the backup lock screen.  Bringing FaceLock
up after a call ends does not seem like the correct thing to do.

While working near the FaceLock callback code, the sleepDevice()
callback was removed because it is no longer used (Fix 5327896).

Some cleanup was also done with regards to KeyguardViewManager.
FaceLock calls were being made from the KeyguardViewManager in
onScreenTurnedOn() and onScreenTurnedOff() via an interface to
LockPatternKeyguardView.  This level of indirection was removed
because it can just be handled inside of the corresponding calls
in LockPatternKeyguardView.  Likewise the FaceLock functionality
inside of hide() in KeyguardViewManager is now in
onDetachedFromWindow() in LockPatternKeyguardView.  Overall this
is much cleaner, especially considering interfacing through
KeyguardViewBase was a bit of a hack.

Patch Set 2:

- Now using KeyguardUpdateMonitor to get phone state

- Removed unnecessary wrapper functions for hiding / viewing
  FaceLock area
  - These were really only there because at one point I was calling
    them from KeyguardViewManager and the naming was confusing

- Removed if(DEBUG) from a couple of log messages that are actually
  warnings that shouldn't show up and I want to know if they happen
  even if I don't have DEBUG set to true

Change-Id: Id7befc47dd421156ff6cdb3aaf62fc76fe9cfad2
 2011-09-27 12:45:13 -04:00
Daniel Sandler
64061c38f0 am abff032e: Draw smaller system status icons without scaling. 
* commit 'abff032e783398be7a1c6b7e1e25a73a8467adcf':
  Draw smaller system status icons without scaling.
 2011-09-27 09:23:05 -07:00
Teng-Hui Zhu
8d48b75b0c Merge "Double check the permission before setting the Wake Lock" 2011-09-27 09:07:13 -07:00
Steve Block
9a0cd15eec Always update the WebView's SSL certificate, regardless of whether a WebViewClient has been set 
This looks like a copy-paste error from other CallbackProxy methods which call
back to the WebViewClient or WebChromeClient, rather than the WebView.

Also remove '@hide' annotations. These are superfluous as the class is not
public.

Bug: 5287216
Change-Id: If97c4d769cf82563b9c182ba09fc742fbb7e08e9
 2011-09-27 16:42:51 +01:00
Steve Block
200ff0a7b1 Remove superfluous synchronized modifier on SslCertLookupTable.getInstance() 
Also fixes style in SslCertLookupTable and WebViewcore.reportSslCertError().

Bug: 5287216
Change-Id: I1cd975b1c8cecf1ca1dad0643be8ab62f7a950bc
 2011-09-27 16:42:45 +01:00
Daniel Sandler
abff032e78 Draw smaller system status icons without scaling. 
Bug: 5297795
Change-Id: I11dc3a21b2e1111963b1cd9621434747f1757a67
 2011-09-27 11:20:17 -04:00
Flavio Lerda
2613e0064b Do not format numbers starting with hash or star. 
If the user asks to format a number that starts with either a hash or a
star symbol, do not further format the phone number since we are not
actually able to parse such a number correctly and current this results
in the star or hash being dropped.

Bug: 5362177
Change-Id: Iff8d317c087d0ca07f2b107459ce8c47882ef367
 2011-09-27 13:53:23 +01:00
The Android Automerger
a3365668f2 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-09-27 03:52:49 -07:00
Irfan Sheriff
cbb62bb818 Merge "Switch to cfg based signal_poll command" 2011-09-26 22:11:03 -07:00
Scott Main
e187d8148a Merge "docs: fix markup in javadocs Change-Id: I1f9be842f40c813134fbcd5fdbbead5647fb72e5" 2011-09-26 21:55:24 -07:00
Scott Main
4510705b28 docs: fix markup in javadocs 
Change-Id: I1f9be842f40c813134fbcd5fdbbead5647fb72e5
 2011-09-26 21:53:24 -07:00
Jim Miller
a2f00da374 am b4f0a9f3: Merge "Fix 5326463: rework sim state handling in lockscreen" into ics-factoryrom 
* commit 'b4f0a9f3894c1f039168ad672f4aa194999c7cdd':
  Fix 5326463: rework sim state handling in lockscreen
 2011-09-26 20:40:59 -07:00
Christopher Tate
d7208b98e9 am 7462251b: Merge "Don\'t hang in restore if the transport reports failure" into ics-factoryrom 
* commit '7462251b0a3f2601236b599bcabf54451143b704':
  Don't hang in restore if the transport reports failure
 2011-09-26 20:40:56 -07:00
Fabrice Di Meglio
3a6c2e9855 am a200a23a: Merge "Bug 5332065: IOOB in case the suggestionSpan has been removed" into ics-factoryrom 
* commit 'a200a23af10dfcbbe46d10e868c2eae9f2c794a4':
  Bug 5332065: IOOB in case the suggestionSpan has been removed
 2011-09-26 20:40:54 -07:00
Mathias Agopian
994897f0e7 am 8632561e: Merge "Make the status and navigation bars OPAQUE." into ics-factoryrom 
* commit '8632561e14c5cc546cec39edd213ea8cc7aea2f9':
  Make the status and navigation bars OPAQUE.
 2011-09-26 20:40:50 -07:00
Mathias Agopian
02ee442d9a am a2a3f1e7: Merge "don\'t clear the framebuffer when the framebuffer is not used" into ics-factoryrom 
* commit 'a2a3f1e7e6a31f1109a3c25a48c33d3d67cb1adc':
  don't clear the framebuffer when the framebuffer is not used
 2011-09-26 20:40:48 -07:00
Mathias Agopian
36fd85f67a am a7969d91: Merge "Do not blend opaque windows." into ics-factoryrom 
* commit 'a7969d91ad7547e5a83d54df835ca6820fef0927':
  Do not blend opaque windows.
 2011-09-26 20:40:47 -07:00
Mathias Agopian
8f9af0a24d am 781fea80: Region cannot handle malformed Rects. Abort the Region op in that case. 
* commit '781fea802b6b1c2e33a35dfe24c6ec29ed73a9c2':
  Region cannot handle malformed Rects. Abort the Region op in that case.
 2011-09-26 20:40:46 -07:00
Mathias Agopian
b5a5dee8db am 04ba6d0e: (-s ours) Make sure Region handles invalid rectangles 
* commit '04ba6d0ebd6a750d2ab2794af5bc4a8406178f00':
  Make sure Region handles invalid rectangles
 2011-09-26 20:40:45 -07:00
Peter Ng
a9e520e9ee Fixed jaggy circles in pattern unlock 
Bug: 5349016
Change-Id: I837088b80bd182b415ad1434f88d3b2be9d68ae9
 2011-09-26 20:17:44 -07:00
Jamie Gennis
b0aa87e941 am 892ac415: (-s ours) Merge "(DO NOT MERGE) SurfaceFlinger: fix isOpaque check in lockPageFlip" into ics-factoryrom 
* commit '892ac4155a7e2f2c824ee9898d4c5cef4bbe1afc':
  (DO NOT MERGE) SurfaceFlinger: fix isOpaque check in lockPageFlip
 2011-09-26 19:44:48 -07:00
Jamie Gennis
f3292716b7 am 3780d380: Merge "SurfaceFlinger: fix the transform hint" into ics-factoryrom 
* commit '3780d38010f50ccce508871058d54c1921936e0c':
  SurfaceFlinger: fix the transform hint
 2011-09-26 19:44:41 -07:00
Eric Fischer
a771775022 am 622abb73: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom 
* commit '622abb73a9fa8253679de1ac22bca66ab055eef8':
  Import revised translations. DO NOT MERGE
 2011-09-26 19:44:28 -07:00
Peter Ng
90ac4934c8 Merge "Transparent lockscreen green indicator icons in a step to remove them fully from pattern unlock" 2011-09-26 19:27:07 -07:00
Jim Miller
b4f0a9f389 Merge "Fix 5326463: rework sim state handling in lockscreen" into ics-factoryrom 2011-09-26 18:41:01 -07:00
Jamie Gennis
3a23212111 SurfaceFlinger: fix setting default buffer size 
This change makes SurfaceFlinger update a SurfaceTextureLayer's default
buffer size in response to a window resize even if the Layer is in fixed
size mode.

Change-Id: I3871c8f19a045d03904d1284390cad7659be71ff
Bug: 5366426
 2011-09-26 18:38:52 -07:00
Fabrice Di Meglio
5293cea4e0 Fix bug # 5376028 Arabic text is kinda broken - disappearing glyphs 
- make the log clusters happy

Change-Id: I73ca9512f0ca02549dad5270d6ec198ae9b00a4e
 2011-09-26 18:29:54 -07:00