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

47964 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Lockwood
179122ad56 am a8731e1e: Merge "DO NOT MERGE: UsbService: Make USB disconnect handling for accessory mode more robust" into gingerbread 
* commit 'a8731e1e922512e5c22485e48059f33b61ab93ea':
  DO NOT MERGE: UsbService: Make USB disconnect handling for accessory mode more robust
 2011-04-04 12:25:33 -07:00
Trevor Johns
ea477d2043 am cafbe87d: Merge "Fixing line in Market IAB docs that explains how to bind to the MarketService." into gingerbread 
* commit 'cafbe87d5b6108d71e85950796b587f95d00cfac':
  Fixing line in Market IAB docs that explains how to bind to the MarketService.
 2011-04-04 12:25:29 -07:00
Simon Wilson
d7a8e8453d am ec944728: Merge "DO NOT MERGE Disable WiMAX when "Data Enabled" is off" into gingerbread 
* commit 'ec94472835787b66e1799110411d5077d0ef37cd':
  DO NOT MERGE Disable WiMAX when "Data Enabled" is off
 2011-04-04 12:25:25 -07:00
Eric Fischer
d20023ae44 am 8b312c6c: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
* commit '8b312c6ca1c3f6dc4bec0c7d45bc9509afef4984':
  Import revised translations.  DO NOT MERGE
 2011-04-04 12:20:38 -07:00
Jason parks
1d73362597 am cca2f2f9: Merge "Send out a broadcast that the system is being factory reset." into gingerbread 
* commit 'cca2f2f987ab772a4bae3176df7259f59d6502ce':
  Send out a broadcast that the system is being factory reset.
 2011-04-04 12:20:33 -07:00
Justin Ho
0f5e36deee am 87805ca3: Updated CDMA roaming icons 
* commit '87805ca3a477e165891baa18efe5239a70d11bc9':
  Updated CDMA roaming icons
 2011-04-04 12:19:39 -07:00
Jean-Baptiste Queru
0c61e10590 am bef31431: No-op - reconcile with open-source gingerbread 
* commit 'bef31431cafe100e382a3caf7ea7dce343832d68':
 2011-04-04 12:19:26 -07:00
Robert Greenwalt
ab2194aade am 27725e8c: Only leave one default network up at a time. 
* commit '27725e8cd1e2eb3b88186ae8d43e437f130b1f84':
  Only leave one default network up at a time.
 2011-04-04 12:18:58 -07:00
Robert Ly
cbfeda13e7 am 6f7e4cb5: am 3f39f653: Adding package description for android.hardware.usb 
* commit '6f7e4cb5ae58f5eff6bb4216439c47fd13202b09':
  Adding package description for android.hardware.usb
 2011-04-04 11:48:51 -07:00
Robert Ly
6f7e4cb5ae am 3f39f653: Adding package description for android.hardware.usb 
* commit '3f39f653a90f9727d13be1e9908f0afb8fe66d6e':
  Adding package description for android.hardware.usb
 2011-04-04 11:41:02 -07:00
Robert Greenwalt
37229514c5 Merge "resolved conflicts for merge of 7544b23e to gingerbread-plus-aosp" into gingerbread-plus-aosp 2011-04-04 11:23:51 -07:00
Robert Greenwalt
d685c731bf resolved conflicts for merge of 7544b23e to gingerbread-plus-aosp 
Change-Id: I28cf91f473eb9e3e758129b2f4d89827e73049dd
 2011-04-04 11:21:23 -07:00
Robert Ly
3f39f653a9 Adding package description for android.hardware.usb 
Change-Id: I4d243424c6747531a1ac6ab2230c2af73bad4fed
 2011-04-04 11:07:46 -07:00
Brad Fitzpatrick
27e00544ea am 9907d161: Merge "Fix data corruption when writing to Bluetooth socket" 
* commit '9907d161584415c81de1099678f160da172fd1a6':
  Fix data corruption when writing to Bluetooth socket
 2011-04-04 11:03:03 -07:00
Brad Fitzpatrick
9907d16158 Merge "Fix data corruption when writing to Bluetooth socket" 2011-04-04 10:49:05 -07:00
Brad Fitzpatrick
9b1b643995 am 2ed72048: Merge "Always return a valid index from Rfc822Tokenizer.findTokenEnd()" 
* commit '2ed72048828cf9f617da971e5d2b8a062de08e5b':
  Always return a valid index from Rfc822Tokenizer.findTokenEnd()
 2011-04-04 10:17:43 -07:00
Brad Fitzpatrick
f7a34b1598 am e558a000: Merge "Avoid crash in system server when mounting container" 
* commit 'e558a0000389a2523b8d3d3a787db6b4579d2bdc':
  Avoid crash in system server when mounting container
 2011-04-04 10:17:35 -07:00
