Commit Graph

37713 Commits

Author SHA1 Message Date
Eric Laurent
2308fef4b2 Merge "libstagefright: Compile MP3 & AAC decoders in 32bit ARM Mode" 2010-12-09 13:30:07 -08:00
Justin Ho
9ff63ce58f Merge "Adding updated HDPI chat stat_notify icon" 2010-12-09 13:29:16 -08:00
Dianne Hackborn
bca1c4ffad Merge "Fix issue #3271486: SetupWizward NullPointerException in" 2010-12-09 13:16:49 -08:00
Dianne Hackborn
fb3806d68d Fix issue #3271486: SetupWizward NullPointerException in
andriod.app.ActivityThread.performStopActivityInner

Change-Id: Ifce73b7fc48fedb4767d759f70c98fcdee510f36
2010-12-09 13:14:12 -08:00
Christopher Tate
a58fd15a5b Merge "Add a couple of transport-descriptive methods to IBackupManager" 2010-12-09 13:06:46 -08:00
Christopher Tate
f5e1c29637 Add a couple of transport-descriptive methods to IBackupManager
Privileged callers can now ask the transport for a string describing
its current state, and for an Intent that can be passed to startActivity()
in order to bring up its exported configuration UI.  These will be used
in Settings in order to e.g. show the user the currently active account
being used for backup, and allow the user to choose an account.

The data being funnelled through IBackupManager here are the ones
already exposed by the transports in their implementation of the
IBackupTransport interface.

Bug: 2753632

Change-Id: I2227a2b111d8d0ddf221d63020e20c1316fff55b
2010-12-09 12:58:24 -08:00
John Wang
488a0d5ece Merge "Add iDEN to getNetworkTypeName." 2010-12-09 12:53:01 -08:00
Jason Sams
3eb3106137 Merge "Fix a severe cleanup bug where teardown of the GL driver could occur on the wrong thread." 2010-12-09 12:21:19 -08:00
Jason Sams
546f01b6d5 Fix a severe cleanup bug where teardown of the GL
driver could occur on the wrong thread.

Change-Id: Icd56182ccbd1371124a247695bf3ebd3085df450
2010-12-09 12:19:46 -08:00
James Wylder
d285415e8a libstagefright: Compile MP3 & AAC decoders in 32bit ARM Mode
Speeds up the decoding leaving more time for cpuidle (lp2),
thus lowering overall current drain.

Change-Id: Ia4e0636b1813810072fe0a4f94f6921adf2eab31
Signed-off-by: James Wylder <james.wylder@motorola.com>
2010-12-09 12:00:58 -08:00
Ben Murdoch
e627f55bf8 Merge "Make audio tag cope with live streams" 2010-12-09 11:54:24 -08:00
Amith Yamasani
d4de05eae3 Merge "Remove the OnItemClick listener when the fragment is destroyed." 2010-12-09 11:45:32 -08:00
Amith Yamasani
74402cfe4e Remove the OnItemClick listener when the fragment is destroyed.
Bug: 3228510

This probably fixes a lot of other monkey bugs in Settings.
2010-12-09 11:22:15 -08:00
Leon Scroggins
6b82c26607 Merge "Dismiss IME when pressing Next or Previous." 2010-12-09 11:04:06 -08:00
Mindy Pereira
596913ba04 Merge "Make sure bottom overscroll feedback takes scrollY into account." 2010-12-09 10:55:39 -08:00
Leon Scroggins
261f42d64d Dismiss IME when pressing Next or Previous.
Bug:3267230

Change-Id: If4ea2f589c42f7346685a7ce754298dd8e5a00b5
2010-12-09 13:50:00 -05:00
Jean-Baptiste Queru
6a9e0360d8 am 1bec55bd: am d9c17cc1: merge from gingerbread
* commit '1bec55bd244f72c65fa254118a72ad3ed10aa845':
  Add more checks for bad values to protect from corrupt files.
  Grant ACCESS_ALL_DOWNLOADS to DefaultContainerService
