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

30774 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xavier Ducrohet
041fd74bea 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
9d9a7466cd 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
d1735ef91a 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
d7030e551a 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
f791863f0a Merge "Merge 05b7b69c from honeycomb-mr1. do not merge." into gingerbread 2011-05-20 13:56:47 -07:00
Xavier Ducrohet
bb43828aa7 Merge "Merge 2fae858d from Honeycomb-mr1. do not merge." into gingerbread 2011-05-20 13:56:42 -07:00
Jaikumar Ganesh
4b41df613d 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
198ed3e46a Merge "BT: Wrong publishing result of bonding error code." 2011-05-20 13:35:20 -07:00
Jaikumar Ganesh
0c2d82c6f2 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
848a1e3d85 Merge "OBEX: Fix PrivateOutputStream small write problem" 2011-05-20 09:40:32 -07:00
Erik Ljungberg
a9c4c594ef OBEX: Fix PrivateOutputStream small write problem 
When data less than max packet size in length is sent into the write
method the data will only be added to the internal buffer. If several
calls to write is performed by the application continueOperation will
not be called at all. The solution to the problem is to always check
the internal buffer size and to call continueOperation every time
maxPacketSize bytes is in the internal buffer.

Change-Id: I5ebfa3c26db2c1aefe1a115d7782d8ceaa760937
 2011-05-20 12:39:18 +02:00
Xavier Ducrohet
d9af22e204 Merge 05b7b69c from honeycomb-mr1. do not merge. 
Change-Id: I1aca5774dec2e18ab5f9e860f6fd90b481b2857c
LayoutLib: support the new baseline/margin query API.
 2011-05-19 16:52:41 -07:00
Xavier Ducrohet
e172a3fc23 Merge 2fae858d from Honeycomb-mr1. do not merge. 
Change-Id: I648f9ffa9745331ce4104dc4772f78ed933a4909
LayoutLib: implement data binding for most AdapterView
 2011-05-19 16:52:29 -07:00
Kenny Root
2433c443bb 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
f2006f3123 Merge "Break apart queries to getInstalled* API" into gingerbread 2011-05-19 10:55:00 -07:00
Jean-Baptiste Queru
4b999030ad am 6c427617: Merge "support humidity sensor type" 
* commit '6c427617be940be32fdebbd9c78f9223b292c814':
  support humidity sensor type
 2011-05-18 15:20:29 -07:00
Jean-Baptiste Queru
6c427617be Merge "support humidity sensor type" 2011-05-18 15:00:11 -07:00
Jean-Baptiste Queru
a38762f340 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
7ae7d31c2f Merge "MOTOYA changed two kinds of Japanese font files." 2011-05-18 09:24:40 -07:00
Jean-Baptiste Queru
2d7d3f78c9 am f247e545: Merge "Adapt to latest skia" 
* commit 'f247e545b521584bb778e79710c1e60ab814839e':
  Adapt to latest skia
 2011-05-12 15:38:18 -07:00
Jean-Baptiste Queru
a84d29cb04 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
20fd3f0d83 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
e8b669cbd7 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
f247e545b5 Merge "Adapt to latest skia" 2011-05-12 15:09:51 -07:00
Derek Sollenberger
0ceb9501b2 Adapt to latest skia 
Change-Id: I39247db04ca8b7993b0f5a16fb0324828d04cc3a
 2011-05-12 15:05:44 -07:00
Jean-Baptiste Queru
6714e67740 Merge "Ninepatch tweaks for better interop" 2011-05-12 14:24:09 -07:00
Jean-Baptiste Queru
9faa34e603 Ninepatch tweaks for better interop 
Change-Id: I96781e2b27fcd6dd05d9726829e8e79ff365cbdc
 2011-05-12 14:22:43 -07:00
Jean-Baptiste Queru
4770c79c34 Merge "Tweak audio APIs for better forward/backward/sideways compatibility." 2011-05-12 14:19:41 -07:00
Jean-Baptiste Queru
71d25778c6 Merge "Switch to SkSafeUnref for better portability" 2011-05-12 14:19:26 -07:00
Jean-Baptiste Queru
da94c346a5 Tweak audio APIs for better forward/backward/sideways compatibility. 
Change-Id: I293e99107aed260db68edccad35cdc15ed88c1d3
 2011-05-12 09:46:49 -07:00
Jean-Baptiste Queru
c9e22e9aff Switch to SkSafeUnref for better portability 
Change-Id: Ia146a4728b5eb92626462effe42521ca73454a7d
 2011-05-12 08:22:35 -07:00
Irfan Sheriff
aa1fd70100 am 8dd85f80: Merge "Move Wifi Ap configuration to flat file" into gingerbread 
* commit '8dd85f80ba9c463f5616b47eceb620fe21203f4f':
  Move Wifi Ap configuration to flat file
 2011-05-11 09:45:36 -07:00
Irfan Sheriff
8dd85f80ba Merge "Move Wifi Ap configuration to flat file" into gingerbread 2011-05-11 09:15:48 -07:00
Irfan Sheriff
97b4cf783f Move Wifi Ap configuration to flat file 
Secure settings are accessible by applications without
permissions. Move to a system-only accessible file

