Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,883 Commits 3 Branches 0 Tags
d7b3c6471773191c2f60dd38bf106cebe45a94e5
Commit Graph

58883 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Peter Ng
0a09207a22 Transparent lockscreen green indicator icons in a step to remove them fully from pattern unlock 
Bug: 5136097
Change-Id: I0bfcd2e8806161d816b3cc9248775accdcc457af
 2011-09-26 18:18:04 -07:00
Teng-Hui Zhu
fb2fd5f52c Double check the permission before setting the Wake Lock 
bug:5361732
Change-Id: Ia9092b25d62c4a14cba885f5e3fac0326d0fde1c
 2011-09-26 17:36:11 -07:00
Chia-chi Yeh
9d1c183503 Merge "VpnDialogs: revise UI layout." 2011-09-26 17:29:38 -07:00
Christopher Tate
7462251b0a Merge "Don't hang in restore if the transport reports failure" into ics-factoryrom 2011-09-26 17:12:08 -07:00
Christopher Tate
84da4e47e7 Merge "Use the new INSTALL_FROM_ADB Package Manager flag..." 2011-09-26 17:12:01 -07:00
Peter Ng
e7b40904be Merge "Vpn icon updated to a flat key and wifi updated to a two tone graphic" 2011-09-26 17:02:06 -07:00
Fabrice Di Meglio
a200a23af1 Merge "Bug 5332065: IOOB in case the suggestionSpan has been removed" into ics-factoryrom 2011-09-26 16:58:35 -07:00
Peter Ng
51be3b2ed9 Vpn icon updated to a flat key and wifi updated to a two tone graphic 
Bug: 5155775
Change-Id: I302fa857185761c408a26b7360ab0db48e72642d
 2011-09-26 16:41:58 -07:00
Christopher Tate
ab63aa87c1 Use the new INSTALL_FROM_ADB Package Manager flag... 
...when installing an apk in the course of an 'adb restore' operation.

Fixes bug 5374597.

Change-Id: I8ddce0e015e3bab79432e82709d841887667c346
 2011-09-26 16:30:30 -07:00
Irfan Sheriff
921df5cbc4 Switch to cfg based signal_poll command 
Bug: 5352916
Change-Id: Id2ba7091a5e4cc4c1e14aa2c49e5b943519019bf
 2011-09-26 16:30:15 -07:00
Mathias Agopian
8632561e14 Merge "Make the status and navigation bars OPAQUE." into ics-factoryrom 2011-09-26 16:19:26 -07:00
Mathias Agopian
a2a3f1e7e6 Merge "don't clear the framebuffer when the framebuffer is not used" into ics-factoryrom 2011-09-26 16:19:04 -07:00
Mathias Agopian
a7969d91ad Merge "Do not blend opaque windows." into ics-factoryrom 2011-09-26 16:18:59 -07:00
The Android Automerger
b19325c2d0 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-09-26 16:17:09 -07:00