Commit Graph

16638 Commits

Author SHA1 Message Date
The Android Open Source Project
6b1586c563 am 2533a6ad: set up fast-forward from froyo-release to gingerbread
Merge commit '2533a6ad3f378db5f160546d10345730f68d676c' into gingerbread-plus-aosp

* commit '2533a6ad3f378db5f160546d10345730f68d676c': (22 commits)
  Properly note the current active restore set's token
  Do not log AT command traffic by default.
  Work on issue # 2778549: Idle FRF72 is awake 18 mins more than ERE27 in 13hr test
  TimedEventQueue is apparently important for glitch-free media playback, and so
  As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files
  When filling the cache, we always time out waiting for a condition that won't occur.
  Respond to changes in throttle policy.
  Fix Tethering of multiple downstream ifaces.
  Update Framework to support multiple dhpc ranges
  Dumb late-night typo.
  Use ViewRoot.addConfigCallback instead of a BroadcastReceiver.
  Clean up changing AP configuration
  Grant permissions to apps on sd when enabling/disabling packages.
  Fix issue #2512507: Shortcuts and Widgets lost on upgrading from Eclair to FRE70D
  Switch default install location to unspecified.
  Fix problem with calling onConfigurationChanged() too much.
  Preserve widgets on upgrade.
  Need to keep new package's cert when using original-package.
  Pick up default install location
  Fix 2463886: Allow delayed fetching of DevicePolicyManager in LockPatternUtils.
  ...
2010-06-29 14:38:47 -07:00
The Android Open Source Project
e34537b3c6 set up fast-forward from froyo-release to gingerbread
Change-Id: I22fc9465f5d8a0144b31803f431602fe3bda516a
2010-06-29 14:34:35 -07:00
Daniel Sandler
ea45e4bb89 am 5d7f6e61: Merge "Support for tapping on an immersive-mode priority notification." into gingerbread
Merge commit '5d7f6e614e7ead1fbe40a6886f78c31809bcbd40' into gingerbread-plus-aosp

* commit '5d7f6e614e7ead1fbe40a6886f78c31809bcbd40':
  Support for tapping on an immersive-mode priority notification.
2010-06-29 12:30:35 -07:00
Daniel Sandler
0c9c6f85b0 Merge "Support for tapping on an immersive-mode priority notification." into gingerbread 2010-06-29 12:28:07 -07:00
Dianne Hackborn
67946c92ee am 0934fbb6: Merge "Update native activity & event APIs to follow correct conventions." into gingerbread
Merge commit '0934fbb6b81006fdf6a76b6519201d2f472a1908' into gingerbread-plus-aosp

* commit '0934fbb6b81006fdf6a76b6519201d2f472a1908':
  Update native activity & event APIs to follow correct conventions.
2010-06-29 12:18:58 -07:00
Dianne Hackborn
78676fdee8 Merge "Update native activity & event APIs to follow correct conventions." into gingerbread 2010-06-29 12:17:20 -07:00
Andreas Huber
518cf72beb am fd751426: Merge "Add qcom\'s new OMX components to the list." into gingerbread
Merge commit 'fd751426ee05243dc8c29b90ac248fa3df8911a5' into gingerbread-plus-aosp

* commit 'fd751426ee05243dc8c29b90ac248fa3df8911a5':
  Add qcom's new OMX components to the list.
2010-06-29 11:48:57 -07:00
Andreas Huber
f79d3b8539 Merge "Add qcom's new OMX components to the list." into gingerbread 2010-06-29 11:45:39 -07:00
Xia Wang
0f0bc251cb am 120a58fb: Extend unit test framework for Wifi soft AP configuration Add test case: testApSsidWithAlphabet
Merge commit '120a58fb80ec9ba5b62e4b7453ea45703d1ce58a' into gingerbread-plus-aosp

* commit '120a58fb80ec9ba5b62e4b7453ea45703d1ce58a':
  Extend unit test framework for Wifi soft AP configuration
2010-06-29 11:32:09 -07:00
Dianne Hackborn
9c7f8186ae Update native activity & event APIs to follow correct conventions.
Change-Id: Ie64fb3a9c68bc9c117fa5621b75d1f609e304e0e
2010-06-29 10:43:54 -07:00
Mike Lockwood
84a5de824f am 059f009d: Make android.hardware.action.USB_STATE a protected broadcast.
Merge commit '059f009d970fb37ac4e408dcf8e1d2d2cdcf0a84' into gingerbread-plus-aosp

* commit '059f009d970fb37ac4e408dcf8e1d2d2cdcf0a84':
  Make android.hardware.action.USB_STATE a protected broadcast.
