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

27168 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
9248e95a2f DO NOT MERGE Cherry-pick of Ie4026a7c back to GB 
Original change description follows:
-----------------------------------

Implement issue #3326435: Battery stats improvements

Keep track of discharge while screen is on vs. off.

Checkin looks like:

5,0,u,dc,1,1,1,0

The last four numbers are, from left:

- Maximum battery drain over time period.
- Minimum battery drain over time period.
- Battery drain while screen was on.
- Battery drain while screen was off.

Change-Id: Ie3cfe52df29b3f28ba8dc3350abe6cc967c76324
 2011-02-23 17:21:09 -08:00
Maarten Hooft
99cca89f41 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2011-02-17 17:17:40 -08:00
Andreas Huber
dbe09da6ac DO NOT MERGE: Respond to RTSP server->client requests. 
Even if it's just to tell them that we don't support any (this is optional).

Change-Id: Iee50b4020f28a47dfbe5d56f1732fe044b3b3655
related-to-bug: 3353752
 2011-02-16 13:37:19 -08:00
Robert Greenwalt
3259d88537 Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread 2011-02-16 10:44:26 -08:00
Alon Albert
be5f82ab0d Merge "DO NOT MERGE - Clear backoffs on reconnect" into gingerbread 2011-02-16 10:20:13 -08:00
Alon Albert
c441e4e355 DO NOT MERGE - Clear backoffs on reconnect 
Slightly modified backport from HC

Bug: 3460736
Change-Id: I155dfd34bb7abb76a10b5b58fe9a32af2449d4f1
 2011-02-16 10:16:33 -08:00
daniel_tomas
7bcd2c62eb New API added in NfcAdapter to enable/disable SE card emulation 
Change-Id: Ia0c123873ba9265b45e847d1a30c1300de3c1346
 2011-02-16 09:27:25 -08:00
Nick Pelly
1df862a465 Minor doc update. 
Change-Id: I1d29adfccbdc196a145a2c2a044d63b00e5f788b
 2011-02-16 09:18:34 -08:00
Andreas Huber
8db7a7bfad Merge "DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary" into gingerbread 2011-02-16 08:50:37 -08:00
Robert Ly
4bebbe5fea Merge "Adding package summary for nfc.tech package" into gingerbread 2011-02-15 17:44:56 -08:00
Robert Ly
2deeefeb5e Adding package summary for nfc.tech package 
Change-Id: Ibbf55c21dcaf48b4eb369e78c54fb1023abb3cb3
 2011-02-15 17:41:47 -08:00
Andreas Huber
ea47cb4ede DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary 
and continue even if we were unable to poke a hole into the firewall.

Change-Id: I5757a2521b8d81a42d03cca379179ce2c9ee46e7
related-to-bug: 3457201
 2011-02-15 14:02:34 -08:00
John Wang
29853a356b Merge "Only decode EXT1 tag when it is available." into gingerbread 2011-02-15 12:34:37 -08:00
Andreas Huber
d1ba051a46 DO NOT MERGE: Work around several issues with non-compliant RTSP servers. 
In this particular case these RTSP servers were implemented as local services,
retransmitting live streams via a local RTSP server instance.

They picked wrong rtp/rtcp port pairs (odd rtp port), blank lines in the session
description, wrong case of the format description, relative base URLs...

Change-Id: I502a04a7e1d690fd461b7ecf0b56c6a6c2ac1325
related-to-bug: 3452103
 2011-02-15 11:02:43 -08:00
John Wang
c2cbc730fc Only decode EXT1 tag when it is available. 
Normally ADN record is stored in two tags, EFADN_TAG and EFEXT1_TAG. But if the EFEXT1_TAG is not set in EF_PBR entry,
it shouldn't be decoded otherwise it causes NullPointerException in readAdnFileAndWait().

bug: 3376954
Change-Id: I744cf5cb8662c75be1e7c6219fa92c67bdda82f2
 2011-02-14 17:44:13 -08:00
Eric Fischer
3537011651 Import revised translations. DO NOT MERGE 
Change-Id: If134b2db7449d3646541fc83e8973938926fb481
 2011-02-14 17:21:02 -08:00
Scott Main
d495238097 fix md5sum for windows installer 
Change-Id: I85a3f5c9c39b0bb5d9c8654c8b7702e7bd0235f2
 2011-02-14 08:56:54 -08:00
Robert Greenwalt
7e62fd1436 DO NOT MERGE - backport of l92a02b31 from master 
Fix handling of multiple possible default networks.

bug:3328196
Change-Id: I994f1621ff82de454192945a9cae961e1710d537
 2011-02-11 17:32:58 -08:00
Robert Ly
322891c689 Doc change: nfc dev guide 
Change-Id: I380cebe8d015749a00f6f3d22fdc5c55a380f447
 2011-02-10 13:42:13 -08:00
Gilles Debunne
2050de5b9a Text selection is broken. 
Bug 3439569

Lazy initialization code was not back-ported.

Change-Id: I9815f649891e2ddc602383488749144686ab1dd3
 2011-02-09 14:17:22 -08:00
Mathias Agopian
ada1b6f297 Merge "fix [3421350] Killing a game that uses the accelerometer renders the device unable to sleep" into gingerbread 2011-02-09 13:06:00 -08:00
Scott Main
07cefd3cc3 add 2.3.3 announcement to site home page 
Change-Id: I4323a1a30fad8a67cce55baba9f7a89c4bdd4494
 2011-02-09 10:17:08 -08:00
Jeff Hamilton
58c9d4726e Merge "More documentation updates for NFC." into gingerbread 2011-02-09 00:34:22 -08:00
Jeff Hamilton
28319c0cec More documentation updates for NFC. 
Change-Id: Ie134d4296ee12333e6647ce76126f9767ba1ba34
 2011-02-09 17:26:47 +09:00
