OSDN Git Service
Jim Miller [Fri, 18 Nov 2011 21:56:20 +0000 (13:56 -0800)]
resolved conflicts for merge of
1a783be3 to master
Change-Id: Ibaff3547ac51250fe40adf3aa06d6a30ecfcef54
Jesse Wilson [Fri, 18 Nov 2011 20:06:42 +0000 (12:06 -0800)]
Merge "Remove untrue tip about zero-length arrays."
Jesse Wilson [Fri, 18 Nov 2011 20:02:15 +0000 (15:02 -0500)]
Remove untrue tip about zero-length arrays.
Change-Id: I45ee2d603c1286c96acaa35d0c0fc28ecda47cef
Guang Zhu [Fri, 18 Nov 2011 17:15:56 +0000 (09:15 -0800)]
am
1753fd00: am
3af8b699: Merge "add a self instrumentation into framework perf app" into ics-mr1
* commit '
1753fd00764614213cfb9f88b00ee16fe3c1da3e':
add a self instrumentation into framework perf app
satok [Fri, 18 Nov 2011 17:15:54 +0000 (09:15 -0800)]
am
852b589a: am
1a3c051b: Merge "Hide/show ime switch icon properly" into ics-mr1
* commit '
852b589a51531f8f7a166f36f7596c255896f35c':
Hide/show ime switch icon properly
Jim Miller [Fri, 18 Nov 2011 10:37:49 +0000 (02:37 -0800)]
am
a8606cf6: am
398f80ea: Merge "Fix
5620754: don\'t show pattern screen after SIM PUK unlock" into ics-mr1
* commit '
a8606cf661fde3300165f181c5825cf0535adc66':
Fix
5620754: don't show pattern screen after SIM PUK unlock
Jamie Gennis [Fri, 18 Nov 2011 10:37:41 +0000 (02:37 -0800)]
am
9da22d2c: am
2ba13186: Merge "SurfaceTexture: fix a bug with buffer reallocation" into ics-mr1
* commit '
9da22d2cc31069d86a92021d8540bb5a77c9591b':
SurfaceTexture: fix a bug with buffer reallocation
Jamie Gennis [Fri, 18 Nov 2011 10:37:39 +0000 (02:37 -0800)]
am
e2fca63a: am
c8fd6e30: Merge "EGL: fix blob cache extension detection" into ics-mr1
* commit '
e2fca63a18c7bd3fb0c14e1c5dc391cd699cea9f':
EGL: fix blob cache extension detection
David Brown [Fri, 18 Nov 2011 10:37:28 +0000 (02:37 -0800)]
am
7d22534b: am
3f51f954: Merge "Fix a crash caused by SIP addresses containing "%40" instead of "@"" into ics-mr1
* commit '
7d22534b4cba49b1bd9d88969c3189a2c6fecf55':
Fix a crash caused by SIP addresses containing "%40" instead of "@"
Jamie Gennis [Fri, 18 Nov 2011 10:37:22 +0000 (02:37 -0800)]
am
0272e600: am
a37a78e2: Merge "GLES: add image external enums" into ics-mr1
* commit '
0272e60060162d2c32aec02d9cd1414dbbe14782':
GLES: add image external enums
The Android Open Source Project [Fri, 18 Nov 2011 10:37:17 +0000 (02:37 -0800)]
Jim Miller [Fri, 18 Nov 2011 02:59:59 +0000 (18:59 -0800)]
am
70bded0a: Merge "Fix
5636798: clear PIN/PUK fields when device sleeps or user cancels" into ics-mr1
* commit '
70bded0ab8390cb53342f1fb1f1ff9ee56f60e5f':
Fix
5636798: clear PIN/PUK fields when device sleeps or user cancels
Jim Miller [Fri, 18 Nov 2011 02:58:20 +0000 (18:58 -0800)]
Merge "Fix
5636798: clear PIN/PUK fields when device sleeps or user cancels" into ics-mr1
Guang Zhu [Fri, 18 Nov 2011 02:06:18 +0000 (18:06 -0800)]
am
3af8b699: Merge "add a self instrumentation into framework perf app" into ics-mr1
* commit '
3af8b699830bb5804f3c1b6420d9210b2fd8adb9':
add a self instrumentation into framework perf app
Guang Zhu [Fri, 18 Nov 2011 02:04:23 +0000 (18:04 -0800)]
Merge "add a self instrumentation into framework perf app" into ics-mr1
satok [Fri, 18 Nov 2011 02:03:46 +0000 (18:03 -0800)]
am
1a3c051b: Merge "Hide/show ime switch icon properly" into ics-mr1
* commit '
1a3c051bcc787363d9154da4a8e8e562dda32926':
Hide/show ime switch icon properly
satok [Fri, 18 Nov 2011 02:02:09 +0000 (18:02 -0800)]
Merge "Hide/show ime switch icon properly" into ics-mr1
Jim Miller [Fri, 18 Nov 2011 01:58:40 +0000 (17:58 -0800)]
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
Jim Miller [Fri, 18 Nov 2011 01:44:37 +0000 (17:44 -0800)]
am
398f80ea: Merge "Fix
5620754: don\'t show pattern screen after SIM PUK unlock" into ics-mr1
* commit '
398f80eacb8e59d868f287bf273a1253fe219ce4':
Fix
5620754: don't show pattern screen after SIM PUK unlock
Jim Miller [Fri, 18 Nov 2011 01:41:50 +0000 (17:41 -0800)]
Merge "Fix
5620754: don't show pattern screen after SIM PUK unlock" into ics-mr1
Jamie Gennis [Fri, 18 Nov 2011 01:11:59 +0000 (17:11 -0800)]
am
2ba13186: Merge "SurfaceTexture: fix a bug with buffer reallocation" into ics-mr1
* commit '
2ba13186b268de3527af6da1933a4b65877548d9':
SurfaceTexture: fix a bug with buffer reallocation
Jamie Gennis [Fri, 18 Nov 2011 01:11:57 +0000 (17:11 -0800)]
am
c8fd6e30: Merge "EGL: fix blob cache extension detection" into ics-mr1
* commit '
c8fd6e3057a98a992b96c2bce3fa2a981c6e45c0':
EGL: fix blob cache extension detection
Jamie Gennis [Fri, 18 Nov 2011 01:10:47 +0000 (17:10 -0800)]
Merge "SurfaceTexture: fix a bug with buffer reallocation" into ics-mr1
Jamie Gennis [Fri, 18 Nov 2011 01:10:32 +0000 (17:10 -0800)]
Merge "EGL: fix blob cache extension detection" into ics-mr1
Jim Miller [Fri, 18 Nov 2011 00:57:01 +0000 (16:57 -0800)]
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
David Brown [Fri, 18 Nov 2011 00:32:52 +0000 (16:32 -0800)]
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 "@"
David Brown [Fri, 18 Nov 2011 00:31:10 +0000 (16:31 -0800)]
Merge "Fix a crash caused by SIP addresses containing "%40" instead of "@"" into ics-mr1
satok [Thu, 17 Nov 2011 23:38:19 +0000 (08:38 +0900)]
Hide/show ime switch icon properly
Bug:
5481999
Change-Id: I4b3dde7285a9ac49da8d5d1133fddd0807b03f4d
Jamie Gennis [Fri, 18 Nov 2011 00:00:44 +0000 (16:00 -0800)]
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
Scott Main [Thu, 17 Nov 2011 23:56:43 +0000 (15:56 -0800)]
am
ff31a5b1: 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
* commit '
ff31a5b1566a7a3eaaf75fa67db11b8cadacf453':
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
Bill Gruber [Thu, 17 Nov 2011 23:56:41 +0000 (15:56 -0800)]
am
dbda791f: am
be0dab48: am
69e24843: Merge "Licensing docs: clarifies server response for draft apps Bug
2900690" into ics-mr0
* commit '
dbda791f3a77449b023fe0062895510e95da73dd':
Licensing docs: clarifies server response for draft apps Bug
2900690
Bill Gruber [Thu, 17 Nov 2011 23:56:39 +0000 (15:56 -0800)]
am
50c6dd0f: am
9d3dffc7: am
ef20eb25: Merge "Filters docs: removes references to forward-locking Bug
3055286" into ics-mr0
* commit '
50c6dd0fd5f7842bfbdc54ddbb134be883b52c41':
Filters docs: removes references to forward-locking Bug
3055286
Scott Main [Thu, 17 Nov 2011 23:56:37 +0000 (15:56 -0800)]
am
309643d9: am
fa847110: am
7d4c4721: docs: add sums/sizes for adt 15.0.1
* commit '
309643d93afd877b279acbe298b2258b62f67f53':
docs: add sums/sizes for adt 15.0.1
Fred Chung [Thu, 17 Nov 2011 23:56:36 +0000 (15:56 -0800)]
am
7f9c1c67: (-s ours) am
c2c77700: am
4750cbd9: Merge "DO NOT MERGE: Bluetooth HDP sample. Cherry pick from ics-mr1 Change ID I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e" into ics-mr0
* commit '
7f9c1c67ef135a5e7b8226a0003df525adc2593c':
DO NOT MERGE: Bluetooth HDP sample. Cherry pick from ics-mr1 Change ID I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e
Robert Ly [Thu, 17 Nov 2011 23:56:34 +0000 (15:56 -0800)]
am
57e16ed5: am
0a2da863: am
4f361741: Merge "docs: adt 15.0.1 rel notes" into ics-mr0
* commit '
57e16ed5f6c254b8b59d1effec2c4a8f3f43eac8':
docs: adt 15.0.1 rel notes
Christopher Tate [Thu, 17 Nov 2011 23:56:28 +0000 (15:56 -0800)]
am
7d997121: am
4cf1656e: Merge "Add a few GC-flexing microbenchmark tests" into ics-mr1
* commit '
7d9971213ff8fbfd41fa7039300ac28f555f43be':
Add a few GC-flexing microbenchmark tests
Jake Hamby [Thu, 17 Nov 2011 23:56:25 +0000 (15:56 -0800)]
am
2084d206: am
0f3570c3: Merge "Re-enable vril-dump for adb bugreport." into ics-mr1
* commit '
2084d20668a79e5a31ec7365652434ec943503ef':
Re-enable vril-dump for adb bugreport.
Jamie Gennis [Thu, 17 Nov 2011 23:49:45 +0000 (15:49 -0800)]
am
a37a78e2: Merge "GLES: add image external enums" into ics-mr1
* commit '
a37a78e2efe54892a744adfc6330c2d2179dee21':
GLES: add image external enums
Jamie Gennis [Thu, 17 Nov 2011 23:47:28 +0000 (15:47 -0800)]
Merge "GLES: add image external enums" into ics-mr1
The Android Open Source Project [Thu, 17 Nov 2011 23:41:03 +0000 (15:41 -0800)]
am
31b0c687: Reconcile with ics-mr0-release
* commit '
31b0c6872dcec0759ff0dbbcfc6bf1e51d3e0f12':
David Brown [Thu, 17 Nov 2011 06:10:56 +0000 (22:10 -0800)]
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
The Android Open Source Project [Thu, 17 Nov 2011 23:36:52 +0000 (15:36 -0800)]
Reconcile with ics-mr0-release
Change-Id: Ief57a18b44889bbdfb1bd7bd7c379f49b2f126b8
Nick Kralevich [Thu, 17 Nov 2011 23:30:46 +0000 (15:30 -0800)]
Merge "Rename EntropyService to EntropyMixer"
Guang Zhu [Thu, 17 Nov 2011 22:32:41 +0000 (14:32 -0800)]
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
Matthew Xie [Thu, 17 Nov 2011 23:13:03 +0000 (15:13 -0800)]
am
a4f5c425: am
2b9af44e: am
6da97a24: Merge "Check the bluetooth state for getUuid call" into ics-mr0
* commit '
a4f5c425b822a46fc49bc87bba82688570584ff1':
Check the bluetooth state for getUuid call
Nick Pelly [Thu, 17 Nov 2011 23:12:56 +0000 (15:12 -0800)]
am
c6a0277b: am
63b7360e: Merge "Fix NPE on devices that don\'t have NFC." into ics-mr1
* commit '
c6a0277bca29359ec1aee123495065982d2eea7a':
Fix NPE on devices that don't have NFC.
David Brown [Thu, 17 Nov 2011 23:12:54 +0000 (15:12 -0800)]
am
19a57bde: am
1733a3de: Merge "SIP addresses containing "911" shouldn\'t be considered emergency calls" into ics-mr1
* commit '
19a57bdedf3f9ccfa4d45cd35ef4b379853c6a81':
SIP addresses containing "911" shouldn't be considered emergency calls
Dave Santoro [Thu, 17 Nov 2011 23:12:52 +0000 (15:12 -0800)]
am
60e345a9: am
9be49620: Merge "Unhide social stream permissions." into ics-mr1
* commit '
60e345a9a95a0f24804f729eeb5216012d1bcbac':
Unhide social stream permissions.
Michael Kolb [Thu, 17 Nov 2011 23:12:49 +0000 (15:12 -0800)]
am
5397bb52: am
852585c0: Merge "Draw input field focus ring in WebTextView" into ics-mr1
* commit '
5397bb52fba04e8dc8496d731611210213847308':
Draw input field focus ring in WebTextView
Jeff Sharkey [Thu, 17 Nov 2011 23:12:45 +0000 (15:12 -0800)]
am
7892cbff: am
8ac35e30: Merge "Only write network stats when already loaded." into ics-mr1
* commit '
7892cbffbeffb6e73f4c88e9965064b3985971c2':
Only write network stats when already loaded.
Scott Main [Thu, 17 Nov 2011 22:53:51 +0000 (14:53 -0800)]
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
Bill Gruber [Thu, 17 Nov 2011 22:53:50 +0000 (14:53 -0800)]
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
Bill Gruber [Thu, 17 Nov 2011 22:53:48 +0000 (14:53 -0800)]
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
Scott Main [Thu, 17 Nov 2011 22:53:46 +0000 (14:53 -0800)]
am
fa847110: am
7d4c4721: docs: add sums/sizes for adt 15.0.1
* commit '
fa847110524512b4bb1cb8e655471d324aba69ff':
docs: add sums/sizes for adt 15.0.1
Fred Chung [Thu, 17 Nov 2011 22:53:45 +0000 (14:53 -0800)]
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
Robert Ly [Thu, 17 Nov 2011 22:53:43 +0000 (14:53 -0800)]
am
0a2da863: am
4f361741: Merge "docs: adt 15.0.1 rel notes" into ics-mr0
* commit '
0a2da86346f1f74b66425565e783efb2d5239f25':
docs: adt 15.0.1 rel notes
Alex Sakhartchouk [Thu, 17 Nov 2011 22:52:23 +0000 (14:52 -0800)]
Merge "adding benchmark single test"
Scott Main [Thu, 17 Nov 2011 22:49:36 +0000 (14:49 -0800)]
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
Bill Gruber [Thu, 17 Nov 2011 22:49:33 +0000 (14:49 -0800)]
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
Bill Gruber [Thu, 17 Nov 2011 22:49:32 +0000 (14:49 -0800)]
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
Scott Main [Thu, 17 Nov 2011 22:49:28 +0000 (14:49 -0800)]
am
7d4c4721: docs: add sums/sizes for adt 15.0.1
* commit '
7d4c4721c6dd5473464d4620749b302a413c7ebd':
docs: add sums/sizes for adt 15.0.1
Fred Chung [Thu, 17 Nov 2011 22:49:26 +0000 (14:49 -0800)]
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
Robert Ly [Thu, 17 Nov 2011 22:49:21 +0000 (14:49 -0800)]
am
4f361741: Merge "docs: adt 15.0.1 rel notes" into ics-mr0
* commit '
4f361741185d523b5469a264521eeeb4eee9344d':
docs: adt 15.0.1 rel notes
Christopher Tate [Thu, 17 Nov 2011 22:45:26 +0000 (14:45 -0800)]
am
4cf1656e: Merge "Add a few GC-flexing microbenchmark tests" into ics-mr1
* commit '
4cf1656e10514d0575304d5a8108bc7a0b7384ed':
Add a few GC-flexing microbenchmark tests
Christopher Tate [Thu, 17 Nov 2011 22:43:17 +0000 (14:43 -0800)]
Merge "Add a few GC-flexing microbenchmark tests" into ics-mr1
Alex Sakhartchouk [Thu, 17 Nov 2011 22:08:47 +0000 (14:08 -0800)]
adding benchmark single test
Change-Id: I902579085bfee2f0bdc0bf4f38442f2f1569bf71
Glenn Kasten [Thu, 17 Nov 2011 22:08:31 +0000 (14:08 -0800)]
Merge "Bug
5522189 re-enable ARM opts but disable inline"
Christopher Tate [Thu, 17 Nov 2011 21:51:08 +0000 (13:51 -0800)]
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
Jamie Gennis [Thu, 17 Nov 2011 05:45:30 +0000 (21:45 -0800)]
EGL: fix blob cache extension detection
Bug:
5474671
Change-Id: I6359063ccf23f076fc84c80b8a2f6731a65eef18
Jake Hamby [Thu, 17 Nov 2011 21:55:29 +0000 (13:55 -0800)]
am
0f3570c3: Merge "Re-enable vril-dump for adb bugreport." into ics-mr1
* commit '
0f3570c3c1467bc4c900d256c6d9dc12ffb35ff1':
Re-enable vril-dump for adb bugreport.
Jake Hamby [Thu, 17 Nov 2011 21:53:17 +0000 (13:53 -0800)]
Merge "Re-enable vril-dump for adb bugreport." into ics-mr1
Nick Kralevich [Thu, 17 Nov 2011 21:24:32 +0000 (13:24 -0800)]
Rename EntropyService to EntropyMixer
EntropyService implies that this program provides entropy to other
programs, and is misleading. The EntropyMixer class is designed purely
to stir the existing entropy pool with some possibily random-ish data,
and carryover entropy across device reboots.
Change-Id: I086cd339a3b652d32371521e61e1b1f555ce2280
Glenn Kasten [Thu, 17 Nov 2011 21:27:22 +0000 (13:27 -0800)]
Bug
5522189 re-enable ARM opts but disable inline
PIE did not work together with inlining. This change combines (almost
all of) the performance benefits of ARM optimizations together with PIE.
Change-Id: I4594d33ae5a0a7bac327ae08e30fb35343a06256
Jake Hamby [Thu, 17 Nov 2011 21:20:35 +0000 (13:20 -0800)]
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
Amith Yamasani [Thu, 17 Nov 2011 21:20:22 +0000 (13:20 -0800)]
am
664bb774: am
aefc0ed9: Merge "Don\'t upgrade some settings from GB to ICS." into ics-mr1
* commit '
664bb774f528fead63d7c0e62b533da66390b246':
Don't upgrade some settings from GB to ICS.
Fred Chung [Thu, 17 Nov 2011 21:20:19 +0000 (13:20 -0800)]
am
a8f7b7c4: am
3a7e2c0b: Merge "Adding missed Android.mk file to the original Bluetooth HDP sample Change-Id: I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e." into ics-mr1
* commit '
a8f7b7c4794d62df4b3cec67dee1a9887afb53a4':
Adding missed Android.mk file to the original Bluetooth HDP sample Change-Id: I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e.
Andreas Huber [Thu, 17 Nov 2011 21:20:16 +0000 (13:20 -0800)]
am
624efe45: am
c1b1709b: Merge "Make sure not to cancel pending seek/EOS notifications on a cache underrun..." into ics-mr1
* commit '
624efe45671131903fb5165f6133ba39486092ab':
Make sure not to cancel pending seek/EOS notifications on a cache underrun...
John Reck [Thu, 17 Nov 2011 21:20:15 +0000 (13:20 -0800)]
am
0551287f: am
775e986e: Merge "Fix add single character check" into ics-mr1
* commit '
0551287f6ed06511feae2a6b3700a9bca4cfc3cd':
Fix add single character check
John Reck [Thu, 17 Nov 2011 21:20:12 +0000 (13:20 -0800)]
am
2c6afef8: am
1da3d656: Merge "Undeprecate LayoutAlgorithm" into ics-mr1
* commit '
2c6afef8766371bf933f8675c80687802ce045e0':
Undeprecate LayoutAlgorithm
Matthew Xie [Thu, 17 Nov 2011 21:12:39 +0000 (13:12 -0800)]
am
2b9af44e: am
6da97a24: Merge "Check the bluetooth state for getUuid call" into ics-mr0
* commit '
2b9af44e401d884469869a4ac0933bfa727d3135':
Check the bluetooth state for getUuid call
Matthew Xie [Thu, 17 Nov 2011 21:10:14 +0000 (13:10 -0800)]
am
6da97a24: Merge "Check the bluetooth state for getUuid call" into ics-mr0
* commit '
6da97a24e329851888890d4e380066037d08bcd7':
Check the bluetooth state for getUuid call
Nick Pelly [Thu, 17 Nov 2011 20:51:18 +0000 (12:51 -0800)]
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.
Nick Pelly [Thu, 17 Nov 2011 20:48:48 +0000 (12:48 -0800)]
Merge "Fix NPE on devices that don't have NFC." into ics-mr1
David Brown [Thu, 17 Nov 2011 20:35:26 +0000 (12:35 -0800)]
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
David Brown [Thu, 17 Nov 2011 20:33:00 +0000 (12:33 -0800)]
Merge "SIP addresses containing "911" shouldn't be considered emergency calls" into ics-mr1
Scott Main [Thu, 17 Nov 2011 20:32:11 +0000 (12:32 -0800)]
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
Dave Santoro [Thu, 17 Nov 2011 20:27:44 +0000 (12:27 -0800)]
am
9be49620: Merge "Unhide social stream permissions." into ics-mr1
* commit '
9be4962060ca67c4fe9bfc391043f6d2829cf720':
Unhide social stream permissions.
Dave Santoro [Thu, 17 Nov 2011 20:26:17 +0000 (12:26 -0800)]
Merge "Unhide social stream permissions." into ics-mr1
Michael Kolb [Thu, 17 Nov 2011 20:25:06 +0000 (12:25 -0800)]
am
852585c0: Merge "Draw input field focus ring in WebTextView" into ics-mr1
* commit '
852585c034d383ea6afe1b484afa57cbf4d04f95':
Draw input field focus ring in WebTextView
Scott Main [Tue, 25 Oct 2011 19:11:40 +0000 (12:11 -0700)]
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
Michael Kolb [Thu, 17 Nov 2011 20:22:58 +0000 (12:22 -0800)]
Merge "Draw input field focus ring in WebTextView" into ics-mr1
Jeff Sharkey [Thu, 17 Nov 2011 20:11:47 +0000 (12:11 -0800)]
am
8ac35e30: Merge "Only write network stats when already loaded." into ics-mr1
* commit '
8ac35e30b29f3a3e81ed722621bf7f1de708455f':
Only write network stats when already loaded.
Jeff Sharkey [Thu, 17 Nov 2011 20:10:02 +0000 (12:10 -0800)]
Merge "Only write network stats when already loaded." into ics-mr1
Jeff Sharkey [Thu, 17 Nov 2011 19:59:29 +0000 (11:59 -0800)]
Only write network stats when already loaded.
Bug:
5584564
Change-Id: Ife2a68804bf3691e9bccdc167807204bce8a85b2
Ben Murdoch [Thu, 17 Nov 2011 19:46:30 +0000 (11:46 -0800)]
am
e6269f79: am
fead0e14: Merge changes I59323dc5,I31a01aa3 into ics-mr1
* commit '
e6269f7988a2ec0d1f9ea37d92d6b0ca2f3dc3b8':
WebViewDatabase v11 for ICS.
Fix a bug in the database upgrade process, and refactor slightly.
Jeff Sharkey [Thu, 17 Nov 2011 19:46:26 +0000 (11:46 -0800)]
am
66b570c7: am
b9df01d3: Merge "Update NTP outside locks, log large trim events." into ics-mr1
* commit '
66b570c70471976cd2a99825898c778a7850f2c8':
Update NTP outside locks, log large trim events.
Daniel Sandler [Thu, 17 Nov 2011 19:46:23 +0000 (11:46 -0800)]
am
a092482c: am
293f861a: Merge "Activate Dreams (screen saver) when desk-docked." into ics-mr1
* commit '
a092482c17830b985798d5da9c1d1951735bacf3':
Activate Dreams (screen saver) when desk-docked.
Daniel Sandler [Thu, 17 Nov 2011 19:46:21 +0000 (11:46 -0800)]
am
7fd3ba91: am
d5decdcc: Merge "Disable desk dock apps." into ics-mr1
* commit '
7fd3ba9149affe68f8e21c88d3eceb4514cf2f6f':
Disable desk dock apps.
Mathias Agopian [Thu, 17 Nov 2011 19:46:20 +0000 (11:46 -0800)]
am
2030d78d: am
8fc3540f: Merge "be a bit more defensive when parsing extension strings" into ics-mr1
* commit '
2030d78dc9c20d2f561f4b11f1a1adddb63661c6':
be a bit more defensive when parsing extension strings
Nicolas Roard [Thu, 17 Nov 2011 19:46:09 +0000 (11:46 -0800)]
am
e788fa84: am
e88ca718: Merge "Hack to workaround the fact that the EGL context can be removed from under us by framework in low memory condition." into ics-mr1
* commit '
e788fa84f1fac845e50922fc536694ce1cc2fbdb':
Hack to workaround the fact that the EGL context can be removed from under us by framework in low memory condition.