Commit Graph

2564 Commits

Author SHA1 Message Date
Christopher Tate
510ac7fcf0 am c2487836: am 46a23872: am c4c239bf: Merge "Don\'t crash in JNI: add DeadObjectException(String msg) ctor" into mnc-dev
* commit 'c2487836618e93e0e2e6f1ca42670ebb73e5c629':
  Don't crash in JNI: add DeadObjectException(String msg) ctor
2015-06-30 00:25:49 +00:00
Christopher Tate
e56db0e3fa Don't crash in JNI: add DeadObjectException(String msg) ctor
Bug 22104446

Change-Id: I0a538119269fe45955130e4e3d0d0bae8ee64993
2015-06-29 16:04:57 -07:00
Nicolas Prevot
2f37bd3921 am d1d1a700: am 64c0c4da: am 6fd49936: Merge "Rename ALLOW_PARENT_APP_LINKING to ALLOW_PARENT_PROFILE_APP_LINKING" into mnc-dev
* commit 'd1d1a700501242cca06b5729c2bd888d6f2d4d52':
  Rename ALLOW_PARENT_APP_LINKING to ALLOW_PARENT_PROFILE_APP_LINKING
2015-06-29 17:41:26 +00:00
Nicolas Prevot
6fd49936ae Merge "Rename ALLOW_PARENT_APP_LINKING to ALLOW_PARENT_PROFILE_APP_LINKING" into mnc-dev 2015-06-29 17:08:34 +00:00
Dianne Hackborn
21002cf256 am c063f1cf: am 97abd672: am d5f387bc: Merge "Looks like MNC is gonna be API 23." into mnc-dev
* commit 'c063f1cf50c4f4b015c763af8476a25a0df7f45b':
  Looks like MNC is gonna be API 23.
2015-06-27 01:07:16 +00:00
Dianne Hackborn
2e5cad7868 Looks like MNC is gonna be API 23.
Change-Id: I9c9c62209c949b1a16ed53eafc259e88e2ddb69a
2015-06-26 16:15:55 -07:00
Jeff Sharkey
aedb56fd18 Merge commit 'b02c73d5' into manualmerge
Change-Id: I3ec37c9d45d685c2393087bdefa6ab512cc70062
2015-06-26 09:32:09 -07:00
Jeff Sharkey
9527b223a9 Let's reinvent storage, yet again!
Now that we're treating storage as a runtime permission, we need to
grant read/write access without killing the app.  This is really
tricky, since we had been using GIDs for access control, and they're
set in stone once Zygote drops privileges.

The only thing left that can change dynamically is the filesystem
itself, so let's do that.  This means changing the FUSE daemon to
present itself as three different views:

/mnt/runtime_default/foo - view for apps with no access
/mnt/runtime_read/foo - view for apps with read access
/mnt/runtime_write/foo - view for apps with write access

There is still a single location for all the backing files, and
filesystem permissions are derived the same way for each view, but
the file modes are masked off differently for each mountpoint.

During Zygote fork, it wires up the appropriate storage access into
an isolated mount namespace based on the current app permissions.  When
the app is granted permissions dynamically at runtime, the system
asks vold to jump into the existing mount namespace and bind mount
the newly granted access model into place.

Bug: 21858077
Change-Id: I62fb25d126dd815aea699b33d580e3afb90f8fd2
2015-06-25 22:25:48 -07:00
Nicolas Prevot
f0029c1ddb Rename ALLOW_PARENT_APP_LINKING to ALLOW_PARENT_PROFILE_APP_LINKING
Also improve the javadoc.

BUG:21701782
Change-Id: I88a75ccfa71b0d5df2f4779987cf0fff56001fd3
2015-06-25 19:54:12 -07:00
Xiaohui Chen
b1cc316dce Merge "Introduce system user and primary user." 2015-06-23 22:44:03 +00:00
Xiaohui Chen
70f6c38644 Introduce system user and primary user.
Bug: 19913735
Change-Id: I2c7855915d778cf80a7154314321ddd90e2eaaac
2015-06-23 15:25:37 -07:00
Hiroshi Yamauchi
ac4d8aab79 am 26898e57: am 189ebe5d: am a1ee09c8: Merge "Clarify art.gc.gc-count-rate-histogram runtime stat." into mnc-dev
* commit '26898e575ca3d977a643657f125b254aed9e0211':
  Clarify art.gc.gc-count-rate-histogram runtime stat.
