ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
20,820 Commits 2 Branches 0 Tags 54 MiB
9bbc6b0528
Commit Graph

20820 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xavier Ducrohet
9bbc6b0528 am ee1b4976: Merge changes I035c48b9,Ib302af47,Iebda5ea6 into gingerbread 
* commit 'ee1b497648a0c3c03b09c4739619f23315d491fb':
  Cherrypick 5b61ea6b from hc-mr1
  LayoutLib: enable the LAYOUT_ONLY capability.
  Merge dba35f1b from honeycomb-mr1. do not merge.
 2011-06-06 18:08:32 -07:00
Romain Guy
445abdcf8d am 258f32e2: Merge "Disable plugins if setPluginsEnabled(false) called." 
* commit '258f32e2e3ff7f4f4b1395cae292098141047fde':
  Disable plugins if setPluginsEnabled(false) called.
 2011-06-06 17:54:12 -07:00
Romain Guy
47a5fe58d2 Merge "Disable plugins if setPluginsEnabled(false) called." 2011-06-06 16:23:25 -07:00
Jake Hamby
a5338831fa resolved conflicts for merge of ab79ee4a to gingerbread-plus-aosp 
Change-Id: Ib885176060f65ef3286a24c7b9cae1a673666275
 2011-06-06 15:33:37 -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
Andreas Huber
d2f99b158d am 8050a02b: DO NOT MERGE: Linux sockets are odd, closing a socket descriptor does not abort pending recv/send calls. 
* commit '8050a02b0130f0ba2e2ddfc240aa59029ee2ac6d':
  DO NOT MERGE: Linux sockets are odd, closing a socket descriptor does not abort pending recv/send calls.
 2011-06-02 07:37:52 -07:00
Martijn Coenen
3e1db14ded am 0aa1017f: Prevent allocation overflows by corrupt NDEF records. 
* commit '0aa1017f9183bca752c95af72f73120e102ab2d3':
  Prevent allocation overflows by corrupt NDEF records.
 2011-06-01 09:51:15 -07:00
Jaikumar Ganesh
9ea7f08b79 am 1b755dea: Merge "Remove discoverable timeout handler. DO NOT MERGE" into gingerbread 
* commit '1b755dea38cc428a4adb8b8954bbafaa9c0441fb':
  Remove discoverable timeout handler. DO NOT MERGE
 2011-05-27 13:46:50 -07:00
Jaikumar Ganesh
076e66034f Merge "Remove discoverable timeout handler. DO NOT MERGE" into gingerbread 2011-05-27 13:28:28 -07:00
TK MUN
ba7ce02e8e am 94260caf: Allow control over search order for tethering upstream interface selection 
* commit '94260caf2fb3f5dbf6e17b29a269b46ea05f8680':
  Allow control over search order for tethering upstream interface selection
 2011-05-25 10:42:07 -07:00
Jaikumar Ganesh
a442e3fc2b am 94062517: Merge "Require bonding and encryption for PBAP server" 
* commit '94062517ae5573f9a1a877a83fe7d8e6d1a2c350':
  Require bonding and encryption for PBAP server
 2011-05-25 09:59:44 -07:00
Jaikumar Ganesh
51b46daea5 Merge "Require bonding and encryption for PBAP server" 2011-05-25 09:27:32 -07:00
Jean-Baptiste Queru
16b77f839f am 038e8f99: Merge "Adding support for parsing of SMS-CB pdus in UMTS format." 
* commit '038e8f99845e171c0d9d606f5697e36b1b684d01':
  Adding support for parsing of SMS-CB pdus in UMTS format.
 2011-05-25 09:04:40 -07:00
Jean-Baptiste Queru
88f5a824a6 Merge "Adding support for parsing of SMS-CB pdus in UMTS format." 2011-05-25 08:06:17 -07:00
Simon Wilson
be93983384 am c9cd2387: Merge changes I37f0f315,I8cbf6044,Ibb598931,I5262bf11 into gingerbread 
* commit 'c9cd2387b6938a6fbefc731d2177902266f2a130':
  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:29:12 -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
Conley Owens
7555e549c0 am 4cf0eee7: Merge "Fixing concurrency issue on IccPhoneBookInterfaceManager." 
* commit '4cf0eee755046734568959ac01f207b108e449c0':
  Fixing concurrency issue on IccPhoneBookInterfaceManager.
 2011-05-24 15:01:18 -07:00
Conley Owens
4b4db99063 Merge "Fixing concurrency issue on IccPhoneBookInterfaceManager." 2011-05-24 14:05:05 -07:00
Xavier Ducrohet
b3e3837feb am 34f5991e: Merge 6103e22c from honeycomb-mr1. do not merge. 
* commit '34f5991ebe8b203f1720caf95889c15dd131d86e':
  Merge 6103e22c from honeycomb-mr1. do not merge.
 2011-05-24 12:28:38 -07:00
Xavier Ducrohet
ed0e037b04 am c7b87766: Merge 2402ad60 from honeycomb-mr1. do not merge. 
* commit 'c7b87766b21fe5cf2f644efa8753b936d413dc9a':
  Merge 2402ad60 from honeycomb-mr1. do not merge.
 2011-05-24 10:54:35 -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
Soojung Shin
8529096474 am 4e4ad341: SmsMessage: convert + to international dialing prefix 
* commit '4e4ad34159dc1c720a3e6145bb9f14c60fb1a3f7':
  SmsMessage: convert + to international dialing prefix
 2011-05-23 15:11:04 -07:00
TK MUN
c414a4660d am 6f0394a3: DO NOT MERGE SystemUI: update signal level when broadcast is received 
* commit '6f0394a3b4d6082c9cb01de4a220a3b082e1840a':
  DO NOT MERGE SystemUI: update signal level when broadcast is received
 2011-05-23 14:47:38 -07:00
