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

48739 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Roman Nurik
5a41a8a0fd Merge "Document support for .TS video containers." into honeycomb-mr1 2011-04-04 13:41:11 -07:00
Elliott Hughes
763006af3e Merge "You can't fsync(2) /dev/urandom..." 2011-04-04 12:55:58 -07:00
Roman Nurik
c1b34f3d8e Document support for .TS video containers. 
Change-Id: I99a2da97ce2bbb79beb4a7b5847ad3de90a6b7af
 2011-04-04 12:51:18 -07:00
Andreas Huber
dc5ba0451c Merge "This reverts an earlier change 4aeec2da39fce4de9b07b694d59fd308ffb3d491" 2011-04-04 12:45:23 -07:00
Eric Laurent
b7a76e84fd am a482d83c: Merge "Issue 4157048: mic gain for VoIP/SIP calls." into gingerbread 
* commit 'a482d83ccf35ccd6cc29a9e1ace3d77b5f28d013':
  Issue 4157048: mic gain for VoIP/SIP calls.
 2011-04-04 12:25:37 -07:00
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
Elliott Hughes
6907891b1f You can't fsync(2) /dev/urandom... 
...so don't even try. Doing so leads to this:

W/EntropyService( 1586): unable to load initial entropy (first boot?)
W/EntropyService( 1586): java.io.SyncFailedException: fsync failed: EINVAL (Invalid argument)
W/EntropyService( 1586): 	at java.io.FileDescriptor.sync(FileDescriptor.java:73)
W/EntropyService( 1586): 	at java.io.RandomAccessFile.write(RandomAccessFile.java:694)
W/EntropyService( 1586): 	at java.io.RandomAccessFile.write(RandomAccessFile.java:676)
W/EntropyService( 1586): 	at com.android.server.RandomBlock.toDataOut(RandomBlock.java:88)
W/EntropyService( 1586): 	at com.android.server.RandomBlock.toFile(RandomBlock.java:70)
W/EntropyService( 1586): 	at com.android.server.EntropyService.loadInitialEntropy(EntropyService.java:99)
W/EntropyService( 1586): 	at com.android.server.EntropyService.<init>(EntropyService.java:86)
W/EntropyService( 1586): 	at com.android.server.EntropyService.<init>(EntropyService.java:76)
W/EntropyService( 1586): 	at com.android.server.ServerThread.run(SystemServer.java:139)
W/EntropyService( 1586): Caused by: libcore.io.ErrnoException: fsync failed: EINVAL (Invalid argument)
W/EntropyService( 1586): 	at libcore.io.Posix.fsync(Native Method)
W/EntropyService( 1586): 	at libcore.io.BlockGuardOs.fsync(BlockGuardOs.java:39)
W/EntropyService( 1586): 	at java.io.FileDescriptor.sync(FileDescriptor.java:71)
W/EntropyService( 1586): 	... 8 more

Change-Id: I598a9456eccec0ca087f1568d47b6b8e531de8a8
 2011-04-04 12:15:34 -07:00
Adam Cohen
fd125f0c4b Merge "Fixing build" 2011-04-04 12:12:25 -07:00
Adam Cohen
f45f5b2715 Fixing build 
Change-Id: If18012c03265f3fa02d8743d583668d9e0245845
 2011-04-04 12:08:58 -07:00
Andreas Huber
284b831d15 Merge "Avoid a race condition while signaling audio EOS/seek complete by acquiring the lock." 2011-04-04 12:00:20 -07:00
Robert Ly
c474031642 am cbfeda13: am 6f7e4cb5: am 3f39f653: Adding package description for android.hardware.usb 
* commit 'cbfeda13e7da5c1cdf6f02e76d81ac5f878b1225':
  Adding package description for android.hardware.usb
 2011-04-04 11:55:23 -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
Andreas Huber
c6e3b27fa1 This reverts an earlier change 4aeec2da39fce4de9b07b694d59fd308ffb3d491 
Instead of returning 0-filled buffers after EOS from AudioTrack we do this
work in AudioOutput instead. That way the EOS signal (0 frames returned)
is preserved in AudioCache which otherwise would lead to a heap size overflow
filling everything with zeroes.

Change-Id: I7e07429ba887957a4340dd4b21eef4bba76248cd
related-to-bug: 3514073
 2011-04-04 11:43:40 -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
Andreas Huber
8e64c31f6c Avoid a race condition while signaling audio EOS/seek complete by acquiring the lock. 
Change-Id: Idfea452ff661b264e013fe515bcd2a2762bd959c
related-to-bug: 4193552
 2011-04-04 11:29:35 -07:00
Adam Cohen
4b6bf80fad Merge "Making StackView res-out and click feedback colors stylable" 2011-04-04 11:27:07 -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
Gilles Debunne
c5a43594ba IME is no longer shown when an EditText gets focus. 
Change-Id: Ife24f83831f97c911e4e800547182a390cda0d75
 2011-04-04 10:57:47 -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
7f5a026d25 am 9e374cf4: am 826af857: am f9cdf7fe: Doc change: add diff report for API 12. 
* commit '9e374cf4941c18059ce47b5eba9ace08d06f57b0':
  Doc change: add diff report for API 12.
 2011-04-03 14:07:49 -07: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
51b27366be am b079c1f8: am 85709ac8: am 16769201: Merge "Doc change: update media formats tables with adts/aac and flac" into honeycomb-mr1 
* commit 'b079c1f8ee41e714b5273189014a5601598a8b62':
  Doc change: update media formats tables with adts/aac and flac
 2011-04-03 14:01:40 -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
Brian Carlstrom
aedc2a8fcc Merge "Tracking merge of dalvik-dev to master" 2011-04-02 20:39:32 -07:00
Scott Main
d4f4e077ab am e1e46c72: am 342d8fdb: am 90a1befa: am 27690eba: Merge "docs: update device dashboard" into honeycomb 
* commit 'e1e46c7263948f5127f618e905fe5fb3ec0b3437':
  docs: update device dashboard
 2011-04-01 17:45:41 -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