2015-06-23 21:29:56 +00:00
Dianne Hackborn
4874bd161f am 9a5ea4e9: am 67e2aab1: am b7412897: Merge "Fix issue #21254610: StrictMode uses Log.wtf which crashes apps on L+" into mnc-dev
* commit '9a5ea4e9ca9ba965dc940a2b65224cd5e4ff033b':
  Fix issue #21254610: StrictMode uses Log.wtf which crashes apps on L+
2015-06-23 18:23:12 +00:00
Hiroshi Yamauchi
a1ee09c843 Merge "Clarify art.gc.gc-count-rate-histogram runtime stat." into mnc-dev 2015-06-23 18:14:50 +00:00
Dianne Hackborn
b74128978a Merge "Fix issue #21254610: StrictMode uses Log.wtf which crashes apps on L+" into mnc-dev 2015-06-23 16:46:37 +00:00
Nicolas Prevot
9a0f9682a9 am 69042609: am 2e70cf73: am 3ab6f9e6: Merge "Allow cross-profile app linking from work to personal." into mnc-dev
* commit '6904260904176c67f200654d48fd8046c63011f4':
  Allow cross-profile app linking from work to personal.
2015-06-23 03:04:52 +00:00
Dianne Hackborn
fde298e738 Fix issue #21254610: StrictMode uses Log.wtf which crashes apps on L+
Raise the limit at which we consider the strict mode trace to
be unreasonably large.

Change-Id: I5ec5332dd5aa2631e017d246e4a8b978b82cf318
2015-06-22 17:52:13 -07:00
Rahul Chaturvedi
8ee0c2cf24 Merge "Add binder transaction tracking." 2015-06-22 23:55:09 +00:00
Nicolas Prevot
3ab6f9e691 Merge "Allow cross-profile app linking from work to personal." into mnc-dev 2015-06-22 23:18:32 +00:00
Hiroshi Yamauchi
2d6327d0ad Clarify art.gc.gc-count-rate-histogram runtime stat.
Bug: 21491908
Change-Id: I84d93aa73eebc327513c4663a6b606e2dad9a0b7
2015-06-22 15:58:47 -07:00
Jeff Sharkey
0e5e4eea5e am 4edfd64b: am 421daf85: am c629271d: Merge "Forget private partition keys." into mnc-dev
* commit '4edfd64bc1c69be3107fe924772331c1a974e28c':
  Forget private partition keys.
2015-06-22 21:57:08 +00:00
Nicolas Prevot
9edbda18df Allow cross-profile app linking from work to personal.
If the profile owner sets ALLOW_PARENT_APP_LINKING:

ACTION_VIEW, scheme http/https intents sent from the work profile
can be resolved by personal apps if they specify a host.

BUG:21701782
Change-Id: I372e2405345539eac9d6b4fb08def6bf84da14a6
2015-06-22 14:39:44 -07:00
Jeff Sharkey
c629271d48 Merge "Forget private partition keys." into mnc-dev 2015-06-22 21:09:52 +00:00
Jeff Sharkey
5cc0df214b Forget private partition keys.
When we forget a private partition, ask vold to also forget the key
for that partition GUID.  This means we need to track both the
filesystem UUID and the partition GUID for a private volume.

Bug: 21782268
Change-Id: Icda1cbb65539d61dacc663428daf3d1a2e4c313e
2015-06-22 14:07:10 -07:00
Rahul Chaturvedi
52613f9084 Add binder transaction tracking.
Add the ability to am to be able to track binder transact calls. This
will help us diagnose excessive IPC calls.

This CL adds the trace-ip command to am. The usage is,

To start binder transaction tracking,
am trace-ipc start
To stop tracking and dump the data to a file,
am trace-ipc stop --dump-file <FILE>

