17236 Commits

Author SHA1 Message Date
Dianne Hackborn
4141d035c7 Don't crash when there is no admin. 2010-01-21 16:29:00 -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
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
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
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
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
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
San Mehat
db43099f9e Merge "INetworkManagementService: Add support for enumerating TTYs and attaching ppp servers to them" 2010-01-20 18:15:43 -08:00
San Mehat
8ab6135841 MountService: Codeshrink
Signed-off-by: San Mehat <san@google.com>
2010-01-20 18:14:09 -08:00
San Mehat
45891e8bfd Merge "NativeDaemonConnector: Add a convenience method for obtaining lists" 2010-01-20 18:12:54 -08:00
Vasu Nori
994bc22f1e caching PRAGMA sql statements caused cts-tests failures.
thats a strange-bug..caching PRAGMA sql statements caused sqlite to return
incorrect results.
2010-01-20 16:39:40 -08:00
Andreas Huber
703f0614f3 Merge "Fix no-copy-overhead OMXCodec implementation to actually work." 2010-01-20 16:07:23 -08:00
Vasu Nori
1849d2d8c7 Merge "reduce logging noise from cache-full conditions." 2010-01-20 15:41:54 -08:00
San Mehat
deba6935c6 NativeDaemonConnector: Add a convenience method for obtaining lists
Signed-off-by: San Mehat <san@google.com>
2010-01-20 15:32:02 -08:00
San Mehat
72759df749 INetworkManagementService: Add support for enumerating TTYs and attaching ppp servers to them
Signed-off-by: San Mehat <san@google.com>

Updated: Refactor out duplicated code
2010-01-20 15:17:45 -08:00
Jim Miller
1206b9eb71 Merge "Fix 2385283: Add DevicePolicyManager calls to LockScreen." 2010-01-20 15:12:04 -08:00
Mathias Agopian
973fbb1591 Merge "fix [2363362] [Sapphire] Corrupted raw picture displayed during snapshot" 2010-01-20 15:08:33 -08:00
Mathias Agopian
6fb0f22b29 Merge "part of fix for [2363362] [Sapphire] Corrupted raw picture displayed during snapshot" 2010-01-20 15:08:27 -08:00
Vasu Nori
e9d9210205 reduce logging noise from cache-full conditions.
when the compiled-sql cache is full, print the warning only a few times and
after that, if the condition persists, clear the cache.
don't flood the cache with the same warning million times.
2010-01-20 15:07:26 -08:00
Andreas Huber
c712b9fe28 Fix no-copy-overhead OMXCodec implementation to actually work. 2010-01-20 15:05:46 -08:00
Jim Miller
31f90b62e8 Fix 2385283: Add DevicePolicyManager calls to LockScreen. 2010-01-20 14:48:37 -08:00
Joe Onorato
af07b591bb am b3699b14: am 836e1666: Merge "add drawSpriteScreenspaceCropped to renderscript" into eclair
Merge commit 'b3699b14be3a3db1d75ea4c38853b0a53d14b1be'

* commit 'b3699b14be3a3db1d75ea4c38853b0a53d14b1be':
  add drawSpriteScreenspaceCropped to renderscript
2010-01-20 14:35:52 -08:00
Mathias Agopian
d23fa27630 fix [2363362] [Sapphire] Corrupted raw picture displayed during snapshot
handled all cases where the scale factor of a video is out of bounds of
supported scale factors in copybit.
2010-01-20 14:31:53 -08:00
Jacek Surazski
8be346429c Merge "Add systemApp field to ApplicationErrorReport" 2010-01-20 14:14:12 -08:00
Barry Hayes
2671b101f6 Merge "Check the boolean value for the arg to ZygoteInit to make sure it's either true or false. Make a slightly more informative usage message. Give developers a slightly easier way to have their preloaded classes list out of sync without blowing up." 2010-01-20 14:11:26 -08:00
Mathias Agopian
d2832fb415 part of fix for [2363362] [Sapphire] Corrupted raw picture displayed during snapshot
make sure to fallback properly to software when copybit operation fails.
with this change, the preview image will at least be displayed in b&w
(since GL doesn't support the yuv format). This would also fix
2363506, but that one is now handled more cleanly.
2010-01-20 14:07:44 -08:00
Mathias Agopian
3bc0346b3d Merge "fix [2363506] [Sapphire] Video playback broken" 2010-01-20 13:44:53 -08:00