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

48713 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
e4cafabbcc am a90eb8fe: docs: fix the TOC in a few docs 
* commit 'a90eb8fec1c67177b614b945bcc4a4b14aaabaff':
  docs: fix the TOC in a few docs
 2011-04-05 14:21:36 -07:00
Fabrice Di Meglio
1de9e7a9df Code refactoring for TextLayoutCache 
- rename TextLayoutCache entry name
- update references to old name
- better variable names in TextLayoutCache::getRunAdvances()

Change-Id: I5173fbc8af79437ce4786084580426f130120ce8
 2011-04-05 14:13:22 -07:00
Scott Main
a90eb8fec1 docs: fix the TOC in a few docs 
Change-Id: Iff2b91701ba39e17cc0d88804f3eb3f658e13c27
 2011-04-05 14:05:03 -07:00
Mike LeBeau
c95c3a3fc7 Merge "Add EXTRA_ORIGIN to RecognizerIntent." 2011-04-05 14:03:55 -07:00
Mike LeBeau
216ce0f16e Add EXTRA_ORIGIN to RecognizerIntent. 
This is for passing the http referer of a request, e.g., for speech
input from within a browser.

Bug: 4161306
Change-Id: I56fdb7466edd985aab6df8364be1f1619a11a00d
 2011-04-05 16:38:24 -04:00
Mike Lockwood
b83dee77e2 Merge "MTP and media provider support for multiple storage devices:" 2011-04-05 13:36:49 -07:00
Kenny Root
124198d8ad Merge "Update installd to allow multiuser" 2011-04-05 13:17:02 -07:00
Mike Lockwood
772a3b3106 Merge "MountService: Fix running media scanner at boot." 2011-04-05 12:41:47 -07:00
Mike Lockwood
aefb1ea5b0 Merge "Fix deadlock in MountService" 2011-04-05 12:41:35 -07:00
Eric Laurent
31c91b335e Merge "New fix for issue 4111672: control block flags" 2011-04-05 12:23:28 -07:00
Mike Lockwood
b239b68376 MTP and media provider support for multiple storage devices: 
- MTP support for multiple storage units

- Add storage_id column to media database for MTP storage ID

- Add framework resource for defining mount points and user visible descriptions
for multiple volumes

- Clean up locking in MtpServer JNI code

Change-Id: Iffb66ed156ef5bc80b14228af78fbacee7734360
 2011-04-05 15:19:16 -04:00
Eric Laurent
ae29b7632e New fix for issue 4111672: control block flags 
The first fix (commit 913af0b4) is problematic because it makes threads
in mediaserver process block on the cblk mutex. This is not permitted
as it can cause audio to skip or worse have a malicious application
prevent all audio playback by keeping the mutex locked.

The fix consists in using atomic operations when modifying the control
block flags.

Also fixed audio_track_cblk_t::framesReady() so that it doesn't block
when called from AudioFlinger (only applies when a loop is active).

Change-Id: Ibf0abb562ced3e9f64118afdd5036854bb959428
 2011-04-05 12:05:41 -07:00
Adam Powell
67ed4f547e am 2e68ec1b: am 2bb59637: am 030b38ff: Merge "Fix bug 4207704 - Gestures can be lost when Flash is enabled" into honeycomb-mr1 
* commit '2e68ec1bc6e9ab57cd884d32b08dbb389189e7a4':
  Fix bug 4207704 - Gestures can be lost when Flash is enabled
 2011-04-05 11:30:52 -07:00
Mike LeBeau
0cd9cb1827 Merge "Support speech recognizer confidence values." 2011-04-05 11:27:55 -07:00
Adam Powell
2e68ec1bc6 am 2bb59637: am 030b38ff: Merge "Fix bug 4207704 - Gestures can be lost when Flash is enabled" into honeycomb-mr1 
* commit '2bb59637caa71d7e05f7c94d3da425fbfd425ea7':
  Fix bug 4207704 - Gestures can be lost when Flash is enabled
 2011-04-05 11:27:23 -07:00
Eric Fischer
9f3c6160e4 Merge "Import revised translations." 2011-04-05 11:18:57 -07:00
Adam Powell
2bb59637ca am 030b38ff: Merge "Fix bug 4207704 - Gestures can be lost when Flash is enabled" into honeycomb-mr1 
* commit '030b38ffc21ef3962b31d5bac5170531293b6046':
  Fix bug 4207704 - Gestures can be lost when Flash is enabled
 2011-04-05 11:14:27 -07:00
Kenny Root
86c9584559 Update installd to allow multiuser 
* Add ability to select different personas to generate the path to be
  created.

* Move hardcoded paths to read from init's set environment.

* Add unit tests for all the utility functions that build strings to
  make sure they're correct.

* Fill in persona with "0" all the time now. Will be plumbed through in
  later CL.

Change-Id: I0a7f6e3640cb6b052f8823080886ee79e90b679f
 2011-04-05 10:45:35 -07:00
