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

5521 Commits

Author SHA1 Message Date
Mike Lockwood
20c3561284 am 10fbba21: DO NOT MERGE MountService: Fix running media scanner at boot. 
* commit '10fbba21e4827a1582d97aa99e4e8d772ce04920':
  DO NOT MERGE MountService: Fix running media scanner at boot.
 2011-05-04 08:57:19 -07:00
Mike Lockwood
2572051c4f am 0aa5d7b7: DO NOT MERGE Fix deadlock in MountService 
* commit '0aa5d7b7f225236ac8461d0b6835b9c6152a2699':
  DO NOT MERGE Fix deadlock in MountService
 2011-05-04 08:57:12 -07:00
Mike Lockwood
a2a8419db8 am e3b498be: DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methods 
* commit 'e3b498be0ae05367e9b84f4fac2ac5cf57a6b091':
  DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methods
 2011-05-04 08:57:07 -07:00
Mike Lockwood
60c768d412 am 346a2d79: DO NOT MERGE MountService: Add support for multiple volumes 
* commit '346a2d79ecd627e38bc7fc6874fb627995b8bc12':
  DO NOT MERGE MountService: Add support for multiple volumes
 2011-05-04 08:56:55 -07:00
Mike Lockwood
10fbba21e4 DO NOT MERGE MountService: Fix running media scanner at boot. 
Change-Id: Ia56573023f21fa067a14e7d3ac5a6dbd51ecc8a7
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-05-04 10:41:19 -04:00
Mike Lockwood
0aa5d7b7f2 DO NOT MERGE 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: Iaadfb1b8be5567c8e228a8fbc69d4d483c8dc987
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-05-04 10:41:19 -04:00
Mike Lockwood
e3b498be0a DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methods 
Change-Id: I8ba7e56797b0106dafaa6388393e5c629f27e6e6
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-05-04 10:41:19 -04:00
Mike Lockwood
346a2d79ec DO NOT MERGE MountService: Add support for multiple volumes 
Change-Id: I18527e78a1c04023ae7bc0f269eaac082eb48d7f
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-05-04 10:41:19 -04:00
Dan Morrill
e21f376434 am 75c66458: am 8325c3a8: Backporting I57c58c4083bd59f45095c184d6ca5a302f79ff6e to HC-MR1. New change since file was renamed, making cherry-pick impossible. 
* commit '75c664582c5ce5d94826f37cb725b447a4d62c50':
  Backporting I57c58c4083bd59f45095c184d6ca5a302f79ff6e to HC-MR1. New change since file was renamed, making cherry-pick impossible.
 2011-05-03 12:46:20 -07:00
Dan Morrill
75c664582c am 8325c3a8: Backporting I57c58c4083bd59f45095c184d6ca5a302f79ff6e to HC-MR1. New change since file was renamed, making cherry-pick impossible. 
* commit '8325c3a89197e47cfc2eeb4117c927fb8cb91630':
  Backporting I57c58c4083bd59f45095c184d6ca5a302f79ff6e to HC-MR1. New change since file was renamed, making cherry-pick impossible.
 2011-05-03 12:26:16 -07:00
Dan Morrill
8325c3a891 Backporting I57c58c4083bd59f45095c184d6ca5a302f79ff6e to HC-MR1. New change 
since file was renamed, making cherry-pick impossible.

Change-Id: Idc802af57fb9926a69ed52d4e776ef57d8b647c6
 2011-05-02 14:06:06 -07:00
Robert Greenwalt
db46fa25be am a47c4019: Merge "Add RouteInfo objects for tracking routes." into honeycomb-LTE 
* commit 'a47c40193fcbe9ca07facea78b2828afdae5e025':
  Add RouteInfo objects for tracking routes.
 2011-05-02 13:29:22 -07:00
Robert Greenwalt
aa70f101e0 Add RouteInfo objects for tracking routes. 
Used to have list of gateways for default routes, but general static routes
should be supported.

Change-Id: I01730142c6139f2b833b9d48f5381d2d320b69f6
 2011-05-02 11:17:30 -07:00
Conley Owens
08acaec6df am a47c0d29: am 58e4a5e2: Merge "Fixed to draw texture when loadTexture() is called at first time" 
* commit 'a47c0d29bec7c242fb8d5ffe206c4c6ff85a178a':
  Fixed to draw texture when loadTexture() is called at first time
 2011-04-29 17:15:35 -07:00
Conley Owens
92618f5fd9 am 52749c0b: am 03daee63: Merge "frameworks/base: acquire lock on am only when needed" 
* commit '52749c0b1117a05a9c853b7d54f69a281f69cf3c':
  frameworks/base: acquire lock on am only when needed
 2011-04-29 16:44:20 -07:00
