ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
15603 commits 1 branch 0 tags 217 MiB
Commit graph

15603 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Jeff Sharkey
45469a2e98 am 3bff4b4b: am 169944af: Remove unused methods to fix build. 
* commit '3bff4b4ba37697781230cd7ede018287902509f9':
  Remove unused methods to fix build.
 2015-06-26 17:15:23 +00: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
35e0cc552c am 96835733: am f38f29c8: Let\'s reinvent storage, yet again! 
* commit '96835733b397da908c86e2a1190b8c8baf06a441':
  Let's reinvent storage, yet again!
 2015-06-26 16:18:13 +00: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
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
b15e63602d am d3b8b72e: am 9a53bb0f: Merge "[gatekeeperd] fix issue with SW->HW upgrades" into mnc-dev 
* commit 'd3b8b72ec9cbaf202053f0281c33a8da432222ca':
  [gatekeeperd] fix issue with SW->HW upgrades
 2015-06-25 16:10:35 +00:00
Mark Salyzyn
eb3aff3db8 am 348d96fa: am e27ee08a: Merge "logd: serialize accesses to stats helpers" into mnc-dev 
* commit '348d96fae741af0017b8fb46041a3b09724eeb83':
  logd: serialize accesses to stats helpers
 2015-06-25 16:10:34 +00:00
Yusuke Sato
28bfde794f am 57a4640f: am 5c8f6f22: Merge "Add |optional_suffix| to StartIteration()" into mnc-dev 
* commit '57a4640f8a12bb5cad83ca5df6c33385f6e4bf1f':
  Add |optional_suffix| to StartIteration()
 2015-06-25 16:10:33 +00:00
Mark Salyzyn
b6c65bcc68 am ff688ffd: am f32bc723: am 3c233b36: Merge "logd: serialize accesses to stats helpers" 
* commit 'ff688ffd04aeea4af07282afa113aec5d259f8ae':
  logd: serialize accesses to stats helpers
 2015-06-25 16:03:35 +00: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
Mark Salyzyn
ff688ffd04 am f32bc723: am 3c233b36: Merge "logd: serialize accesses to stats helpers" 
* commit 'f32bc723f06d61d31cc611a3cdf8e9ac5f827fdb':
  logd: serialize accesses to stats helpers
 2015-06-25 15:52:43 +00:00
Andres Morales
9a53bb0f80 Merge "[gatekeeperd] fix issue with SW->HW upgrades" into mnc-dev 2015-06-25 15:43:02 +00:00
Mark Salyzyn
f32bc723f0 am 3c233b36: Merge "logd: serialize accesses to stats helpers" 
* commit '3c233b36c2ffd6e1186ccc3d2c7c7e40b0a3c066':
  logd: serialize accesses to stats helpers
 2015-06-25 15:39:29 +00:00
Mark Salyzyn
e27ee08abb Merge "logd: serialize accesses to stats helpers" into mnc-dev 2015-06-25 15:35:45 +00:00
Mark Salyzyn
5803b79528 logd: serialize accesses to stats helpers 
(cherry pick from commit ed777e9eec)

Quick low-risk to resolve possible hash table corruption.
Resolved an unlikely path memory leak.

ToDo: replace lock with nested lock so no lock
      helpers are required.

Bug: 22068332
Change-Id: I303ab06608502c7d61d42f111a9c43366f184d0c
 2015-06-25 08:34:06 -07:00
Mark Salyzyn
3c233b36c2 Merge "logd: serialize accesses to stats helpers" 2015-06-25 15:32:29 +00:00
Yusuke Sato
5c8f6f22c5 Merge "Add |optional_suffix| to StartIteration()" into mnc-dev 2015-06-25 15:22:10 +00:00
Mark Salyzyn
ed777e9eec logd: serialize accesses to stats helpers 
Quick low-risk to resolve possible hash table corruption.
Resolved an unlikely path memory leak.

ToDo: replace lock with nested lock so no lock
      helpers are required.

Bug: 22068332
Change-Id: I303ab06608502c7d61d42f111a9c43366f184d0c
 2015-06-25 07:39:24 -07:00
Andres Morales
7f6dcf6576 [gatekeeperd] fix issue with SW->HW upgrades 
If the handle version is 0, there's no hardware_backed flag
meaning hardware backed handles will be attempted against
the soft impl. Ensure we don't try to read from hardware_backed
unless the version is > 0.

Bug: 21090356
Change-Id: I65f009c55538ea3c20eb486b580eb11ce93934fc
 2015-06-24 18:40:24 -07:00
Dan Albert
d29f2c395f resolved conflicts for merge of c94fa81f to master 
Change-Id: I175c14dbc8719075aaaaa411ab8c493e69da7b87
 2015-06-24 15:31:02 -07:00
Dan Albert
c94fa81f2c am 262be426: Merge "Add missing include. Clang build fix." into mnc-dev 
* commit '262be42687a9095c53dce5e9a63bd1c74ecbdb6a':
  Add missing include. Clang build fix.
 2015-06-24 22:16:16 +00:00
Dan Albert
262be42687 Merge "Add missing include. Clang build fix." into mnc-dev 2015-06-24 21:41:13 +00:00
Elliott Hughes
e4b40fd19b am 90956a20: am 4d2b0716: am 1a3334f2: Merge "Fix Mac fastboot build." 
* commit '90956a2064fc1baa8b5375a7d6d979bcf83909e2':
  Fix Mac fastboot build.
 2015-06-24 20:59:26 +00:00
