Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
62,726 Commits 3 Branches 0 Tags
c2eaee533fe25cd9a0781f349e9c8c7ef02bd648
Commit Graph

62726 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
Fabrice Di Meglio
a0a117b4c1 Fix bug #5822825 Paint.measureText (char[] text, int index, int count) cannot handle text more than 32K long - DO NOT MERGE 
- do not clear the smart pointer when the cache entry does not fit the cache size

See http://code.google.com/p/android/issues/detail?id=23337

Change-Id: Id4533d9f8a396c310c9215157ec5a4c07f30c7f2
 2012-01-05 14:34:42 -08:00
Scott Main
47228cac90 am dacbf67a: Merge changes I1df85b6a,I7c6a68b6 into ics-mr1 
* commit 'dacbf67ab915fa8b987f6fb9f044160af92652cd':
  docs: second set of diagram updates
  docs: Update lifecycle diagrams to use new omnigraffle designs; add corresponding graffle files update discussion of activity state restore for clarification
 2012-01-05 09:45:19 -08:00
Scott Main
dacbf67ab9 Merge changes I1df85b6a,I7c6a68b6 into ics-mr1 
* changes:
  docs: second set of diagram updates
  docs: Update lifecycle diagrams to use new omnigraffle designs; add corresponding graffle files update discussion of activity state restore for clarification
 2012-01-05 09:42:52 -08:00
The Android Open Source Project
d32ee5baa0 Reconcile with ics-mr1-release 
Change-Id: I8a74c329fc7dd115e36d5180fab8e8680d6df4f8
 2012-01-05 07:45:28 -08:00
Scott Main
e63163a334 docs: second set of diagram updates 
Change-Id: I1df85b6a954c29344d537737da57683b2c7941fd
 2012-01-04 17:20:48 -08:00
Winson Chung
a46d778635 Fixing crash when taking screenshot over secure window. 
Change-Id: If3d4e458030e37aae3310b23dcad2ff5fe29fa73
 2012-01-04 16:43:42 -08:00
The Android Automerger
6590d88f65 merge in ics-mr1-release history after reset to ics-mr1 2012-01-04 16:42:23 -08:00
Wink Saville
3ed2803691 am c697ebfd: Merge "Enhancement on ICS data stall polling logic" into ics-mr1 
* commit 'c697ebfdd671c7f4cf338d601917de16d2f1f135':
  Enhancement on ICS data stall polling logic
 2012-01-04 13:55:28 -08:00
Wink Saville
c697ebfdd6 Merge "Enhancement on ICS data stall polling logic" into ics-mr1 2012-01-04 13:53:25 -08:00
Wink Saville
0ad96f8940 am d4d35168: Merge "Add support of dislaying Alpha tag for BIP commands" into ics-mr1 
* commit 'd4d35168129d544f62cee7e1f83c5bf15d9f291d':
  Add support of dislaying Alpha tag for BIP commands
 2012-01-04 13:51:59 -08:00
Wink Saville
d4d3516812 Merge "Add support of dislaying Alpha tag for BIP commands" into ics-mr1 2012-01-04 13:50:04 -08:00
Wink Saville
a3534ad4a4 am c97d0e43: Merge "Support suggestedRetryTime in CDMA DCT" into ics-mr1 
* commit 'c97d0e43bacdae735071d6d7026175fbc4bdafca':
  Support suggestedRetryTime in CDMA DCT
 2012-01-04 13:49:37 -08:00
Bart Sears
875b699281 am 705665ac: Merge "Do not allow file:// access when it is disabled. Do not merge." into ics-mr1 
* commit '705665acda5fec6c8c76683b2e5850b0bd447449':
  Do not allow file:// access when it is disabled. Do not merge.
 2012-01-04 13:49:34 -08:00
Wink Saville
c97d0e43ba Merge "Support suggestedRetryTime in CDMA DCT" into ics-mr1 2012-01-04 13:47:55 -08:00
Bart Sears
705665acda Merge "Do not allow file:// access when it is disabled. Do not merge." into ics-mr1 2012-01-04 13:47:09 -08:00
Eric Laurent
1a4b99396d am fb578b6b: Merge "audioflinger: fix clicks on 48kHz audio." into ics-mr1 
* commit 'fb578b6b88af51812b71a86ad4dd3a7de56e394b':
  audioflinger: fix clicks on 48kHz audio.
 2012-01-04 13:00:49 -08:00
Eric Laurent
fb578b6b88 Merge "audioflinger: fix clicks on 48kHz audio." into ics-mr1 2012-01-04 12:58:17 -08:00
Scott Main
319c3bcbb1 am c8810c2f: docs: add Teleepoch VID/driver info and update Huawei url 
* commit 'c8810c2feb53bd423d0ef31bc10d22fc4cbf9c89':
  docs: add Teleepoch VID/driver info and update Huawei url
 2012-01-04 12:01:02 -08:00
Scott Main
c8810c2feb docs: add Teleepoch VID/driver info 
and update Huawei url

Change-Id: I4d6720d132f0d4e53bb25aa225327e38ba969881
 2012-01-04 11:57:18 -08:00
Kazuhiro Ondo
7efb89b955 Enhancement on ICS data stall polling logic 
Put enhancements on data stall polling logic in ICS so that
stall recovery can kick in earler while screen is on.

Bug: 5767897
Change-Id: I4683fc45c0161f4374749c8e5840261c19a48f77
 2012-01-04 11:09:51 -08:00
Ben Murdoch
b2c63abcdc Do not allow file:// access when it is disabled. Do not merge. 
Cherry pick of If2793f31cb37e0d3af15cb18e818bfa4058167fd