Conley Owens
58e4a5e209 Merge "Fixed to draw texture when loadTexture() is called at first time" 2011-04-29 10:00:12 -07:00
Conley Owens
7ae9f08a17 Merge "Fixed to call computeVisibleRegions() when transparent value changed" 2011-04-29 09:59:30 -07:00
Conley Owens
03daee6380 Merge "frameworks/base: acquire lock on am only when needed" 2011-04-29 09:59:22 -07:00
Conley Owens
a6590e7fee am 13b21e60: Merge "Auto hide virtual keyboard" 
* commit '13b21e608e47382cb94a0aeac13b24ac97f355d2':
  Auto hide virtual keyboard
 2011-04-27 13:53:46 -07:00
Conley Owens
ba5aebd106 am ac505b86: am f0556bb9: am 86d1d747: Merge "Add lock before calling initEglImage" 
* commit 'ac505b86b45462d9883f9c36fad0ef85e0885ee4':
  Add lock before calling initEglImage
 2011-04-27 13:41:12 -07:00
Conley Owens
13b21e608e Merge "Auto hide virtual keyboard" 2011-04-27 13:20:16 -07:00
Conley Owens
f0556bb90f am 86d1d747: Merge "Add lock before calling initEglImage" 
* commit '86d1d74762e65b6f64c2d4758aa5fd4af6275696':
  Add lock before calling initEglImage
 2011-04-27 12:43:19 -07:00
Conley Owens
86d1d74762 Merge "Add lock before calling initEglImage" 2011-04-27 12:28:05 -07:00
Eric Laurent
48dca4de70 am 969357e3: am 223995dc: Fix issue 4335692: HDMI media volume 
* commit '969357e31c93e168e7a4cb3b41c33a6ec26f4a26':
  Fix issue 4335692: HDMI media volume
 2011-04-26 01:14:07 -07:00
Eric Laurent
969357e31c am 223995dc: Fix issue 4335692: HDMI media volume 
* commit '223995dcf28aca2399258951a59559a7ae318ceb':
  Fix issue 4335692: HDMI media volume
 2011-04-26 00:19:34 -07:00
Eric Laurent
223995dcf2 Fix issue 4335692: HDMI media volume 
Forced music stream volume to max when not muted and output device is HDMI.

Change-Id: Ibd287cea8ae1d3f36fea6651a113bd5cf2dbad13
 2011-04-25 13:34:51 -07:00
Jozef BABJAK
5c14d32d56 Fix for startup NPE. 
Change-Id: I6928939d235faf544a85bb84bba2fa135ddc8e45
 2011-04-19 11:27:30 +02:00
Wink Saville
3767784999 am 64c42cae: Rename HierarchicalStateMachine and HierarchicalState to StateMachine and State. 
* commit '64c42cae4482fe0157e977b8ddd0f2c2436b3f31':
  Rename HierarchicalStateMachine and HierarchicalState to StateMachine and State.
 2011-04-18 15:24:47 -07:00
Wink Saville
64c42cae44 Rename HierarchicalStateMachine and HierarchicalState to StateMachine and State. 
Change-Id: Ib4b33894da75f5f156066092fb145b478e52f7d7
 2011-04-18 14:55:10 -07:00
Kobi Cohen Arazi
8ecc90d00d Add lock before calling initEglImage 
Without that lock, there is a chance of race condition
where while composing a specific index, requestBuf with
the same index can be executed and touch the
same data that is being used in initEglImage.
(e.g. dirty flag in texture)
 2011-04-15 10:38:33 -07:00
Dianne Hackborn
07a630d23e am 9a03a73a: am f6f87c98: Merge "Fix issue #4291805: Tap Fish crashes on launch" into honeycomb-mr1 
* commit '9a03a73a44c69706fe2b97a28632928f58b434b1':
  Fix issue #4291805: Tap Fish crashes on launch
 2011-04-14 15:40:00 -07:00
Dianne Hackborn
9a03a73a44 am f6f87c98: Merge "Fix issue #4291805: Tap Fish crashes on launch" into honeycomb-mr1 
* commit 'f6f87c985989603139b31df663f9f9a90543cacc':
  Fix issue #4291805: Tap Fish crashes on launch
 2011-04-14 15:27:32 -07:00
Dianne Hackborn
f6f87c9859 Merge "Fix issue #4291805: Tap Fish crashes on launch" into honeycomb-mr1 2011-04-14 15:10:31 -07:00
Dianne Hackborn
52b0ce0fe3 Fix issue #4291805: Tap Fish crashes on launch 
The activity manager got a little too aggressive about argument validation.

Change-Id: I3cca0cd3135b98e5c50d26db778ec4ec28a47ec1
 2011-04-14 13:09:32 -07:00
Mattias Petersson
44ad61c3a5 Auto hide virtual keyboard 
Sometimes the virtual keyboard was not hidden when switching between
applications. An example of this was when launching the browser from
the Google Search widget:
1) Tap the Google Search widget and enter some text, e.g. "google"
2) Select one search items, e.g. "google maps"
3) Browser opens. Press back button.
4) Select an item again, e.g. "google maps" - Keyboard does not
   close.

