Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
60,637 Commits 3 Branches 0 Tags
217be64139673d7410e7ce7e6d7210d55e676e6d
Commit Graph

20840 Commits

Author SHA1 Message Date
Romain Guy
217be64139 am 816b776b: Merge "Add a bit more doc to TextureView" 
* commit '816b776be13ae6c38b49ec982b317b9bae46a1b2':
  Add a bit more doc to TextureView
 2011-09-27 19:32:37 -07:00
Romain Guy
816b776be1 Merge "Add a bit more doc to TextureView" 2011-09-27 17:45:46 -07:00
Romain Guy
462785fa25 Add a bit more doc to TextureView 
Change-Id: Ib76c80d8f70ede1bb63db319bca1e93c489def4d
 2011-09-27 17:42:10 -07:00
Scott Main
a0e58a6db1 am 4c088485: Merge "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" 
* commit '4c0884853855b1abac62c22426a803df4082fafa':
  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
 2011-09-27 14:51:37 -07:00
Scott Main
4c08848538 Merge "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" 2011-09-27 14:49:12 -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
Alon Albert
98d35a217f am 553e5474: Merge "Add Detailed Sync Stats Section Also improve history formatting Here\'s a smaple of what it looks like:" 
* commit '553e54742043d9e7ee01d704390864ee554e8b09':
  Add Detailed Sync Stats Section Also improve history formatting Here's a smaple of what it looks like:
 2011-09-27 13:31:45 -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
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
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
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
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
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
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
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
Jeff Sharkey
516e760ffa am ba8dea03: Merge "Overlay to configure data usage network types." 
* commit 'ba8dea03f3494abf87885469d53634d416bc860a':
  Overlay to configure data usage network types.
 2011-09-26 19:17:09 -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
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
Gilles Debunne
14ed50a9a3 Bug 5332065: IOOB in case the suggestionSpan has been removed 
I don't understand how the SuggSpan that has been tapped to display
the popup can have disappeared when an item is clicked.

This problem seems specific to monkey test with a race condition somewhere.

Change-Id: I447b6563a1b959dc3c1ead31cde2d9bcad369765
 2011-09-26 15:59:24 -07:00
Jeff Sharkey
ba8dea03f3 Merge "Overlay to configure data usage network types." 2011-09-26 15:34:06 -07:00
Jim Miller
3f5f83b54f Fix 5326463: rework sim state handling in lockscreen 
Previously it was possible to get an inconsistent state because there
were two paths that updated the lock screen sim state.  This reworks
the data flow to ensure the same path is always used to update the state.

KeyguardUpdateMonitor now correctly updates the entire state of the callee
whenever a new callback is registered.

In addition, KeyguardUpdateMonitor now caches the phone state in order
to avoid a round-trip binder call in updateEmergencyCallButtonState().
This avoids a condition that could make lockscreen unresponsive while
updating the emergency call button state.

KeyguardStatusViewManager also ensures the TransportControlView is
hidden when created to ensure we don't inappropriately update the carrier
line while waiting for the first callbacks to update the status lines.

Change-Id: I6b3975b703a7d90bac8d0fe29fbc0f1d9c5e0e7d
 2011-09-26 15:17:05 -07:00
Chet Haase
63c3ffac6b am f425ca97: Merge "Fix display list issue that was crashing an external app." 
* commit 'f425ca9772d5f722fc9a2569b474eb880fd89569':
  Fix display list issue that was crashing an external app.
 2011-09-26 14:48:20 -07:00
Chet Haase
f425ca9772 Merge "Fix display list issue that was crashing an external app." 2011-09-26 14:46:19 -07:00
Chet Haase
6e6db61809 Fix display list issue that was crashing an external app. 
The app was removing a View whilst in its onDraw() method. This meant
that we asked it for its display list and it invalidated that display list
(by removing itself) before it returned from onDraw(). We later attempted to
draw that invalid display list into its parent nad died in native code.

The fix is to check the state of the display list after the call to getDisplayList()
and to avoid doing further work with it if it's invalid.

Change-Id: I14a342b4fe79c8dce2626ff61237b447040e7f42
 2011-09-26 14:32:26 -07:00