Brad Fitzpatrick
2ed7204882 Merge "Always return a valid index from Rfc822Tokenizer.findTokenEnd()" 2011-04-04 09:41:10 -07:00
Brad Fitzpatrick
e558a00003 Merge "Avoid crash in system server when mounting container" 2011-04-04 09:38:16 -07:00
Mattias Niklewski
114f98a753 Always return a valid index from Rfc822Tokenizer.findTokenEnd() 
If an invalid input string ends with a backslash inside a comment
or quoted string, the returned index would be past the end of the
string. In one case this would lead to a runtime exception being
thrown from MultiAutoCompleteTextView.performValidation.

Change-Id: If629372b429716c25cdc25764f088e95d4812d57
 2011-04-04 14:52:35 +02:00
Fredrik Helmer
a20c8ef471 Avoid crash in system server when mounting container 
A race condition when mounting a container in PackageHelper may cause
the system_server to crash (uncaught exception). Calling methods are
prepared to handle null, so return null instead.

Change-Id: I852ee21a2d847e37d81c1b900c27ddf94ef24fcb
 2011-04-04 14:38:24 +02:00
Mike Playle
36aa8839d5 Fix data corruption when writing to Bluetooth socket 
Writes to Bluetooth sockets are handled by writeNative() in
android_bluetooth_BluetoothSocket.cpp. This calls asocket_write()
which is implemented in abort_socket.c.

This latter function sleeps until poll() indicates that the socket is
writeable, then calls write() once, returning the number of bytes
written. However writeNative() just returns this byte count to the
caller; it's eventually ignored in BluetoothOutputStream.java. This
doesn't match the semantics of a Java OutputStream, which is required
to block until all bytes have been written.

This fix adds a loop to writeNative() that repeatedly calls the lower
level write function until all the data has been written (or an error
occurred in which case we should exit the loop early). With this
change it is possible to write large amounts of data to a Bluetooth
socket without experiencing data loss.

Change-Id: I0b464382817e15adec32ba0e3cb37e7d1cccc730
 2011-04-04 08:56:22 +01:00
Dirk Dougherty
9e374cf494 am 826af857: am f9cdf7fe: Doc change: add diff report for API 12. 
* commit '826af8576b27d18997440bec75daa26434033c0c':
  Doc change: add diff report for API 12.
 2011-04-03 14:06:00 -07:00
Dirk Dougherty
826af8576b am f9cdf7fe: Doc change: add diff report for API 12. 
* commit 'f9cdf7feb47aa142e11862f5694c0a29ac013a51':
  Doc change: add diff report for API 12.
 2011-04-03 14:04:20 -07:00
Dirk Dougherty
b079c1f8ee am 85709ac8: am 16769201: Merge "Doc change: update media formats tables with adts/aac and flac" into honeycomb-mr1 
* commit '85709ac8e3340fb8114cfff7128a09d64c06cdc1':
  Doc change: update media formats tables with adts/aac and flac
 2011-04-03 13:56:07 -07:00
Dirk Dougherty
85709ac8e3 am 16769201: Merge "Doc change: update media formats tables with adts/aac and flac" into honeycomb-mr1 
* commit '1676920113d35b66e6e8846ffb7dded7e011c2fa':
  Doc change: update media formats tables with adts/aac and flac
 2011-04-03 13:50:48 -07:00
Dirk Dougherty
f9cdf7feb4 Doc change: add diff report for API 12. 
Change-Id: I9c7367be204208384aafaa19a8243164024ed1de
 2011-04-03 13:50:46 -07:00
Dirk Dougherty
1676920113 Merge "Doc change: update media formats tables with adts/aac and flac" into honeycomb-mr1 2011-04-03 13:40:48 -07:00
Dirk Dougherty
88a1fc2d79 Doc change: update media formats tables with adts/aac and flac 
Change-Id: Ic541f9e4ea1907453041d017d7d3608ead45ed6f
 2011-04-03 13:23:24 -07:00
Scott Main
e1e46c7263 am 342d8fdb: am 90a1befa: am 27690eba: Merge "docs: update device dashboard" into honeycomb 
* commit '342d8fdbb6ee256da90ada3e48e198bbc9e8d8e3':
  docs: update device dashboard
 2011-04-01 17:43:12 -07:00
Scott Main
342d8fdbb6 am 90a1befa: am 27690eba: Merge "docs: update device dashboard" into honeycomb 
* commit '90a1befa551a9e6dc8f06b7331e26e6470ab824f':
  docs: update device dashboard
 2011-04-01 17:41:40 -07:00
