OSDN Git Service
Chiao Cheng [Wed, 20 Mar 2013 20:12:41 +0000 (13:12 -0700)]
Allow leading slash in path argument for addURI() method.
The original documentation for this class indicated a leading slash was possible
but the code did not support it. Since then, the docs were changed to reflect
what the code does.
The purpose of this change is to allow the use of uri.getPath() as an argument.
With this change, the following can be done
matcher.addURI(ContactsContract.AUTHORITY,
ContactsContract.CONTENT_FILTER_URI.getPath(), CONTACTS_FILTER)
instead of
matcher.addURI(ContactsContract.AUTHORITY,
"contacts/filter", CONTACTS_FILTER)
Change-Id: I76a9e3133365be9fe7a8de86eae57f9eea1cd2a3
Svetoslav Ganov [Mon, 18 Mar 2013 21:23:45 +0000 (21:23 +0000)]
Merge "Remember which list child has A11y focus BEFORE clearing A11y focus." into jb-mr2-dev
Irfan Sheriff [Mon, 18 Mar 2013 21:13:48 +0000 (21:13 +0000)]
Merge "Fix tethering" into jb-mr2-dev
Craig Mautner [Mon, 18 Mar 2013 20:57:26 +0000 (20:57 +0000)]
Merge "Properly close Surface when done." into jb-mr2-dev
Irfan Sheriff [Mon, 18 Mar 2013 20:52:22 +0000 (13:52 -0700)]
Fix tethering
Using sendMessageAtFrontofQueue() causes issues here since there can be a start
that is deferred and it basically has no effect. Use defer which is more clean
and obvious here.
Bug:
8410547
Change-Id: I4fbf299283847e7c3009b87a81cb56e765b0e1e1
Dianne Hackborn [Mon, 18 Mar 2013 18:44:51 +0000 (18:44 +0000)]
Merge "Improve/flesh-out shared library version check." into jb-mr2-dev
Chet Haase [Tue, 26 Feb 2013 23:12:13 +0000 (16:12 -0700)]
DO NOT MERGE: ListView transient state fix
ListView child views with transientState (setHasTransientState(true)) are not
handled correctly when the data set changes, such as when an item is added
or removed. The problem is that the transient views are cached by their
position, but this position is out of sync between the ListView and the adapter
until the ListView layout process is complete.
A better way, which unfortunately only works on ListViews with stable IDs, is
to cache the views by their itemID instead, and to use that ID to determine when
and where to reuse/retrieve a transient view during the ListView layout.
Issue #
8254775 View.setHasTransient state has side-effects when deleting content in ListView
Change-Id: I2fc25e71ed6655af30b9c3f47fdf014e9b667616
Craig Mautner [Mon, 18 Mar 2013 17:06:21 +0000 (10:06 -0700)]
Properly close Surface when done.
Surface.destroy was not being called. Leading to warning from
StrictMode.
Fixes bug
8388527.
Change-Id: I472fb57ed2c3f6389e53d8f020f3b22b2d0740c8
Lorenzo Colitti [Mon, 18 Mar 2013 16:41:57 +0000 (16:41 +0000)]
Merge "Framework changes for 464xlat." into jb-mr2-dev
Baligh Uddin [Mon, 18 Mar 2013 16:37:35 +0000 (16:37 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Mon, 18 Mar 2013 16:15:53 +0000 (09:15 -0700)]
Import translations. DO NOT MERGE
Change-Id: I18e0b1bb666d62540c921e8e83508ef6dc3f01af
Auto-generated-cl: translation import
Lorenzo Colitti [Mon, 18 Mar 2013 15:45:01 +0000 (15:45 +0000)]
Merge "Catch RuntimeException in NMService notifications" into jb-mr2-dev
Chet Haase [Mon, 18 Mar 2013 14:29:05 +0000 (14:29 +0000)]
Merge "Add overlays to views" into jb-mr2-dev
Wink Saville [Sun, 17 Mar 2013 21:27:19 +0000 (21:27 +0000)]
Merge "Add new StateMachine constructor with name and handler params." into jb-mr2-dev
Wink Saville [Sun, 17 Mar 2013 21:26:21 +0000 (14:26 -0700)]
Add new StateMachine constructor with name and handler params.
Change-Id: Ic252de6cac24a043050b37d81767d19e2739b2fc
Lorenzo Colitti [Sat, 16 Mar 2013 18:21:35 +0000 (03:21 +0900)]
Catch RuntimeException in NMService notifications
Currently, NetworkManagementService only catches RemoteExceptions
when calling the BaseNetworkObserver notification methods (e.g.,
interfaceStatusChanged). However, if the observer is in the same
process, unchecked exceptions can occur as well.
When this happens, finishBroadcast does not get called, and no
further notifications can be sent, because any attempt to do so
fails with a "beginBroadcast() called while already in a
broadcast" exception.
Fix this by catching RuntimeException as well.
Bug:
8397534
Bug:
8276725
Change-Id: Icd6f32128707244978943c48a9ea3a2b952a2957
Chris Craik [Sat, 16 Mar 2013 02:09:16 +0000 (02:09 +0000)]
Merge "Reset draw modifiers after flushing" into jb-mr2-dev
Dianne Hackborn [Sat, 16 Mar 2013 01:59:29 +0000 (01:59 +0000)]
Merge "Fix issue #
8401553: It's possible to startForeground()..." into jb-mr2-dev
Chris Craik [Sat, 16 Mar 2013 01:43:11 +0000 (18:43 -0700)]
Reset draw modifiers after flushing
bug:
8401910
This avoids leaving the renderer in a state with stale pointers (to,
e.g., shaders or color filters)
Change-Id: Idf8b63657041352e70e34e91ea416fe4385d4bc2
Dianne Hackborn [Sat, 16 Mar 2013 01:48:04 +0000 (18:48 -0700)]
Fix issue #
8401553: It's possible to startForeground()...
...with no visible Notification
Don't allow a 0 icon resource.
Change-Id: I52e93533e6c45c6027ff3c185060cd54d087d077
Robert Greenwalt [Sat, 16 Mar 2013 00:58:57 +0000 (17:58 -0700)]
am
3fafccdd: am
519ba7b1: Merge "update APN version for MVNO"
* commit '
3fafccdd180fa9918e900e1176de97cdfec6bccd':
update APN version for MVNO
Robert Greenwalt [Sat, 16 Mar 2013 00:56:52 +0000 (17:56 -0700)]
am
519ba7b1: Merge "update APN version for MVNO"
* commit '
519ba7b10c4e0da3586aeeaa9696349f28313898':
update APN version for MVNO
Robert Greenwalt [Sat, 16 Mar 2013 00:18:52 +0000 (00:18 +0000)]
Merge "update APN version for MVNO"
Robert Greenwalt [Fri, 15 Mar 2013 23:30:58 +0000 (23:30 +0000)]
Merge "Revert of Ifd0c4081a. Turning off logging." into jb-mr2-dev
Dianne Hackborn [Fri, 15 Mar 2013 23:10:47 +0000 (23:10 +0000)]
Merge "Fix a bug where we could lose a loader content change." into jb-mr2-dev
Chris Craik [Fri, 15 Mar 2013 22:54:15 +0000 (22:54 +0000)]
Merge "Fully deferred displaylist replay" into jb-mr2-dev
Chet Haase [Mon, 11 Mar 2013 14:56:30 +0000 (07:56 -0700)]
Add overlays to views
It is useful, particularly in animations, to be able to add a view, or at
least some graphics, on top of a view. For example, to have a child of a layout
fade away, we might want to remove the child from that layout and then fade it out
gradually. Meanwhile, we have to have a place to put that view where it will be
drawn. We could do this in the content container sometimes, but this is not a
reliable workaround in the general case, and may obscure other siblings/parents of
the layout/view in the hierarchy. A better approach would be to place a view/graphic
temporarily in the layout itself.
This feature adds the ability to add one or more Views and Drawables to an "overlay"
layer, after which the view will handle drawing that extra content when it redraws itself.
Issue #
8350510 Add APIs needed for future animation capabilities
Change-Id: I70bf78c46ee3db8bd87ea1cdc2ecb5c0747ccbf9
Chet Haase [Fri, 15 Mar 2013 22:51:01 +0000 (22:51 +0000)]
Merge "Reset reverse state when an animator ends" into jb-mr2-dev
Chet Haase [Fri, 15 Mar 2013 22:50:51 +0000 (22:50 +0000)]
Merge "Log warning when animator detects NaN value" into jb-mr2-dev
Alan Viverette [Fri, 15 Mar 2013 22:50:37 +0000 (15:50 -0700)]
Remember which list child has A11y focus BEFORE clearing A11y focus.
Bug:
8332399
Change-Id: I0293efe5cef4a011a584e62fc4a64cde7d354efe
Chet Haase [Fri, 15 Mar 2013 22:50:05 +0000 (22:50 +0000)]
Merge "Use same default duration (300) for animator resources as for other animators" into jb-mr2-dev
kmccormick [Fri, 15 Mar 2013 22:34:36 +0000 (15:34 -0700)]
am
3e329234: am
088aef97: am
96a60639: am
eb46c95c: am
4758e3e7: Merge "Doc update: Add memory mgt lesson to bitmaps class" into jb-mr1.1-docs
* commit '
3e32923425d20a77f5597af844758de395e69813':
Doc update: Add memory mgt lesson to bitmaps class
kmccormick [Fri, 15 Mar 2013 22:33:13 +0000 (15:33 -0700)]
am
088aef97: am
96a60639: am
eb46c95c: am
4758e3e7: Merge "Doc update: Add memory mgt lesson to bitmaps class" into jb-mr1.1-docs
* commit '
088aef975808497caf90f03b7eb0a0175d43e01f':
Doc update: Add memory mgt lesson to bitmaps class
kmccormick [Fri, 15 Mar 2013 22:31:53 +0000 (15:31 -0700)]
am
96a60639: am
eb46c95c: am
4758e3e7: Merge "Doc update: Add memory mgt lesson to bitmaps class" into jb-mr1.1-docs
* commit '
96a6063943d725c9febc2bc525cb8be648c34fa5':
Doc update: Add memory mgt lesson to bitmaps class
kmccormick [Fri, 15 Mar 2013 22:30:38 +0000 (15:30 -0700)]
am
eb46c95c: am
4758e3e7: Merge "Doc update: Add memory mgt lesson to bitmaps class" into jb-mr1.1-docs
* commit '
eb46c95c8094e4dd09b5f99a362e55921d259bac':
Doc update: Add memory mgt lesson to bitmaps class
kmccormick [Fri, 15 Mar 2013 22:28:48 +0000 (15:28 -0700)]
am
4758e3e7: Merge "Doc update: Add memory mgt lesson to bitmaps class" into jb-mr1.1-docs
* commit '
4758e3e7c824bc5cb8b11b6536c5236145f2670f':
Doc update: Add memory mgt lesson to bitmaps class
kmccormick [Fri, 15 Mar 2013 22:26:45 +0000 (22:26 +0000)]
Merge "Doc update: Add memory mgt lesson to bitmaps class" into jb-mr1.1-docs
kmccormick [Mon, 4 Mar 2013 23:25:40 +0000 (15:25 -0800)]
Doc update: Add memory mgt lesson to bitmaps class
Change-Id: If780ad8bfabd66de21842bdb465d86ab24b2940c
Chris Craik [Fri, 8 Mar 2013 21:12:16 +0000 (13:12 -0800)]
Fully deferred displaylist replay
bug:
8037003
A recursive drawDisplayList call is now entirely deferred before
playing back to the screen and issuing GL commands. This way, the
entire stream can be inspected, optimized, and batch work (such as
uploading textures) before issuing commands.
Additionally, this fixes an issue where operations draw could move
across restores corresponding to saveLayer(alpha). Those and other
similar cases (such as complex clipping, requiring the stencil) are
now treated as batching barriers, with the operations that change
renderer state in a way that's difficult to defer are just re-issued
at flush time.
Change-Id: Ie7348166662a5ad89fb9b1e87558334fb826b01e
Jeff Sharkey [Fri, 15 Mar 2013 21:47:58 +0000 (21:47 +0000)]
Merge "Avoid warnings about synthesized IDs." into jb-mr2-dev
Jeff Sharkey [Fri, 15 Mar 2013 21:46:46 +0000 (14:46 -0700)]
Avoid warnings about synthesized IDs.
Bug:
8153518
Change-Id: I5d638e17581f63c6d4a10ff6bc2c1bf9997a78b3
Nick Kralevich [Fri, 15 Mar 2013 21:39:08 +0000 (14:39 -0700)]
am
57eed5b4: am
38bfb5a7: Merge "app_process: don\'t pollute the environment"
* commit '
57eed5b416bd72d4111a0aead2f5c71f24fde07b':
app_process: don't pollute the environment
Nick Kralevich [Fri, 15 Mar 2013 21:36:30 +0000 (14:36 -0700)]
am
38bfb5a7: Merge "app_process: don\'t pollute the environment"
* commit '
38bfb5a7bfc0eeab68f25afad43245efd062caef':
app_process: don't pollute the environment
Chet Haase [Fri, 15 Mar 2013 21:33:24 +0000 (14:33 -0700)]
Use same default duration (300) for animator resources as for other animators
Issue #
7492926 Animator resources should use same default duration as code-created Animators
Change-Id: I337a2c37ff26ebb6cb8b2fb2b58523c464af518b
Chet Haase [Fri, 15 Mar 2013 21:29:09 +0000 (21:29 +0000)]
Merge "Fix errors in Canvas.EdgeType docs" into jb-mr2-dev
Chet Haase [Fri, 15 Mar 2013 21:25:54 +0000 (14:25 -0700)]
Fix errors in Canvas.EdgeType docs
Issue #
7722363 Fix Canvas EdgeType docs
Change-Id: I2908ff22879eb5996da73a37dae1a4cabf82fffb
Nick Kralevich [Fri, 15 Mar 2013 20:55:53 +0000 (20:55 +0000)]
Merge "app_process: don't pollute the environment"
Chet Haase [Fri, 15 Mar 2013 20:48:53 +0000 (13:48 -0700)]
Log warning when animator detects NaN value
Issue #
8350458 Add exception to Animators when NaN detected
Change-Id: I926c3f35b661b0bb1d9e3c7c0df55e7513734589
Fabrice Di Meglio [Fri, 15 Mar 2013 20:34:06 +0000 (20:34 +0000)]
Merge "Revert "Clean Paint.mBidiFlags as it is no longer used"" into jb-mr2-dev
Fabrice Di Meglio [Fri, 15 Mar 2013 20:33:42 +0000 (20:33 +0000)]
Merge "Revert "Fix bug #
8194572 Chrome SIGBUS'es on launch around TextLayoutCacheKey"" into jb-mr2-dev
Fabrice Di Meglio [Fri, 15 Mar 2013 20:33:21 +0000 (20:33 +0000)]
Merge "Revert "fix argument mismatches in Paint JNI"" into jb-mr2-dev
Robert Greenwalt [Fri, 15 Mar 2013 20:17:11 +0000 (13:17 -0700)]
Revert of Ifd0c4081a. Turning off logging.
Found our bug, so switching the logging back off.
bug:
8377625
Change-Id: I254bd83c48f1dd8dd62db1fcb162d460328169c5
Nick Kralevich [Fri, 15 Mar 2013 20:12:28 +0000 (13:12 -0700)]
app_process: don't pollute the environment
Give a hoot — don't pollute!
Change-Id: I30d6c05cecab483f0e9d8063907f7bc0ef2bb104
Chet Haase [Fri, 15 Mar 2013 20:04:42 +0000 (13:04 -0700)]
Reset reverse state when an animator ends
Seeking an animation after the animator has reverse()'d to the beginning
will result in seeking in reverse. Starting the animation will make it proceed
normally, and calling reverse() will also give expected behavior. But seeking
causes this unexpected behavior because the state of reversing is not reset until
the next time the animation is played (either by start() or reverse()).
Fix is to reset the internal flag when the animator ends.
Issue #
8234676 Reversing an Animator Leaves it in A Reversed State Until Explicitly Started
Change-Id: I9d212ae1879aa277d1add7eb4c7ec61432af059e
Robert Greenwalt [Fri, 15 Mar 2013 19:19:46 +0000 (19:19 +0000)]
Merge "Revert "Turn on more logging to find this bug."" into jb-mr2-dev
Robert Greenwalt [Fri, 15 Mar 2013 19:18:45 +0000 (19:18 +0000)]
Revert "Turn on more logging to find this bug."
This reverts commit
bb5bcaaaed37e6215f5f253d968afcb10c1b2f3d
bug:
8377625
Change-Id: I9663a4646f7581c86b2303aec2655cbf3742fd80
Nick Kralevich [Fri, 15 Mar 2013 19:19:00 +0000 (12:19 -0700)]
am
9c322c75: am
f7ec4e61: Merge "Never call app_main more than once"
* commit '
9c322c756276a9b22b05fd9c8bd67f2edfb50324':
Never call app_main more than once
Nick Kralevich [Fri, 15 Mar 2013 19:16:43 +0000 (12:16 -0700)]
am
f7ec4e61: Merge "Never call app_main more than once"
* commit '
f7ec4e61ebde9ff6d4934bd398e9ef8a39e4c28b':
Never call app_main more than once
Robert Greenwalt [Fri, 15 Mar 2013 19:13:47 +0000 (19:13 +0000)]
Merge "Don't return an unmod collection." into jb-mr2-dev
Nick Kralevich [Fri, 15 Mar 2013 19:08:50 +0000 (19:08 +0000)]
Merge "Never call app_main more than once"
Craig Mautner [Fri, 15 Mar 2013 18:59:51 +0000 (18:59 +0000)]
Merge "Catch BadTokenException and continue." into jb-mr2-dev
Nick Kralevich [Fri, 15 Mar 2013 18:38:29 +0000 (11:38 -0700)]
Never call app_main more than once
Different kernels seem to handle ADDR_COMPAT_LAYOUT differently,
sometimes passing it to its children, sometimes not. If it's not
passed to its child successfully, we can end up in a restart loop.
Instead of testing for the presence of ADDR_COMPAT_LAYOUT, use an
environment variable instead, which is handled more predictably.
Bug:
8392487
Change-Id: Ia531dd2abb4e1cd46f3430d844e644f53581f530
ztenghui [Fri, 15 Mar 2013 18:41:33 +0000 (18:41 +0000)]
Merge "Make release() behaves the same way as other part of media framework" into jb-mr2-dev
Craig Mautner [Fri, 15 Mar 2013 18:38:44 +0000 (11:38 -0700)]
Catch BadTokenException and continue.
BadTokenException is a normal consequence of swapping IMEs while there
is a DO_SHOW_SOFT_INPUT message in the IIMethodWrapper queue. This
race condition cannot be avoided without an unacceptable lock down of
InputMethodManagerService.
Fixes bug
8387663.
Fixes bug
8263462.
Change-Id: I2c21573cf972145ab08e66604cdb9344139a3f31
Dianne Hackborn [Fri, 15 Mar 2013 18:37:01 +0000 (11:37 -0700)]
Improve/flesh-out shared library version check.
Change-Id: I3d6eb19c8aeaae07a6d17de81ac707c7741608fb
Robert Greenwalt [Fri, 15 Mar 2013 18:28:50 +0000 (11:28 -0700)]
Don't return an unmod collection.
It's not needed as people can mess with this, and people do, so this fixes the build.
bug:
8398355
Change-Id: Iddd00af41009c88b67fb7f9a8789bb416c377922
Fabrice Di Meglio [Fri, 15 Mar 2013 18:26:56 +0000 (11:26 -0700)]
Revert "Clean Paint.mBidiFlags as it is no longer used"
This reverts commit
6d9fe5bd22b531bfce69b146254a4791c76acddc.
Fabrice Di Meglio [Fri, 15 Mar 2013 18:26:23 +0000 (11:26 -0700)]
Revert "Fix bug #
8194572 Chrome SIGBUS'es on launch around TextLayoutCacheKey"
This reverts commit
ebcacc785b0883c9435a3e850f790785fba93370.
Fabrice Di Meglio [Fri, 15 Mar 2013 18:22:29 +0000 (11:22 -0700)]
Revert "fix argument mismatches in Paint JNI"
This reverts commit
b61fb10fe435b74a761e82f517abd0320f22193e.
Lorenzo Colitti [Fri, 15 Mar 2013 18:06:20 +0000 (18:06 +0000)]
Merge "Don't update routes if Dhcp fails." into jb-mr2-dev
Robert Greenwalt [Fri, 15 Mar 2013 17:48:46 +0000 (10:48 -0700)]
Don't update routes if Dhcp fails.
bug:
8377625
Change-Id: I11d2c29728078813bfb1245cc46e8cce2b307a2c
Lorenzo Colitti [Fri, 15 Mar 2013 17:42:30 +0000 (02:42 +0900)]
Fix build.
Change-Id: Iac84a5f35d7fcaebd096e605a4590f8c90fe97b0
Lorenzo Colitti [Fri, 15 Mar 2013 17:14:42 +0000 (17:14 +0000)]
Merge "Set routes from stacked links as well." into jb-mr2-dev
Lorenzo Colitti [Fri, 15 Mar 2013 17:11:29 +0000 (17:11 +0000)]
Merge "Add stacking to the NetworkStateTrackers." into jb-mr2-dev
Lorenzo Colitti [Fri, 15 Mar 2013 17:08:59 +0000 (17:08 +0000)]
Merge "Add stacked interfaces to LinkProperties." into jb-mr2-dev
Chet Haase [Fri, 15 Mar 2013 14:29:41 +0000 (14:29 +0000)]
Merge "Fix erroneous requestLayout-during-layout issues" into jb-mr2-dev
Lorenzo Colitti [Thu, 14 Mar 2013 19:22:37 +0000 (04:22 +0900)]
Framework changes for 464xlat.
1. Add a Nat464Xlat service that ConnectivityService can use
to start and stop clat. When clat is started, the service
waits for the clat interface to come up and then calls
ConnectivityService to add the appropriate routes.
2. Make ConnectivityService start clat when an IPv6-only mobile
interface is connected. We only support clat on mobile for
now.
3. Make tethering use the interface that has the IPv4 default
route insted of using the base interface of the
LinkProperties. This allows us to tether to a stacked
interface, which is needed for tethering with 464xlat.
Bug:
8276725
Change-Id: I24480af69ee280f504399062638af0836a56268e
Lorenzo Colitti [Fri, 15 Mar 2013 04:58:38 +0000 (13:58 +0900)]
Set routes from stacked links as well.
Currently, ConnectivityService adds and removes routes to/from
the routing table only based on the LinkProperties's routes.
Make it update routes based on the stacked links as well.
Bug:
8276725
Change-Id: I9a2adf537af5a04de0aaab3780afbcc3bb5c6acb
Lorenzo Colitti [Thu, 7 Mar 2013 19:01:12 +0000 (11:01 -0800)]
Add stacking to the NetworkStateTrackers.
Bug:
8276725
Change-Id: I55a107fea78f9cc84f15bd6c75292138fb35a1b6
Lorenzo Colitti [Thu, 7 Mar 2013 18:59:25 +0000 (10:59 -0800)]
Add stacked interfaces to LinkProperties.
Bug:
8276725
Change-Id: I2f592d4c690e9af0459ae742ab16107a10d89353
Wink Saville [Fri, 15 Mar 2013 05:07:40 +0000 (05:07 +0000)]
Merge "Revert "Fail fast if somebody is adding default routes"" into jb-mr2-dev
Wink Saville [Fri, 15 Mar 2013 05:07:04 +0000 (05:07 +0000)]
Revert "Fail fast if somebody is adding default routes"
This reverts commit
6f210bd0191e1936bbc1f036912c6efc4ea69475
Mako wouldn't boot for me, reverting for now.
Change-Id: Ie92d6bf77811e7257e86d65e1e15e1973c027cd7
Dianne Hackborn [Fri, 15 Mar 2013 02:10:04 +0000 (19:10 -0700)]
Fix a bug where we could lose a loader content change.
If AsyncTaskLoader starts a background update due to a
content change, and that update is cancelled, we drop the
data when it finally arrives and forget that the content changed.
If we later come back to the loader, we then end up showing
stale data because we don't know that we still need to update
due to the old content change.
This change adds a couple new APIs to Loader to deal with the
time between when you ask for whether there is a content change
and finally either commit the data or cancel the update.
AsyncTaskLoader is changed to make use of this so that it doesn't
lose changes.
Change-Id: I3866236b1c22bb9138f2d9f6032b126aeaee2e6e
Yu Shan Emily Lau [Fri, 15 Mar 2013 01:27:02 +0000 (01:27 +0000)]
Merge "Media test clean up. Remove duplicated camera preview stress test. Remove duplicated recorder stress test. Remove camera recorder switching stress test. Reduced the total number of iterations for all the stress loop." into jb-mr2-dev
Yu Shan Emily Lau [Fri, 15 Mar 2013 01:14:54 +0000 (18:14 -0700)]
Media test clean up.
Remove duplicated camera preview stress test.
Remove duplicated recorder stress test.
Remove camera recorder switching stress test.
Reduced the total number of iterations for all the stress loop.
Change-Id: I447f8060fadd0599c160727fb7dda8a4cc384656
Nick Kralevich [Fri, 15 Mar 2013 00:21:38 +0000 (17:21 -0700)]
am
6098579a: am
1ae6ae20: Merge "Don\'t use ADDR_COMPAT_LAYOUT on the emulator"
* commit '
6098579a205848339cf6886f5c6d476ccf40e6fe':
Don't use ADDR_COMPAT_LAYOUT on the emulator
Nick Kralevich [Fri, 15 Mar 2013 00:20:12 +0000 (17:20 -0700)]
am
1ae6ae20: Merge "Don\'t use ADDR_COMPAT_LAYOUT on the emulator"
* commit '
1ae6ae2094fd0ab8c82ad1a347e7a8bd67d995e5':
Don't use ADDR_COMPAT_LAYOUT on the emulator
Nick Kralevich [Thu, 14 Mar 2013 23:46:20 +0000 (23:46 +0000)]
Merge "Don't use ADDR_COMPAT_LAYOUT on the emulator"
Nick Kralevich [Thu, 14 Mar 2013 23:31:34 +0000 (16:31 -0700)]
Don't use ADDR_COMPAT_LAYOUT on the emulator
For the emulator, we want people to see memory as it
actually is, not how we're hacking around buggy apps. Don't
set ADDR_COMPAT_LAYOUT on the emulator.
For reasons that I don't understand, personality(ADDR_COMPAT_LAYOUT)
does not persist across an exec on the emulator. app_main gets
into a tight loop restarting itself because of this. This change
also works around that bug.
Change-Id: Ia73a7d2d623c25cf39d248145d97307945d554da
Nick Kralevich [Thu, 14 Mar 2013 23:16:43 +0000 (16:16 -0700)]
am
31a7345c: am
f732108e: Merge "Respawn app_main if ADDR_COMPAT_LAYOUT is not set"
* commit '
31a7345c9c9398c18d6fb6fa4118bd2bfdb437e2':
Respawn app_main if ADDR_COMPAT_LAYOUT is not set
Nick Kralevich [Thu, 14 Mar 2013 23:14:10 +0000 (16:14 -0700)]
am
f732108e: Merge "Respawn app_main if ADDR_COMPAT_LAYOUT is not set"
* commit '
f732108e86fcc9825d5ecaa0b65ee91469c4a24c':
Respawn app_main if ADDR_COMPAT_LAYOUT is not set
ztenghui [Thu, 14 Mar 2013 23:02:39 +0000 (16:02 -0700)]
Make release() behaves the same way as other part of media framework
bug:
7991013
Change-Id: Ib3efa94c0a6a599f71517f80fb7c3842d8d4e74f
Robert Greenwalt [Thu, 14 Mar 2013 23:02:28 +0000 (23:02 +0000)]
Merge "Fail fast if somebody is adding default routes" into jb-mr2-dev
Nick Kralevich [Thu, 14 Mar 2013 22:28:01 +0000 (22:28 +0000)]
Merge "Respawn app_main if ADDR_COMPAT_LAYOUT is not set"
Nick Kralevich [Thu, 14 Mar 2013 20:23:52 +0000 (13:23 -0700)]
Respawn app_main if ADDR_COMPAT_LAYOUT is not set
Bug:
8358800
Change-Id: Id81aa26d74dfd16a49f0ee5926ea2cdb3c2106d8
Jeff Sharkey [Thu, 14 Mar 2013 22:06:15 +0000 (22:06 +0000)]
Merge "Move deleteOlderFiles() to framework, tests." into jb-mr2-dev
Jeff Sharkey [Thu, 14 Mar 2013 21:11:57 +0000 (14:11 -0700)]
Move deleteOlderFiles() to framework, tests.
Supports both age and count based constraints. Added light docs and
tests to verify behavior.
Bug:
8387555
Change-Id: If4d0dac8bc54ce705c2a339bc09a60ea748728b8
Fabrice Di Meglio [Thu, 14 Mar 2013 21:52:05 +0000 (21:52 +0000)]
Merge "Code BidiFormatter code" into jb-mr2-dev
Nick Kralevich [Thu, 14 Mar 2013 21:45:40 +0000 (21:45 +0000)]
Merge "Respawn app_main if ADDR_COMPAT_LAYOUT is not set" into jb-mr2-dev
Jean-Michel Trivi [Thu, 14 Mar 2013 21:36:15 +0000 (21:36 +0000)]
Merge "Fix race in media button intent registration" into jb-mr2-dev