Adam Powell
030b38ffc2 Merge "Fix bug 4207704 - Gestures can be lost when Flash is enabled" into honeycomb-mr1 2011-04-05 10:45:25 -07:00
Eric Laurent
d8cbd16659 am 7a492a9a: am b7a76e84: am a482d83c: Merge "Issue 4157048: mic gain for VoIP/SIP calls." into gingerbread 
* commit '7a492a9ad42947a3a7b777b0eb6eec56f5bb942b':
  Issue 4157048: mic gain for VoIP/SIP calls.
 2011-04-05 10:27:06 -07:00
Mike Lockwood
a88990cf5b am 824c6edc: (-s ours) am 179122ad: (-s ours) am a8731e1e: Merge "DO NOT MERGE: UsbService: Make USB disconnect handling for accessory mode more robust" into gingerbread 
* commit '824c6edce8f79aac9c98caabd9b8857d4c580629':
  DO NOT MERGE: UsbService: Make USB disconnect handling for accessory mode more robust
 2011-04-05 10:27:03 -07:00
Trevor Johns
385539c7d5 am fa6b7889: am ea477d20: am cafbe87d: Merge "Fixing line in Market IAB docs that explains how to bind to the MarketService." into gingerbread 
* commit 'fa6b78890b17f6df2175b143783174ab5e7f7758':
  Fixing line in Market IAB docs that explains how to bind to the MarketService.
 2011-04-05 10:27:01 -07:00
Simon Wilson
52a5880fc4 am 442bf4cd: (-s ours) am d7a8e845: (-s ours) am ec944728: Merge "DO NOT MERGE Disable WiMAX when "Data Enabled" is off" into gingerbread 
* commit '442bf4cd1efb24ea29fcc3b6b4d54f89f3a1dc7a':
  DO NOT MERGE Disable WiMAX when "Data Enabled" is off
 2011-04-05 10:26:54 -07:00
Mike LeBeau
bb7cf916b2 Support speech recognizer confidence values. 
Pass speech recognizer confidence values in the SpeechRecognizer and
RecognizerIntent APIs through to the caller. This change defines new
API constants for keys to these values.

The corresponding change is being made to Google Voice Search, and should be
made to any other implementations.

Bug: 3267513
Bug: 4163206

Change-Id: I294553f2eb9eb3be21298b8434117c8c5309558d
 2011-04-05 10:54:18 -04:00
Mike Lockwood
80e0a416a6 MountService: Fix running media scanner at boot. 
Change-Id: Ibd1111b7ec6380011cd10a56f11f891f2e16abc2
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-04-05 10:22:25 -04:00
Mike Lockwood
84338c4559 Fix deadlock in MountService 
It is not safe to call into vold with a lock held on mVolumeStates
since we will receive events back from vold on a different thread.
So in the boot completed handler we make a copy of the volume list and
then call vold to mount volumes after releasing the lock

Change-Id: I0dee91f09e4056132aaaf0fb0a663148c65db1e4
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-04-05 10:07:53 -04:00
Adam Powell
3c534772de Fix bug 4207704 - Gestures can be lost when Flash is enabled 
Pre-queue WebView touch events as we send them to webkit so that we
can run them through WebView later if webkit or hosted plugins go out
to lunch.

Change-Id: Id4e9f56beeb0c1d55e77233423844b15f6f00aef
 2011-04-04 22:06:50 -07:00
Mathias Agopian
fb96b5ece3 Remove unused references to ISurface 
Change-Id: I542806b5c91c525ed7cde821f6963f1e020ddf1a
 2011-04-04 21:09:55 -07:00
Eric Laurent
7a492a9ad4 am b7a76e84: am a482d83c: Merge "Issue 4157048: mic gain for VoIP/SIP calls." into gingerbread 
* commit 'b7a76e84fde7fe534d46aaaa71e3224798354009':
  Issue 4157048: mic gain for VoIP/SIP calls.
 2011-04-04 17:44:50 -07:00
Mike Lockwood
824c6edce8 am 179122ad: (-s ours) am a8731e1e: Merge "DO NOT MERGE: UsbService: Make USB disconnect handling for accessory mode more robust" into gingerbread 
* commit '179122ad56f12bd802fd29fe0b6606dd23ec5ba9':
  DO NOT MERGE: UsbService: Make USB disconnect handling for accessory mode more robust
 2011-04-04 17:44:46 -07:00
Trevor Johns
fa6b78890b am ea477d20: am cafbe87d: Merge "Fixing line in Market IAB docs that explains how to bind to the MarketService." into gingerbread 
* commit 'ea477d2043eeb8c20435f17b139bd5dd1248d763':
  Fixing line in Market IAB docs that explains how to bind to the MarketService.
 2011-04-04 17:44:42 -07:00
