The Android Automerger
23ca1ed524
Merge remote branch 'goog/gingerbread-release' into gingerbread-mr4-release
2011-08-02 16:47:53 -07:00
The Android Automerger
3b84a48a67
merge in gingerbread-release history after reset to gingerbread
2011-06-16 17:29:48 -07:00
Maarten Hooft
fad4d64a42
Merge "Import revised Croatian translations." into gingerbread
2011-06-16 15:41:20 -07:00
Mathias Agopian
76feee7a58
fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
...
Bug: 4595257
Change-Id: I4773cf4fe59b2509db0ed733739eb6961d473b25
2011-06-13 13:58:34 -07:00
The Android Automerger
e6997a5f7d
merge in gingerbread-release history after reset to gingerbread
2011-06-10 14:57:24 -07:00
Dan Morrill
907dfec02d
Merge "Adding a new config value used to tell StatusBarPolicy to always use CDMA signal strength value even when on EVDO. Default is off, but devices that need to can override it." into gingerbread
2011-06-09 14:43:58 -07:00
The Android Automerger
30f4eb54f7
merge in gingerbread-release history after reset to gingerbread
2011-06-09 13:45:38 -07:00
Mathias Agopian
9a03cecf8b
Fix a leak in RefBase (DO NOT MERGE)
...
this bug was introduced recently. it caused RefBase's weakref_impl
structure to be leaked for every RefBase object (about 20 bytes).
Change-Id: Ia9b155fbfa643ef72cfb8129e96260a3b806a78c
2011-06-08 16:13:39 -07:00
The Android Automerger
aa197221c1
merge in gingerbread-release history after reset to gingerbread
2011-06-06 15:00:36 -07:00
Xavier Ducrohet
df25902127
Merge "Cherrypick d1ed33c4 from hc-mr1. do not merge." into gingerbread
2011-06-03 18:53:41 -07:00
Xavier Ducrohet
ff4e02a897
Merge changes I035c48b9,Ib302af47,Iebda5ea6 into gingerbread
...
* changes:
Cherrypick 5b61ea6b from hc-mr1
LayoutLib: enable the LAYOUT_ONLY capability.
Merge dba35f1b from honeycomb-mr1. do not merge.
2011-06-03 18:53:23 -07:00
Jaikumar Ganesh
076e66034f
Merge "Remove discoverable timeout handler. DO NOT MERGE" into gingerbread
2011-05-27 13:28:28 -07:00
The Android Automerger
77a459f769
merge in gingerbread-release history after reset to gingerbread
2011-05-25 16:14:22 -07:00
Simon Wilson
5657c010c6
Merge changes I37f0f315,I8cbf6044,Ibb598931,I5262bf11 into gingerbread
...
* changes:
Fix a race that could cause GL commands to be executed from the wrong thread.
RefBase subclasses can now decide how they want to be destroyed.
Fix a race in SurfaceFlinger that could cause layers to be leaked forever.
Fix a race-condtion in SurfaceFlinger that could lead to a crash.
2011-05-24 17:07:39 -07:00
Mathias Agopian
b4081bb52a
Fix a race that could cause GL commands to be executed from the wrong thread.
...
Bug: 4483050
Change-Id: I37f0f3156059c208c6168ee6131d0e267d823188
2011-05-23 16:14:10 -07:00
Mathias Agopian
3d6881f394
RefBase subclasses can now decide how they want to be destroyed.
...
This adds a destroy() virtual on RefBase which
sublasses can implement. destroy() is called
in lieu of the destructor whenthe last strong
ref goes away.
Bug: 4483050
Change-Id: I8cbf6044a6fd3f01043a45592b5a60fa1e5fade2
2011-05-23 16:13:48 -07:00
Mathias Agopian
34cd9b72f1
Fix a race in SurfaceFlinger that could cause layers to be leaked forever.
...
The transaction flags were atomically read-and-cleared to determine if
a transaction was needed, in the later case, mStateLock was taken to
keep the current state still during the transaction. This left a small
window open, where a layer could be removed after the transaction flags
were checked but before the transaction was started holding the lock.
In that situation eTraversalNeeded would be set but only seen during the
next transaction cycle; however, because we're handling this transaction
(because of another flag) it will be commited, "loosing" the information
about the layer being removed -- so when the next transaction cycle due
to eTraversalNeeded starts, it won't notice that layers have been removed
and won't populated the ditchedLayers array.
Bug: 4483049
Change-Id: Ibb5989312f871339928ee1aa3f9567770d72969b
2011-05-23 16:13:20 -07:00
Mathias Agopian
02cf75e0ca
Fix a race-condtion in SurfaceFlinger that could lead to a crash.
...
Client::mLayers could be accessed from different threads.
On one side from Client::attachLayer() which is currently
called from a binder thread; on the other side from
Client::detachLayer() which is always called from the main
thread.
This could lead to a corruption of Client::mLayers.
We fix this issue by adding an internal lock to Client.
Bug: 4483046
Change-Id: I5262bf1124d9a65ec6f8ffd8e367356fc33a7536
2011-05-23 16:12:02 -07:00
Xavier Ducrohet
8949eabac7
Merge "Merge 05b7b69c from honeycomb-mr1. do not merge." into gingerbread
2011-05-20 13:56:47 -07:00
Xavier Ducrohet
e2ac5a6dfa
Merge "Merge 2fae858d from Honeycomb-mr1. do not merge." into gingerbread
2011-05-20 13:56:42 -07:00
Kenny Root
46eb8c2d2d
Merge "Break apart queries to getInstalled* API" into gingerbread
2011-05-19 10:55:00 -07:00
The Android Automerger
a2efd2ed08
merge in gingerbread-release history after reset to gingerbread
2011-05-13 14:27:46 -07:00
Irfan Sheriff
ea08a66129
Merge "Move Wifi Ap configuration to flat file" into gingerbread
2011-05-11 09:15:48 -07:00
Jake Hamby
f068f4f487
Merge "Enable support for SMS national language shift tables." into gingerbread
2011-05-05 13:09:11 -07:00
The Android Automerger
7f6580c6b7
merge in gingerbread-release history after reset to gingerbread
2011-04-01 13:28:17 -07:00
Jason parks
bef49808c7
Merge "Implement teardown script." into gingerbread
2011-04-01 13:11:06 -07:00
James Dong
2688dddfd2
Merge "When read() from AudioRecord returns 0 or negative value, report an error to application. DO NOT MERGE." into gingerbread
2011-03-31 11:20:40 -07:00
The Android Automerger
1e0616eb70
merge in gingerbread-release history after reset to gingerbread
2011-03-30 18:33:05 -07:00
Eric Laurent
ce75529174
Merge "Issue 4157048: mic gain for VoIP/SIP calls." into gingerbread
2011-03-30 14:55:49 -07:00
Mike Lockwood
6de2e32fd3
Merge "DO NOT MERGE: UsbService: Make USB disconnect handling for accessory mode more robust" into gingerbread
2011-03-30 14:15:51 -07:00
Trevor Johns
e4e971ee13
Merge "Fixing line in Market IAB docs that explains how to bind to the MarketService." into gingerbread
2011-03-30 13:50:40 -07:00
Simon Wilson
ae9739aec3
Merge "DO NOT MERGE Disable WiMAX when "Data Enabled" is off" into gingerbread
2011-03-30 13:26:45 -07:00
Eric Fischer
8ee2f9df92
Merge "Import revised translations. DO NOT MERGE" into gingerbread
2011-03-30 10:41:05 -07:00
Jason parks
00607ddaee
Merge "Send out a broadcast that the system is being factory reset." into gingerbread
2011-03-30 08:17:53 -07:00
Jean-Baptiste Queru
825370ebef
No-op - reconcile with open-source gingerbread
...
Change-Id: I64beb8dfb6f175eb9a160f1145dad3dc323fc98e
2011-03-29 14:05:53 -07:00
Michael I. Gold
894c1459c1
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-03-29 13:43:54 -07:00
The Android Automerger
1a4a9bf6e0
merge in gingerbread-release history after reset to gingerbread
2011-03-28 16:31:27 -07:00
The Android Automerger
b0bd3f0285
merge in gingerbread-release history after reset to gingerbread
2011-03-28 05:44:08 -07:00
Robert Greenwalt
f9a75b96bd
Merge "Fix Default route after secondary net use." into gingerbread
2011-03-26 08:58:01 -07:00
The Android Automerger
8c765ab809
merge in gingerbread-release history after reset to gingerbread
2011-03-25 22:26:02 -07:00
Jeff Hamilton
fbf4a75c57
Merge "Make STOP_APP_SWITCHES signatureOrSystem." into gingerbread
2011-03-25 14:53:14 -07:00
The Android Automerger
f23c437c8e
merge in gingerbread-release history after reset to gingerbread
2011-03-25 14:32:36 -07:00
Irfan Sheriff
fce4eab91a
Merge "DO NOT MERGE Pick upstream intf with valid IP conf" into gingerbread
2011-03-25 11:01:02 -07:00
Robert Greenwalt
9028577960
Merge "Fix some alt-network issues." into gingerbread
2011-03-25 09:35:53 -07:00
The Android Automerger
af24ae9fbd
merge in gingerbread-release history after reset to gingerbread
2011-03-25 06:04:52 -07:00
The Android Automerger
2e624a0818
merge in gingerbread-release history after reset to gingerbread
2011-03-24 08:49:17 -07:00
The Android Automerger
1d5df9a451
merge in gingerbread-release history after reset to gingerbread
2011-03-23 05:43:33 -07:00
The Android Automerger
c2520c3e11
merge in gingerbread-release history after reset to gingerbread
2011-03-22 13:10:41 -07:00
Nick Pelly
54b76288d4
Merge "NfcAdapterExtras: reset singleton state if initialization fails." into gingerbread
2011-03-22 09:52:55 -07:00
The Android Automerger
1bf20cfc02
merge in gingerbread-release history after reset to gingerbread
2011-03-22 05:43:42 -07:00
