61437 Commits

Author SHA1 Message Date
Wei Huang
c2fff5ea39 Merge "Unlock camera AWB lock only when white-balance is changed." into ics-mr1 2011-11-18 14:00:09 -08:00
The Android Open Source Project
d5280e51aa Reconcile with ics-mr0-release
Change-Id: I805d2b484b72fb640a889ff2a4b67944cbbe012a
2011-11-18 13:12:33 -08:00
Mathias Agopian
4d71053b07 Merge "attempt to fix bug 5313580" into ics-mr1 2011-11-18 12:11:15 -08:00
Bart Sears
e6a96560ed Merge "Content and viewport rects set in one step." into ics-mr1 2011-11-18 11:46:26 -08:00
Svetoslav Ganov
0358787f68 Merge "Add the support libraries to the platform documentation (build)." into ics-mr1 2011-11-18 10:11:35 -08:00
Joe Fernandez
dea90a0e1c am 366113fa: Merge "docs: Camera Features for developers" into ics-mr0
* commit '366113fa1bea5ef39cf6557f18ff00310eb6e458':
  docs: Camera Features for developers
2011-11-18 06:14:01 -08:00
Scott Main
d353df8db4 am 48eaa6c9: docs: update caption for action bar figure to match new screenshot
* commit '48eaa6c9e5ab224201b17d2ea3e7e43e04c40f3b':
  docs: update caption for action bar figure to match new screenshot
2011-11-18 02:49:49 -08:00
Wu-cheng Li
b838d8d4a2 Unlock camera AWB lock only when white-balance is changed.
bug:5633546
Change-Id: I90bb4b5b445daedf38a64e2f8fb980fc0f0aaa81
2011-11-18 15:21:47 +08:00
Daniel Sandler
da0e7b0c7a Merge "Tie screen saver to the screen off timeout." into ics-mr1 2011-11-17 21:02:40 -08:00
Adam Powell
8c54182f0b Merge "Fix bug 5614962 - Constant spinning wheel in USB Mass Storage screen (UX)" into ics-mr1 2011-11-17 19:44:14 -08:00
Jim Miller
70bded0ab8 Merge "Fix 5636798: clear PIN/PUK fields when device sleeps or user cancels" into ics-mr1 2011-11-17 18:58:20 -08:00
Mathias Agopian
90cbbd1f7f attempt to fix bug 5313580
the working theory here is that a Surface object has become non-promotable
because it lost its last reference; later Surface::readFromParcel is called
the previous surface is found in the cache, but can't be promoted. this causes
a new Surface object to be created which will promptly try to connect to the
CPU_API -- this in turn will fail because the previous (now dead) surface is
still connected.

To fix this, we make sure to disconnect from the SurfaceTexture when
Surface[TextureClient] is destroyed.

Change-Id: I422234868a05d7b7d283e9d5a85f7ab79e65d8a9
2011-11-17 18:46:09 -08:00
Guang Zhu
3af8b69983 Merge "add a self instrumentation into framework perf app" into ics-mr1 2011-11-17 18:04:23 -08:00
satok
1a3c051bcc Merge "Hide/show ime switch icon properly" into ics-mr1 2011-11-17 18:02:09 -08:00
Adam Powell
c992087d09 Fix bug 5614962 - Constant spinning wheel in USB Mass Storage screen (UX)
Disable the window-level progress spinner; another is already shown while
connecting.

Use the correct Settings icon for SystemUI.

Specify the activity title for the USB mass storage screen in the
manifest to avoid title flashing during startup.

Change-Id: Ic57af56bf1661a5eaa91fff77471dc8447340d16
2011-11-17 18:01:07 -08:00
Jim Miller
9a3caf39e4 Fix 5636798: clear PIN/PUK fields when device sleeps or user cancels
This bug is the result of onPause()/onResume() not being called properly
when we have both lock and unlock screens present, which is true for the SIM
and PUK unlock cases.

The fix is to invoke onPause() and onResume() on both of them if they exist.

Verified the rest of the code correctly handles having both.

Also, when the user cancels, we now clear the fields.

