109261 Commits

Author SHA1 Message Date
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
Dianne Hackborn
f9ad937d7a Merge "Update SparseArray docs to be more informative." 2013-07-13 01:06:38 +00:00
Dianne Hackborn
b993f41eb2 Update SparseArray docs to be more informative.
Change-Id: I5d8d17d46a69ccdcf6b29f93be3d44addd80ab61
2013-07-12 18:05:37 -07:00
Dianne Hackborn
9ad5bc7e64 Merge "Reduce some event log noise:" 2013-07-13 01:02:32 +00:00
Dianne Hackborn
cf11716409 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
2013-07-12 17:26:02 -07:00
Igor Murashkin
b9dd637f83 camera2 api: Generate metadata keys and enums from XML
Change-Id: I9b04b5933c5922fc522e9216f4deebcd6fc24d78
2013-07-12 17:25:50 -07:00
keunyoung
e3d2cc8fcc fix build
Change-Id: Ife4a1e33df2e4a71edba7b29844a06138103440d
2013-07-12 16:55:44 -07:00
keunyoung
27116e35e8 Merge "add TYPE_PRIVATE_PRESENTATION window type" 2013-07-12 23:03:21 +00:00
Deepanshu Gupta
d97d60c0fa Add orientation to configuration for layoutlib.
Update the configuration with the device orientation before rendering.

Change-Id: Icd40901204fd13f90b18353e53a15e25e5b2176c
2013-07-12 15:54:08 -07:00
Adam Powell
e5ff7d81db 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
2013-07-12 15:13:55 -07:00
Adam Powell
45130c62e1 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
2013-07-12 15:11:41 -07:00
Adam Powell
1dc3b790df am 4b8cc94c: Merge "PreferenceActivity should not leave message in looper when destroyed"
* commit '4b8cc94cc67d760e724c56aee9301d1bcc2bbe89':
  PreferenceActivity should not leave message in looper when destroyed
2013-07-12 15:09:54 -07:00
Adam Powell
4b8cc94cc6 Merge "PreferenceActivity should not leave message in looper when destroyed" 2013-07-12 22:07:04 +00:00
Adam Powell
da05cc2fac Merge "Tweak error fallback behavior for view direction resolution" 2013-07-12 21:56:44 +00:00
keunyoung
a446bf0e8c 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
2013-07-12 14:41:10 -07:00
Adam Powell
cc5b49f07f Merge "Fix MenuItemImpl#hasCollapsibleActionView for action providers" 2013-07-12 21:36:07 +00:00
Scott Main
414e204199 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
2013-07-12 14:31:27 -07:00
Scott Main
e86ba6dcbe 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
2013-07-12 14:28:40 -07:00
Scott Main
797a99ff3e 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
2013-07-12 14:22:48 -07:00
Scott Main
c0f5bb70b7 am ca4b112e: am 546ac85a: am ad17523d: add warning for Windows users and fix typos
* commit 'ca4b112eb243b1350aba000c4f021574be25bd96':
  add warning for Windows users and fix typos
2013-07-12 14:20:11 -07:00
Scott Main
ca4b112eb2 am 546ac85a: am ad17523d: add warning for Windows users and fix typos
* commit '546ac85a834cf033cf1f3ce82624f1f4a63d099f':
  add warning for Windows users and fix typos
2013-07-12 14:17:30 -07:00
Scott Main
546ac85a83 am ad17523d: add warning for Windows users and fix typos
* commit 'ad17523da976c2d6b7b70fd3aa9ad290e4731224':
  add warning for Windows users and fix typos
2013-07-12 14:15:15 -07:00
Scott Main
ad17523da9 add warning for Windows users and fix typos
Change-Id: I694baa83cde2b97cf0159a75358fa129bd656da3
2013-07-12 14:09:38 -07:00
Chet Haase
f72257473f Merge "Fix minor transition bugs and add capabilities" 2013-07-12 21:00:40 +00:00
Chet Haase
c81a849388 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
2013-07-12 13:40:38 -07:00
Christopher Tate
70d3dd4f79 Merge "Out-of-band apk pushes to the privileged install dir" 2013-07-12 20:18:55 +00:00
Glenn Kasten
2dafbe78c1 Merge "Return correct status for android.media.AudioTrack.write(short[]...)" 2013-07-12 20:13:00 +00:00
Chad Brubaker
12324b4604 Add NetworkUtil function for marking sockets
Add NetworkUtil function for setting the SO_MARK field of sockets

Change-Id: I94389b64296d87ee928293f24a26f8dd08c3bf37
2013-07-12 19:48:32 +00:00