Bug: 4391796
Change-Id: I5448943d26cccce39dd4f32423c68dad4bbf50ad
 2011-05-09 22:46:55 -07:00
Conley Owens
87d86044c0 am bcd029b6: Merge "Add missing clean-up of idmap file descriptors." 
* commit 'bcd029b6c8dee19d2cefb00f3ff637b4dcd407b3':
  Add missing clean-up of idmap file descriptors.
 2011-05-05 14:03:15 -07:00
Jake Hamby
18cc814c94 am 4d53cb02: Merge "Enable support for SMS national language shift tables." into gingerbread 
* commit '4d53cb02168fe35104d7e644dd9b3efd8ca4c91b':
  Enable support for SMS national language shift tables.
 2011-05-05 13:31:03 -07:00
Conley Owens
bcd029b6c8 Merge "Add missing clean-up of idmap file descriptors." 2011-05-05 13:22:18 -07:00
Jake Hamby
4d53cb0216 Merge "Enable support for SMS national language shift tables." into gingerbread 2011-05-05 13:09:11 -07:00
Mårten Kongstad
2b91c67137 Add missing clean-up of idmap file descriptors. 
Change-Id: I9bdc9a4b7962f1a8dce77f4b213c8b9dc26e4b0f
 2011-05-05 15:38:14 +02:00
Nicu Pavel
75d14c33d7 Use proper type for oob variable in register_agent. 
Without this change the BluetoothEventLoop crashes on my armv5 arch board.

Change-Id: Ia10382f0aea4736be268512ccf9d5c5cde052851
 2011-05-05 13:11:12 +03:00
Arek Lichwa
ae5fbb0b43 BT: Wrong publishing result of bonding error code. 
During bonding bluez stack publish the error code over dbus.
JNI gets the error, in this ER case:
org.bluez.Error.AuthenticationFailed (Authentication Failed),
and then wrong call to overloaded setBondState() is made on
callstack using default result code parameter as 0 (BOND_SUCCESS).

Change-Id: I6f743cedc76e63d0c2a35e89d3aa48267b89c06e
Signed-off-by: Christian Bejram <christian.bejram@stericsson.com>
 2011-05-05 10:41:25 +02:00
Irfan Sheriff
8a14d8b9c0 am 1a5b6098: Handle GET_POWER failures 
* commit '1a5b6098d5002ae07ce3f9bc514400a87c2b64fa':
  Handle GET_POWER failures
 2011-05-04 21:14:47 -07:00
Irfan Sheriff
1a5b6098d5 Handle GET_POWER failures 
Return a failure when GET_POWER returns a non-conforming
format

Bug: 4380317
Change-Id: If1ce73572ae261cd6998e4289e21112c88859437
 2011-05-04 14:23:42 -07:00
Dan Morrill
dacce73bcc am 4ec33c2a: Do not merge. Cherry-pick of Idc802af57fb9926a69ed52d4e776ef57d8b647c6 (package manager fix) to gingerbread. 
* commit '4ec33c2aad59b2a745ee891c9b7246b9533d95e0':
  Do not merge. Cherry-pick of Idc802af57fb9926a69ed52d4e776ef57d8b647c6 (package manager fix) to gingerbread.
 2011-05-03 14:59:52 -07:00
Conley Owens
eac835e52e am 9c4ba258: Merge "Removing dead store; it was likely a relict of debuging code." 
* commit '9c4ba2580e2ef582747cce2960804a2a5e4b776e':
  Removing dead store; it was likely a relict of debuging code.
 2011-05-03 12:07:19 -07:00
Dan Morrill
4ec33c2aad Do not merge. Cherry-pick of Idc802af57fb9926a69ed52d4e776ef57d8b647c6 
(package manager fix) to gingerbread.

Change-Id: Ia5373100e97bfe42d2211c6249996dc7ff4818e0
 2011-05-02 17:00:13 -07:00
Conley Owens
9c4ba2580e Merge "Removing dead store; it was likely a relict of debuging code." 2011-05-02 09:53:25 -07:00
Conley Owens
a3be387375 am eb8171bc: Merge "Adjust mBiggerTouchSlopSquare to the suitable value" 
* commit 'eb8171bcff9bd980dbdfc99b2d843a5bcc0ae3e5':
  Adjust mBiggerTouchSlopSquare to the suitable value
 2011-04-29 10:24:34 -07:00
Conley Owens
b737647db8 am 76616b13: Merge "Scolling using arrow keys with padding" 
* commit '76616b138eb68a77a838a93fdf2f0322e982f706':
  Scolling using arrow keys with padding
 2011-04-29 10:24:29 -07:00
Conley Owens
19653c6440 am 425db473: Merge "CHAR_SEQUENCE_CREATOR cannot handle null string" 
* commit '425db473a05e4204301bf46d4ab6f51b12d9c447':
  CHAR_SEQUENCE_CREATOR cannot handle null string
 2011-04-29 10:24:23 -07:00