2010-12-09 10:48:54 -08:00
Jean-Baptiste Queru
1bec55bd24 am d9c17cc1: merge from gingerbread
* commit 'd9c17cc1178bc09d30eead05bf5be7ec5a05cbe7':
  Add more checks for bad values to protect from corrupt files.
  Grant ACCESS_ALL_DOWNLOADS to DefaultContainerService
2010-12-09 10:45:29 -08:00
Mindy Pereira
e1be66cdbc Make sure bottom overscroll feedback takes scrollY into account.
This fixes an issue where the overscroll feedback was rendering
several pixels above the bottom of the list on a flick.

Change-Id: I66160d1b72c04f0273f063910eff995e2b2569f0
2010-12-09 10:23:59 -08:00
Andy Stadler
e9362fa157 Merge "API CHANGE - Add hasGrantedPolicy() API" 2010-12-09 10:05:27 -08:00
Dianne Hackborn
fe0b5a5260 Merge "Fix not saving state when restarting an activity." 2010-12-09 09:28:26 -08:00
Dianne Hackborn
e2b0480f5e Fix not saving state when restarting an activity.
Change-Id: I4c9e93e9523c9c62e3a15e6e4587ffad06280545
2010-12-09 09:24:55 -08:00
Andy Stadler
c25f70a440 API CHANGE - Add hasGrantedPolicy() API
* Allows an app to detect that it needs to have additional policies granted
* Add "refreshing" parameter to setActiveAdmin() to handle this case
* Minor cleanups to eliminate warnings (mostly for unused things)

Bug: 3253179
Change-Id: I4bf639bf560557130bf98e8cfb75f996fac416f1
2010-12-09 09:22:06 -08:00
Jean-Baptiste Queru
d9c17cc117 merge from gingerbread
Change-Id: I12d6ef65986db41e658bf8d476a8e18c4dd89917
2010-12-09 09:11:06 -08:00
Mike Lockwood
ffec4385a3 Merge "Rehide the PTP content provider interface from the public API." 2010-12-09 08:42:56 -08:00
Mike Lockwood
97b2488a14 Rehide the PTP content provider interface from the public API.
Change-Id: I472175d79a999038f2f2eef185a2f936109c2526
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-09 08:39:59 -08:00
Ben Murdoch
9059f44fee Make audio tag cope with live streams
Live streams seem to take a little while to initialize, so it's feasible
that we might get a play request before transitioned to the PREPARED
state. In that case track that we should start playing when onPrepare
completes.

Change-Id: I66ed0ef3a0905a1c5d4206fb2e7bbcc05a593fc7
2010-12-09 16:20:26 +00:00
satok
8dc9f07630 Merge "Change the initial visibility of IME switch button" 2010-12-09 08:10:53 -08:00
satok
3616fb6ddc Change the initial visibility of IME switch button
Change-Id: I407d49997355a286a13c94a2d6b48a6dbcdaa2d1
2010-12-10 01:09:22 +09:00
Dianne Hackborn
e59e0309a1 Add more checks for bad values to protect from corrupt files.
Change-Id: I5e282099e7c6fcc8756146fc7282eec31937af1f
2010-12-09 07:49:05 -08:00
Kenny Root
63be7a732e Grant ACCESS_ALL_DOWNLOADS to DefaultContainerService
Be compatible with the old DownloadProvider behavior of being able to
operate on content URIs returned from .insert()

Bug: 3242328
Change-Id: Ibd2ed553c87ea694d4b09a8265c7131fae588719
2010-12-09 07:48:55 -08:00
Kristian Monsen
3f98f7bd53 Merge "Make CookieManager.removeSessionCookies async" 2010-12-09 07:26:01 -08:00
Amith Yamasani
9f02357a82 Merge "Move the breadcrumbs to the right pane." 2010-12-09 04:20:04 -08:00
Kristian Monsen
8517305521 Make CookieManager.removeSessionCookies async
Webkit loadurl() will wait on the webcore thread until oustanding
cookie operations complete.