Change-Id: If7fbd31df7eab9e3d60656d50d2392607a4bf471
2011-11-17 17:58:40 -08:00
The Android Automerger
a5dd3bab78 merge in ics-mr0-release history after reset to ics-mr0 2011-11-17 17:49:17 -08:00
Jim Miller
398f80eacb Merge "Fix 5620754: don't show pattern screen after SIM PUK unlock" into ics-mr1 2011-11-17 17:41:50 -08:00
Joe Fernandez
366113fa1b Merge "docs: Camera Features for developers" into ics-mr0 2011-11-17 17:34:33 -08:00
Jamie Gennis
2ba13186b2 Merge "SurfaceTexture: fix a bug with buffer reallocation" into ics-mr1 2011-11-17 17:10:47 -08:00
Jamie Gennis
c8fd6e3057 Merge "EGL: fix blob cache extension detection" into ics-mr1 2011-11-17 17:10:32 -08:00
Joe Fernandez
452e41f607 docs: Camera Features for developers
Change-Id: Ie85f9a5c6808a921b0f80a30749442369740a9c6
2011-11-17 17:03:37 -08:00
Jim Miller
90d5d46b9e Fix 5620754: don't show pattern screen after SIM PUK unlock
This fixes a bug where we would inadvertently show the pattern
screen after PUK-unlocking the device.  Could potentially happen
after SIM unlock as well, but that path appears to be fast enough that
it's rarely seen.

The cause was not getting the SIM state change before deciding to show
the Unlock screen.

We now immediately invoke the callback if SIM/PUK unlock succeeds without
waiting for the round-trip from the radio layer.

Change-Id: I02dcb456da415b82f30f8e3abc43f788f3931b33
2011-11-17 16:57:01 -08:00
David Brown
3f51f95494 Merge "Fix a crash caused by SIP addresses containing "%40" instead of "@"" into ics-mr1 2011-11-17 16:31:10 -08:00
satok
3afd6c0d4d Hide/show ime switch icon properly
Bug: 5481999
Change-Id: I4b3dde7285a9ac49da8d5d1133fddd0807b03f4d
2011-11-18 09:15:18 +09:00
Scott Main
48eaa6c9e5 docs: update caption for action bar figure to match new screenshot
Change-Id: I233383ca7168ddb96231d3d22a5dcd6342462103
2011-11-17 16:10:54 -08:00
Jamie Gennis
e36d05483f SurfaceTexture: fix a bug with buffer reallocation
This change fixes an issue involving buffer reallocation and the
ALLOW_DEQUEUE_CURRENT_BUFFER mode in SurfaceTexture.  The bug happened
when the buffer slot currently attached to the GL texture was selected
for dequeuing, but the dequeue operation caused the buffer to be
reallocated.  Because the buffer is new, the image producer could fill
the buffer and queue it before an updateTexImage call, which would
result in the "slot %d is current" error in queueBuffer.

Bug: 5631630
Change-Id: Icdd8bc5cad3c7db43953446d9be2603aaea11a8d
2011-11-17 16:00:44 -08:00
Svetoslav Ganov
92f12f5e40 Add the support libraries to the platform documentation (build).
Updated the make file to generate documentation for the support libs.

bug:5629339

Change-Id: I44222f78d002660ad52610083421e4b840ceb541
2011-11-17 15:56:13 -08:00
Jamie Gennis
a37a78e2ef Merge "GLES: add image external enums" into ics-mr1 2011-11-17 15:47:28 -08:00
David Brown
158f116eb7 Fix a crash caused by SIP addresses containing "%40" instead of "@"
CallerInfo.doSecondaryLookupIfNecessary() was assuming that SIP addresses
would always contain the character '@', but that's not always true since
the username/domainname delimiter can actually be "%40" (the URI-escaped
equivalent.)

This would cause the in-call UI to crash if you ever called a SIP address
like "xyz%40example.com".

TESTED:
 - Make an outgoing call to the SIP address "xyz%40example.com"
   ==> The call ultimately fails, but the in-call UI no longer crashes when
       it first comes up.

Bug: 5637074
Change-Id: I62d15a7ccd509924d38b780b92e657b9efa26125
2011-11-17 15:39:21 -08:00
The Android Open Source Project
31b0c6872d Reconcile with ics-mr0-release
Change-Id: Ief57a18b44889bbdfb1bd7bd7c379f49b2f126b8
2011-11-17 15:36:52 -08:00
Guang Zhu
5eefd7711f add a self instrumentation into framework perf app
It's essentially a test app on itself to facilitate
running the perf automatically.

Change-Id: I5aad3565e64719d219e76969a989ca80aa6df286
2011-11-17 15:26:36 -08:00
Scott Main
85c7394836 am 08d40d71: Merge "docs: Big update to action bar guide for ICS. Added section for action provider, new APIs for handsets such as split action bar, more information and diagrams for up navigation, guidelines for picking action items, revised sample code and discussio
* commit '08d40d71806d482fa92f6a9b952487c3ccc63bb3':
  docs: Big update to action bar guide for ICS. Added section for action provider, new APIs for handsets such as split action bar, more information and diagrams for up navigation, guidelines for picking action items, revised sample code and discussion for tabs, add expandible action view info, and expanded discussion for customizing action bar styles bug:4726917
2011-11-17 14:49:36 -08:00
Bill Gruber
be0dab4856 am 69e24843: Merge "Licensing docs: clarifies server response for draft apps Bug 2900690" into ics-mr0
* commit '69e24843fc89dcdd35802dbb6a2b693650ec8a41':
  Licensing docs: clarifies server response for draft apps Bug 2900690
