Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,292 Commits 3 Branches 0 Tags
be2ed6d6e366d3639aecd7ef615c95f0ccf17b9d
Commit Graph

30292 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
repo sync
be2ed6d6e3 resolved conflicts for merge of c96b6690 to gingerbread-plus-aosp 
Change-Id: I1d8a026d7efe0762865d6e1a6a3fc79cbbcbd9c4
 2011-02-24 09:58:25 -08:00
Alon Albert
c96b669013 Merge "DO NOT MERGE - Increasing timeout to 60 sec This was already done in HC branch in this CL: https://android-git.corp.google.com/w/?p=platform/frameworks/base.git;a=commit;h=d39fd5a97c6f56794a6ed7ac1dfb0bbf585becf1 This is also related to bug http://b/issue?id=3402863 I first considered increasing the timeout specificaly for our GData client but when I saw we already accepted a CL for HC that did this at a lower level, I decided to do that instead." into gingerbread 2011-02-24 09:20:46 -08:00
Jason Chen
22577b8d3a am 5ff79c3b: Merge "DO NOT MERGE Cherry-pick of Ie4026a7c back to GB" into gingerbread 
* commit '5ff79c3b06d7087153617dc973491fc890700af5':
  DO NOT MERGE Cherry-pick of Ie4026a7c back to GB
 2011-02-23 18:03:34 -08:00
Jason Chen
5ff79c3b06 Merge "DO NOT MERGE Cherry-pick of Ie4026a7c back to GB" into gingerbread 2011-02-23 17:23:53 -08:00
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
Alon Albert
9add122296 DO NOT MERGE - Increasing timeout to 60 sec 
This was already done in HC branch in this CL:
https://android-git.corp.google.com/w/?p=platform/frameworks/base.git;a=commit;h=d39fd5a97c6f56794a6ed7ac1dfb0bbf585becf1
This is also related to bug http://b/issue?id=3402863
I first considered increasing the timeout specificaly for our GData client
but when I saw we already accepted a CL for HC that did this at a lower level, I decided
to do that instead.

Bug: 3402863
Change-Id: I7ef2968ecbab3cc0d698a408f2c643c83d333e2f
 2011-02-23 13:55:11 -08:00
Jamie Gennis
76d0c763f0 am fa238f03: Merge "egl: fixes for object refcounts" into gingerbread 
* commit 'fa238f033203f8e722b060af3f0095762b134f37':
  egl: fixes for object refcounts
 2011-02-23 12:46:57 -08:00
Jamie Gennis
fa238f0332 Merge "egl: fixes for object refcounts" into gingerbread 2011-02-23 12:30:55 -08:00
Justin Ho
da34ab2148 am 9208875e: Updated iconography for network status and adding 4G assets 
* commit '9208875e92ec190d49864b92823dd7011b9b443a':
  Updated iconography for network status and adding 4G assets
 2011-02-22 21:19:05 -08:00
Alon Albert
1aba843dc3 am ccc802e1: Merge "Support quoted parameters" into gingerbread 
* commit 'ccc802e12be64248c2c6822eb36a957435a06ef2':
  Support quoted parameters
 2011-02-22 21:18:52 -08:00
Michael I. Gold
c0775a2567 egl: fixes for object refcounts 
eglMakeCurrent() would only deref the previous surfaces if the old and
new contexts were the same.  eglTerminate() should not touch TLS.
eglReleaseThread() needs to unbind the current context.

Change-Id: I7f4c090a287ee1e29e4708ae10679fb9d7d8c8c5
Related-Bug: 2964479
 2011-02-22 18:15:08 -08:00
Justin Ho
9208875e92 Updated iconography for network status and adding 4G assets 
Change-Id: Ie8dc203587836d88ded2846329db1a0c1667afcc
 2011-02-22 16:12:46 -08:00
Alon Albert
ccc802e12b Merge "Support quoted parameters" into gingerbread 2011-02-22 10:31:26 -08:00
Maarten Hooft
62f40c8bcf am 99cca89f: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
* commit '99cca89f41e500f8b39fd75eb17f337422c4ac90':
  Import revised translations.  DO NOT MERGE
 2011-02-18 15:22:48 -08:00
Alon Albert
06912bddc6 Support quoted parameters 
iCalendar RFC http://www.ietf.org/rfc/rfc2445.txt says:
4.1.1 List and Field Separators
   Property parameters with values containing a COLON, a SEMICOLON or a
   COMMA character MUST be placed in quoted text.

So we must be able to support this.

Bug: 3463510
Change-Id: Ie0463fdc2d5cbc340801cc8cc5b4f00e374f2954
 2011-02-18 09:40:44 -08:00
Romain Guy
ad492161e4 am a2090bea: am 7118bdec: Merge "Fix for #12945: ProgressBar.setMax() will always redraw." 
* commit 'a2090bea4824cf153c4d9c735ee779613cf2e3d7':
  Fix for #12945: ProgressBar.setMax() will always redraw.
 2011-02-18 08:06:01 -08:00
