37673 Commits

Author SHA1 Message Date
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
Jeff Brown
c1fb48d77c Improve shortcut handling.
Shortcut keys invoked using Meta are handled as fallback actions instead
so applications can handle Meta however they like.

Change-Id: I28955bac5bba9a399eed2fc6c9b73bba3f4bf383
2010-12-08 17:10:48 -08:00
Mathias Agopian
e35c878ed2 am a2c3b355: (-s ours) am 74da537f: Merge "[317580] fix issue where the screen wouldn\'t be rotated properly in bypass mode" into gingerbread
* commit 'a2c3b355877690d889882da3492950d1b2e0e974':
  [317580] fix issue where the screen wouldn't be rotated properly in bypass mode
2010-12-08 16:56:29 -08:00
Romain Guy
97684ed8dd Merge "bug_3259956 and bug_2166704" 2010-12-08 16:50:57 -08:00
Mathias Agopian
19f9eda28a fix [3259708] Graphic Buffer Mapper does not support YV12
remove a bunch of a code that was there only to support broken gralloc implementations

Change-Id: I3c1a9172224cbcc283601abfbbd695a20815451f
2010-12-08 16:48:28 -08:00
Gilles Debunne
f7ae525855 SelectAllOnFocus text fields do not display the insertion handle when focused.
Change-Id: Ieb0dfe37498a339a781098134f4a0dd7f40193ec
2010-12-08 16:46:46 -08:00
Jim Miller
e5c16ab5a8 Fix 3253629: Initial pass at updating RecentsPanel UI
Change-Id: I578d0efd9f4b67675ff531494259f54182851e0e
2010-12-08 16:42:12 -08:00
Jeff Sharkey
b119b6cfcf SegmentedButton style should inherit.
Change-Id: Idd3bc5e6de3d64fd681f69ba1de3ac88576c9ca7
2010-12-08 16:37:02 -08:00
Jim Miller
c57406cdfa Fix 3148496: Update PreferenceActivity to handle single-pane fragments.
This fixes a couple of bugs I found while updating SecuritySettings.

Change-Id: I9881cff71799ddf3c1d1493c2f7f3bfb31ca7774
2010-12-08 16:33:34 -08:00
Mathias Agopian
054ae78245 am e1752f41: Merge "fix [3258603] \'Quadrant\' benchmark crashes inside eglQueryContext on GB/Crespo" into gingerbread
* commit 'e1752f41d34249c891564889b07963262b1bd8bf':
  fix [3258603] 'Quadrant' benchmark crashes inside eglQueryContext on GB/Crespo
2010-12-08 16:20:23 -08:00
James Dong
c402def718 am 1f5b133a: Merge "When INFO_FORMAT_CHANGED event comes in before the renderer was initialized, go back to read from source again" into gingerbread
* commit '1f5b133ae29090f1807be392874f6b7a5d92c6d4':
  When INFO_FORMAT_CHANGED event comes in before the renderer was initialized, go back to read from source again
2010-12-08 16:20:16 -08:00
Mathias Agopian
e1752f41d3 Merge "fix [3258603] 'Quadrant' benchmark crashes inside eglQueryContext on GB/Crespo" into gingerbread 2010-12-08 16:17:02 -08:00
Mathias Agopian
a2c3b35587 am 74da537f: Merge "[317580] fix issue where the screen wouldn\'t be rotated properly in bypass mode" into gingerbread
* commit '74da537f80ba36c1279c04fcb85d89fc38c246a6':
  [317580] fix issue where the screen wouldn't be rotated properly in bypass mode
2010-12-08 16:15:08 -08:00
James Dong
1f5b133ae2 Merge "When INFO_FORMAT_CHANGED event comes in before the renderer was initialized, go back to read from source again" into gingerbread 2010-12-08 16:14:27 -08:00
Mathias Agopian
d211230633 remove support for PUSH_BUFFER surfaces and overlays
the same functionality is now supported through
the h/w composer HAL, and YUV support in the GPU.

Change-Id: I8146605449954b8e8fd7f78810b7d873c2d8f5bf
2010-12-08 16:13:59 -08:00
Svetoslav Ganov
a911d4a2b1 bug_3259956 and bug_2166704
Change-Id: I71b4cc3c1111e7a4e78fb276d54a291c22fb2752
2010-12-08 16:11:30 -08:00
Mike Lockwood
365e03e494 MTP: Improve argument checking in SendObjectInfo
In particular, make sure the parent is a folder and make sure file
does not already exist.

Change-Id: Ifa870faba3285f03a92025d9e82f93fed78a761c
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-08 16:09:37 -08:00
Joe Onorato
ff3c470778 Merge "make the wifi button go where it's supposed to." 2010-12-08 15:51:33 -08:00
Joe Onorato
cbcce92295 Merge "Make the ToggleSlider in the status bar settings panel show the right track when it's disabled." 2010-12-08 15:51:27 -08:00
Joe Onorato
1c3e3c78de Merge "Make setDrawable work after initialization has occurred." 2010-12-08 15:50:52 -08:00
Dianne Hackborn
47b8f52eb9 Merge "Fix issues #3257701 and #3267312" 2010-12-08 15:49:04 -08:00
Joe Onorato
64eb5d2900 make the wifi button go where it's supposed to.
Change-Id: I415a5ad5e7524746d1e8d467f94058468bc719b7
2010-12-08 15:48:08 -08:00
Joe Onorato
4b0912d490 Make the ToggleSlider in the status bar settings panel show the right track when it's disabled.
Change-Id: Iead2a7f93dd312254d715f010ccca50cdcda5d00
2010-12-08 15:48:07 -08:00
Joe Onorato
aa07263463 Make setDrawable work after initialization has occurred.
Change-Id: Id040f69f2fc3402013229114fc3c1b0730eef579
2010-12-08 15:48:06 -08:00