Commit graph

15656 commits

Author SHA1 Message Date
Paul Lawrence
1c875cc40f am 22d0ee6a: am a65e402b: Merge "Change init sequence to support file level encryption" into mnc-dev
* commit '22d0ee6a25b3bedd6c3cd52473df1404fce8615f':
  Change init sequence to support file level encryption
2015-07-07 00:32:17 +00:00
Jeff Sharkey
7c195a2760 am 341b607c: am 25aabb9e: Permission to view shared storage for all users.
* commit '341b607c89649e901bd4b18c201693ce9b7c00a3':
  Permission to view shared storage for all users.
2015-07-07 00:31:18 +00:00
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
a2b0ff4999 am 17cf7498: am f4bb11d2: am 913ef1ca: Merge "Fixed a documentation error in protocol.txt"
* commit '17cf7498a96402449f4b1a2293031d1dc514be47':
  Fixed a documentation error in protocol.txt
2015-07-06 18:58:55 +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
4b2051ee42 am 2621f8ef: am 845f829f: am f9fd0d5a: Merge "Add static versions for libbacktrace and libnativebridge. Bug fixes."
* commit '2621f8ef2257f64e32e884d24d667032f7358d67':
  Add static versions for libbacktrace and libnativebridge. Bug fixes.
2015-07-06 12:48:47 +00: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
a7d4c58ee4 am 975d17a6: am d5a84845: Merge "Fingerprintd: Add post_enroll() API." into mnc-dev
* commit '975d17a6b000206f8dc6220ccabfdbacfa18b200':
  Fingerprintd: Add post_enroll() API.
2015-07-01 00:28:48 +00: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
654c6bbf26 am cf8d4263: am 4a485818: Gracefully handle ENODEV in sdcard daemon.
* commit 'cf8d4263b554b57ab2a2504cdbfa01db816ab0e1':
  Gracefully handle ENODEV in sdcard daemon.
2015-07-01 00:13:57 +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
c034a164c9 am ae18127e: am 7d4fc449: am 8c047830: Merge "Fix ODR issues in ART."
* commit 'ae18127ec33b030aeaa4eece6b741784b016e48c':
  Fix ODR issues in ART.
2015-06-30 22:59:03 +00: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
Elliott Hughes
85e14e9c40 am 5b8ff095: resolved conflicts for merge of b40ebc54 to mnc-dev-plus-aosp
* commit '5b8ff09578e647db8575699cf46ab9f6f816f6f8':
  Consistently use strerror in libutils.
2015-06-30 22:32:33 +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
c33fcf4041 am 1bb6a4b8: am eb73219c: am b80ed906: Merge "adb server: don\'t close stale fd when TCP transport is closed"
* commit '1bb6a4b89ed9fbba6d73ee8e716c3e9847feaefa':
  adb server: don't close stale fd when TCP transport is closed
2015-06-29 23:07:18 +00:00
Todd Kjos
a08f7d2862 am 7c3e2696: am 1fb6e24f: Merge "Fix janky navbar ripples -- incorrect timerslack values" into mnc-dev
* commit '7c3e2696c558dbaec4ca6e7ef9fc06879c443c51':
  Fix janky navbar ripples -- incorrect timerslack values
2015-06-29 23:07:17 +00: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
b33737bb64 am 7522b3d5: am 95a37e75: am 692dc75d: Merge "Rename ZipEntryName to ZipString"
* commit '7522b3d58f9b9f397b8f25c7078273f2c0859693':
  Rename ZipEntryName to ZipString
2015-06-29 20:40:29 +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
eb97929a00 am 40e8b27a: am 6d43d448: am f5a59f92: Merge "Add |optional_suffix| to StartIteration()"
* commit '40e8b27a58d7fd3834d4f5d530ca93a428a9d17d':
  Add |optional_suffix| to StartIteration()
2015-06-29 17:47:17 +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
ef15c7303a am 108cb2f0: am 1eb38187: Merge "Adds a parameter to the wakeup_callback to report sucessful wakeup or suspend aborts." into mnc-dev
* commit '108cb2f06a5bb0aac9c4dd5701b7df5202191af8':
  Adds a parameter to the wakeup_callback to report sucessful wakeup or suspend aborts.
2015-06-27 01:17:07 +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