OSDN Git Service
Jeff Brown [Tue, 16 Jul 2013 22:28:22 +0000 (22:28 +0000)]
Merge "Fix missing lock in power manager."
Romain Guy [Tue, 16 Jul 2013 22:26:59 +0000 (22:26 +0000)]
Merge "Fix crashes in setMatrix() and concat()"
Jeff Brown [Tue, 16 Jul 2013 22:18:19 +0000 (15:18 -0700)]
Fix missing lock in power manager.
The display wake lock and other internal state could become
out of sync if we happened to execute the power manager's update
function concurrently due to the missing lock.
This bug can be trigged due to display state changes or proximity
sensor updated. Although it would be extremely rare, we have
some evidence of this happening on at least a few devices resulting
in rapid power drain with the screen off or a crash.
Bug:
9880044
Change-Id: I3c674ce429621a50cbb36c3a01883d5f388205b2
Chet Haase [Tue, 16 Jul 2013 22:17:44 +0000 (22:17 +0000)]
Merge "Fix issues with delayed transitions"
Chet Haase [Tue, 16 Jul 2013 21:40:11 +0000 (14:40 -0700)]
Fix issues with delayed transitions
Previously, there were two distinct problems with how delayed
transitions were being run:
- there would be a delay between the transition being put into
a preDrawListener (to be kicked off when that listener fired) and
being removed from the pending list. This allowed another delayed
transition to be run in parallel, which would cause conflicting/
clobbering issues with transition values on the same objects.
- there would be an extra frame delay in some cases due to how/when the
delayed transition would be started. Specfically, we would postOnAnimation()
to call a method that would then add the onPreDraw listener. This two-step
forwarding caused issues noted above.
The fix is to simply add the transition to the preDrawListener immediately, removing
the two-step problem, and also ensuring that the transition is only removed
from the pending list when it is actually started, which prevents other transitions
from starting in the meantime.
Also, added more debug logging to help chase future issues with transitions.
Change-Id: Ie2ff8e73d29f342512842e9641bd8d605e74544c
Romain Guy [Tue, 16 Jul 2013 20:47:01 +0000 (13:47 -0700)]
Fix crashes in setMatrix() and concat()
setMatrix() was crashing in native code, only with hw acceleration on.
concat() would throw a NullPointerException. It now ignores null matrices.
Change-Id: Iebd8b410a957d2ba501570c6fbb3f680ff4a1a23
Craig Mautner [Tue, 16 Jul 2013 21:45:32 +0000 (21:45 +0000)]
Merge "Remove iterators."
Svetoslav [Tue, 25 Jun 2013 01:29:33 +0000 (18:29 -0700)]
Clean up of the print APIs.
1. Fixed a case in which the onPrintCompleted callback may not be invoked.
2. Added string resulrces for the different error messages for failed
printing in OnPrintCompletedCallback
3. Fixed the string comments for the MediaSize constants.
4. Added APIs to create certain print attributes by passing in a
string label instead of resource and package name since in some cases
a print service may be getting already internationalized lables
or it may not know all possible values.
5. Fixed a crash in PrintJobConfigActivity if there is no input or
output tray.
Change-Id: Ie877b7dc669051606394aa290e6d2b979a42db4c
Eino-Ville Talvala [Tue, 16 Jul 2013 21:10:43 +0000 (21:10 +0000)]
Merge "Camera2: Remove/@hide non-public keys."
Svetoslav [Tue, 16 Jul 2013 20:49:44 +0000 (13:49 -0700)]
Add a clean spec rule due to renamed *.aidl
Change-Id: I87bfd02b8c4f3ceb43594a91ac8f501a867ccfe6
Craig Mautner [Tue, 16 Jul 2013 16:10:55 +0000 (09:10 -0700)]
Remove iterators.
Remove DisplayContentsIterator and AllWindowsIterator. These were cute
but they take up valuable resources. Iterate over ArrayList members
in their place.
Change-Id: I1d8a3b040175cb88b98f6a7e97cab06d17d5706b
Svetoslav [Tue, 16 Jul 2013 20:43:41 +0000 (13:43 -0700)]
Fix the build - missed a renaming
Change-Id: I0e85723647c0e5a6f6374e119f0fbd43db477ee0
Jeff Sharkey [Tue, 16 Jul 2013 20:03:35 +0000 (20:03 +0000)]
Merge "Disable documents test UI."
Jeff Sharkey [Tue, 16 Jul 2013 20:01:57 +0000 (13:01 -0700)]
Disable documents test UI.
Change-Id: Iae8ef3e751a53a3f7df0a7c5bc666ec75e91d9e9
Svetoslav Ganov [Tue, 16 Jul 2013 20:01:34 +0000 (20:01 +0000)]
Merge "Refactoring of the print sub-system and API clean up."
Svetoslav Ganov [Tue, 25 Jun 2013 21:59:53 +0000 (14:59 -0700)]
Refactoring of the print sub-system and API clean up.
1. Now a user state has ins own spooler since the spooler app is
running per user. The user state registers an observer for the state
of the spooler to get information needed to orchestrate unbinding
from print serivces that have no work and eventually unbinding from
the spooler when all no service has any work.
2. Abstracted a remote print service from the perspective of the system
in a class that is transparently managing binding and unbinding to
the remote instance.
3. Abstracted the remote print spooler to transparently manage binding
and unbinding to the remote instance when there is work and when
there is no work, respectively.
4. Cleaned up the print document adapter (ex-PrintAdapter) APIs to
enable implementing the all callbacks on a thread of choice. If
the document is really small, using the main thread makes sense.
Now if an app that does not need the UI state to layout the printed
content, it can schedule all the work for allocating resources, laying
out, writing, and releasing resources on a dedicated thread.
5. Added info class for the printed document that is now propagated
the the print services. A print service gets an instance of a
new document class that encapsulates the document info and a method
to access the document's data.
6. Added APIs for describing the type of a document to the new document
info class. This allows a print service to do smarts based on the
doc type. For now we have only photo and document types.
7. Renamed the systemReady method for system services that implement
it with different semantics to systemRunning. Such methods assume
the the service can run third-party code which is not the same as
systemReady.
8. Cleaned up the print job configuration activity.
9. Sigh... code clean up here and there. Factoring out classes to
improve readability.
Change-Id: I637ba28412793166cbf519273fdf022241159a92
Dmitry Shmidt [Tue, 16 Jul 2013 19:41:22 +0000 (12:41 -0700)]
wifi: Add tdls_discover command to tdls enable call
Bug:
8539031
Change-Id: I29739e74f73b68fbf9ff73cfc19017a01655f9a4
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Chris Wren [Tue, 16 Jul 2013 18:41:00 +0000 (18:41 +0000)]
Merge "unify variable naming scheme."
Adam Powell [Tue, 16 Jul 2013 18:37:35 +0000 (18:37 +0000)]
Merge "Fix collapsible action views."
Adam Powell [Tue, 16 Jul 2013 18:35:17 +0000 (11:35 -0700)]
Fix collapsible action views.
Fix a regression caused by a previous overzealous refactoring. (Oops.)
Watch those conditionals, everyone!
Bug
9866559
Change-Id: Ia88a4ee38edef378e70bdc7151c825375a3d482d
Chris Wren [Mon, 15 Jul 2013 22:48:37 +0000 (18:48 -0400)]
unify variable naming scheme.
inflateViews() and updateNotification() reference the same objects
with different names, and it was confusing. #cleanup
Bug:
6497005
Change-Id: I0d9a94d7ec156b6bfcf4b85c777f9b58311d07d0
Dianne Hackborn [Tue, 16 Jul 2013 18:15:08 +0000 (18:15 +0000)]
Merge "Switch proc stats to use new process state constants."
Eino-Ville Talvala [Mon, 15 Jul 2013 22:19:22 +0000 (15:19 -0700)]
Camera2: Remove/@hide non-public keys.
Change-Id: I28fc5d6d41a444730061b6d2652f5cb75f97d56b
Glenn Kasten [Tue, 16 Jul 2013 17:54:26 +0000 (17:54 +0000)]
Merge "AudioTrack write() on a full buffer while paused returns 0"
Alan Viverette [Tue, 16 Jul 2013 14:41:39 +0000 (14:41 +0000)]
Merge "Add disabled state to FastScroller."
John Spurlock [Tue, 16 Jul 2013 13:37:18 +0000 (13:37 +0000)]
Merge "Un@hide View.PRESSED_STATE_SET."
Alon Albert [Tue, 16 Jul 2013 07:57:31 +0000 (07:57 +0000)]
Merge "Minor Formating Fix"
Rom Lemarchand [Tue, 16 Jul 2013 02:32:13 +0000 (02:32 +0000)]
Merge "Increase swappiness of processes when memcgroups are enabled"
Baligh Uddin [Tue, 16 Jul 2013 02:24:34 +0000 (02:24 +0000)]
Merge "Import translations. DO NOT MERGE"
Mathias Agopian [Tue, 16 Jul 2013 02:17:56 +0000 (02:17 +0000)]
Merge "always pass the BufferQueue explicitely to consumers"
Jeff Brown [Tue, 16 Jul 2013 01:49:52 +0000 (01:49 +0000)]
Merge "Completely remove skia dependency from libinput."
michaelwr [Tue, 16 Jul 2013 01:38:46 +0000 (01:38 +0000)]
Merge "Add a keycode to switch audio tracks (1/2)"
Jeff Brown [Tue, 16 Jul 2013 01:05:59 +0000 (18:05 -0700)]
Completely remove skia dependency from libinput.
Change-Id: I943d0e5b7bb6e922803e14b8c3a3564e82fc5e63
Alan Viverette [Tue, 16 Jul 2013 00:47:34 +0000 (17:47 -0700)]
Add disabled state to FastScroller.
BUG:
9759511
Change-Id: I555f501b33029665d94a493ee5cab5741c843328
Jeff Brown [Tue, 16 Jul 2013 00:44:19 +0000 (00:44 +0000)]
Merge "Fix PDK build."
Jeff Brown [Tue, 16 Jul 2013 00:31:32 +0000 (17:31 -0700)]
Fix PDK build.
Change-Id: Ide48ea30c2f7f24d20ab6fcdc47c806ac1f133ee
Svetoslav [Tue, 16 Jul 2013 00:24:10 +0000 (00:24 +0000)]
Merge "Fixing bugs discovered by the CTS tests."
Svetoslav [Tue, 16 Jul 2013 00:12:41 +0000 (17:12 -0700)]
Fixing bugs discovered by the CTS tests.
1. Delayed accessibility events sent when a view subtree changes may be
be delivered after accessibility is disabled leading to a crash. It is
possible that accessibility was disabled while we were waiting for
the timeout before sending the event. Added a check before dispatching.
2. When refreshing a cached node the accessibility node info cache was
not using the correct bypass cache argument value and as result was
not getting the latest node but its cached value. We really want to
get the latest state to update the cache.
3. The debugging cache integrity verification logic was incorrectly
removing nodes from the cache while doing its work.
4. Removed the comments for some debug logging.
bug:
9857067
Change-Id: I20ee1a6ffa65ad35457b51d3f2dc0bc5d8d784e6
Alan Viverette [Mon, 15 Jul 2013 23:56:24 +0000 (23:56 +0000)]
Merge "Revert "Update ListMenuItemView to use a single RelativeLayout""
Alan Viverette [Mon, 15 Jul 2013 23:43:58 +0000 (16:43 -0700)]
Revert "Update ListMenuItemView to use a single RelativeLayout"
This reverts commit
8933efd49a0b2c10ddb30b23b57f5676634d0277.
BUG:
9774755
Change-Id: Ib6481e396092da81edd2c69f619f45f61e8fa393
Dianne Hackborn [Sun, 14 Jul 2013 04:32:12 +0000 (21:32 -0700)]
Switch proc stats to use new process state constants.
These new constants are a better mapping to the kind of
information that procstats is wanting to collect about
processes. In doing this, the process states are tweaked
to have a bit more information that we care about for
procstats.
This changes the format of the data printed by procstats,
so the checkin version is bumped to 2. The structure is
the same, however the codes for process states have all
changed. The new codes are, in order of precedence:
p -- persistent system process.
t -- top activity; actually any visible activity.
f -- important foreground process (ime, wallpaper, etc).
b -- important background process
u -- performing backup operation.
w -- heavy-weight process (currently not used).
s -- background process running a service.
r -- process running a receiver.
h -- process hosting home/launcher app when not on top.
l -- process hosting the last app the user was in.
a -- cached process hosting a previous activity.
c -- cached process hosting a client activity.
e -- cached process that is empty.
In addition, we are now collecting uss along with pss
data for each process, so the pss checkin entries now
have three new values at the end of the min/avg/max uss
values of that process.
With this switch to using process state constants more
fundamentally, I realized that they could actually be
used by the core oom adj code to make it a lot cleaner.
So that change has been made, that code has changed quite
radically, and lost a lot of its secondary states and flags
that it used to use in its computation, now relying on
primarily the oom_adj and proc state values for the process.
This also cleaned up a few problems -- for example for
purposes of determing the memory level of the device, if a
long-running service dropped into the cached oom_adj level,
it would start being counted as a cached process and thus
make us think that the memory state is better than it is.
Now we do this based on the proc state, which always stays
as a service regardless of what is happening like this, giving
as a more consistent view of the memory state of the device.
Making proc state a more fundamentally part of the oom adj
computation means that the values can also be more carefully
tuned in semantic meaning so the value assigned to a process
doesn't tend to change unless the semantics of the process
has really significantly changed.
For example, a process will be assigned the service state
regardless of whether that services is executing operations
in the foreground, running normally, or has been dropped to
the lru list for pruning. The top state is used for everything
related to activities visible to the user: when actually on
top, visible but not on top, currently pausing, etc.
There is a new Context.BIND_SHOWING_UI added for when system
services bind to apps, to explicitly indicate that the app
is showing UI for the system. This gives us a better metric
to determine when it is showing UI, and thus when it needs
to do a memory trim when it is no longer in that state. Without
this, services could get in bad states of continually trimming.
Finally, more HashSet containers have been changed to ArraySet,
reducing the temporary iterators created for iterating over
them.
Change-Id: I1724113f42abe7862e8aecb6faae5a7620245e89
Jeff Brown [Mon, 15 Jul 2013 20:22:04 +0000 (13:22 -0700)]
Remove dead code in system server initialization.
System server always forks from Zygote so we no longer need
the system_server executable which was probably broken anyhow.
This makes the initialization sequence slightly more intelligible.
Likewise, we don't need the GrimReaper anymore because init
will automatically take care of restarting the system when the
service manager dies.
Change-Id: I02c88d9392f7c8133d9cde9d0d978da89ed80452
Jeff Brown [Fri, 12 Jul 2013 23:56:34 +0000 (16:56 -0700)]
Declare permission for accessing input flinger.
Change-Id: I2914b301b74e0d310a9e95e2d6fb5cb72d3e3703
Geremy Condra [Mon, 15 Jul 2013 21:57:18 +0000 (21:57 +0000)]
Merge "Support routing sockets as another user"
Geremy Condra [Mon, 15 Jul 2013 21:56:54 +0000 (21:56 +0000)]
Merge "Restricted profiles use Owner's VPN"
Geremy Condra [Mon, 15 Jul 2013 21:56:30 +0000 (21:56 +0000)]
Merge changes Ia6646363,I94389b64
* changes:
Add per user VPN support
Add NetworkUtil function for marking sockets
Igor Murashkin [Mon, 15 Jul 2013 20:45:35 +0000 (20:45 +0000)]
Merge "camera2: Implement CameraDevice#getCameraInfo"
Igor Murashkin [Sat, 13 Jul 2013 01:01:31 +0000 (18:01 -0700)]
camera2: Implement CameraDevice#getCameraInfo
Bug:
9529161
Change-Id: Ie37d1e07bb8416cbb141f4d49e52337bf7236610
Rom Lemarchand [Fri, 12 Jul 2013 23:15:36 +0000 (16:15 -0700)]
Increase swappiness of processes when memcgroups are enabled
When memcgroups are enabled, migrate heavier and lower priority processes
to the sw memcgroup.
Change-Id: Iba07a723037a599736ef23dea16a30a26634428a
Chris Craik [Mon, 15 Jul 2013 19:29:10 +0000 (19:29 +0000)]
Merge "Add webp to BitmapFactory.Options outMimetype"
Chad Brubaker [Thu, 11 Jul 2013 20:29:30 +0000 (13:29 -0700)]
Support routing sockets as another user
Add support for routing sockets as if they were another user's.
This is for services that handle delegated network tasks like MediaServer and DownloadManager.
Change-Id: Id20efc1f5c2cce6f8838d777762f6c0a703a9437
Chad Brubaker [Wed, 10 Jul 2013 21:46:23 +0000 (14:46 -0700)]
Restricted profiles use Owner's VPN
Restricted profiles cannot start their own VPN and will use the Owner's
VPN if one is running.
Change-Id: I1fc153742047f9149acb414c4c9d35305e97d8d0
Evan Charlton [Mon, 15 Jul 2013 18:31:20 +0000 (18:31 +0000)]
Merge "Add carrier setup app integration"
Svetoslav [Mon, 15 Jul 2013 17:25:59 +0000 (17:25 +0000)]
Merge "Allowing the root user to use the screen introspection APIs."
Svetoslav [Mon, 15 Jul 2013 17:20:27 +0000 (10:20 -0700)]
Allowing the root user to use the screen introspection APIs.
We were allowing the system and the shell user to access use the
screen introspection APIs but the root user was not able to to so.
This change enableS the root user to also use these APIs. Note that
we usually allow the root user to access privileged functionality
similarly to the shell user of the system.
bug:
8877685
Change-Id: Ie4008339e864b835bd3a2d5e06b042e4431c5270
Baligh Uddin [Mon, 15 Jul 2013 16:45:36 +0000 (09:45 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4fe9c9f3884aa5c5a3ffce69f72bd1cafde0802b
Auto-generated-cl: translation import
The Android Open Source Project [Mon, 15 Jul 2013 16:37:54 +0000 (09:37 -0700)]
am
59734490: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
59734490f6a4f46308c39368a7b20f4fcf5e0e97':
The Android Open Source Project [Mon, 15 Jul 2013 16:32:49 +0000 (09:32 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: Ib08f5c3c72f9d6eee571e7f9dff130abadffbbec
John Spurlock [Mon, 15 Jul 2013 16:18:04 +0000 (12:18 -0400)]
Un@hide View.PRESSED_STATE_SET.
Looks like an oversight. The other state sets are public, and we
reference this one in the public docs.
Change-Id: I1c2d8bec3cb277ebfb55ccaacefab0cb38703177
John Spurlock [Mon, 17 Jun 2013 14:32:46 +0000 (10:32 -0400)]
Docfixes in IBinder, Context, View, and Intent.
Fix links in @throws clauses, typos, redundant "returns"
and use @code for true + false in returns.
Change-Id: Ic3c4c75d6061732d997a386dc3232475c992c188
The Android Automerger [Mon, 15 Jul 2013 15:19:11 +0000 (08:19 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Alon Albert [Sun, 7 Jul 2013 09:31:27 +0000 (12:31 +0300)]
Minor Formating Fix
Put a space between the period and the bundle of a
periodic sync.
Change-Id: If6cd7ae2b3faf59d2c8fd760983eb4650d62aca9
Mathias Agopian [Sat, 13 Jul 2013 05:06:31 +0000 (22:06 -0700)]
always pass the BufferQueue explicitely to consumers
Change-Id: I32e380979a3f4c6b1dfb440cc5b5c3d30d7607db
Chad Brubaker [Fri, 14 Jun 2013 18:16:51 +0000 (11:16 -0700)]
Add per user VPN support
VPNs are now per user instead of global. A VPN set by user A routes only
user A's traffic and no other user can access it.
Change-Id: Ia66463637b6bd088b05768076a1db897fe95c46c
Chris Craik [Sat, 13 Jul 2013 02:46:19 +0000 (19:46 -0700)]
Add webp to BitmapFactory.Options outMimetype
Change-Id: Id0d5b4d6c2c5b21fa0b31f1a5ada6275fdc38f44
Dianne Hackborn [Sat, 13 Jul 2013 01:15:30 +0000 (01:15 +0000)]
Merge "Add new proc state constants and delivery."
Igor Murashkin [Sat, 13 Jul 2013 01:14:46 +0000 (01:14 +0000)]
Merge "camera2 api: Generate metadata keys and enums from XML"
Dianne Hackborn [Fri, 12 Jul 2013 19:02:55 +0000 (12:02 -0700)]
Add new proc state constants and delivery.
The activity manager now keeps a new "process state" for
each process, indicating the general execution and memory
state of the process. This closely follows the out-of-memory
adjustment and scheduling class that it currently tracks,
but roles these together (plus a little more info) into one
more semantically meaningful number.
This value is reported to each process as it changes, so they
can do things like tune the Dalvik garbage collector to match
the current process state.
I think I should also switch to this for process states. It
will give is more meaningful divisions of time for each process.
Also fix a problem in the activity stack where the previous
process was not being set correctly when moving between
activity stacks.
Change-Id: I598b1667dc46547f8fadae304e210c352cc9d41f
Dianne Hackborn [Sat, 13 Jul 2013 01:06:37 +0000 (01:06 +0000)]
Merge "Update SparseArray docs to be more informative."
Dianne Hackborn [Sat, 13 Jul 2013 00:46:45 +0000 (17:46 -0700)]
Update SparseArray docs to be more informative.
Change-Id: I5d8d17d46a69ccdcf6b29f93be3d44addd80ab61
Dianne Hackborn [Sat, 13 Jul 2013 01:02:32 +0000 (01:02 +0000)]
Merge "Reduce some event log noise:"
Dianne Hackborn [Sat, 13 Jul 2013 00:26:02 +0000 (17:26 -0700)]
Reduce some event log noise:
- Only log battery levels on level changes, not voltage or temp.
- Reduce the text in the start service log to only the suffix
of the service component, and a uid field.
Change-Id: I6d65e6700e021b3b005dccc90d64f36c1f97137f
Igor Murashkin [Fri, 12 Jul 2013 02:37:04 +0000 (19:37 -0700)]
camera2 api: Generate metadata keys and enums from XML
Change-Id: I9b04b5933c5922fc522e9216f4deebcd6fc24d78
keunyoung [Fri, 12 Jul 2013 23:55:44 +0000 (16:55 -0700)]
fix build
Change-Id: Ife4a1e33df2e4a71edba7b29844a06138103440d
keunyoung [Fri, 12 Jul 2013 23:03:21 +0000 (23:03 +0000)]
Merge "add TYPE_PRIVATE_PRESENTATION window type"
Adam Powell [Fri, 12 Jul 2013 22:13:55 +0000 (15:13 -0700)]
am
45130c62: am
1dc3b790: am
4b8cc94c: Merge "PreferenceActivity should not leave message in looper when destroyed"
* commit '
45130c62e1a17887bd27f12c834609159bba1c1a':
PreferenceActivity should not leave message in looper when destroyed
Adam Powell [Fri, 12 Jul 2013 22:11:41 +0000 (15:11 -0700)]
am
1dc3b790: am
4b8cc94c: Merge "PreferenceActivity should not leave message in looper when destroyed"
* commit '
1dc3b790df61aa95cb68da390045249c59049fcd':
PreferenceActivity should not leave message in looper when destroyed
Adam Powell [Fri, 12 Jul 2013 22:09:54 +0000 (15:09 -0700)]
am
4b8cc94c: Merge "PreferenceActivity should not leave message in looper when destroyed"
* commit '
4b8cc94cc67d760e724c56aee9301d1bcc2bbe89':
PreferenceActivity should not leave message in looper when destroyed
Adam Powell [Fri, 12 Jul 2013 22:07:04 +0000 (22:07 +0000)]
Merge "PreferenceActivity should not leave message in looper when destroyed"
Adam Powell [Fri, 12 Jul 2013 21:56:43 +0000 (21:56 +0000)]
Merge "Tweak error fallback behavior for view direction resolution"
keunyoung [Sat, 22 Jun 2013 02:07:57 +0000 (19:07 -0700)]
add TYPE_PRIVATE_PRESENTATION window type
- This window type can be used for Presentation created on top of virtual
private display.
- There can be PRIVATE_PRESENTATION specific policy / behavior, but for now,
there is nothing special.
Change-Id: I9fde0f0376e57fcc60000d3a3f8657a21ef58993
Adam Powell [Fri, 12 Jul 2013 21:36:07 +0000 (21:36 +0000)]
Merge "Fix MenuItemImpl#hasCollapsibleActionView for action providers"
Scott Main [Fri, 12 Jul 2013 21:31:27 +0000 (14:31 -0700)]
am
e86ba6dc: am
797a99ff: am
c0f5bb70: am
ca4b112e: am
546ac85a: am
ad17523d: add warning for Windows users and fix typos
* commit '
e86ba6dcbee541c9b1837799c3de67249ad48470':
add warning for Windows users and fix typos
Scott Main [Fri, 12 Jul 2013 21:28:40 +0000 (14:28 -0700)]
am
797a99ff: am
c0f5bb70: am
ca4b112e: am
546ac85a: am
ad17523d: add warning for Windows users and fix typos
* commit '
797a99ff3e7e1fd81f8def2e5ca4ea089c01ad06':
add warning for Windows users and fix typos
Scott Main [Fri, 12 Jul 2013 21:22:48 +0000 (14:22 -0700)]
am
c0f5bb70: am
ca4b112e: am
546ac85a: am
ad17523d: add warning for Windows users and fix typos
* commit '
c0f5bb70b72c25c0057d2318bbcc8d79553d1e12':
add warning for Windows users and fix typos
Scott Main [Fri, 12 Jul 2013 21:20:11 +0000 (14:20 -0700)]
am
ca4b112e: am
546ac85a: am
ad17523d: add warning for Windows users and fix typos
* commit '
ca4b112eb243b1350aba000c4f021574be25bd96':
add warning for Windows users and fix typos
Scott Main [Fri, 12 Jul 2013 21:17:30 +0000 (14:17 -0700)]
am
546ac85a: am
ad17523d: add warning for Windows users and fix typos
* commit '
546ac85a834cf033cf1f3ce82624f1f4a63d099f':
add warning for Windows users and fix typos
Scott Main [Fri, 12 Jul 2013 21:15:15 +0000 (14:15 -0700)]
am
ad17523d: add warning for Windows users and fix typos
* commit '
ad17523da976c2d6b7b70fd3aa9ad290e4731224':
add warning for Windows users and fix typos
Scott Main [Fri, 12 Jul 2013 18:28:01 +0000 (11:28 -0700)]
add warning for Windows users and fix typos
Change-Id: I694baa83cde2b97cf0159a75358fa129bd656da3
Chet Haase [Fri, 12 Jul 2013 21:00:39 +0000 (21:00 +0000)]
Merge "Fix minor transition bugs and add capabilities"
Chet Haase [Fri, 12 Jul 2013 19:54:38 +0000 (12:54 -0700)]
Fix minor transition bugs and add capabilities
Some view changes require more flexible transitions than the
defaults provided by Crossfade and TextChange - this change supplies some
of that flexibility.
Also, starting a new transition on a hierarchy undergoing a transition
caused the first to get canceled, then the start values to be retrieved.
The new transition should actually get the start values from the intermediate
state of the views, so we now cancel the previous transition only after the
start values have been captured.
Issue #
9756349 Transitions: Crossfade does not handle interruption/reverse correctly
Issue #
9295863 Transitions: Add behavior API/flags to various transitions
Issue #
9275859 Transitions: Improve mechanism for transition interruption
Change-Id: I5a8c5a12466ddcab9e84e4880930563fa1216f3b
Christopher Tate [Fri, 12 Jul 2013 20:18:55 +0000 (20:18 +0000)]
Merge "Out-of-band apk pushes to the privileged install dir"
Glenn Kasten [Fri, 12 Jul 2013 20:12:59 +0000 (20:12 +0000)]
Merge "Return correct status for android.media.AudioTrack.write(short[]...)"
Chad Brubaker [Thu, 11 Jul 2013 20:30:36 +0000 (13:30 -0700)]
Add NetworkUtil function for marking sockets
Add NetworkUtil function for setting the SO_MARK field of sockets
Change-Id: I94389b64296d87ee928293f24a26f8dd08c3bf37
Geremy Condra [Fri, 12 Jul 2013 19:47:19 +0000 (19:47 +0000)]
Merge "Add NetworkManagement support for fwmark routes"
Christopher Tate [Fri, 12 Jul 2013 19:29:41 +0000 (12:29 -0700)]
Out-of-band apk pushes to the privileged install dir
The new apk will now correctly allow system permissions to an app
placed in the privileged install dir via 'adb push' on the fly.
Change-Id: Ie4284d12628e08d9562d18eee6a7e8f74ae6295e
Amith Yamasani [Fri, 12 Jul 2013 19:24:09 +0000 (19:24 +0000)]
Merge "Fix build"
Amith Yamasani [Fri, 12 Jul 2013 19:23:16 +0000 (12:23 -0700)]
Fix build
Change-Id: If4c4f1f104826b599c86bc1c924ebadc5223c8f0
Wink Saville [Fri, 12 Jul 2013 19:14:01 +0000 (12:14 -0700)]
am
97b077bc: am
42a85412: am
925ec03f: Merge "VZW wants the phoneNumber to be 10 zero\'s if there isn\'t one." into jb-mr2-dev
* commit '
97b077bc18752e7dafe041cb04c19e67ce69939c':
VZW wants the phoneNumber to be 10 zero's if there isn't one.
Wink Saville [Fri, 12 Jul 2013 19:03:53 +0000 (12:03 -0700)]
am
42a85412: am
925ec03f: Merge "VZW wants the phoneNumber to be 10 zero\'s if there isn\'t one." into jb-mr2-dev
* commit '
42a85412d12078f36c3fdeda1211bdc3800bab0c':
VZW wants the phoneNumber to be 10 zero's if there isn't one.