109289 Commits

Author SHA1 Message Date
Adam Powell
2dc27f22c9 Fix collapsible action views.
Fix a regression caused by a previous overzealous refactoring. (Oops.)
Watch those conditionals, everyone!

Bug 9866559

Change-Id: Ia88a4ee38edef378e70bdc7151c825375a3d482d
2013-07-16 11:35:17 -07:00
Chris Wren
574a55e9ee unify variable naming scheme.
inflateViews() and updateNotification() reference the same objects
with different names, and it was confusing.  #cleanup

Bug: 6497005
Change-Id: I0d9a94d7ec156b6bfcf4b85c777f9b58311d07d0
2013-07-16 14:34:46 -04:00
Chad Brubaker
d1c87546b3 Move markSocketAsUser to the top of IConnectivityManager.aidl
Move markSocketAsUser to the top of IConnectivityManager.aidl to make
calls from
framework/native/services/connectivitymanager less fragile

Change-Id: Iba92c21dfef175b570521f34e7ee2732e5a0a9c9
2013-07-16 11:29:11 -07:00
Dianne Hackborn
cdae0f3c60 Merge "Switch proc stats to use new process state constants." 2013-07-16 18:15:09 +00:00
Eino-Ville Talvala
855ccce701 Camera2: Remove/@hide non-public keys.
Change-Id: I28fc5d6d41a444730061b6d2652f5cb75f97d56b
2013-07-16 11:13:12 -07:00
Glenn Kasten
78b6a8615c Merge "AudioTrack write() on a full buffer while paused returns 0" 2013-07-16 17:54:26 +00:00
Alan Viverette
d91f8af40b Merge "Add disabled state to FastScroller." 2013-07-16 14:41:40 +00:00
John Spurlock
fe4fb365ba Merge "Un@hide View.PRESSED_STATE_SET." 2013-07-16 13:37:18 +00:00
Alon Albert
2d48f0690a Merge "Minor Formating Fix" 2013-07-16 07:57:32 +00:00
Rom Lemarchand
0a880d0402 Merge "Increase swappiness of processes when memcgroups are enabled" 2013-07-16 02:32:13 +00:00
Baligh Uddin
59983f7b45 Merge "Import translations. DO NOT MERGE" 2013-07-16 02:24:34 +00:00
Mathias Agopian
377d7bd543 Merge "always pass the BufferQueue explicitely to consumers" 2013-07-16 02:17:56 +00:00
Jeff Brown
e77d6dd943 Merge "Completely remove skia dependency from libinput." 2013-07-16 01:49:52 +00:00
michaelwr
20555cb645 Merge "Add a keycode to switch audio tracks (1/2)" 2013-07-16 01:38:46 +00:00
Jeff Brown
11093285c2 Completely remove skia dependency from libinput.
Change-Id: I943d0e5b7bb6e922803e14b8c3a3564e82fc5e63
2013-07-15 18:05:59 -07:00
Alan Viverette
447cdf2c06 Add disabled state to FastScroller.
BUG: 9759511
Change-Id: I555f501b33029665d94a493ee5cab5741c843328
2013-07-15 17:47:34 -07:00
Jeff Brown
15ecbdd2e3 Merge "Fix PDK build." 2013-07-16 00:44:19 +00:00
Jeff Brown
48a3d98d1f Fix PDK build.
Change-Id: Ide48ea30c2f7f24d20ab6fcdc47c806ac1f133ee
2013-07-15 17:31:32 -07:00
Svetoslav
f9d73e6016 Merge "Fixing bugs discovered by the CTS tests." 2013-07-16 00:24:10 +00:00
Svetoslav
8d820ecffd 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
2013-07-15 17:22:04 -07:00
Alan Viverette
08ec9b2f93 Merge "Revert "Update ListMenuItemView to use a single RelativeLayout"" 2013-07-15 23:56:24 +00:00
Alan Viverette
d9ddf52c12 Revert "Update ListMenuItemView to use a single RelativeLayout"
This reverts commit 8933efd49a0b2c10ddb30b23b57f5676634d0277.