Gilles Debunne
a61fd5eb71 am 52edaa9c: Merge "Bug 5250788: TextView gets slower as the text length grows" 
* commit '52edaa9cfb612bd20b0f718dc95e576f55d9367e':
  Bug 5250788: TextView gets slower as the text length grows
 2011-09-26 14:20:56 -07:00
Gilles Debunne
52edaa9cfb Merge "Bug 5250788: TextView gets slower as the text length grows" 2011-09-26 14:18:14 -07:00
Fabrice Di Meglio
98db742abc am 8013290d: Merge "Fix bug #5366547 TruncateAt.MARQUEE should be replaces with "two dot" ellipsis on hardware that dont support MARQUEE" 
* commit '8013290dd0e9d3eabc3611d7eca47aa50bdceed0':
  Fix bug #5366547 TruncateAt.MARQUEE should be replaces with "two dot" ellipsis on hardware that dont support MARQUEE
 2011-09-26 12:19:10 -07:00
Fabrice Di Meglio
4dad016de3 am 8eb34ed8: Merge "Fix bug #5344067 android.text.DynamicLayout.sStaticLayout can hold onto an Activity, potential memory leak" 
* commit '8eb34ed88cdc43408bb73a806d6e998782d5c9b9':
  Fix bug #5344067 android.text.DynamicLayout.sStaticLayout can hold onto an Activity, potential memory leak
 2011-09-26 12:19:08 -07:00
Fabrice Di Meglio
8013290dd0 Merge "Fix bug #5366547 TruncateAt.MARQUEE should be replaces with "two dot" ellipsis on hardware that dont support MARQUEE" 2011-09-26 12:16:41 -07:00
Fabrice Di Meglio
8eb34ed88c Merge "Fix bug #5344067 android.text.DynamicLayout.sStaticLayout can hold onto an Activity, potential memory leak" 2011-09-26 12:16:30 -07:00
Jeff Sharkey
630a171216 Overlay to configure data usage network types. 
Specify which network types should be counted when computing data
usage totals.

Bug: 5361005
Change-Id: I830caed1a29199892d209a692b50f8b3e144cafe
 2011-09-26 10:50:30 -07:00
Gilles Debunne
60e10f2494 am ea1c7f3c: Merge "Bug 5248215: Even though I turned off the Spelling correction, it still shows up" 
* commit 'ea1c7f3c5175f6e83dddd381b9a809ec52a9320f':
  Bug 5248215: Even though I turned off the Spelling correction, it still shows up
 2011-09-26 10:40:27 -07:00
Gilles Debunne
ea1c7f3c51 Merge "Bug 5248215: Even though I turned off the Spelling correction, it still shows up" 2011-09-26 10:38:58 -07:00
Kenny Root
59ad0330ac am 8a663c89: Merge "Allow non-required package verifiers" 
* commit '8a663c89a3b5bda4e749a58d0434b130260eabb2':
  Allow non-required package verifiers
 2011-09-26 09:55:56 -07:00
Kenny Root
8a663c89a3 Merge "Allow non-required package verifiers" 2011-09-26 09:53:06 -07:00
Steve Block
e0047612e4 am 2cdbe2f1: Merge "Update the error for WebView thread violations to make clear that it\'s not fatal" 
* commit '2cdbe2f1cf0157bf49913c46cc806169e0f9ecc6':
  Update the error for WebView thread violations to make clear that it's not fatal
 2011-09-26 08:42:29 -07:00
Steve Block
2cdbe2f1cf Merge "Update the error for WebView thread violations to make clear that it's not fatal" 2011-09-26 08:41:09 -07:00
Steve Block
7a01d94c5e Update the error for WebView thread violations to make clear that it's not fatal 
- Update the description
- Use Throwable rather than RuntimeException
- Log as a warning rather than an error

Bug: 5313494
Change-Id: If13ce2088e7080122db14e5e0565f64e6d6f4320
 2011-09-26 14:59:12 +01:00
Ben Murdoch
409af6c487 am e0b0578a: Merge "Force a WebView pictureset invalidation on screen rotation." 
* commit 'e0b0578a1efe6dc3ed259835ce0ceb939a0ecee6':
  Force a WebView pictureset invalidation on screen rotation.
 2011-09-26 06:21:07 -07:00
Ben Murdoch
e0b0578a1e Merge "Force a WebView pictureset invalidation on screen rotation." 2011-09-26 06:19:56 -07:00