17538 Commits

Author SHA1 Message Date
Dianne Hackborn
ab489cabed Merge "Don't crash when there is no admin." 2010-01-21 16:44:53 -08:00
Mathias Agopian
6e6393c279 Merge changes I2d41cb94,Ia1a17985
* changes:
  fix [2324665] texture leak in surfaceflinger when using camera
  fix a texture leak introduced recently.
2010-01-21 16:37:48 -08:00
Wink Saville
aa6a2aad03 Fix build, incorrect link/see tags.
Change-Id: Ia1c13ddb198721234323f1944ea3537ea6f34820
2010-01-21 16:37:04 -08:00
Mathias Agopian
2d41cb9433 fix [2324665] texture leak in surfaceflinger when using camera 2010-01-21 16:29:34 -08:00
Dianne Hackborn
4141d035c7 Don't crash when there is no admin. 2010-01-21 16:29:00 -08:00
Mathias Agopian
a1a1798599 fix a texture leak introduced recently.
create the texture name once and for all for a given BufferSource
and make sure to recreate it when we're forced to delete the texture.
2010-01-21 16:27:30 -08:00
Doug Zongker
37f3ddb60b Merge "relocate GoogleLoginService" 2010-01-21 16:10:58 -08:00
Kenny Root
3a19833750 Multiple asset adding in one shot for AssetManager
Add a hidden convenience method to allow adding multiple assets
to an AssetManager at once.

Change-Id: I56753a85904a2c8e9a405cba2ea3cb85ec40e1cc
2010-01-21 16:09:40 -08:00
Wink Saville
051ab62334 Merge "Fix build, GsmServiceStateTracker was using old EventLog API." 2010-01-21 15:00:12 -08:00
Jim Miller
11b019d07f Fix 2385283: Use device-specific salt when generating hashes for lock passwords. 2010-01-21 14:53:22 -08:00
Doug Zongker
0a2fb2174e relocate GoogleLoginService
Change-Id: I79f4ff658ab136adcc54c432db76f34d2de5f6ac
2010-01-21 14:36:17 -08:00
Grace Kloba
1b810a5706 am 88196464: (-s ours) am 4d69ac66: Merge "DO NOT MERGE" into eclair
Merge commit '88196464e91dd533f2dd28a02f55b7e4801eead0'

* commit '88196464e91dd533f2dd28a02f55b7e4801eead0':
  DO NOT MERGE
2010-01-21 14:32:01 -08:00
Grace Kloba
15e26dca2b Merge branch 'master' of ssh://android-git.corp.google.com:29418/platform/frameworks/base 2010-01-21 14:31:45 -08:00
Grace Kloba
ee20cbf30a am c8cab725: (-s ours) am d1019a99: Merge "DO NOT MERGE" into eclair
Merge commit 'c8cab72521781091e87049861c4b25fb19197ea4'

* commit 'c8cab72521781091e87049861c4b25fb19197ea4':
  DO NOT MERGE
2010-01-21 14:31:33 -08:00
Xavier Ducrohet
18d21ef83e am 20cc5570: am 79f05bb4: Merge "ADT/Layoutlib: improved gradient drawing for perf." into eclair
Merge commit '20cc55703348827fbd80ff0410777a537f01e10e'

* commit '20cc55703348827fbd80ff0410777a537f01e10e':
  ADT/Layoutlib: improved gradient drawing for perf.
2010-01-21 14:31:11 -08:00
Dianne Hackborn
df83afaf29 More device policy manager / admin work.
Update API with some new features, re-arrange how you check for valid
passwords, and start hooking up the back-end implementation.
2010-01-21 14:30:57 -08:00
Xavier Ducrohet
beb0993c6a am 38fa9eee: am 89d538dc: ADT/Layoutlib: don\'t draw 0-sized rectangle, AWT doesn\'t like that.
Merge commit '38fa9eee9324b2355f28372e80dba12c1d7cc105'

* commit '38fa9eee9324b2355f28372e80dba12c1d7cc105':
  ADT/Layoutlib: don't draw 0-sized rectangle, AWT doesn't like that.
2010-01-21 14:30:48 -08:00
Xavier Ducrohet
900399f3e8 am 895c92a4: am 240298f9: Merge "ADT/Layoutlib: always use custom gradient (java) Paint." into eclair
Merge commit '895c92a44b8bcf0aec7066c061293cafe12a76c2'

* commit '895c92a44b8bcf0aec7066c061293cafe12a76c2':
  ADT/Layoutlib: always use custom gradient (java) Paint.
