Commit graph

15340 commits

Author SHA1 Message Date
Paul Lawrence
22d0ee6a25 am a65e402b: Merge "Change init sequence to support file level encryption" into mnc-dev
* commit 'a65e402b613e927697d35e7936c6d80908d77e88':
  Change init sequence to support file level encryption
2015-07-06 20:34:05 +00:00
Paul Lawrence
a65e402b61 Merge "Change init sequence to support file level encryption" into mnc-dev 2015-07-06 19:33:30 +00:00
Jeff Sharkey
341b607c89 am 25aabb9e: Permission to view shared storage for all users.
* commit '25aabb9edeb9203e52758d307b8a94ec8c64d338':
  Permission to view shared storage for all users.
2015-07-06 19:18:20 +00:00
Elliott Hughes
17cf7498a9 am f4bb11d2: am 913ef1ca: Merge "Fixed a documentation error in protocol.txt"
* commit 'f4bb11d29888bae67d09a8004c3925f7dea9b1fc':
  Fixed a documentation error in protocol.txt
2015-07-06 18:46:20 +00:00
Elliott Hughes
f4bb11d298 am 913ef1ca: Merge "Fixed a documentation error in protocol.txt"
* commit '913ef1ca5adb7f04b8e7282565ae98c656ebf90b':
  Fixed a documentation error in protocol.txt
2015-07-06 18:00:42 +00:00
Jeff Sharkey
25aabb9ede Permission to view shared storage for all users.
Typical apps are restricted so they can only view shared storage
belonging to the user they're running as.  However, a handful of
system components need access to shared storage across all users,
such as DefaultContainerService and SystemUI.

Since WRITE_MEDIA_STORAGE already offers this functionality by
bypassing any FUSE emulation, reuse it to grant the "sdcard_rw" GID
which is no longer handed out to third-party apps.  Then we change
the FUSE daemon to allow the "sdcard_rw" GID to see shared storage
of all users.

Bug: 19995822
Change-Id: Id2fe846aefbf13fc050e9b00ddef120021e817f4
2015-07-06 10:54:53 -07:00
Elliott Hughes
913ef1ca5a Merge "Fixed a documentation error in protocol.txt" 2015-07-06 17:51:12 +00:00
Derrick Bonafilia
36da715f2f Fixed a documentation error in protocol.txt
Prior to the documentation told users to pass 0 in as
the first argument to write messages, when they should
be outting in their local-id. It is now corrected.

Change-Id: Ia2c6c84f95383baa5ca471493a29a39e5173b604
Signed-off-by: Derrick Bonafilia <dbonafilia@google.com>
2015-07-06 10:19:28 -07:00
Paul Lawrence
d815178b75 Change init sequence to support file level encryption
File level encryption must get the key between mounting userdata and
calling post_fs_data when the directories are created. This requires
access to keymaster, which in turn is found from a system property.

Split property loaded into system and data, and load in right order.

Bug: 22233063
Change-Id: I8a6c40d44e17de386417a443c9dfc3b4e7fe59a5
2015-07-06 07:52:06 -07:00
Calin Juravle
2621f8ef22 am 845f829f: am f9fd0d5a: Merge "Add static versions for libbacktrace and libnativebridge. Bug fixes."
* commit '845f829fe0a4e5e24bcb2605b929eafe8c769a62':
  Add static versions for libbacktrace and libnativebridge. Bug fixes.
2015-07-04 02:57:41 +00:00
Calin Juravle
845f829fe0 am f9fd0d5a: Merge "Add static versions for libbacktrace and libnativebridge. Bug fixes."
* commit 'f9fd0d5af917ed5016b3430359ee53f1730fdc85':
  Add static versions for libbacktrace and libnativebridge. Bug fixes.
2015-07-02 10:39:28 +00:00
Calin Juravle
f9fd0d5af9 Merge "Add static versions for libbacktrace and libnativebridge. Bug fixes." 2015-07-02 10:29:33 +00:00
Calin Juravle
28042b5627 Add static versions for libbacktrace and libnativebridge. Bug fixes.
Change-Id: Ic68ac15b2676e4f475330c8e7bb34e0d48783686
2015-07-02 02:09:20 +01:00
Sasha Levitskiy
975d17a6b0 am d5a84845: Merge "Fingerprintd: Add post_enroll() API." into mnc-dev
* commit 'd5a84845e6d75777de3cd35ecb23115bb740024c':
  Fingerprintd: Add post_enroll() API.
2015-07-01 00:15:22 +00:00
Jeff Sharkey
cf8d4263b5 am 4a485818: Gracefully handle ENODEV in sdcard daemon.
* commit '4a4858185177616707dda7ab562f45a0a8494e3f':
  Gracefully handle ENODEV in sdcard daemon.
2015-07-01 00:02:13 +00:00
Sasha Levitskiy
d5a84845e6 Merge "Fingerprintd: Add post_enroll() API." into mnc-dev 2015-06-30 23:52:46 +00:00
Jeff Sharkey
4a48581851 Gracefully handle ENODEV in sdcard daemon.
When someone force-unmounts our target endpoint, gracefully handle by
terminating, instead of looping on the same errno forever.