2010-06-29 09:17:36 -07:00
Joe Onorato
e802bddfa1 am 1c95ecb4: recombine StatusBarService and PhoneStatusBarService
Merge commit '1c95ecb47a19e18d0c51f3fd2931d13e9bd845b9' into gingerbread-plus-aosp

* commit '1c95ecb47a19e18d0c51f3fd2931d13e9bd845b9':
  recombine StatusBarService and PhoneStatusBarService
2010-06-29 08:04:13 -07:00
Joe Onorato
3ad5690c3f am b54ef614: Separate the status bar height from the icon size.
Merge commit 'b54ef61434eb82a53d8c840d86d1d656215604f9' into gingerbread-plus-aosp

* commit 'b54ef61434eb82a53d8c840d86d1d656215604f9':
  Separate the status bar height from the icon size.
2010-06-29 08:02:10 -07:00
Mike Lockwood
8cc3228f37 am de6bd120: Merge "Notifications: Use new ACTION_USB_STATE broadcast to monitor USB connected state" into gingerbread
Merge commit 'de6bd120c97bb7986a6bac3889288f77bca63288' into gingerbread-plus-aosp

* commit 'de6bd120c97bb7986a6bac3889288f77bca63288':
  Notifications: Use new ACTION_USB_STATE broadcast to monitor USB connected state
2010-06-29 05:27:11 -07:00
Mike Lockwood
65a6cf7626 am 606d591a: Merge "Add new Usb.ACTION_USB_STATE sticky broadcast for monitoring USB connect state" into gingerbread
Merge commit '606d591afee24e31e3885a7330638893db1710f5' into gingerbread-plus-aosp

* commit '606d591afee24e31e3885a7330638893db1710f5':
  Add new Usb.ACTION_USB_STATE sticky broadcast for monitoring USB connect state
2010-06-29 05:27:08 -07:00
Mike Lockwood
0c3af05e12 Merge "Notifications: Use new ACTION_USB_STATE broadcast to monitor USB connected state" into gingerbread 2010-06-29 05:24:45 -07:00
Mike Lockwood
24c2ff830d Merge "Add new Usb.ACTION_USB_STATE sticky broadcast for monitoring USB connect state" into gingerbread 2010-06-29 05:24:22 -07:00
Mathias Agopian
2eb4ed53c1 am f0562b4b: Merge changes I93dfc4c8,I781953d6 into gingerbread
Merge commit 'f0562b4b071b74a760ad9c9caa0e41687ae6f407' into gingerbread-plus-aosp

* commit 'f0562b4b071b74a760ad9c9caa0e41687ae6f407':
  fix[2798925] Gingerbread TOT not booting
  Revert "Revert "fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger""
2010-06-28 20:04:23 -07:00
Mathias Agopian
f8e79cc372 Merge changes I93dfc4c8,I781953d6 into gingerbread
* changes:
  fix[2798925] Gingerbread TOT not booting
  Revert "Revert "fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger""
2010-06-28 20:01:58 -07:00
Mathias Agopian
05650aec9f fix[2798925] Gingerbread TOT not booting
Fixed a typo where checking against the wrong constant caused GL_TEXTURE_EXTERNAL_OES
to be used with a regular texture, which some GL driver will choke on.

Change-Id: I93dfc4c8fa674433bbb678eee31954e9a8d0cb4b
2010-06-28 19:54:17 -07:00
Chris Tate
4512638911 am 31e0ffe8: Merge "Native input event dispatching." into gingerbread
Merge commit '31e0ffe8444b70500cac319da084c4c45e62aca2' into gingerbread-plus-aosp

* commit '31e0ffe8444b70500cac319da084c4c45e62aca2':
  Native input event dispatching.
2010-06-28 19:14:18 -07:00
Chris Tate
b14c3e7e93 Merge "Native input event dispatching." into gingerbread 2010-06-28 19:12:55 -07:00
Jeff Brown
50de30a523 Native input event dispatching.
Target identification is now fully native.
Fixed a couple of minor issues related to input injection.
Native input enabled by default, can be disabled by setting
WindowManagerPolicy.ENABLE_NATIVE_INPUT_DISPATCH to false.

Change-Id: I7edf66ed3e987cc9306ad4743ac57a116af452ff
2010-06-28 19:10:54 -07:00
James Dong
7da1562254 am d4760c24: Collect statistical data from authoring engine (second part)
Merge commit 'd4760c243fb129ebda43972c0fadf43a02c9849f' into gingerbread-plus-aosp

* commit 'd4760c243fb129ebda43972c0fadf43a02c9849f':
  Collect statistical data from authoring engine (second part)
2010-06-28 17:28:07 -07:00
James Dong
4644f0fe94 am 2a76b316: Merge "Separate MediaRecorderClient with MediaPlayerClient" into gingerbread
Merge commit '2a76b3163b934e833d2eea8eb5269ae3fdc8a587' into gingerbread-plus-aosp