Xavier Ducrohet
7e7703528c am 4c1e73b6: Merge e57aa434 from honeycomb-mr1. do not merge. 
* commit '4c1e73b69a13a4f24a8fc123f599a9e9d8505525':
  Merge e57aa434 from honeycomb-mr1. do not merge.
 2011-05-23 09:52:55 -07:00
Xavier Ducrohet
03f2861cae am f791863f: Merge "Merge 05b7b69c from honeycomb-mr1. do not merge." into gingerbread 
* commit 'f791863f0ac67ab6abd7410d5807d716cffc5b72':
  Merge 05b7b69c from honeycomb-mr1. do not merge.
 2011-05-23 09:52:52 -07:00
Xavier Ducrohet
fc445ebe8b am bb43828a: Merge "Merge 2fae858d from Honeycomb-mr1. do not merge." into gingerbread 
* commit 'bb43828aa749e71d4e52ba69db01b83c83a755b5':
  Merge 2fae858d from Honeycomb-mr1. do not merge.
 2011-05-23 09:52:41 -07:00
Jaikumar Ganesh
bbe85a84bc am 4b41df61: Merge "Use proper type for oob variable in register_agent. Without this change the BluetoothEventLoop crashes on my armv5 arch board." 
* commit '4b41df613db19c5fe1d8c0d05ef314326fd3f95b':
  Use proper type for oob variable in register_agent. Without this change the BluetoothEventLoop crashes on my armv5 arch board.
 2011-05-20 14:21:29 -07:00
Jaikumar Ganesh
629c19dfbc am 198ed3e4: Merge "BT: Wrong publishing result of bonding error code." 
* commit '198ed3e46af4bd51fa6be0186bacdde9e832ba94':
  BT: Wrong publishing result of bonding error code.
 2011-05-20 14:21:23 -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
Jaikumar Ganesh
701d3366e0 Merge "Use proper type for oob variable in register_agent. Without this change the BluetoothEventLoop crashes on my armv5 arch board." 2011-05-20 13:37:00 -07:00
Jaikumar Ganesh
0b0b8a76d5 Merge "BT: Wrong publishing result of bonding error code." 2011-05-20 13:35:20 -07:00
Jaikumar Ganesh
90c8f1ce3c am 848a1e3d: Merge "OBEX: Fix PrivateOutputStream small write problem" 
* commit '848a1e3d8522129c8a39d198a10b134926d71bd2':
  OBEX: Fix PrivateOutputStream small write problem
 2011-05-20 10:23:48 -07:00
Jaikumar Ganesh
ca7f168e4b Merge "OBEX: Fix PrivateOutputStream small write problem" 2011-05-20 09:40:32 -07:00
Kenny Root
e5c511391b am f2006f31: Merge "Break apart queries to getInstalled* API" into gingerbread 
* commit 'f2006f3123dcdf598e052051041b49c89710b53e':
  Break apart queries to getInstalled* API
 2011-05-19 11:04:01 -07:00
Kenny Root
46eb8c2d2d Merge "Break apart queries to getInstalled* API" into gingerbread 2011-05-19 10:55:00 -07:00
Jean-Baptiste Queru
99d8ed3c30 am 6c427617: Merge "support humidity sensor type" 
* commit '6c427617be940be32fdebbd9c78f9223b292c814':
  support humidity sensor type
 2011-05-18 15:20:29 -07:00
Jean-Baptiste Queru
14402a1a5a Merge "support humidity sensor type" 2011-05-18 15:00:11 -07:00
Jean-Baptiste Queru
4664d07374 am 7ae7d31c: Merge "MOTOYA changed two kinds of Japanese font files." 
* commit '7ae7d31c2fb06a5c53e71c9e77fa75c8f5777391':
  MOTOYA changed two kinds of Japanese font files.
 2011-05-18 09:46:16 -07:00
Jean-Baptiste Queru
af859fa9ae Merge "MOTOYA changed two kinds of Japanese font files." 2011-05-18 09:24:40 -07:00
Jean-Baptiste Queru
d6c51aef6b am f247e545: Merge "Adapt to latest skia" 
* commit 'f247e545b521584bb778e79710c1e60ab814839e':
  Adapt to latest skia
 2011-05-12 15:38:18 -07:00
Jean-Baptiste Queru
40951a8cf1 am 6714e677: Merge "Ninepatch tweaks for better interop" 
* commit '6714e6774063aae7a8a7a80c36c89ec60170cb27':
  Ninepatch tweaks for better interop
 2011-05-12 15:38:15 -07:00
Jean-Baptiste Queru
0e4b2d5826 am 4770c79c: Merge "Tweak audio APIs for better forward/backward/sideways compatibility." 
* commit '4770c79c340c2fb5b6b58c0a1ccf8aac96138ef6':
  Tweak audio APIs for better forward/backward/sideways compatibility.
 2011-05-12 15:38:11 -07:00
Jean-Baptiste Queru
6546fee8cc am 71d25778: Merge "Switch to SkSafeUnref for better portability" 
* commit '71d25778c61327bf82d0e81cd78175a9ee74420a':
  Switch to SkSafeUnref for better portability
 2011-05-12 15:38:07 -07:00
Jean-Baptiste Queru
d698b563da Merge "Adapt to latest skia" 2011-05-12 15:09:51 -07:00
Jean-Baptiste Queru
c97843ba1f Merge "Ninepatch tweaks for better interop" 2011-05-12 14:24:09 -07:00
Jean-Baptiste Queru
fa5f5587ae Merge "Tweak audio APIs for better forward/backward/sideways compatibility." 2011-05-12 14:19:41 -07:00