Change-Id: I067408fdb9acd2e2d1f1f21eef910d0b26304332
2010-12-09 11:41:02 +00:00
Jason Sams
5c1619fff4 Fix build
Change-Id: I189d3b8afd351ab5cf604105579212593a98d5a4
2010-12-09 00:58:47 -08:00
Jason Sams
3247842c67 Merge "Allocation API update." 2010-12-08 23:46:28 -08:00
Amith Yamasani
3c9f519f89 Move the breadcrumbs to the right pane.
Bug: 3236568
2010-12-08 23:44:38 -08:00
Wink Saville
3345f27fbf am cc41b92e: am 0a5ae453: am 7f7474dd: Merge "frameworks/base/telephony: Release wakelock on RIL request send error"
* commit 'cc41b92ed7e66cc5d4e14f22b3ea914175d662ec':
  frameworks/base/telephony: Release wakelock on RIL request send error
2010-12-08 22:00:58 -08:00
Wink Saville
cc41b92ed7 am 0a5ae453: am 7f7474dd: Merge "frameworks/base/telephony: Release wakelock on RIL request send error"
* commit '0a5ae453e50144b31c7f544714feb5bbc7b77d18':
  frameworks/base/telephony: Release wakelock on RIL request send error
2010-12-08 21:57:03 -08:00
Wink Saville
0a5ae453e5 am 7f7474dd: Merge "frameworks/base/telephony: Release wakelock on RIL request send error"
* commit '7f7474ddd6170b68b8b58cc03b75df85c96f08f2':
  frameworks/base/telephony: Release wakelock on RIL request send error
2010-12-08 21:53:24 -08:00
Wink Saville
7f7474ddd6 Merge "frameworks/base/telephony: Release wakelock on RIL request send error" 2010-12-08 21:37:38 -08:00
Adam Cohen
5a242ec2cf Added some pieces for Wallpaper previews
Change-Id: I48cd80108e5a555a1ca6180e29f67a87e05e9683
2010-12-08 19:37:59 -08:00
Jesse Wilson
2095a6d63b Merge "Make doclava happy by returning the same type in old and new APIs." 2010-12-08 19:13:34 -08:00
Romain Guy
279d34f4b2 Merge "New, better line drawing implementation. Bug #3207544 Bug #3225875" 2010-12-08 19:10:51 -08:00
Romain Guy
a957eea785 New, better line drawing implementation.
Bug #3207544
Bug #3225875

Change-Id: Ibdd1dfc64e01625d5c441f39eb0aa3ee647f6ff5
2010-12-08 19:06:58 -08:00
Jesse Wilson
75cfba9cc3 Make doclava happy by returning the same type in old and new APIs.
Change-Id: Ie6ae6b30964566c2c25ac5ea1a8b43163bf65aaa
2010-12-08 18:56:18 -08:00
Iliyan Malchev
324c31622b Merge "service_manager: duplicate registrations override previous ones" 2010-12-08 18:40:43 -08:00
Jeff Brown
19f5a91e92 Merge "Fix a regression in clearMetaKeyState." 2010-12-08 18:33:05 -08:00
Jeff Brown
52715a7c10 Fix a regression in clearMetaKeyState.
Bug: 3267519
Change-Id: Ibbc7d4e38ef3208b9ece09566e44e8421866ab95
2010-12-08 18:29:08 -08:00
Iliyan Malchev
1d8843897e service_manager: duplicate registrations override previous ones
When a process that has registered one or several binder services with
the service manager crashes, that process will usually be restarted by
init (see init.rc).  When the process comes back up, it will attempt
to re-register itself with the service manager.  However, the binder
driver may not deliver the death notification to the service manager
before the the new service-registation request, in which case the
service manager will reject the request as a duplicate.

The same may occur if a process takes a while to actually exit.  Since
the init language's restart command does not wait for a process to
exit before restarting it, there may be for a brief instant two
processes.  The new one will attempt to register before the old
one has exited, causing the same problem.

This patch does not treat duplicate registrations as an error.
Instead, the service manager force-releases the old instance and
proceeds with registering the new instance of a service.

Change-Id: Ib70640ab13f5e22460fff6af2f9520b8a9ac9713
Signed-off-by: Iliyan Malchev <malchev@google.com>
2010-12-08 18:27:29 -08:00