2010-01-21 14:30:17 -08:00
Roman Nurik
eca7f02f52 am b8c564d0: am 6a739ea8: Merge "Updated developer groups documentation to point to Stack Overflow, also rearranged a few things." into eclair
Merge commit 'b8c564d0fc7b2bdcc794d63f23b21df2540d7cef'

* commit 'b8c564d0fc7b2bdcc794d63f23b21df2540d7cef':
  Updated developer groups documentation to point to Stack Overflow, also rearranged a few things.
2010-01-21 14:29:26 -08:00
Xavier Ducrohet
7fa53aa5df am 31ef2e77: am b847fbf2: Merge "ADT/Layout: support for 3+ color in linear gradients" into eclair
Merge commit '31ef2e77c50485ad6ed410a5d341754d6787b8e1'

* commit '31ef2e77c50485ad6ed410a5d341754d6787b8e1':
  ADT/Layout: support for 3+ color in linear gradients
2010-01-21 14:29:02 -08:00
Wink Saville
ac376f4854 Fix build, GsmServiceStateTracker was using old EventLog API.
Change-Id: Ib202d0ebbbb11c0ccad40445426c0c3704eb30b5
2010-01-21 14:15:05 -08:00
Leon Scroggins
04ce08f34e Merge "Create a common method for updating the title of a download from the filename." 2010-01-21 13:29:32 -08:00
Leon Scroggins
fe79ef44fe Create a common method for updating the title of a download from the filename.
This method will be used by the DownloadProvider and the BrowserDownloadPage.
2010-01-21 16:19:41 -05:00
John Wang
88a195b58a am 7319d94f: am 99f2a4bb: Merge "Add Event log for RAT switch." into eclair
Merge commit '7319d94ff1ca898c36d2da8dd0cd8469d91bc5af'

* commit '7319d94ff1ca898c36d2da8dd0cd8469d91bc5af':
  Add Event log for RAT switch.
2010-01-21 12:47:13 -08:00
Derek Sollenberger
f5831d4303 Removing unused parameter from NP_Initialize. 2010-01-21 15:06:19 -05:00
Justin Mattson
ef340357ce NEW_API: Declare an ACTION_SEARCH_SETTINGS constant in android.provider.Settings so that apps can cause this system setting group to be opened directly.
The Settings app already responds to this action it just was not exposed in the platform API.
2010-01-21 11:40:58 -08:00
Amith Yamasani
2fa6b52c2b Merge "Workaround for a database update callback that claims that the data doesn't exist." 2010-01-21 11:22:01 -08:00
Andreas Huber
48da344cf0 Merge "Fix circular dependency between StagefrightPlayer and AwesomePlayer that prevented proper cleanup." 2010-01-21 10:44:54 -08:00
Andreas Huber
84a93a5674 Merge "Special-case .wmv and .wma metadata retrieval and playback to use PV if available." 2010-01-21 10:44:47 -08:00
Andreas Huber
2cb5c9c633 Special-case .wmv and .wma metadata retrieval and playback to use PV if available.
related-to-bug: 2381874
2010-01-21 10:31:05 -08:00
Vasu Nori
589eb9c5e1 Merge "caching PRAGMA sql statements caused cts-tests failures." 2010-01-21 10:29:22 -08:00
Andreas Huber
a3f4384ce8 Fix circular dependency between StagefrightPlayer and AwesomePlayer that prevented proper cleanup.
related-to-bug: 2355922
2010-01-21 10:28:45 -08:00
Robert Greenwalt
1f2f23bd16 am 9fdf82e0: Merge "Try to switch to another default net on connection failure." into eclair
Merge commit '9fdf82e080ea20086378e751ace245a4a1b022dc' into eclair-plus-aosp

* commit '9fdf82e080ea20086378e751ace245a4a1b022dc':
  Try to switch to another default net on connection failure.
2010-01-21 10:05:13 -08:00
Amith Yamasani
58bb107f2a Workaround for a database update callback that claims that the data doesn't exist.
It's probably some intermediate state when updating the volumes that's causing
the row to be missing.
2010-01-21 09:58:01 -08:00
Robert Greenwalt
9fdf82e080 Merge "Try to switch to another default net on connection failure." into eclair 2010-01-21 09:57:46 -08:00
Derek Sollenberger
72666bac20 am 1f7747ad: am 7cabb03d: Resize the WebView when the soft-keyboard appears in landscape mode.
Merge commit '1f7747adb6a79317f4bd52fb78b3c567dd203883'

* commit '1f7747adb6a79317f4bd52fb78b3c567dd203883':
  Resize the WebView when the soft-keyboard appears in landscape mode.