* commit '2a76b3163b934e833d2eea8eb5269ae3fdc8a587':
  Separate MediaRecorderClient with MediaPlayerClient
2010-06-28 16:25:39 -07:00
James Dong
e1b6c6fe6f Merge "Separate MediaRecorderClient with MediaPlayerClient" into gingerbread 2010-06-28 16:19:40 -07:00
Scott Main
3fb395dc2e am f2b544f5: am 337b0873: docs: update backup guide and bmgr tool elaborate the guide to testing a backup agent and add links between the docs
Merge commit 'f2b544f5ae7676f7ab4cdf3379b2ed3c60a65def' into gingerbread-plus-aosp

* commit 'f2b544f5ae7676f7ab4cdf3379b2ed3c60a65def':
  docs: update backup guide and bmgr tool
2010-06-28 15:34:37 -07:00
Scott Main
a84687252b am 337b0873: docs: update backup guide and bmgr tool elaborate the guide to testing a backup agent and add links between the docs
Merge commit '337b0873f43eac5f23483bec94bd8729f79d47ec' into gingerbread

* commit '337b0873f43eac5f23483bec94bd8729f79d47ec':
  docs: update backup guide and bmgr tool
2010-06-28 15:31:35 -07:00
Scott Main
fe2871079b am 337b0873: docs: update backup guide and bmgr tool elaborate the guide to testing a backup agent and add links between the docs
Merge commit '337b0873f43eac5f23483bec94bd8729f79d47ec' into froyo-plus-aosp

* commit '337b0873f43eac5f23483bec94bd8729f79d47ec':
  docs: update backup guide and bmgr tool
2010-06-28 15:31:11 -07:00
Wei Huang
6598367dd3 am 9c4c98b1: Merge "new presence icons for video/audio chats." into gingerbread
Merge commit '9c4c98b1027bbf0b7652a56a1f5614a028a01d33' into gingerbread-plus-aosp

* commit '9c4c98b1027bbf0b7652a56a1f5614a028a01d33':
  new presence icons for video/audio chats.
2010-06-28 15:08:37 -07:00
Wei Huang
d8b9035a1c Merge "new presence icons for video/audio chats." into gingerbread 2010-06-28 15:05:56 -07:00
Daniel Sandler
7a3b87e0a6 am 5dbd05ed: Intruder alert! (First try at the immersive-mode alert bar.)
Merge commit '5dbd05ed18906be3499978303f2fca4f86211567' into gingerbread-plus-aosp

* commit '5dbd05ed18906be3499978303f2fca4f86211567':
  Intruder alert! (First try at the immersive-mode alert bar.)
2010-06-28 14:22:17 -07:00
Chih-Chung Chang
d57b2a6ce9 am de1057c4: Unhide new API for supporting multiple cameras.
Merge commit 'de1057c4a6aa41c3b88bcc4fd49d70f973f1d9eb' into gingerbread-plus-aosp

* commit 'de1057c4a6aa41c3b88bcc4fd49d70f973f1d9eb':
  Unhide new API for supporting multiple cameras.
2010-06-27 20:49:42 -07:00
Irfan Sheriff
547bd14362 am 9005e7f4: Merge "Add setWifiApConfiguration interface" into gingerbread
Merge commit '9005e7f4297a3f04263e81cb61ba2703d5667b0a' into gingerbread-plus-aosp

* commit '9005e7f4297a3f04263e81cb61ba2703d5667b0a':
  Add setWifiApConfiguration interface
2010-06-25 19:51:50 -07:00
Irfan Sheriff
3b9900423c Merge "Add setWifiApConfiguration interface" into gingerbread 2010-06-25 19:49:58 -07:00
Mathias Agopian
1f7bec634f Revert "Revert "fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger""
This reverts commit 330dd304a471d260a73e342a240921c03c825f99.
2010-06-25 18:02:21 -07:00
James Dong
86b9626a44 am 41debbc6: Merge "Provide progress status report during authoring" into gingerbread
Merge commit '41debbc613ec57aa892f604229df376402942687' into gingerbread-plus-aosp

* commit '41debbc613ec57aa892f604229df376402942687':
  Provide progress status report during authoring
2010-06-25 16:44:09 -07:00
James Dong
48756cddfa Merge "Provide progress status report during authoring" into gingerbread 2010-06-25 16:40:47 -07:00
David Brown
896818e384 am 01719a22: Merge "Placeholder icons for the "ringing" variant of stat_sys_phone_call." into gingerbread
Merge commit '01719a22f9e0e0eadfedcfc17b2deb73c5fb3d6b' into gingerbread-plus-aosp