Dirk Dougherty
a3f53afd13 Merge "Doc change: Add version notes for Android 2.3.3." into gingerbread 2011-02-08 23:24:22 -08:00
Nick Pelly
39cf3a445e Document NFC permissions. 
Change-Id: Ib1b1625058c9c673692f3fbcb3546ec7c2d54a07
 2011-02-09 16:10:46 +09:00
Dirk Dougherty
237a3440d3 Doc change: Add version notes for Android 2.3.3. 
Change-Id: I32dffaee15079a3dffb30dcdff6587be03378fc5
 2011-02-08 20:10:51 -08:00
Jeff Hamilton
584afa8dde Merge "Improve the docs a bit for foreground dispatch." into gingerbread 2011-02-08 19:30:47 -08:00
Jeff Hamilton
167d9e473f Improve the docs a bit for foreground dispatch. 
Change-Id: I4179133a0956bc66a49201c20f1dd2d6d67874d2
 2011-02-09 12:30:18 +09:00
Eric Fischer
be4b39d2fd Merge "Import revised translations. DO NOT MERGE" into gingerbread 2011-02-08 10:00:24 -08:00
Scott Main
3c01a139f0 rename SIP doc title 
Change-Id: I14aa36bc617ef77c20804c868caa8bf85b0fb5f8
 2011-02-08 09:37:47 -08:00
Scott Main
c442bc605c docs: move the SIP guide into guide/network/ 
Change-Id: I3c2a7ea731d2fc3c0e2372e2f1a06ed659a6539f
 2011-02-07 18:35:49 -08:00
Katie McCormick
7134520b26 cherrypick Change-Id: I5b52c5d11e111a9dab2b08fd44a439ab4db04dd2 
Doc change: Adding new docs for SIP API

Change-Id: I62bedbcaab3900edcc49d67b59279c5025977a95
 2011-02-07 18:32:04 -08:00
Dirk Dougherty
01967c0ee1 Merge "Doc change: Add diff report for api 10." into gingerbread 2011-02-07 17:21:56 -08:00
Eric Fischer
dff2fea9b1 Import revised translations. DO NOT MERGE 
Change-Id: I9fe35888f8aa02c559949ad8395e8e4f4dffb669
 2011-02-07 13:17:26 -08:00
Gilles Debunne
cdfe899991 Fix for multiple merge problem. 
Change-Id: I5d9c497f44aa9cdc34c195c41e02c3d7353c3fb4
 2011-02-04 16:50:01 -08:00
Gilles Debunne
c0728cc042 Double tap triggers text selection in a TextView. DO NOT MERGE 
This is a convenient way to switch to selection mode without the
context menu. Context menu is still available and offerts Select Input method option.

Browser overloads touch events and this feature is not available in Browser which
limits the conflict with double tap zoom in browser.

Change-Id: I286504cf03733d5c2fb9bc01765f713d14bbd2f4
 2011-02-04 15:50:10 -08:00
Gilles Debunne
893ac28f75 Merge "Blinking runnable is created only if text is editable. DO NOT MERGE." into gingerbread 2011-02-04 15:46:15 -08:00
Gilles Debunne
8a6ba494a2 Merge "All runnable are stopped on detach. DO NOT MERGE." into gingerbread 2011-02-04 15:46:11 -08:00
Gilles Debunne
53841df2a4 Merge "SelectAllOnFocus shows a higlighted text. DO NOT MERGE." into gingerbread 2011-02-04 15:46:06 -08:00
Joe Onorato
163c28b5ca Merge "Managed dialogs should run on the same thread as their activity." into gingerbread 2011-02-03 18:05:20 -08:00
Joe Onorato
c7f8b6fcf5 Managed dialogs should run on the same thread as their activity. 
Bug: 3418998
Change-Id: I9b1cf73f9d6f8a5594f405546fcaa3cfd6f03c45
 2011-02-03 17:50:02 -08:00
Mathias Agopian
7dce874f0d fix [3421350] Killing a game that uses the accelerometer renders the device unable to sleep 
when an app dies, make sure to disable all sensors that process
is connected to, regardless of wether this was the LAST connection
to this sensor.

Change-Id: I400fa1c1389b2bd05a1d19abea8a35ec5bcba273
 2011-02-03 16:37:31 -08:00
Nick Pelly
40684946cb Merge "Fix docs type that broke build." into gingerbread 2011-02-03 16:27:51 -08:00
Nick Pelly
46797ac098 Fix docs type that broke build. 
Change-Id: I5b5a2fc5baf95ace74bf90ff2c750ba890054d64
 2011-02-03 16:23:58 -08:00
Scott Main
779f7410b3 Merge "cherrypick Change-Id: I6053e6f20045b0ecba4b964f9bfb87c3241d3a91 update dashboard" into gingerbread 2011-02-03 15:24:40 -08:00
Nick Pelly
630ac8df24 Merge "NFC documentation overhaul." into gingerbread 2011-02-03 15:23:17 -08:00
Scott Main
00a600e845 cherrypick Change-Id: I6053e6f20045b0ecba4b964f9bfb87c3241d3a91 
update dashboard

Change-Id: Iea5d441e417fc1a407c623ec2faf0cff90059592
 2011-02-03 15:22:54 -08:00
Nick Pelly
74fe6c6b24 NFC documentation overhaul. 
Change-Id: I45dca95a24b2d0327e080436fbcc7b1dad79de02
 2011-02-03 15:11:09 -08:00
Jean-Baptiste Queru
8444023f35 Merge from open-source gingerbread 
Change-Id: I19c4ba36cf4f2ef518b55768360b0bff1a92a5ab
 2011-02-03 14:05:23 -08:00