Elliott Hughes
90956a2064 am 4d2b0716: am 1a3334f2: Merge "Fix Mac fastboot build." 
* commit '4d2b0716c539fd07fd836197655b4768c4bfc3d5':
  Fix Mac fastboot build.
 2015-06-24 20:47:48 +00:00
Elliott Hughes
4d2b0716c5 am 1a3334f2: Merge "Fix Mac fastboot build." 
* commit '1a3334f22965f531449d890c1a97811fa249a754':
  Fix Mac fastboot build.
 2015-06-24 20:40:47 +00:00
Elliott Hughes
1a3334f229 Merge "Fix Mac fastboot build." 2015-06-24 20:28:49 +00:00
Elliott Hughes
fbcb93abe2 Fix Mac fastboot build. 
Change-Id: I516c07cee39845caaa47608604eeb30ce15f06cb
 2015-06-24 13:28:24 -07:00
Elliott Hughes
4bdff2805f am 529bb75f: am 04016450: am 9137d65e: Merge "Improve the "device \'(null)\' not found" error." 
* commit '529bb75f9ff4a36788babb6666e0bb17ab8f99c1':
  Improve the "device '(null)' not found" error.
 2015-06-24 20:08:50 +00:00
Elliott Hughes
eb06fe01f3 am 7d61df8b: am c078d54a: am 75d47421: Merge "Move fastboot\'s Windows code to C++." 
* commit '7d61df8bf7fee1e108572ac4219f21f11e9f74c0':
  Move fastboot's Windows code to C++.
 2015-06-24 20:08:48 +00:00
Elliott Hughes
18a7648be1 am 20370b5f: am cb7f5f51: am feddd582: Merge "Move fastboot\'s Mac OS code to C++." 
* commit '20370b5ffb628b1bd5dc1b5b6ea40d0cb440d01a':
  Move fastboot's Mac OS code to C++.
 2015-06-24 20:08:47 +00:00
Elliott Hughes
529bb75f9f am 04016450: am 9137d65e: Merge "Improve the "device \'(null)\' not found" error." 
* commit '0401645033b0418f9cd6e07768ae3b062aa256ca':
  Improve the "device '(null)' not found" error.
 2015-06-24 19:55:06 +00:00
Elliott Hughes
7d61df8bf7 am c078d54a: am 75d47421: Merge "Move fastboot\'s Windows code to C++." 
* commit 'c078d54adc4342c9573a7b9a8fdc13fb4c83c635':
  Move fastboot's Windows code to C++.
 2015-06-24 19:55:05 +00:00
Elliott Hughes
20370b5ffb am cb7f5f51: am feddd582: Merge "Move fastboot\'s Mac OS code to C++." 
* commit 'cb7f5f511141d80c8a9672cd544b576cabf4e9b6':
  Move fastboot's Mac OS code to C++.
 2015-06-24 19:55:04 +00:00
Elliott Hughes
0401645033 am 9137d65e: Merge "Improve the "device \'(null)\' not found" error." 
* commit '9137d65e9ba7e8a83440e1e2058ad19b2d6b6434':
  Improve the "device '(null)' not found" error.
 2015-06-24 19:42:32 +00:00
Elliott Hughes
c078d54adc am 75d47421: Merge "Move fastboot\'s Windows code to C++." 
* commit '75d47421d0fc1458fad97c32e7fcb6e2d94f3f44':
  Move fastboot's Windows code to C++.
 2015-06-24 19:42:31 +00:00
Elliott Hughes
cb7f5f5111 am feddd582: Merge "Move fastboot\'s Mac OS code to C++." 
* commit 'feddd582e7194e034c291f42528dc3f30d496b53':
  Move fastboot's Mac OS code to C++.
 2015-06-24 19:42:30 +00:00
Elliott Hughes
9137d65e9b Merge "Improve the "device '(null)' not found" error." 2015-06-24 19:31:20 +00:00
Elliott Hughes
75d47421d0 Merge "Move fastboot's Windows code to C++." 2015-06-24 19:30:58 +00:00
Elliott Hughes
feddd582e7 Merge "Move fastboot's Mac OS code to C++." 2015-06-24 19:29:20 +00:00
Andres Morales
db100ff076 am 7f270fa8: am 3c2086da: [gatekeeperd] clear state and mark on cold boot 
* commit '7f270fa8a18c86b8d5451dfcd8936c79115440ef':
  [gatekeeperd] clear state and mark on cold boot
 2015-06-24 18:52:51 +00:00
Andres Morales
7f270fa8a1 am 3c2086da: [gatekeeperd] clear state and mark on cold boot 
* commit '3c2086dabdb87e027412bb4405279128a321e184':
  [gatekeeperd] clear state and mark on cold boot
 2015-06-24 18:33:14 +00:00
Evgenii Stepanov
c25f0dc38b am c7b86c16: am eaa97876: am 2e8d31f6: Merge "SANITIZE_TARGET: set global ASAN_OPTIONS" 
* commit 'c7b86c1661c7d178784dc2b9f09e478569a2886c':
  SANITIZE_TARGET: set global ASAN_OPTIONS
 2015-06-24 18:30:03 +00:00
Elliott Hughes
20750ad823 Move fastboot's Mac OS code to C++. 
Change-Id: I4f452860a401a115b6e8349237923949f2f476d1
 2015-06-24 11:17:28 -07:00