When switching application, the virtual keyboard needs to find a new
Z position (window index) among the other windows. Normally it is
placed on top of the first window that is visible and can get focus
(canBeImeTarget()).

With a new application being launched, there is
an exception: a special "starting window" is placed on top of the
Activity window while the application is starting up. Since this
window should not get input, we need to look below that window.
When doing this, the previous implementation assumed that the
first window below always was focusable. If it wasn't, the
input method was placed above the "starting window", which
caused confusion that led to the keyboard not being closed
automatically.

In the case of the Browser, it sometimes has a "fake TitleBar"
window that can not get focus and that is placed above the
Activity window.

With this fix, we now keep looking through the windows below
the "starting window" until we find a window that can receive
input.

Change-Id: I1117846eb0f57603e64329bd955e28182f98f226
 2011-04-13 15:09:16 +02:00
Benoit Goby
316594715d am 2869d171: resolved conflicts for merge of 08c39c6a to honeycomb-LTE 
* commit '2869d1715d815ef2b357bf182d384515cdf6f9ab':
  Add support for USB Ethernet adapters
 2011-04-11 18:53:57 -07:00
Benoit Goby
2869d1715d resolved conflicts for merge of 08c39c6a to honeycomb-LTE 
Change-Id: I79f8ac1dc8ff9f5d0559d37043b850cd26246b92
 2011-04-11 18:41:23 -07:00
Brad Fitzpatrick
07c25b6512 am 4430670f: am ca7ad44a: Merge "audioflinger: Enable ARMv5TE optimized resampler" 
* commit '4430670f48f75661293371dab8db55865f5f56e0':
  audioflinger: Enable ARMv5TE optimized resampler
 2011-04-11 17:27:12 -07:00
Benoit Goby
08c39c6a11 Add support for USB Ethernet adapters 
Change-Id: I6ae34a32d0e1b6f21c484b8639c3e7ce086e568d
 2011-04-11 16:33:43 -07:00
Wink Saville
de1b950d2b am 9e7a5a1e: Merge "ConnectivityService needs to use the new names for the NetConfig vars." into honeycomb-LTE 
* commit '9e7a5a1e567a0e696d9a7b68fffd00b7408e6ac1':
  ConnectivityService needs to use the new names for the NetConfig vars.
 2011-04-07 14:29:17 -07:00
Wink Saville
975c8488a3 ConnectivityService needs to use the new names for the NetConfig vars. 
Change-Id: I809a624057462871cd1849051286c2bffd5099e9
 2011-04-07 14:23:45 -07:00
Robert Greenwalt
f4a29403ae resolved conflicts for merge of 70c3d1c2 to honeycomb-plus-aosp 
Change-Id: I0962138f6ecb1ed54fda25524d8850b086f13c4f
 2011-04-07 14:13:52 -07:00
Robert Greenwalt
d55a6b498d Add external dependency API. 
An APN will not be connected to if some external dependency is not met.

bug:3486704
Change-Id: I7d94df343b260013efd11faa978deb13f07f1389
 2011-04-07 12:28:37 -07:00
Brad Fitzpatrick
4430670f48 am ca7ad44a: Merge "audioflinger: Enable ARMv5TE optimized resampler" 
* commit 'ca7ad44a8b6764b5935143bfe55700cbddb0d990':
  audioflinger: Enable ARMv5TE optimized resampler
 2011-04-07 09:08:58 -07:00
Jim Huang
592a6d9768 audioflinger: Enable ARMv5TE optimized resampler 
Previously, the optimized asm option is only enabled when
__ARM_ARCH_5E__ is defined, which is assigned in armv5te.mk
rather than armv7-a series targets.  This patch checks the ARM CPU
feature about half-word multiply instructions to enable ARMv5TE
resampler optimization routines properly.

Change-Id: I4c5a5d8c932416f23bedb0b389db958349f21ea4
 2011-04-07 21:08:39 +08:00
Ichitaro Kohara
222c221a1a Fixed to draw texture when loadTexture() is called at first time 
SW renderer of Stagefright reaches loadTexture() to draw image.
The first time loadTexture() is called, it just initializes OGL
texture, then returns. Thus, the first time call doesn't draw.
This patch fixes to move on to draw stage after the initialization.

Change-Id: I3ec1ad68fb8d376a4ad7aefded1c18a002d175c4
 2011-04-05 08:58:44 +02:00
Robert Greenwalt
e716a5515b resolved conflicts for merge of ab2194aa to honeycomb-plus-aosp 
Change-Id: I99a29f920336b00b26b9aadafd2bd835049f48cf
 2011-04-04 16:26:42 -07:00
Brad Fitzpatrick
8f7aad147d am f7a34b15: am e558a000: Merge "Avoid crash in system server when mounting container" 
* commit 'f7a34b15986f8c00bc6fb941a40f9acbe2c21aff':
  Avoid crash in system server when mounting container
 2011-04-04 15:25:21 -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
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