37697 Commits

Author SHA1 Message Date
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
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
Jesse Wilson
436786e759 Merge "Update API with latest parameter names and getClass() return type." 2010-12-08 18:16:42 -08:00
Jeff Brown
b4c121f280 Merge "Improve shortcut handling." 2010-12-08 18:15:38 -08:00
Jesse Wilson
bcb71d301f Update API with latest parameter names and getClass() return type.
Change-Id: I37e8d08b413a4a25b430c040ada79278eda4c680
2010-12-08 18:12:43 -08:00
Mathias Agopian
f23cf9741e Merge "[3211070] camera preview image is rendered offset from the UI overlay frame" 2010-12-08 17:47:04 -08:00
Mathias Agopian
b5393dc479 fix build.
Change-Id: I49262ac143da297efcaec4eed04052274c73b7f8
2010-12-08 17:44:07 -08:00
Mathias Agopian
ac843f28f6 [3211070] camera preview image is rendered offset from the UI overlay frame
somehow this change got lost.

Change-Id: I36f6c7ef3f782918042b77e9dc91a4c811d84a40
2010-12-08 17:40:28 -08:00
Mathias Agopian
2d54cd6637 Merge "fix [3260137] Sometimes front-facing camera mirroring is wrong" 2010-12-08 17:24:52 -08:00
Mathias Agopian
8128ee86da fix [3260137] Sometimes front-facing camera mirroring is wrong
make sure to take the buffer's orientation into account.

Change-Id: I9fef89e66368ad2dec1cb8c7b77ac2b3b4858efb
2010-12-08 17:23:18 -08:00
Mathias Agopian
cd505aef72 am 054ae782: am e1752f41: Merge "fix [3258603] \'Quadrant\' benchmark crashes inside eglQueryContext on GB/Crespo" into gingerbread
* commit '054ae78245fe9b4c14bbc372ae77cd0a977ded73':
  fix [3258603] 'Quadrant' benchmark crashes inside eglQueryContext on GB/Crespo
2010-12-08 17:20:39 -08:00
James Dong
c106a9d1e3 Merge "resolved conflicts for merge of c402def7 to master" 2010-12-08 17:18:26 -08:00
Mathias Agopian
8f8f594b01 Merge changes Id4222c9b,I3c1a9172
* changes:
  More clean-up. Get rid off the "blur" effect in SurfaceFlinger
  fix [3259708] Graphic Buffer Mapper does not support YV12
2010-12-08 17:15:54 -08:00
Mike Lockwood
51f56cbd30 Merge "MTP: Improve argument checking in SendObjectInfo" 2010-12-08 17:15:22 -08:00
James Dong
c6e7e65740 resolved conflicts for merge of c402def7 to master
Change-Id: I328e7c41ad410f07322f6d3a32251e495710c090
2010-12-08 17:14:14 -08:00
Mathias Agopian
c3802d22f1 More clean-up. Get rid off the "blur" effect in SurfaceFlinger
For multiple reason, this effect is not maintainable and was never
used due to its abysmal performance. it'll be resurected when it can be
implemented efficiently.

Change-Id: Id4222c9b86c629275cdec18873ef07be8723b6d2
2010-12-08 17:13:19 -08:00