2010-01-21 08:39:15 -08:00
Derek Sollenberger
1f7747adb6 am 7cabb03d: Resize the WebView when the soft-keyboard appears in landscape mode.
Merge commit '7cabb03da7053f3ceb5ff8b41b6a46052c6658a1' into eclair-mr2-plus-aosp

* commit '7cabb03da7053f3ceb5ff8b41b6a46052c6658a1':
  Resize the WebView when the soft-keyboard appears in landscape mode.
2010-01-21 08:29:33 -08:00
Mike Lockwood
80ffe5d2fe Merge "Implement Notification.DEFAULT_LIGHTS flag." 2010-01-21 08:18:15 -08:00
Irfan Sheriff
d051434773 am dcc14d6a: Merge "Use MCC value to always override channel count setting" into eclair
Merge commit 'dcc14d6a26961a3ba45eaeb7305fdafb2b6694e2' into eclair-plus-aosp

* commit 'dcc14d6a26961a3ba45eaeb7305fdafb2b6694e2':
  Use MCC value to always override channel count setting
2010-01-21 07:52:52 -08:00
Irfan Sheriff
dcc14d6a26 Merge "Use MCC value to always override channel count setting" into eclair 2010-01-21 07:46:49 -08:00
Derek Sollenberger
7cabb03da7 Resize the WebView when the soft-keyboard appears in landscape mode.
The WebView notifies the IME that it wishes to be resized when the
soft-keyboard is displayed. This fixes http://b/2170192.
2010-01-21 10:37:38 -05:00
Grace Kloba
e5b9beae26 am f6aed0e0: Merge "DO NOT MERGE" into eclair
Merge commit 'f6aed0e0a7c96094b66f5426baad78032b794497' into eclair-plus-aosp

* commit 'f6aed0e0a7c96094b66f5426baad78032b794497':
  DO NOT MERGE
2010-01-20 23:34:42 -08:00
Grace Kloba
f6aed0e0a7 Merge "DO NOT MERGE" into eclair 2010-01-20 23:30:05 -08:00
Grace Kloba
5b74576218 am d5ada83c: ScaleGestureDetector needs to query the displaymetrics for the width/height on each touch down as orientation can change.
Merge commit 'd5ada83c719d366d3063572ca6ce5ab8918fd39b' into eclair-plus-aosp

* commit 'd5ada83c719d366d3063572ca6ce5ab8918fd39b':
  ScaleGestureDetector needs to query the displaymetrics
2010-01-20 23:26:03 -08:00
Grace Kloba
d5ada83c71 ScaleGestureDetector needs to query the displaymetrics
for the width/height on each touch down as orientation
can change.

This should fix the problem where we can't pinch on the
top right corner when device is in landscape mode.
2010-01-20 23:06:43 -08:00
Grace Kloba
52cb3cbd6f DO NOT MERGE
Just scale the canvas instead of changing the real
scale factor during pinch.

Added over limit zoom feedback for pinch in the WebView.

Fix http://b/issue?id=2383539
2010-01-20 21:58:27 -08:00
Nick Pelly
425324e97b am e834722f: Merge "Fix failure to open AVRCP input device due to EPERM." into eclair
Merge commit 'e834722f547d13eaa453464502456892c6225e42' into eclair-plus-aosp

* commit 'e834722f547d13eaa453464502456892c6225e42':
  Fix failure to open AVRCP input device due to EPERM.
2010-01-20 20:46:35 -08:00
Nick Pelly
e834722f54 Merge "Fix failure to open AVRCP input device due to EPERM." into eclair 2010-01-20 20:43:54 -08:00
Nick Pelly
e6b1bbd8ac Fix failure to open AVRCP input device due to EPERM.
Sleep for 100us and try to open the input device again if it fails, with a
maximum of 10 attempts.

We need the retry logic because setting permissions on a new input device is
racy. The init process watches for new input device (via uevent) and sets the
permission on them in devices.c:make_device(). However at the same time
EventHub.cpp watches for new input devices from the system_server process, and
immediately tries to open them. I can't see a simple way to avoid this race
condition.

As best as I can tell this race condition has always exisited.
There must have been some timing change that happened recently that causes us
to hit this race condition much more often. See repro notes in referenced bug.

Bug: 2375632
2010-01-20 19:56:24 -08:00
Mike Lockwood
670f93283b Implement Notification.DEFAULT_LIGHTS flag.
This flag was already in the public API but did not do anything until now.
We now use it so we can override the default notification LED color on a per device basis.

Change-Id: I0d6e239b7da2fdbeda9608d6d4de3e778aa88e2c
BUG: 2329568

Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-01-20 22:43:47 -05:00