Romain Guy
a2090bea48 am 7118bdec: Merge "Fix for #12945: ProgressBar.setMax() will always redraw." 
* commit '7118bdec523568842e70555e353951df9f2596fd':
  Fix for #12945: ProgressBar.setMax() will always redraw.
 2011-02-18 07:53:50 -08:00
Romain Guy
7118bdec52 Merge "Fix for #12945: ProgressBar.setMax() will always redraw." 2011-02-17 22:40:33 -08:00
Michael Krehan
58e3822b59 Fix for #12945: ProgressBar.setMax() will always redraw. 
Fix for issue #12945: Changing the maximum of a progress bar does
not cause it to be redrawn, even though a new maximum changes the
position of the current progress in relation to its maximum. With this fix,
setMax() will always cause refreshProgress() to be called if the maximum is
different than it was before.

Change-Id: I971ec3302953bcadc0aac3dd8241481bab2b5a91
 2011-02-17 20:56:29 -08:00
Maarten Hooft
99cca89f41 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2011-02-17 17:17:40 -08:00
Andreas Huber
79a9748949 am dbe09da6: DO NOT MERGE: Respond to RTSP server->client requests. 
* commit 'dbe09da6ac4d1e9e78e5c8f33fbc6d32822ba7ed':
  DO NOT MERGE: Respond to RTSP server->client requests.
 2011-02-16 14:24:53 -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
de27b51958 am 3259d885: Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread 
* commit '3259d8853760a72b811757e1711119d041962a1c':
  DO NOT MERGE - backport of l92a02b31 from master
 2011-02-16 10:51:04 -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
b79db4cd5c am be5f82ab: Merge "DO NOT MERGE - Clear backoffs on reconnect" into gingerbread 
* commit 'be5f82ab0ddacea3846cfa5aa846d1c97def0318':
  DO NOT MERGE - Clear backoffs on reconnect
 2011-02-16 10:24:15 -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
99e267ebcf am 7bcd2c62: New API added in NfcAdapter to enable/disable SE card emulation 
* commit '7bcd2c62ebfad640e8082c1dc700c9d8c57aba81':
  New API added in NfcAdapter to enable/disable SE card emulation
 2011-02-16 09:41:00 -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
8c8e9d9a7f am 1df862a4: Minor doc update. 
* commit '1df862a4656bb0d7a3329311b1e243fc6db32448':
  Minor doc update.
 2011-02-16 09:23:08 -08:00
Nick Pelly
1df862a465 Minor doc update. 
Change-Id: I1d29adfccbdc196a145a2c2a044d63b00e5f788b
 2011-02-16 09:18:34 -08:00
Andreas Huber
16d94f580a am 8db7a7bf: Merge "DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary" into gingerbread 
* commit '8db7a7bfadc7bdfa30f60bb06063f91b19234096':
  DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary
 2011-02-16 09:02:08 -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
c3ebf27a51 am 4bebbe5f: Merge "Adding package summary for nfc.tech package" into gingerbread 
* commit '4bebbe5fea1b6d7f5deff6d41d7633308607c08b':
  Adding package summary for nfc.tech package
 2011-02-15 22:54:52 -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
3901402600 am 29853a35: Merge "Only decode EXT1 tag when it is available." into gingerbread 
* commit '29853a356bb6ddb094df6d0f5dd04e2a63f25147':
  Only decode EXT1 tag when it is available.
 2011-02-15 12:38:38 -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
e0c9f2757b am d1ba051a: DO NOT MERGE: Work around several issues with non-compliant RTSP servers. 
* commit 'd1ba051a465518fa4325c364ed77025fc1a2a794':
  DO NOT MERGE: Work around several issues with non-compliant RTSP servers.
 2011-02-15 11:49:03 -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
b269346ca3 am d4952380: fix md5sum for windows installer 
* commit 'd49523809714b04636a9ac43de1c508ed1dbfc38':
  fix md5sum for windows installer
 2011-02-14 09:14:12 -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
810c1c0c35 am 322891c6: Doc change: nfc dev guide 
* commit '322891c689c845b5aa63dbca606967eb9f8f900b':
  Doc change: nfc dev guide
 2011-02-11 13:18:31 -08:00
Jean-Baptiste Queru
6d104f118a am 6901f963: am 93552de8: Merge "stubs" 
* commit '6901f963c27f2d0a9caf56b42b6054d0cecc84d1':
  stubs
 2011-02-11 10:04:53 -08:00
Jean-Baptiste Queru
6901f963c2 am 93552de8: Merge "stubs" 
* commit '93552de8e305027fb003401e347b9493c64c981f':
  stubs
 2011-02-11 09:54:59 -08:00
Jean-Baptiste Queru
93552de8e3 Merge "stubs" 2011-02-11 09:39:46 -08:00