If WebSettings is configured to disallow access to file://
URLs, then block them.

Bug: 5773763
Change-Id: I0ab84cde90c955d31077329fddebc25978287c64
 2012-01-04 15:08:07 +00:00
Scott Main
9c9b9adbfa docs: Update lifecycle diagrams to use new omnigraffle designs; 
add corresponding graffle files
update discussion of activity state restore for clarification

Change-Id: I7c6a68b627b35d0b648fac071a06960a7e833686
 2012-01-03 18:27:23 -08:00
Christopher Tate
91582b86d9 am 30ad699c: Merge "Tweak docs on \'adb logcat\'" into ics-mr1 
* commit '30ad699c0e246ef3889f691361758235ecb89895':
  Tweak docs on 'adb logcat'
 2012-01-03 17:40:53 -08:00
Christopher Tate
30ad699c0e Merge "Tweak docs on 'adb logcat'" into ics-mr1 2012-01-03 17:38:51 -08:00
Christopher Tate
1df51c65ea Tweak docs on 'adb logcat' 
* Add description of 'threadtime' output format
* Remove description of highly-confusing and never-used 'thread' output format
* Adjust language slightly

Change-Id: I2dcc8b7e5e8c039659697e90d7a4b3746b9135e9
 2012-01-03 16:50:50 -08:00
Scott Main
f65320a274 am 12d9954d: docs: dasboard update for 1/3/12 
* commit '12d9954d198d29da1a15ba2c6947ce91839cbb83':
  docs: dasboard update for 1/3/12
 2012-01-03 15:58:41 -08:00
Scott Main
12d9954d19 docs: dasboard update for 1/3/12 
Change-Id: Ie584d9ee238b6d4a37c25dd7e30b0cf493cbfe47
 2012-01-03 15:45:00 -08:00
Wink Saville
81fa7f305b Add support of dislaying Alpha tag for BIP commands 
While BIP data call setup is still handled in RIL/Modem,
this patch is adding support of Alpha tag display on UI.
Alpha tag is optionally included in "OPEN Channel", "Close Channel",
"Send Data" or "Receive Data" command.

"Open channel" will be notified via RIL_UNSOL_STK_PROACTIVE_COMMAND
which requires TERMINAL RESPONSE based on user input.
"Close channel", "Send Data" and "Receive Data" commands
are send via RIL_UNSOL_STK_EVENT_NOTIFY just to display
transient notice.

Bug:5165510
Change-Id: I873e55274c860886bc816ce6fb07cb882d339214
 2012-01-03 15:06:15 -08:00
Winson Chung
f4a014e335 Updating default image wallpaper for tablet. 
Change-Id: Ia4784cf05ccbf819d35adb494cd181850f6b7e11
 2012-01-03 14:00:08 -08:00
Dirk Dougherty
27d2a07a55 am a17e100b: Doc change: fix link target for "Publish" icon. 
* commit 'a17e100b7a192cae3935d2ae144fb1a1115a4ca7':
  Doc change: fix link target for "Publish" icon.
 2012-01-03 10:35:18 -08:00
Dirk Dougherty
a17e100b7a Doc change: fix link target for "Publish" icon. 
Change-Id: Iafc8db7e9ad7c42e5e2a1eaed2fb5b93a53e56f9
 2012-01-03 10:09:29 -08:00
Scott Main
e231cd0a0d am 0582da68: docs: add links for Galaxy Nexus driver 
* commit '0582da680ed3d48bfd9d6ed550f39aa2177baf79':
  docs: add links for Galaxy Nexus driver
 2011-12-28 10:34:03 -08:00
Scott Main
0582da680e docs: add links for Galaxy Nexus driver 
Change-Id: Iae875f70049f3b4561783e66e264eac802e8ae19
 2011-12-27 15:52:11 -08:00
Eric Laurent
72dafb20e0 audioflinger: fix clicks on 48kHz audio. 
The calculation done in prepareTracks_l() for the minimum amount
off frames needed to mix one output buffer had 2 issues:
- the additional sample needed for interpolation was not included
- the fact that the resampler does not acknowledge the frames consumed
immediately after each mixing round but only once all frames requested have been used
was not taken into account.
Thus the number of frames available in track buffer could be considered sufficient although
it was not and the resampler would abort producing a short silence perceived as a click.

Issue 5727099.

Change-Id: I7419847a7474c7d9f9170bedd0a636132262142c
 2011-12-22 16:08:41 -08:00
Joe Fernandez
201469f545 am bb7f590a: Merge "docs: Add developer guide cross-references, Project ACRE, round 4" into ics-mr1 
* commit 'bb7f590a5a539486de5127071c7ade8ec988d755':
  docs: Add developer guide cross-references, Project ACRE, round 4
 2011-12-22 15:57:09 -08:00
Joe Fernandez
bb7f590a5a Merge "docs: Add developer guide cross-references, Project ACRE, round 4" into ics-mr1 2011-12-22 15:55:00 -08:00
Joe Fernandez
3aef8e1d1b docs: Add developer guide cross-references, Project ACRE, round 4 
Change-Id: I1b43414aaec8ea217b39a0d780c80a25409d0991
 2011-12-22 15:08:23 -08:00
Roman Nurik
38daf3f122 am 38ee0dae: Merge "docs: Update App Widgets dev guide size discussion" into ics-mr1 
* commit '38ee0dae2cf0ff1860973523e5cda6e38642e904':
  docs: Update App Widgets dev guide size discussion
 2011-12-22 14:29:25 -08:00