* commit '01719a22f9e0e0eadfedcfc17b2deb73c5fb3d6b':
  Placeholder icons for the "ringing" variant of stat_sys_phone_call.
2010-06-25 15:59:33 -07:00
David Brown
c536426ec5 Merge "Placeholder icons for the "ringing" variant of stat_sys_phone_call." into gingerbread 2010-06-25 15:54:55 -07:00
Mathias Agopian
767d68e221 am 1cb3fdc9: Merge "Fix a bug in sp<> and wp<> which could cause memory corruptions" into gingerbread
Merge commit '1cb3fdc91e1b82a5afe064714a1b530cc05577a7' into gingerbread-plus-aosp

* commit '1cb3fdc91e1b82a5afe064714a1b530cc05577a7':
  Fix a bug in sp<> and wp<> which could cause memory corruptions
2010-06-25 13:29:54 -07:00
Mathias Agopian
c75c68825d Merge "Fix a bug in sp<> and wp<> which could cause memory corruptions" into gingerbread 2010-06-25 13:28:06 -07:00
Dianne Hackborn
47562cf9cb am 50dc3bca: Refactor ActivityManagerService activity stack.
Merge commit '50dc3bca5afbce911636b3ba15ee953bc203a9d6' into gingerbread-plus-aosp

* commit '50dc3bca5afbce911636b3ba15ee953bc203a9d6':
  Refactor ActivityManagerService activity stack.
2010-06-25 13:14:07 -07:00
Eric Laurent
8500df6989 am 8e103da1: Merge "Various fixes and improvements in audio effects implementation" into gingerbread
Merge commit '8e103da1f1b0656e3427b34b75f02d7ddf6073d5' into gingerbread-plus-aosp

* commit '8e103da1f1b0656e3427b34b75f02d7ddf6073d5':
  Various fixes and improvements in audio effects implementation
2010-06-25 12:38:31 -07:00
Andreas Huber
fdabbe8810 am 330dd304: Revert "fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger"
Merge commit '330dd304a471d260a73e342a240921c03c825f99' into gingerbread-plus-aosp

* commit '330dd304a471d260a73e342a240921c03c825f99':
  Revert "fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger"
2010-06-25 12:36:19 -07:00
Eric Laurent
7ed4797b7b Merge "Various fixes and improvements in audio effects implementation" into gingerbread 2010-06-25 12:35:30 -07:00
Eric Laurent
9bf80f02f7 Various fixes and improvements in audio effects implementation
Effect API:
- Use different definitions for audio device, channels, formats... in AudioSystem and EffectApi:
  Removed media/AudioCommon.h file created for initial version of EffectApi
- Indicate audio session and output ID to effect library when calling EffectCreate(). Session ID can be useful to optimize
the implementation of effect chains in the same audio session. Output ID can be used for effects implemented in audio hardware.
- Renamed EffectQueryNext() function to EffectQueryEffect() and changed operating mode:
  now an index is passed for the queried effect instead of implicitly querying the next one.
- Added CPU load and memory usage indication in effects descriptor
- Added flags and commands to indicate changes in audio mode (ring tone, in call...) to effect engine
- Added flag to indicate hardware accelerated effect implementation.
- Renamed EffectFactoryApi.h to EffectsFactoryApi.h for consistency with EffectsFactory.c/h

Effect libraries:
- Reflected changes in Effect API
- Several fixes in reverb implementation
- Added build option TEST_EFFECT_LIBRARIES in makefile to prepare integration of actual effect library.
- Replaced pointer by integer identifier for library handle returned by effects factory

Audio effect framework:
- Added support for audio session -1 in preparation of output stage effects configuration.
- Reflected changes in Effect API
- Removed volume ramp up/down when effect is inserted/removed: this has to be taken care of by effect engines.
- Added some overflow verification on indexes used for deferred parameter updates via shared memory
- Added hardcoded CPU and memory limit check when creating a new effect instance

Change-Id: I43fee5182ee201384ea3479af6d0acb95092901d
2010-06-25 11:59:35 -07:00
The Android Open Source Project
9af4e06e36 merge from froyo-plus-aosp
Change-Id: I0b5605e2b1c31593dc31abd62e275d0602db46eb
2010-06-25 11:23:56 -07:00
The Android Open Source Project
e1da0d7ca1 merge from froyo-plus-aosp
Change-Id: I8b8714eef0295bd5d731b3a0ef816392b1c51261
2010-06-25 11:22:27 -07:00
The Android Open Source Project
6c9227d821 merge from froyo-plus-aosp
Change-Id: I9bd45d66c9586b99635d7d05d1f351126bfc9840
2010-06-25 11:21:37 -07:00