BUG: 9774755
Change-Id: Ib6481e396092da81edd2c69f619f45f61e8fa393
2013-07-15 16:43:58 -07:00
Dianne Hackborn
c823051972 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
2013-07-15 16:21:35 -07:00
Jeff Brown
ef69117979 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
2013-07-15 15:08:39 -07:00
Jeff Brown
6c1c0b6cbe Declare permission for accessing input flinger.
Change-Id: I2914b301b74e0d310a9e95e2d6fb5cb72d3e3703
2013-07-15 15:08:39 -07:00
Geremy Condra
c3bdf87505 Merge "Support routing sockets as another user" 2013-07-15 21:57:18 +00:00
Geremy Condra
b7fb8dbad6 Merge "Restricted profiles use Owner's VPN" 2013-07-15 21:56:55 +00:00
Geremy Condra
045ad910b7 Merge changes Ia6646363,I94389b64
* changes:
  Add per user VPN support
  Add NetworkUtil function for marking sockets
2013-07-15 21:56:30 +00:00
Igor Murashkin
648e4fc7ad Merge "camera2: Implement CameraDevice#getCameraInfo" 2013-07-15 20:45:36 +00:00
Igor Murashkin
d7bf1778df camera2: Implement CameraDevice#getCameraInfo
Bug: 9529161
Change-Id: Ie37d1e07bb8416cbb141f4d49e52337bf7236610
2013-07-15 13:37:08 -07:00
Rom Lemarchand
5534ba91ac 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
2013-07-15 13:19:27 -07:00
Chris Craik
d63ee75652 Merge "Add webp to BitmapFactory.Options outMimetype" 2013-07-15 19:29:10 +00:00
Chad Brubaker
d475c70424 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
2013-07-15 12:14:10 -07:00
Chad Brubaker
c2865195b6 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
2013-07-15 12:13:47 -07:00
Evan Charlton
10dd2b6464 Merge "Add carrier setup app integration" 2013-07-15 18:31:20 +00:00
Svetoslav
06a884671f Merge "Allowing the root user to use the screen introspection APIs." 2013-07-15 17:25:59 +00:00
Svetoslav
d08d7ee4e9 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
2013-07-15 10:20:31 -07:00
Baligh Uddin
7ac4b9662d Import translations. DO NOT MERGE
Change-Id: I4fe9c9f3884aa5c5a3ffce69f72bd1cafde0802b
Auto-generated-cl: translation import
2013-07-15 09:45:36 -07:00
The Android Open Source Project
cd6b8e49a7 am 59734490: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '59734490f6a4f46308c39368a7b20f4fcf5e0e97':
2013-07-15 09:37:54 -07:00
The Android Open Source Project
59734490f6 Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: Ib08f5c3c72f9d6eee571e7f9dff130abadffbbec
2013-07-15 09:32:49 -07:00
John Spurlock
0a55c94730 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
2013-07-15 12:18:04 -04:00
John Spurlock
6098c5d355 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
2013-07-15 12:08:21 -04:00
The Android Automerger
d67c55b8d0 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-07-15 08:19:11 -07:00
Alon Albert
eca2fe9cfc Minor Formating Fix
Put a space between the period and the bundle of a
periodic sync.

Change-Id: If6cd7ae2b3faf59d2c8fd760983eb4650d62aca9
2013-07-15 08:41:34 +03:00
Mathias Agopian
b550929b7a always pass the BufferQueue explicitely to consumers
Change-Id: I32e380979a3f4c6b1dfb440cc5b5c3d30d7607db
2013-07-12 22:06:31 -07:00
Chad Brubaker
4ca19e8377 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
2013-07-12 20:51:03 -07:00
Chris Craik
95587f9045 Add webp to BitmapFactory.Options outMimetype
Change-Id: Id0d5b4d6c2c5b21fa0b31f1a5ada6275fdc38f44
2013-07-12 19:46:19 -07:00
Dianne Hackborn
326ef35f6f Merge "Add new proc state constants and delivery." 2013-07-13 01:15:30 +00:00
Igor Murashkin
e1bc8d4eb8 Merge "camera2 api: Generate metadata keys and enums from XML" 2013-07-13 01:14:46 +00:00
Dianne Hackborn
a413dc06b2 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
2013-07-12 18:14:46 -07:00