Scott Main
90a1befa55 am 27690eba: Merge "docs: update device dashboard" into honeycomb 
* commit '27690ebabc915091956f0331023c9d074177271d':
  docs: update device dashboard
 2011-04-01 17:39:05 -07:00
Scott Main
27690ebabc Merge "docs: update device dashboard" into honeycomb 2011-04-01 17:36:42 -07:00
Wink Saville
22cfcaee24 am 0b8e313c: Merge "Data Retry fix after failure due to permanent causes." into honeycomb-LTE 
* commit '0b8e313c7f97f9cb34e2ba555182621889b69a16':
  Data Retry fix after failure due to permanent causes.
 2011-04-01 16:36:25 -07:00
Wink Saville
0b8e313c7f Merge "Data Retry fix after failure due to permanent causes." into honeycomb-LTE 2011-04-01 16:34:51 -07:00
Scott Main
03d4dc3b75 am 0fa1d66c: am 6261861a: am cb719a48: Merge "docs: update homepage announcement for Google IO" into honeycomb 
* commit '0fa1d66cccc6041bcc55cf39e77970edbe89109f':
  docs: update homepage announcement for Google IO
 2011-04-01 16:25:14 -07:00
Scott Main
0fa1d66ccc am 6261861a: am cb719a48: Merge "docs: update homepage announcement for Google IO" into honeycomb 
* commit '6261861a94448e4fbc26e313ce1410a184a10914':
  docs: update homepage announcement for Google IO
 2011-04-01 16:22:35 -07:00
Scott Main
6261861a94 am cb719a48: Merge "docs: update homepage announcement for Google IO" into honeycomb 
* commit 'cb719a48a2f2e9bc47b317f75ebb8320f6ce877c':
  docs: update homepage announcement for Google IO
 2011-04-01 16:19:30 -07:00
Scott Main
cb719a48a2 Merge "docs: update homepage announcement for Google IO" into honeycomb 2011-04-01 16:17:40 -07:00
Scott Main
248f68de40 docs: update device dashboard 
Change-Id: I0c94a8fabf85c5acb6195aae9f87d3d6ca5dadb8
 2011-04-01 15:20:41 -07:00
Scott Main
0e3df2b9f9 docs: update homepage announcement for Google IO 
Change-Id: I0421f1ae8731fdeb96145ebd82df1298389a5af5
 2011-04-01 15:04:24 -07:00
Wink Saville
44ff718f62 Data Retry fix after failure due to permanent causes. 
Change-Id: I86d5a2dc9394dac93c4350159f4d99cf19aedec9
 2011-04-01 14:45:49 -07:00
Mike Lockwood
43707a83ec UsbManager: minor Javadoc tweak 
Change-Id: I44efc54cd2a0991465aabe0ecea1b8a3291014c2
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-04-01 17:28:45 -04:00
Robert Greenwalt
92d72ca01b Fix bad merge. 
Add host route for a default gateway before adding the default route.
Also fixing bug were "already active" condtion of APN failed to
propagate the default gateway info, resulting in a loss of that address.

bug:4175328
Change-Id: I38f9d108693382a43e6605d56ca3963adf4eb6f4
 2011-04-01 14:11:30 -07:00
Jason parks
78a9766be2 Merge "Implement teardown script." into gingerbread 2011-04-01 13:11:06 -07:00
Jason parks
ab8f48c2ee Implement teardown script. 
Change-Id: I1a3feda3b1007b08fcaa24c3f8dd21abf1efd885
 2011-04-01 14:41:18 -05:00
Jeff Hamilton
84d340781b Make the NFC UID forward compatible. 
Change-Id: I67316ee7906c29ba11ca7c8eb36ca1b736fe59b1
 2011-04-01 13:43:28 -05:00
Mike Lockwood
1c56976a77 am 38f04c0f: am 11dd5ae9: Improve Javadoc for USB Manager and MTP/PTP support. 
* commit '38f04c0f28fc59bc7e893ca6a1ffc4d0745ab8c2':
  Improve Javadoc for USB Manager and MTP/PTP support.
 2011-04-01 11:37:05 -07:00
Mike Lockwood
38f04c0f28 am 11dd5ae9: Improve Javadoc for USB Manager and MTP/PTP support. 
* commit '11dd5ae97b1cd5889bb66862fd12718da62a9c75':
  Improve Javadoc for USB Manager and MTP/PTP support.
 2011-04-01 11:34:39 -07:00
Mike Lockwood
11dd5ae97b Improve Javadoc for USB Manager and MTP/PTP support. 
Bug: 4091519

Change-Id: Ida79593d5a984f7ffd0934ae7bded23b8faf9eef
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-04-01 14:11:50 -04:00