2011-11-17 14:49:33 -08:00
Bill Gruber
9d3dffc7b0 am ef20eb25: Merge "Filters docs: removes references to forward-locking Bug 3055286" into ics-mr0
* commit 'ef20eb2595d0c74eabbcafe6ec50387de37e18de':
  Filters docs: removes references to forward-locking Bug 3055286
2011-11-17 14:49:32 -08:00
Scott Main
fa84711052 am 7d4c4721: docs: add sums/sizes for adt 15.0.1
* commit '7d4c4721c6dd5473464d4620749b302a413c7ebd':
  docs: add sums/sizes for adt 15.0.1
2011-11-17 14:49:28 -08:00
Fred Chung
c2c77700fb am 4750cbd9: Merge "DO NOT MERGE: Bluetooth HDP sample. Cherry pick from ics-mr1 Change ID I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e" into ics-mr0
* commit '4750cbd9311b763265f8ab6ddee187e0c9a71665':
  DO NOT MERGE: Bluetooth HDP sample. Cherry pick from ics-mr1 Change ID I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e
2011-11-17 14:49:26 -08:00
Robert Ly
0a2da86346 am 4f361741: Merge "docs: adt 15.0.1 rel notes" into ics-mr0
* commit '4f361741185d523b5469a264521eeeb4eee9344d':
  docs: adt 15.0.1 rel notes
2011-11-17 14:49:21 -08:00
Christopher Tate
4cf1656e10 Merge "Add a few GC-flexing microbenchmark tests" into ics-mr1 2011-11-17 14:43:17 -08:00
Christopher Tate
4c18ad56f7 Add a few GC-flexing microbenchmark tests
Added ObjectGc and FinalizingGc to stress single-object allocation and
collection with/without the presence of finalizers.

Also added GcOp() to the menu of available single-shot tests.

Change-Id: I36d3254dfe2e97e504f9e4f77c8addda98ab4f4b
2011-11-17 14:07:58 -08:00
Jamie Gennis
cf30c60f1b EGL: fix blob cache extension detection
Bug: 5474671
Change-Id: I6359063ccf23f076fc84c80b8a2f6731a65eef18
2011-11-17 14:06:46 -08:00
Jake Hamby
0f3570c3c1 Merge "Re-enable vril-dump for adb bugreport." into ics-mr1 2011-11-17 13:53:17 -08:00
Daniel Sandler
7e37df5d1f Tie screen saver to the screen off timeout.
The window manager now monitors the plug state; the screen
saver will never be automatically started if the device is
running off battery.

Change-Id: Ib1064d9cdd540238957df3ba7020303b0f6943c2
2011-11-17 13:29:01 -08:00
Jake Hamby
9c27e36eca Re-enable vril-dump for adb bugreport.
vril-dump was causing adb bugreport to hang on Xoom. The OEM fixed
the utility and we can now run it again as part of the bug report.

Bug: 5482585
Change-Id: I1db3b50c327d50d18fb9c6327c4cd521e09f3916
2011-11-17 13:20:35 -08:00
Matthew Xie
2b9af44e40 am 6da97a24: Merge "Check the bluetooth state for getUuid call" into ics-mr0
* commit '6da97a24e329851888890d4e380066037d08bcd7':
  Check the bluetooth state for getUuid call
2011-11-17 13:10:14 -08:00
Nick Pelly
63b7360e9d Merge "Fix NPE on devices that don't have NFC." into ics-mr1 2011-11-17 12:48:48 -08:00
David Brown
1733a3de8c Merge "SIP addresses containing "911" shouldn't be considered emergency calls" into ics-mr1 2011-11-17 12:33:00 -08:00
Scott Main
08d40d7180 Merge "docs: Big update to action bar guide for ICS. Added section for action provider, new APIs for handsets such as split action bar, more information and diagrams for up navigation, guidelines for picking action items, revised sample code and discussion for tabs, add expandible action view info, and expanded discussion for customizing action bar styles bug:4726917" into ics-mr0 2011-11-17 12:32:11 -08:00
Dave Santoro
9be4962060 Merge "Unhide social stream permissions." into ics-mr1 2011-11-17 12:26:17 -08:00
Scott Main
258a51e3e6 docs: Big update to action bar guide for ICS.
Added section for action provider, new APIs for handsets such as
split action bar, more information and diagrams for up navigation,
guidelines for picking action items, revised sample code and discussion
for tabs, add expandible action view info,
and expanded discussion for customizing action bar styles
bug:4726917

Change-Id: If61a5f2aad5ed21b0b23b3fc14309a50617f86ce
2011-11-17 12:24:31 -08:00