Bug: 21398706
Change-Id: Ic0c9b3be757dd0662a2750a0d8447e2a5ef1fa90
2015-06-22 16:28:24 -04:00
Jeff Brown
e689cca19c am 3a9f86a2: am 6903187a: am d63c721e: Merge "Repurpose doze wake lock stats for draw wake lock instead." into mnc-dev
* commit '3a9f86a2df00973b10754fa4011b8e8c32928685':
  Repurpose doze wake lock stats for draw wake lock instead.
2015-06-22 20:01:41 +00:00
Jeff Brown
6a8bd7bc13 Repurpose doze wake lock stats for draw wake lock instead.
The doze wake lock is an internal implementation detail with no
power impact.  However the draw wake lock is much more interesting
to track because it's essentially like a special purpose partial
wake lock which may be acquired while dozing.

Bug: 21949905
Change-Id: Iedd5f366eb010a47a9691374c5cd3d85ea68173d
2015-06-19 17:27:21 -07:00
Adam Lesinski
d28292f319 am 52e7f8c7: am bd9b25ef: am b6a09299: Merge "BatteryStats: Record doze wake locks" into mnc-dev
* commit '52e7f8c76f78176ae33c22118e2f05626923c724':
  BatteryStats: Record doze wake locks
2015-06-19 21:48:37 +00:00
Adam Lesinski
9425fe21c9 BatteryStats: Record doze wake locks
Doze wake locks don't actually hold the CPU awake, so we should record them
separately from full wakelocks, which is what we did before.

Bug:21949905
Change-Id: Ib4db3399069e0ad11f1f0dc6925a87ad0ad21ff9
2015-06-19 14:12:01 -07:00
David Srbecky
f32f7a3ffd Merge "Replace --include-cfi with --generate-debug-info." into mnc-dev 2015-06-19 18:26:42 +00:00
Dianne Hackborn
6c32b58bf1 am 50bf0203: am 1594edce: am 0348ba2e: Merge "Fix issue #20494208: Go out of device idle when headset button is pressed" into mnc-dev
* commit '50bf0203b9ed0ac5c72ad6b2e2fcc1a6737bb565':
  Fix issue #20494208: Go out of device idle when headset button is pressed
2015-06-19 14:17:59 +00:00
Adam Lesinski
6c2a8e0da8 am 9f0179cc: am a0578a02: am 00fac635: Merge "BatteryStats: Fix regression in wakelock power distribution" into mnc-dev
* commit '9f0179cc5f6f74a6b9957f60526353898f02ac0b':
  BatteryStats: Fix regression in wakelock power distribution
2015-06-19 14:17:52 +00:00
Dianne Hackborn
50bf0203b9 am 1594edce: am 0348ba2e: Merge "Fix issue #20494208: Go out of device idle when headset button is pressed" into mnc-dev
* commit '1594edcea1e8862827410f2542d19c5edb403cbe':
  Fix issue #20494208: Go out of device idle when headset button is pressed
2015-06-19 13:58:20 +00:00
Adam Lesinski
9f0179cc5f am a0578a02: am 00fac635: Merge "BatteryStats: Fix regression in wakelock power distribution" into mnc-dev
* commit 'a0578a025949b0759dbd6109b60c2c560b03b2d5':
  BatteryStats: Fix regression in wakelock power distribution
2015-06-19 13:58:09 +00:00
David Srbecky
065075e1f9 Replace --include-cfi with --generate-debug-info.
This follows a change in dex2oat.

(cherry picked from commit f39477b592)

Bug: 21924613
Change-Id: I46b61298ca00bee2e83080456b180d63efd95b8f
2015-06-19 02:20:06 +01:00
Dianne Hackborn
0348ba2e23 Merge "Fix issue #20494208: Go out of device idle when headset button is pressed" into mnc-dev 2015-06-19 01:01:38 +00:00
Adam Lesinski
00fac63575 Merge "BatteryStats: Fix regression in wakelock power distribution" into mnc-dev 2015-06-19 00:57:47 +00:00
Dianne Hackborn
b6683c4286 Fix issue #20494208: Go out of device idle when headset button is pressed
Rework how we record active transitions in battery stats to be
more general, and add an API that others can call in to
DeviceIdleController to request that we go out of idle mode.
use this for VOICE_SEARCH_HANDS_FREE.