Bug: 22197797
Change-Id: I7e71632f69d47152ea78a94431c23ae69aba9b93
2015-06-30 16:02:52 -07:00
Evgenii Stepanov
ae18127ec3 am 7d4fc449: am 8c047830: Merge "Fix ODR issues in ART."
* commit '7d4fc4495a09c67703456e5f1ece33a9f4e7d3dd':
  Fix ODR issues in ART.
2015-06-30 22:46:41 +00:00
Evgenii Stepanov
7d4fc4495a am 8c047830: Merge "Fix ODR issues in ART."
* commit '8c0478309e86c6c6d47124035a23f958fa7f08c4':
  Fix ODR issues in ART.
2015-06-30 22:34:41 +00:00
Evgenii Stepanov
8c0478309e Merge "Fix ODR issues in ART." 2015-06-30 22:19:22 +00:00
Elliott Hughes
5b8ff09578 resolved conflicts for merge of b40ebc54 to mnc-dev-plus-aosp
Change-Id: I9da05b46da2326ae21d164b137be57a9b5220f7b
2015-06-30 15:17:14 -07:00
Elliott Hughes
b40ebc5433 am 6d1e6ec3: Merge "Consistently use strerror in libutils."
* commit '6d1e6ec36fe47432739b06501894670c10f3d953':
  Consistently use strerror in libutils.
2015-06-30 21:56:44 +00:00
Elliott Hughes
6d1e6ec36f Merge "Consistently use strerror in libutils." 2015-06-30 21:47:21 +00:00
Elliott Hughes
6ed68cc412 Consistently use strerror in libutils.
It's easier for people to debug, and side-steps the problem that errno
values differ between architectures.

Bug: http://b/17458391
Change-Id: I1db9b2cbb653839d3936b91e37e5cff02671318a
2015-06-30 10:41:15 -07:00
Evgenii Stepanov
953314fc21 Fix ODR issues in ART.
Linking against both libziparchive-host and libz-host results in
libz loaded twice (because it is also linked statically in
libziparchive).

Change-Id: Ib34eef60200a702c2d7fbca3589b324992e78eab
2015-06-29 16:27:44 -07:00
Elliott Hughes
1bb6a4b89e am eb73219c: am b80ed906: Merge "adb server: don\'t close stale fd when TCP transport is closed"
* commit 'eb73219cbe186c4d879df081a83a97afa3ff7fc9':
  adb server: don't close stale fd when TCP transport is closed
2015-06-29 22:59:23 +00:00
Todd Kjos
7c3e2696c5 am 1fb6e24f: Merge "Fix janky navbar ripples -- incorrect timerslack values" into mnc-dev
* commit '1fb6e24f19533c2d7bfa1e8e69443d752e9df3ce':
  Fix janky navbar ripples -- incorrect timerslack values
2015-06-29 22:55:34 +00:00
Elliott Hughes
eb73219cbe am b80ed906: Merge "adb server: don\'t close stale fd when TCP transport is closed"
* commit 'b80ed9069623efa3d48ac318c2c7585882d9b5d1':
  adb server: don't close stale fd when TCP transport is closed
2015-06-29 22:49:03 +00:00
Elliott Hughes
b80ed90696 Merge "adb server: don't close stale fd when TCP transport is closed" 2015-06-29 22:32:19 +00:00
Todd Kjos
1fb6e24f19 Merge "Fix janky navbar ripples -- incorrect timerslack values" into mnc-dev 2015-06-29 22:29:54 +00:00
Yusuke Sato
7522b3d58f am 95a37e75: am 692dc75d: Merge "Rename ZipEntryName to ZipString"
* commit '95a37e756e42507d35c8d16f952cd696f7d6109d':
  Rename ZipEntryName to ZipString
2015-06-29 20:22:38 +00:00
Yusuke Sato
95a37e756e am 692dc75d: Merge "Rename ZipEntryName to ZipString"
* commit '692dc75d9fbf5c256cd8c66219a930ae0fe9f523':
  Rename ZipEntryName to ZipString
2015-06-29 18:01:16 +00:00
Yusuke Sato
692dc75d9f Merge "Rename ZipEntryName to ZipString" 2015-06-29 17:49:39 +00:00
Yusuke Sato
40e8b27a58 am 6d43d448: am f5a59f92: Merge "Add |optional_suffix| to StartIteration()"
* commit '6d43d448ef9ff97590151f395baf649763d1bd68':
  Add |optional_suffix| to StartIteration()
2015-06-29 17:30:48 +00:00
Yusuke Sato
6d43d448ef am f5a59f92: Merge "Add |optional_suffix| to StartIteration()"
* commit 'f5a59f929e9833e840df6da2131f2b45cb373e36':
  Add |optional_suffix| to StartIteration()