Simon Wilson
442bf4cd1e am d7a8e845: (-s ours) am ec944728: Merge "DO NOT MERGE Disable WiMAX when "Data Enabled" is off" into gingerbread 
* commit 'd7a8e8453d8302ac9820af49b4b112468efdf36d':
  DO NOT MERGE Disable WiMAX when "Data Enabled" is off
 2011-04-04 17:44:38 -07:00
Christopher Tate
42bc0e946f Merge "Fix deadlock in BackupManagerService" 2011-04-04 17:41:22 -07:00
Mike Lockwood
cace13d72a Merge "StorageManager: Add getVolumeList() and getVolumeState() methods" 2011-04-04 17:39:21 -07:00
Mike Lockwood
47c5581ada Merge "MountService: Add support for multiple volumes" 2011-04-04 17:39:15 -07:00
Bill Gruber
50c697e591 am 0ac3183c: am f0d2c1c4: am 63ac0379: am d36bc32e: Merge "SDK doc updates" into honeycomb 
* commit '0ac3183c6489120fa84df9e289b2db31fb49c842':
  SDK doc updates
 2011-04-04 17:37:46 -07:00
Bill Gruber
0ac3183c64 am f0d2c1c4: am 63ac0379: am d36bc32e: Merge "SDK doc updates" into honeycomb 
* commit 'f0d2c1c4eb613130e34a4f377d8f82f935170873':
  SDK doc updates
 2011-04-04 17:35:34 -07:00
Bill Gruber
f0d2c1c4eb am 63ac0379: am d36bc32e: Merge "SDK doc updates" into honeycomb 
* commit '63ac03794df9ca383416c3a782812b9a9c03456d':
  SDK doc updates
 2011-04-04 17:31:23 -07:00
Eric Fischer
50a8be6c8a Import revised translations. 
Change-Id: I818cbbb1741e083bc105596dba103f2ee0c0582a
 2011-04-04 17:29:34 -07:00
Bill Gruber
63ac03794d am d36bc32e: Merge "SDK doc updates" into honeycomb 
* commit 'd36bc32ea9a109596308a0516b3e0898c82cebc5':
  SDK doc updates
 2011-04-04 17:21:25 -07:00
Bill Gruber
d36bc32ea9 Merge "SDK doc updates" into honeycomb 2011-04-04 17:15:08 -07:00
Jason Sams
48f505657a Seperate GL from RS program store. 
Change-Id: I0eae9c0699845af8e8611b065e70738cc9f2b15c
 2011-04-04 17:09:37 -07:00
Christopher Tate
4559764e9f Fix deadlock in BackupManagerService 
Lock ordering bug.  The fix is to avoid having to hold both locks
simultaneously in one prong of the deadlock.  (Further strengthening:
the code path for potentially acquiring both simultaneously now
begins at a common method, ensuring that lock ordering is always
consistent.)

Change-Id: If9433aff8326fec2ba0e97e96ad2d835b01e2cda
 2011-04-04 16:59:21 -07:00
Bill Gruber
604917b339 SDK doc updates 
Change-Id: Iaf24235cf40a4e22a4c8ee787f0b18ce8f5cb61e
 2011-04-04 16:55:53 -07:00
Eric Fischer
9f4ef02aef am 2e715df8: (-s ours) am d20023ae: (-s ours) am 8b312c6c: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
* commit '2e715df8d4a568d3a6d7e2ee569ab1331dcafaa7':
  Import revised translations.  DO NOT MERGE
 2011-04-04 16:46:38 -07:00
Jason parks
c5a229665d am 5ee250aa: am 1d733625: am cca2f2f9: Merge "Send out a broadcast that the system is being factory reset." into gingerbread 
* commit '5ee250aa744720c90b264966f9721cfb9d256e96':
  Send out a broadcast that the system is being factory reset.
 2011-04-04 16:46:34 -07:00
Justin Ho
77a1d4ae01 am d95fa2ff: am 0f5e36de: am 87805ca3: Updated CDMA roaming icons 
* commit 'd95fa2ff8cf7cc302dab5de0f1becf67bd298898':
  Updated CDMA roaming icons
 2011-04-04 16:46:31 -07:00
Jean-Baptiste Queru
70d81b3ab6 am e2fbd0a9: am 0c61e105: am bef31431: No-op - reconcile with open-source gingerbread 
* commit 'e2fbd0a9b03956dbb7d787ed435b895cfc735780':
 2011-04-04 16:46:29 -07:00
Robert Greenwalt
b6c5d824c0 am e716a551: resolved conflicts for merge of ab2194aa to honeycomb-plus-aosp 
* commit 'e716a5515bfb9d9f1f8a5b87fee8b75bef3a1a96':
  Only leave one default network up at a time.
 2011-04-04 16:44:25 -07:00
Eric Fischer
2e715df8d4 am d20023ae: (-s ours) am 8b312c6c: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
* commit 'd20023ae44e611b104b58bc23aae6a42b219a503':
  Import revised translations.  DO NOT MERGE
 2011-04-04 16:43:48 -07:00