Change-Id: Ie58de60e63036a4142881283835961fbcceec892
2015-06-18 17:40:33 -07:00
Adam Lesinski
72478f053f BatteryStats: Fix regression in wakelock power distribution
We used to give 50% of the cpu time of each app to any app holding a wakelock
while the screen is off.
Since we switched to the new kernel module for measuring app's cpu time, this distribution
was lost.

Bug:21876567
Change-Id: I42c294547f63d150d9929271ca0e27fedaaa9d77
2015-06-18 12:09:25 -07:00
Xiaohui Chen
6d1f8c75cd am 16834d76: am 82422c31: am 802ece61: Merge "system_server: add two child chains to firewall" into mnc-dev
* commit '16834d76072ec1c8049856d355e7cc3bd0ce6a40':
  system_server: add two child chains to firewall
2015-06-18 00:31:15 +00:00
Xiaohui Chen
16834d7607 am 82422c31: am 802ece61: Merge "system_server: add two child chains to firewall" into mnc-dev
* commit '82422c313e5efc80c917afdcf532d6616fbc2313':
  system_server: add two child chains to firewall
2015-06-18 00:20:22 +00:00
Xiaohui Chen
802ece6139 Merge "system_server: add two child chains to firewall" into mnc-dev 2015-06-17 23:50:28 +00:00
Xiaohui Chen
b41c9f7f39 system_server: add two child chains to firewall
This is an attempt to speed up getting out of device idle.  It groups
uid firewall rules in these child chains so we can attach/detach a whole
chain instead of individual uid rules.

BUG:21446713
Change-Id: Ie8f392da2deabe7cc86a9ecf4ed080163861d41e
2015-06-17 15:55:37 -07:00
Jeff Sharkey
1142341872 am 10d045cd: am 716978e3: am 2cc03e56: Yet another user restriction.
* commit '10d045cd08a60403056f90f03b8f79dc0bf18571':
  Yet another user restriction.
2015-06-16 05:44:15 +00:00
Jeff Sharkey
10d045cd08 am 716978e3: am 2cc03e56: Yet another user restriction.
* commit '716978e36b30f339e615eee289a8cbc6f68a4df4':
  Yet another user restriction.
2015-06-16 05:28:43 +00:00
Jeff Sharkey
2cc03e5606 Yet another user restriction.
Change-Id: Ia2952da19cb974a6a9ba0271a298a10df58b8d18
2015-06-15 21:50:47 -07:00
Dianne Hackborn
1317a6585c am d5111d46: am 4169b628: am 285cb414: Merge "Fix issue #21813831: Need API for asking to be added to power whitelist" into mnc-dev
* commit 'd5111d46d6589921c3ad3d7ee6771ccc0e257f8f':
  Fix issue #21813831: Need API for asking to be added to power whitelist
2015-06-15 19:49:46 +00:00
Dianne Hackborn
d5111d46d6 am 4169b628: am 285cb414: Merge "Fix issue #21813831: Need API for asking to be added to power whitelist" into mnc-dev
* commit '4169b6282f78a8027cc0e4c2f3ca4f0f05c57d08':
  Fix issue #21813831: Need API for asking to be added to power whitelist
2015-06-15 19:37:15 +00:00
Dianne Hackborn
1958e5e787 Fix issue #21813831: Need API for asking to be added to power whitelist
Add the API.  Clean up a few related things.

Change-Id: I190adad1812f36f6095b98a1001fedb94874e8b5
2015-06-15 11:53:59 -07:00
Makoto Onuki
a84fc38bdf am 92177ad7: am b3be7c26: am 80b34d7b: Merge "Add StorageEventListener.onDiskDestroyed()" into mnc-dev
* commit '92177ad765b86f77e86a29e9d013883af9fec134':
  Add StorageEventListener.onDiskDestroyed()
2015-06-13 00:29:45 +00:00