64624 Commits

Author SHA1 Message Date
Jamie Gennis
8bf35429f9 am 2ba13186: Merge "SurfaceTexture: fix a bug with buffer reallocation" into ics-mr1
* commit '2ba13186b268de3527af6da1933a4b65877548d9':
  SurfaceTexture: fix a bug with buffer reallocation
2011-11-17 17:12:45 -08:00
Jamie Gennis
3cb3e21339 am c8fd6e30: Merge "EGL: fix blob cache extension detection" into ics-mr1
* commit 'c8fd6e3057a98a992b96c2bce3fa2a981c6e45c0':
  EGL: fix blob cache extension detection
2011-11-17 17:12:43 -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
d196df0d86 am 3f51f954: Merge "Fix a crash caused by SIP addresses containing "%40" instead of "@"" into ics-mr1
* commit '3f51f954948caf1fe5b3f175f7e8523f2ba58f58':
  Fix a crash caused by SIP addresses containing "%40" instead of "@"
2011-11-17 16:32:54 -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
Joe Onorato
77173567ee Merge "Don't try to unmarshal void return types when there are out parameters being returned." into ics-aah 2011-11-17 16:15:18 -08:00
Joe Onorato
6980de4ef9 Don't try to unmarshal void return types when there are out parameters being returned.
Change-Id: Ib7d2a5609167a076dd7ee8e10e8a55056789517e
2011-11-17 16:13:49 -08: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
a77bec3f09 am a37a78e2: Merge "GLES: add image external enums" into ics-mr1
* commit 'a37a78e2efe54892a744adfc6330c2d2179dee21':
  GLES: add image external enums
2011-11-17 16:03:57 -08:00
The Android Open Source Project
2f8f040fb4 am 31b0c687: Reconcile with ics-mr0-release
* commit '31b0c6872dcec0759ff0dbbcfc6bf1e51d3e0f12':
2011-11-17 16:03:55 -08:00
Scott Main
f8d82099be am 85c73948: 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
* commit '85c7394836843b2cbfa2b51504448794a6071b3a':
  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 16:03:49 -08:00
Bill Gruber
cd8cccda8a am be0dab48: am 69e24843: Merge "Licensing docs: clarifies server response for draft apps Bug 2900690" into ics-mr0
* commit 'be0dab485680fb264458f8192b3759b002450102':
  Licensing docs: clarifies server response for draft apps Bug 2900690
2011-11-17 16:03:47 -08:00
Bill Gruber
d36228ac64 am 9d3dffc7: am ef20eb25: Merge "Filters docs: removes references to forward-locking Bug 3055286" into ics-mr0
* commit '9d3dffc7b05dbbad4a5e597fa964398b827ba945':
  Filters docs: removes references to forward-locking Bug 3055286
2011-11-17 16:03:45 -08:00
Scott Main
c326f9da97 am fa847110: am 7d4c4721: docs: add sums/sizes for adt 15.0.1
* commit 'fa847110524512b4bb1cb8e655471d324aba69ff':
  docs: add sums/sizes for adt 15.0.1
2011-11-17 16:03:44 -08:00
Fred Chung
eb0ebc4552 am c2c77700: am 4750cbd9: Merge "DO NOT MERGE: Bluetooth HDP sample. Cherry pick from ics-mr1 Change ID I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e" into ics-mr0
* commit 'c2c77700fbab25bc48002a46a6c0d8a81008030c':
  DO NOT MERGE: Bluetooth HDP sample. Cherry pick from ics-mr1 Change ID I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e
2011-11-17 16:03:42 -08:00
Robert Ly
b61cf8b324 am 0a2da863: am 4f361741: Merge "docs: adt 15.0.1 rel notes" into ics-mr0
* commit '0a2da86346f1f74b66425565e783efb2d5239f25':
  docs: adt 15.0.1 rel notes
2011-11-17 16:03:40 -08:00
Christopher Tate
9bb7c1e6c0 am 4cf1656e: Merge "Add a few GC-flexing microbenchmark tests" into ics-mr1
* commit '4cf1656e10514d0575304d5a8108bc7a0b7384ed':
  Add a few GC-flexing microbenchmark tests
2011-11-17 16:03:28 -08:00
Jake Hamby
bd91e23cde am 0f3570c3: Merge "Re-enable vril-dump for adb bugreport." into ics-mr1
* commit '0f3570c3c1467bc4c900d256c6d9dc12ffb35ff1':
  Re-enable vril-dump for adb bugreport.
2011-11-17 16:03:26 -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
430d36fef9 am 2b9af44e: am 6da97a24: Merge "Check the bluetooth state for getUuid call" into ics-mr0
* commit '2b9af44e401d884469869a4ac0933bfa727d3135':
  Check the bluetooth state for getUuid call
2011-11-17 13:12:39 -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
480f50f483 am 63b7360e: Merge "Fix NPE on devices that don\'t have NFC." into ics-mr1
* commit '63b7360e9d8c6fb077bdd00c7ef08f402d5a76ba':
  Fix NPE on devices that don't have NFC.
2011-11-17 12:50:39 -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
864f87d42f am 1733a3de: Merge "SIP addresses containing "911" shouldn\'t be considered emergency calls" into ics-mr1
* commit '1733a3de8c4f98ba4df08ab79d1fef6d2684d2c2':
  SIP addresses containing "911" shouldn't be considered emergency calls
2011-11-17 12:34:54 -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
60a6540a51 am 9be49620: Merge "Unhide social stream permissions." into ics-mr1
* commit '9be4962060ca67c4fe9bfc391043f6d2829cf720':
  Unhide social stream permissions.
2011-11-17 12:28:11 -08:00
Dave Santoro
9be4962060 Merge "Unhide social stream permissions." into ics-mr1 2011-11-17 12:26:17 -08:00
Michael Kolb
7e0e2dc28d am 852585c0: Merge "Draw input field focus ring in WebTextView" into ics-mr1
* commit '852585c034d383ea6afe1b484afa57cbf4d04f95':
  Draw input field focus ring in WebTextView
2011-11-17 12:24:43 -08:00