OSDN Git Service
Wink Saville [Fri, 5 Aug 2011 18:40:22 +0000 (11:40 -0700)]
resolved conflicts for merge of
7bb2d942 to master
Change-Id: I026b01805c81d8b26d22e4a195e5e38655a34d32
Daniel Sandler [Fri, 5 Aug 2011 15:45:55 +0000 (08:45 -0700)]
Merge "Stop popping up the compatibility mode dialog all the time."
Daniel Sandler [Fri, 5 Aug 2011 15:34:06 +0000 (11:34 -0400)]
Stop popping up the compatibility mode dialog all the time.
(The check for whether the dialog had already been shown was
accidentally removed in change I1c1bd12.)
Bug:
5069310
Change-Id: I2ea35c5891667922e78d7919132ffe599411f851
Steve Block [Fri, 5 Aug 2011 14:53:11 +0000 (07:53 -0700)]
Merge "Improve a network error description"
Svetoslav Ganov [Fri, 5 Aug 2011 11:59:04 +0000 (04:59 -0700)]
Merge "ACTION_HOVER_EXIT sometimes not delivered during touch exploration."
Svetoslav Ganov [Fri, 5 Aug 2011 11:57:24 +0000 (04:57 -0700)]
Merge "AccessibilityEvent#toString() always reports -1 for record count."
Daniel Sandler [Fri, 5 Aug 2011 11:46:09 +0000 (04:46 -0700)]
Merge "Clear all notifications on tablet actually works now."
Daniel Sandler [Fri, 5 Aug 2011 11:45:53 +0000 (04:45 -0700)]
Merge "Instrumentation to track notification panel touch bugs."
Steve Block [Thu, 4 Aug 2011 16:25:07 +0000 (17:25 +0100)]
Improve a network error description
Bug:
5103592
Change-Id: I6deaa69f08acb93fec4c9bd7c2fd581fd76518f8
satok [Fri, 5 Aug 2011 10:59:06 +0000 (03:59 -0700)]
Merge "API cleanup for the spell checker framework"
Ken Wakasa [Thu, 4 Aug 2011 13:44:47 +0000 (22:44 +0900)]
Suppress the IME switcher icon by default on tablet
bug:
5001205
Change-Id: I8c983808078d984d1d25e985e23ab036b869332e
Jim Miller [Fri, 5 Aug 2011 06:26:48 +0000 (23:26 -0700)]
Merge "Fix
5117544: Fix crash in KeyguardStatusViewManager when resId==0"
Daniel Sandler [Fri, 5 Aug 2011 04:19:21 +0000 (00:19 -0400)]
Clear all notifications on tablet actually works now.
Also, the panel is no longer buried below the screen edge
when there are no notifications.
Bug:
5115158
Change-Id: I01bc8a65ceebd64143a4c4c52d63641dc3cd1c77
Daniel Sandler [Fri, 5 Aug 2011 02:49:06 +0000 (22:49 -0400)]
Instrumentation to track notification panel touch bugs.
Bug:
5122306
Bug:
5105599
Change-Id: I2ca677d71daf9c6d5931ae933b3ab496620ab564
Daniel Sandler [Fri, 5 Aug 2011 02:15:49 +0000 (19:15 -0700)]
Merge "Fix another NPE."
Jim Miller [Fri, 5 Aug 2011 02:03:18 +0000 (19:03 -0700)]
Fix
5117544: Fix crash in KeyguardStatusViewManager when resId==0
Change-Id: If870760f7dcafe02084af4c82db7dbb809c31c75
The Android Open Source Project [Fri, 5 Aug 2011 01:46:02 +0000 (18:46 -0700)]
Reconcile with gingerbread-release gingerbread-mr4-release
Change-Id: I4ef90a9d38940c8484c030056157a99a103f6aa9
Tsu Chiang Chuang [Fri, 5 Aug 2011 01:34:53 +0000 (18:34 -0700)]
Merge "Bandwidth microbenchmark test app for ICS."
Adam Powell [Fri, 5 Aug 2011 01:32:18 +0000 (18:32 -0700)]
Merge "Fix bug
5118908 - ImageView.setImageDrawable always requests layout"
Adam Powell [Thu, 4 Aug 2011 17:55:03 +0000 (10:55 -0700)]
Fix bug
5118908 - ImageView.setImageDrawable always requests layout
Make ImageView a bit more conservative about when it requests a
layout. This improves performance for ListViews where apps
asynchronously load images and replace placeholders outside of the
optimized getView path.
Change-Id: I564a4a343ab9c8c2d5baf907b5f573b5ee02c87a
Amith Yamasani [Fri, 5 Aug 2011 01:25:32 +0000 (18:25 -0700)]
Merge "Don't call onQueryTextChanged more often than necessary."
Jim Miller [Fri, 5 Aug 2011 01:06:03 +0000 (18:06 -0700)]
Merge "Fix
5045008: replace "ring/silence" target in LockScreen with camera app"
Jim Miller [Thu, 4 Aug 2011 23:10:50 +0000 (16:10 -0700)]
Fix
5045008: replace "ring/silence" target in LockScreen with camera app
This change replaces the ring/silence target with a camera target. It
is disabled and falls back to the old behavior when any device policy
disables the camera.
Updated with latest icons.
Change-Id: I2374eba08f85ff1d1b0bad2859efa30bb166fb60
Jeff Sharkey [Fri, 5 Aug 2011 00:33:19 +0000 (17:33 -0700)]
Merge "Data cycle ends on last second of month."
Jeff Sharkey [Thu, 4 Aug 2011 22:38:48 +0000 (15:38 -0700)]
Data cycle ends on last second of month.
When data cycle resets on a day invalid in given month, snap the
cycle to last second of month. Previous behavior was to bump fully
into next month, but that causes cycle loops.
Includes tests to verify.
Bug:
4623124
Change-Id: I2f233091f6f1df33a2814284519cbc04532874e9
Gloria Wang [Thu, 4 Aug 2011 23:32:10 +0000 (16:32 -0700)]
Merge "Close the DRM session in the destructor of ChromiumHTTPDataSource. Fix for bug
5015079."
Wink Saville [Thu, 4 Aug 2011 23:11:41 +0000 (16:11 -0700)]
am
090df1dc: Merge "Delay connectivity change notifications." into honeycomb-LTE
* commit '
090df1dc4188e5b9ef10a0aca5081a196085ff56':
Delay connectivity change notifications.
Wink Saville [Thu, 4 Aug 2011 23:10:11 +0000 (16:10 -0700)]
Merge "Delay connectivity change notifications." into honeycomb-LTE
Gloria Wang [Thu, 4 Aug 2011 23:01:35 +0000 (16:01 -0700)]
Close the DRM session in the destructor of ChromiumHTTPDataSource.
Fix for bug
5015079.
Change-Id: I45fcf6ff8b50e62f2812930eaf68c00206cb7e52
Chet Haase [Thu, 4 Aug 2011 22:47:21 +0000 (15:47 -0700)]
Merge "Fix AnimatorSet cancellation issues"
Jeff Sharkey [Thu, 4 Aug 2011 22:39:24 +0000 (15:39 -0700)]
Merge "Network stats with varint, omit parcel fields."
Steve Block [Thu, 4 Aug 2011 22:36:04 +0000 (15:36 -0700)]
am
03f8fcb8: (-s ours) am
c4d93ba5: Cherry-pick DeviceMotionService CL from master [do not merge]
* commit '
03f8fcb8b017556df08d9926f8ca41b383c5ad08':
Cherry-pick DeviceMotionService CL from master [do not merge]
Irfan Sheriff [Thu, 4 Aug 2011 22:34:47 +0000 (15:34 -0700)]
Merge "Rewrote DnsPinger - now is async and concurrant"
Gloria Wang [Thu, 4 Aug 2011 22:33:12 +0000 (15:33 -0700)]
Merge "resolved conflicts for merge of
845fdba7 to master"
Andreas Huber [Thu, 4 Aug 2011 22:20:24 +0000 (15:20 -0700)]
Merge "Eliminate superfluous memcpys by wrapping an ABuffer in a MediaBuffer"
Gloria Wang [Thu, 4 Aug 2011 22:13:14 +0000 (15:13 -0700)]
resolved conflicts for merge of
845fdba7 to master
Change-Id: I716b6ceb03bd733f9e7f49008112c8f2c53ad9ce
Andreas Huber [Thu, 4 Aug 2011 22:05:17 +0000 (15:05 -0700)]
Eliminate superfluous memcpys by wrapping an ABuffer in a MediaBuffer
Change-Id: I1313f117cd7cdfaf7d6ec25413a0b4b8ea495037
related-to-bug:
5122973
Wink Saville [Thu, 4 Aug 2011 22:01:58 +0000 (15:01 -0700)]
Delay connectivity change notifications.
Because changes to the route tables take time to propagate
we add a delay when sending out change notifications. This allows
applications, such as GTalk, to create sockets without encountering
a 3 minute timeout.
Bug:
5008488
Change-Id: I0eefb03a5d6358a58ea6ae5b4f697ff302b5511d
Steve Block [Thu, 4 Aug 2011 21:49:44 +0000 (14:49 -0700)]
am
c4d93ba5: Cherry-pick DeviceMotionService CL from master [do not merge]
* commit '
c4d93ba55fbe905fa72ee7a068efd7c5fb4e8257':
Cherry-pick DeviceMotionService CL from master [do not merge]
Gloria Wang [Thu, 4 Aug 2011 21:47:43 +0000 (14:47 -0700)]
am
8a6fb50d: am
4e197ea8: am
e15a73ee: Merge "Bug fixes in OMA DRM v1 Forward Lock Agent"
* commit '
8a6fb50d69ec40a413b117bc9145a97ec427852f':
Bug fixes in OMA DRM v1 Forward Lock Agent
Gloria Wang [Thu, 4 Aug 2011 21:36:45 +0000 (14:36 -0700)]
am
4e197ea8: am
e15a73ee: Merge "Bug fixes in OMA DRM v1 Forward Lock Agent"
* commit '
4e197ea8a6c5d5f4393a474591cccdd3fa27ecde':
Bug fixes in OMA DRM v1 Forward Lock Agent
Gloria Wang [Thu, 4 Aug 2011 21:33:06 +0000 (14:33 -0700)]
am
e15a73ee: Merge "Bug fixes in OMA DRM v1 Forward Lock Agent"
* commit '
e15a73ee4c9a28d89888095c7649a70c116ee160':
Bug fixes in OMA DRM v1 Forward Lock Agent
Amith Yamasani [Thu, 4 Aug 2011 21:30:07 +0000 (14:30 -0700)]
Don't call onQueryTextChanged more often than necessary.
Also update the hint text if iconifiedByDefault changes.
Bug:
5097238
Change-Id: I876b3f3e74c30230f68d6bc88a95e182e4cc652b
Gloria Wang [Thu, 4 Aug 2011 21:20:53 +0000 (14:20 -0700)]
Merge "Bug fixes in OMA DRM v1 Forward Lock Agent"
Chet Haase [Wed, 3 Aug 2011 21:10:06 +0000 (14:10 -0700)]
Fix AnimatorSet cancellation issues
AnimatorSet was incorrectly ignoring cancel() when it was in the
initial startDelay phase. Fix is to change isRunning() to be true if the
animator is also in its delay phase.
Change-Id: I1a8c877de24fa294beea0ba30d495658255b13b3
Jean-Michel Trivi [Thu, 4 Aug 2011 21:10:57 +0000 (14:10 -0700)]
Merge "Remove empty remote control client listener methods"
Adam Powell [Thu, 4 Aug 2011 20:21:07 +0000 (13:21 -0700)]
Merge "Fix bug
5121406 - ActionBar.setLogo"
Adam Powell [Thu, 4 Aug 2011 20:12:01 +0000 (13:12 -0700)]
Fix bug
5121406 - ActionBar.setLogo
Make the resource ID version of setLogo work.
Change-Id: I0a710b714c9fd10bc3063a8ec95e59391ba4d4e0
Chia-chi Yeh [Thu, 4 Aug 2011 20:04:51 +0000 (13:04 -0700)]
Merge "VPN: move away from the VPN permission."
Andreas Huber [Thu, 4 Aug 2011 19:57:45 +0000 (12:57 -0700)]
Merge "Restart HLS streaming from the bottom of the playlist if we miss the boat on the"
Daniel Sandler [Thu, 4 Aug 2011 19:57:39 +0000 (15:57 -0400)]
Fix another NPE.
Bug:
5122306
Change-Id: I6877528325d30bb725f8692c86a8752263b5344e
Xavier Ducrohet [Thu, 4 Aug 2011 19:56:46 +0000 (12:56 -0700)]
am
23ce76ce: am
320834c9: am
b9e8b25e: am
6b3a0123: Merge "Insert a break wraparound."
* commit '
23ce76ce1666e5e8b0b17825c271b133ba2626d6':
Insert a break wraparound.
Xavier Ducrohet [Thu, 4 Aug 2011 19:54:49 +0000 (12:54 -0700)]
am
320834c9: am
b9e8b25e: am
6b3a0123: Merge "Insert a break wraparound."
* commit '
320834c9e02364b39b98b610f1d2244cbb9a4f26':
Insert a break wraparound.
Xavier Ducrohet [Thu, 4 Aug 2011 19:52:34 +0000 (12:52 -0700)]
am
b9e8b25e: am
6b3a0123: Merge "Insert a break wraparound."
* commit '
b9e8b25e9066d6f2da0635eaac524246b729fbfa':
Insert a break wraparound.
Xavier Ducrohet [Thu, 4 Aug 2011 19:50:11 +0000 (12:50 -0700)]
am
6b3a0123: Merge "Insert a break wraparound."
* commit '
6b3a0123486e729aca7e7de0c3a78c4c3300d0c9':
Insert a break wraparound.
Xavier Ducrohet [Thu, 4 Aug 2011 19:36:11 +0000 (12:36 -0700)]
Merge "Insert a break wraparound."
Xavier Ducrohet [Thu, 4 Aug 2011 19:18:17 +0000 (12:18 -0700)]
Merge "Layoutlib: implement Resources.getBoolean(int)."
Andreas Huber [Thu, 4 Aug 2011 19:02:47 +0000 (12:02 -0700)]
Restart HLS streaming from the bottom of the playlist if we miss the boat on the
next segment. This can happen if for whatever reason we playback video slower than
it is served.
Also removed some unnecessary verbosity from ChromiumHTTPDataSource.
Change-Id: I6e870879310c9efe4d50d7dc0883c08405442d79
related-to-bug:
5120425
Steve Block [Wed, 3 Aug 2011 13:03:24 +0000 (14:03 +0100)]
Cherry-pick DeviceMotionService CL from master [do not merge]
In DeviceMotionService, handle the fact that we may receive updates from SensorManager after unregistering.
cherry-pick of Change:
d09001fea476ca6c6eaff5e29a1bb6f3aebe5bd5
Bug:
5110230
Change-Id: Id1d1f51b445ce4a14bfcdfad8f173922e01b6563
Adam Powell [Thu, 4 Aug 2011 17:51:57 +0000 (10:51 -0700)]
Merge "Fix bug
5073637 - Market apps crashing FastScroller"
Adam Powell [Thu, 4 Aug 2011 05:38:48 +0000 (22:38 -0700)]
Fix bug
5073637 - Market apps crashing FastScroller
It seems that some popular Market apps do not properly implement
SectionIndexer#getSectionForPosition and the framework did not
previously call it. Revert to more simplistic scrollbar behavior for
apps targeting sdk < Honeycomb.
Change-Id: If0b1f2b4db540de4bb8ba45798e498c09cddb42f
Isaac Levy [Fri, 22 Jul 2011 15:48:26 +0000 (08:48 -0700)]
Rewrote DnsPinger - now is async and concurrant
Change-Id: I93e1374ae857832935202614e34ce18f040fcfc7
Irfan Sheriff [Thu, 4 Aug 2011 17:29:23 +0000 (10:29 -0700)]
Merge "Fix p2p package paths"
Jean-Michel Trivi [Thu, 4 Aug 2011 17:28:07 +0000 (10:28 -0700)]
Remove empty remote control client listener methods
Remove non-implemented methods for registering IRemoteControlClient
listeners.
Rename refreshRemoteControlDisplay() method to follow framework
conventions.
Change-Id: I9254e8eeea9020a530c9a32f328f0ef7dbd9dd0c
Fabrice Di Meglio [Thu, 4 Aug 2011 17:09:24 +0000 (10:09 -0700)]
Merge "Fix bug #
5114358 If writing Numbers with Hebrew & Arabic keyboard, they appear as LTR"
Daniel Sandler [Thu, 4 Aug 2011 16:56:53 +0000 (09:56 -0700)]
Merge "Log some signal condition diagnostics for now."
Daniel Sandler [Thu, 4 Aug 2011 16:46:45 +0000 (09:46 -0700)]
Merge "Crushing Dreams."
Mike Lockwood [Thu, 4 Aug 2011 16:46:09 +0000 (09:46 -0700)]
Merge "Resolve merge conflict for '
75f1fdec':"
Russell Brenner [Thu, 4 Aug 2011 16:41:53 +0000 (09:41 -0700)]
Merge "Adapt TextLayoutCache for new Harfbuzz scripts"
Debashish Chatterjee [Thu, 4 Aug 2011 16:34:25 +0000 (09:34 -0700)]
Merge "Removed permission READ_WRITE_OWN_VOICEMAIL from framework/base."
Daniel Sandler [Thu, 4 Aug 2011 15:46:20 +0000 (08:46 -0700)]
Merge "Fix NPE on first-ever boot if display has rotated."
Daniel Sandler [Thu, 4 Aug 2011 15:44:51 +0000 (08:44 -0700)]
Merge "Restore DISABLE_NOTIFICATION_ICONS."
Mike Lockwood [Thu, 4 Aug 2011 15:40:25 +0000 (11:40 -0400)]
Resolve merge conflict for '
75f1fdec':
GPS Provider Service changes
GPS engine needs to receive network state changes from Android fw.
Added db query for the current APN, also added a new parameter
between JNI / HAL to the new method in AGpsRilInterface struct
for gps engine to receive APN from GPSLocationService
Conflicts:
services/java/com/android/server/location/GpsLocationProvider.java
Change-Id: I33c45027f1571493d3525324f62d199517c4960c
Signed-off-by: Mike Lockwood <lockwood@android.com>
Mike Lockwood [Thu, 4 Aug 2011 14:53:53 +0000 (07:53 -0700)]
am
0b3af353: am
a82ee49a: am
8f5dd9ad: Merge "GPS Provider Service changes"
* commit '
0b3af353dcf61177158934a11404cf2914038696':
GPS Provider Service changes
Mike Lockwood [Thu, 4 Aug 2011 14:51:38 +0000 (07:51 -0700)]
am
a82ee49a: am
8f5dd9ad: Merge "GPS Provider Service changes"
* commit '
a82ee49a7b130ffe3199a488c7bb0ca4464af64c':
GPS Provider Service changes
Debashish Chatterjee [Thu, 4 Aug 2011 13:12:58 +0000 (14:12 +0100)]
Removed permission READ_WRITE_OWN_VOICEMAIL from framework/base.
This permission has now been replaced by ADD_VOICEMAIL.
Bug:
5098551
Change-Id: Idc993f1674a66f0df3ec699ed14b2e5cfedfe3e8
Mike Lockwood [Thu, 4 Aug 2011 14:48:57 +0000 (07:48 -0700)]
am
8f5dd9ad: Merge "GPS Provider Service changes"
* commit '
8f5dd9ad3f98d97d2862b57ba8cd961d2201e40c':
GPS Provider Service changes
Mike Lockwood [Thu, 4 Aug 2011 14:39:03 +0000 (07:39 -0700)]
Merge "GPS Provider Service changes"
Kevin Tang [Sun, 5 Jun 2011 21:25:16 +0000 (14:25 -0700)]
GPS Provider Service changes
GPS engine needs to receive network state changes from Android fw.
Added db query for the current APN, also added a new parameter
between JNI / HAL to the new method in AGpsRilInterface struct
for gps engine to receive APN from GPSLocationService
Change-Id: I62e35c948d2ac1961771d1a10581a3b8e695c05a
Signed-off-by: Mike Lockwood <lockwood@android.com>
Svetoslav Ganov [Mon, 1 Aug 2011 03:23:48 +0000 (20:23 -0700)]
ACTION_HOVER_EXIT sometimes not delivered during touch exploration.
1. The code for detecting the end of a touch exploration gesture
was not injecting the hover exit event upon detection of the
gesture end.
bug:
5091758:
Change-Id: I468164617d6677cd2a2a2815e1756c826d49f3a9
Svetoslav Ganov [Mon, 1 Aug 2011 03:43:45 +0000 (20:43 -0700)]
AccessibilityEvent#toString() always reports -1 for record count.
1. The implementation of toString() was calling a wrong method
for the record count.
bug:
5087078
Change-Id: I4ca79faa6ccce135eb6fe797de7b08e30f8b3e71
Svetoslav Ganov [Thu, 4 Aug 2011 12:55:46 +0000 (05:55 -0700)]
Merge "Removing firing of spurious scroll accesibility events."
Svetoslav Ganov [Thu, 4 Aug 2011 12:55:26 +0000 (05:55 -0700)]
Merge "No selection or click accessibility events are fired when a list item is tapped."
Henrik B Andersson [Mon, 21 Feb 2011 13:22:08 +0000 (14:22 +0100)]
Bug fixes in OMA DRM v1 Forward Lock Agent
A couple of fixes in the Forward Lock Agent.
The DRM Framework isn't thread safe so the Forward Lock Agent needs
to protect the private structures.
Base64-encoded content with LF-only instead of CRLF line breaks is now
accepted.
A fix for non-standard boundary characters.
The debug prints are also turned off as default.
Change-Id: I8ab417231380fbe1c371d18a147773ceabc6f69f
Wu-cheng Li [Thu, 4 Aug 2011 08:46:56 +0000 (01:46 -0700)]
Merge "Add camera bayer image format."
Wu-cheng Li [Tue, 2 Aug 2011 09:49:50 +0000 (17:49 +0800)]
Add camera bayer image format.
The API are hidden.
bug:
5086073
Change-Id: Ic9a53e5d5007ad3f12a28406ee25098227f14cbc
Irfan Sheriff [Wed, 3 Aug 2011 22:37:08 +0000 (15:37 -0700)]
Fix p2p package paths
Split change Iba3beb8c which will not go in master to fix package paths
Bug:
5002384
Change-Id: I15072b65422fcdfe17c3f130d169258d60748012
satok [Wed, 3 Aug 2011 07:08:59 +0000 (16:08 +0900)]
API cleanup for the spell checker framework
Bug:
5110151
- Add a bundle to an argment of newSpellCheckerSession
- Expose SpellCheckerSessionImpl in SpellCheckerService
- Fix function names
- etc
Change-Id: Ia8ec783b7b4d5fcd18389854b445fc10fc502297
Jim Miller [Thu, 4 Aug 2011 02:41:45 +0000 (19:41 -0700)]
Merge "Fix
5044158: layout and asset work on lockscreen PIN mode"
Fabrice Di Meglio [Thu, 4 Aug 2011 02:13:34 +0000 (19:13 -0700)]
Fix bug #
5114358 If writing Numbers with Hebrew & Arabic keyboard, they appear as LTR
- add missing case for Arabic numbers
Change-Id: I7efe8172efee410eaafddec4a1465c1aa93a125b
Dianne Hackborn [Thu, 4 Aug 2011 01:58:04 +0000 (18:58 -0700)]
Merge "Whoops also need to move notification shade above lock screen."
Dianne Hackborn [Thu, 4 Aug 2011 01:55:19 +0000 (18:55 -0700)]
Whoops also need to move notification shade above lock screen.
And this requires making a new layer for the volume toast.
Change-Id: I4f272d56c87cf3b6bf886774b0fb02e610ab9164
Daniel Sandler [Thu, 4 Aug 2011 01:44:08 +0000 (21:44 -0400)]
Fix NPE on first-ever boot if display has rotated.
Bug:
5116154
Change-Id: I8c91fa9eae24c6cb25f4431da00dc4b527124ae3
Mike Lockwood [Thu, 4 Aug 2011 01:35:33 +0000 (18:35 -0700)]
Merge "UsbDeviceManager: Fix typo that broke adb on/off setting persistence"
Mike Lockwood [Thu, 4 Aug 2011 01:35:23 +0000 (18:35 -0700)]
Merge "Add support for localizing order of day of week and date in status bar date view"
Daniel Sandler [Thu, 4 Aug 2011 01:22:16 +0000 (21:22 -0400)]
Log some signal condition diagnostics for now.
Bug:
5103241
Change-Id: Id780a3e535270c53e5f1b531c761ca5010291040
Jaikumar Ganesh [Thu, 4 Aug 2011 01:15:11 +0000 (18:15 -0700)]
Merge "Fix PAN bug for reverse tethering."
Mathias Agopian [Thu, 4 Aug 2011 01:12:36 +0000 (18:12 -0700)]
Merge changes I689cb0c0,I09603218
* changes:
Add a 'release' method to the SurfaceTexture public Java API
Mark Window-Manager-specific APIs on android.view.Surface as @hide
Jean-Baptiste Queru [Thu, 4 Aug 2011 00:42:20 +0000 (17:42 -0700)]
am
a598d144: am
3a5e36f9: (-s ours) am
98c531dc: am
9b0c6bee: Merge "Fix a compiling error when trying to use setBufferCount"
* commit '
a598d144e8c9722ff83e38cd8a70bc15a00bcdf3':
Fix a compiling error when trying to use setBufferCount
Christopher Tate [Thu, 4 Aug 2011 00:37:56 +0000 (17:37 -0700)]
Merge "Make backup/restore confirmation UI landscape-friendly"