2015-06-29 17:18:31 +00:00
Yusuke Sato
f5a59f929e Merge "Add |optional_suffix| to StartIteration()" 2015-06-29 17:04:34 +00:00
Adam Lesinski
108cb2f06a am 1eb38187: Merge "Adds a parameter to the wakeup_callback to report sucessful wakeup or suspend aborts." into mnc-dev
* commit '1eb38187af952493486fff3d84a663744925abb5':
  Adds a parameter to the wakeup_callback to report sucessful wakeup or suspend aborts.
2015-06-27 01:05:06 +00:00
Adam Lesinski
1eb38187af Merge "Adds a parameter to the wakeup_callback to report sucessful wakeup or suspend aborts." into mnc-dev 2015-06-27 00:40:28 +00:00
Yusuke Sato
07447544ad Rename ZipEntryName to ZipString
since the struct is now used for other purposes. Also add some
comparator functions to the struct to simplify zip_archive.cc.

This is a follow-up CL for f1d3d3b247.

Bug: 21957428
Change-Id: I60d4171eeacc561d59226d946e9eb5f9c96d80cf
2015-06-26 10:34:01 -07:00
Jeff Sharkey
3bff4b4ba3 am 169944af: Remove unused methods to fix build.
* commit '169944afdfa328351a327cb3862dca2252d6a3f9':
  Remove unused methods to fix build.
2015-06-26 17:07:34 +00:00
Jeff Sharkey
169944afdf Remove unused methods to fix build.
Change-Id: I6e1f85a7cc3428d558460737da3b3193d035b73e
2015-06-26 09:43:52 -07:00
Jeff Sharkey
96835733b3 am f38f29c8: Let\'s reinvent storage, yet again!
* commit 'f38f29c87d97cea45d04b783bddbd969234b1030':
  Let's reinvent storage, yet again!
2015-06-26 16:05:20 +00:00
Jeff Sharkey
f38f29c87d 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: I5a016f0958a92fd390c02b5ae159f8008bd4f4b7
2015-06-25 22:27:04 -07:00
Sasha Levitskiy
7ded5799a9 Fingerprintd: Add post_enroll() API.
Change-Id: Ia50460c4fa7a5b9112f411970ab96af070863f6f
Signed-off-by: Sasha Levitskiy <sanek@google.com>
2015-06-25 15:59:55 -07:00
Todd Kjos
4cdce427f9 Fix janky navbar ripples -- incorrect timerslack values
If a thread is created while the parent thread is "Background",
then the default timerslack value gets set to the current
timerslack value of the parent (40ms). The default value is
used when transitioning to "Foreground" -- so the effect is that
the timerslack value becomes 40ms regardless of foreground/background.

This does occur intermittently for systemui when creating its
render thread (pretty often on hammerhead and has been seen on
shamu). If this occurs, then some systemui animations like navbar
ripples can wait for up to 40ms to draw a frame when they intended
to wait 3ms -- jank.

This fix is to explicitly set the foreground timerslack to 50us.

A consequence of setting timerslack behind the process' back is
that any custom values for timerslack get lost whenever the thread
has transition between fg/bg.

See Bug: 19398120

Change-Id: Idc259717f62fa2255f8bafbbf88b68c0043f29cf
2015-06-25 14:29:07 -07:00
Yusuke Sato
f1d3d3b247 Add |optional_suffix| to StartIteration()
so that PackageManagerService can iterate over files with a
specific file extension like ".so".

(cherry picked from commit a4a80693d9)

Bug: 21957428
Change-Id: I36ba3c33a8b366a65f67cb6d156067c5caca1151
2015-06-25 14:10:05 -07:00
Ruchi Kandoi
d3027d85f3 Adds a parameter to the wakeup_callback to report sucessful wakeup or suspend aborts.
Adds the call to wakeup_callback when the write to the /sys/power/state
fails. This will help userspace account for the suspend aborts.

Bug: 17478088
Bug: 18179405
Change-Id: Icd1194cfbaf61044ca0b2fe63a10a4c52e1535bc
2015-06-25 13:15:22 -07:00
Andres Morales
d3b8b72ec9 am 9a53bb0f: Merge "[gatekeeperd] fix issue with SW->HW upgrades" into mnc-dev
* commit '9a53bb0f809ae6d048646da2cf720d32d14f1a22':
  [gatekeeperd] fix issue with SW->HW upgrades
2015-06-25 16:02:06 +00:00
Mark Salyzyn
348d96fae7 am e27ee08a: Merge "logd: serialize accesses to stats helpers" into mnc-dev
* commit 'e27ee08abb6b2b7a0d31dda4065c4c639b05ab16':
  logd: serialize accesses to stats helpers
2015-06-25 16:02:05 +00:00
Yusuke Sato
57a4640f8a am 5c8f6f22: Merge "Add |optional_suffix| to StartIteration()" into mnc-dev
* commit '5c8f6f22c52dca2ff968b2bf654c340006b0b240':
  Add |optional_suffix| to StartIteration()
2015-06-25 16:02:04 +00:00