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

60590 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jamie Gennis
65511fb43a am d7b3c647: am da42e0fa: Merge "SurfaceFlinger: fix setting default buffer size" into ics-factoryrom 
* commit 'd7b3c6471773191c2f60dd38bf106cebe45a94e5':
  SurfaceFlinger: fix setting default buffer size
 2011-09-27 12:35:04 -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
Adam Powell
f84ef5a388 am 2b2adbdd: Merge "Improve docs in BaseAdapter." 
* commit '2b2adbdda04c96592026e84243cbb0f90a2021c9':
  Improve docs in BaseAdapter.
 2011-09-27 12:08:23 -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
c071a617fd am 14b4c769: Merge "adding packet count and removing extra uid stats that were used for debugging." 
* commit '14b4c769be93a7fa1b978a75199d6e3cdb4c07da':
  adding packet count and removing extra uid stats that were used for debugging.
 2011-09-27 11:19:36 -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
Tim Kilbourn
b7c4f380ec Merge "Fix PresenterClass by adding a _listener field" into ics-aah 2011-09-27 10:57:43 -07:00
Steve Block
2ae6f76f94 am a3b06ff9: Merge changes If97c4d76,I1cd975b1 
* commit 'a3b06ff933132f149be18035f4f8e14ba6355b07':
  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:54:48 -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
49b02e1ed1 am 53719fc4: Merge "Fix issue 5373048: AudioCache decode errors" 
* commit '53719fc4c5c441e8696f26bbfb9166b0bd19ef29':
  Fix issue 5373048: AudioCache decode errors
 2011-09-27 10:40:33 -07:00
Eric Laurent
53719fc4c5 Merge "Fix issue 5373048: AudioCache decode errors" 2011-09-27 10:32:17 -07:00
Tim Kilbourn
b8a6f22e1b Fix PresenterClass by adding a _listener field 
Change-Id: If5c4fab3bd9b5a42f066c183365aeeec65c87cbc
 2011-09-27 10:30:53 -07:00
Peter Ng
9b89fb9809 am 6ce9dfd8: Merge "Fixed jaggy circles in pattern unlock" 
* commit '6ce9dfd8a45e1133987ab8400d92cb2bb493b666':
  Fixed jaggy circles in pattern unlock
 2011-09-27 10:27:11 -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
87caf8c250 am 5bc305dc: Reconcile with ics-factoryrom-release 
* commit '5bc305dc1e53aaf2b156426d3df98903475819e4':
 2011-09-27 10:16:41 -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
c45f28fe44 am 6e17d879: am 5fd141c2: Merge "Updated stat_sys icons" into ics-factoryrom 
* commit '6e17d8799bcf38935b749d5ff3b2ac6f47318e2a':
  Updated stat_sys icons
 2011-09-27 09:58:24 -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
Daniel Sandler
ba693c47af am 64061c38: am abff032e: Draw smaller system status icons without scaling. 
* commit '64061c38f064e89822475a152b675dea87bd9eb0':
  Draw smaller system status icons without scaling.
 2011-09-27 09:24:38 -07: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
19c66c6471 am 8d48b75b: Merge "Double check the permission before setting the Wake Lock" 
* commit '8d48b75b0cdc14bdec445074e8406a2cc5ea0924':
  Double check the permission before setting the Wake Lock
 2011-09-27 09:08:50 -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
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
a129eb0a02 am cbb62bb8: Merge "Switch to cfg based signal_poll command" 
* commit 'cbb62bb81807ff83a0887b90111218d81a3f57df':
  Switch to cfg based signal_poll command
 2011-09-26 22:12:32 -07:00
Irfan Sheriff
cbb62bb818 Merge "Switch to cfg based signal_poll command" 2011-09-26 22:11:03 -07:00
Scott Main
b13ae138a3 am e187d814: Merge "docs: fix markup in javadocs Change-Id: I1f9be842f40c813134fbcd5fdbbead5647fb72e5" 
* commit 'e187d8148a07de282e907eeeb4b33a8b38653e84':
  docs: fix markup in javadocs Change-Id: I1f9be842f40c813134fbcd5fdbbead5647fb72e5
 2011-09-26 21:57:10 -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
feafcd8edc am a2f00da3: am b4f0a9f3: Merge "Fix 5326463: rework sim state handling in lockscreen" into ics-factoryrom 
* commit 'a2f00da374cd0d9776bc6c4e1cf3c3def990270b':
  Fix 5326463: rework sim state handling in lockscreen
 2011-09-26 20:42:53 -07:00
Christopher Tate
a75f0dc303 am d7208b98: am 7462251b: Merge "Don\'t hang in restore if the transport reports failure" into ics-factoryrom 
* commit 'd7208b98e97abcbc728cb748cc6ff99332b6750f':
  Don't hang in restore if the transport reports failure
 2011-09-26 20:42:51 -07:00
Fabrice Di Meglio
b29da57694 am 3a6c2e98: am a200a23a: Merge "Bug 5332065: IOOB in case the suggestionSpan has been removed" into ics-factoryrom 
* commit '3a6c2e985534aeaef04661e2875a8745022c334a':
  Bug 5332065: IOOB in case the suggestionSpan has been removed
 2011-09-26 20:42:49 -07:00
Mathias Agopian
f17c13e242 am 994897f0: am 8632561e: Merge "Make the status and navigation bars OPAQUE." into ics-factoryrom 
* commit '994897f0e7a22352b7770d6720c28d5614376227':
  Make the status and navigation bars OPAQUE.
 2011-09-26 20:42:47 -07:00
Mathias Agopian
4e4965fe6b am 02ee442d: am a2a3f1e7: Merge "don\'t clear the framebuffer when the framebuffer is not used" into ics-factoryrom 
* commit '02ee442d9aba544d65f474f3cc48b340d31fbaa6':
  don't clear the framebuffer when the framebuffer is not used
 2011-09-26 20:42:45 -07:00
Mathias Agopian
9ece950c0f am 36fd85f6: am a7969d91: Merge "Do not blend opaque windows." into ics-factoryrom 
* commit '36fd85f67a946adf66615d1a73b290f4b17c28dc':
  Do not blend opaque windows.
 2011-09-26 20:42:44 -07:00
Mathias Agopian
ef4adc819a am 8f9af0a2: am 781fea80: Region cannot handle malformed Rects. Abort the Region op in that case. 
* commit '8f9af0a24d28cc05f7170bb932f3cb8bc2388356':
  Region cannot handle malformed Rects. Abort the Region op in that case.
 2011-09-26 20:42:42 -07:00
Mathias Agopian
f6ea2de795 am b5a5dee8: am 04ba6d0e: (-s ours) Make sure Region handles invalid rectangles 
* commit 'b5a5dee8dba1a650f18134750eef89463b5ab974':
  Make sure Region handles invalid rectangles
 2011-09-26 20:42:40 -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