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

23529 commits

This branch
This branch
All branches
Author SHA1 Message Date
Paul Lawrence
7c198d3eef Make file encryption type available 
am: 4e898a01fd

* commit '4e898a01fd4df477f079a6140590f5ec8535102b':
  Make file encryption type available

Change-Id: I72de48f819ab957f4e87a194b714ae667798f136
 2016-05-27 17:13:29 +00:00
Paul Lawrence
4e898a01fd Make file encryption type available 
Bug: 28905864
Change-Id: I5f59f824fd92c32ff87aa730dc5c0f250564c0a9
 2016-05-27 09:38:29 -07:00
Siqi Lin
74521c93de Revert "adb: close ep0 on disconnection." 
am: 57de0514f0

* commit '57de0514f0aeabe092ce3a122402721c93a70a2c':
  Revert "adb: close ep0 on disconnection."

Change-Id: I5a5b577579a9e00b814ce956461e0c983cfb47ba
 2016-05-27 00:56:13 +00:00
Siqi Lin
57de0514f0 Revert "adb: close ep0 on disconnection." 
This reverts commit 69e97e4bee.

Bug: 28932120
Change-Id: I5e2569abed316c089886556c432bfe59bca08549
 2016-05-26 17:25:32 -07:00
Yabin Cui
a06dc0bb9e Merge "adb: retry connecting disconnected emulators instead of always looping." am: 50e91fec0e am: cfb0c5cd91 
am: 16dad488b3

* commit '16dad488b362d3812f9d67b4b751ba6cde22590d':
  adb: retry connecting disconnected emulators instead of always looping.

Change-Id: I4eede079760b4c3ead7c2fef9e942d3fe47069f3
 2016-05-26 02:21:49 +00:00
Yabin Cui
16dad488b3 Merge "adb: retry connecting disconnected emulators instead of always looping." am: 50e91fec0e 
am: cfb0c5cd91

* commit 'cfb0c5cd913b689c8f9d0d930c92c6a0804e2995':
  adb: retry connecting disconnected emulators instead of always looping.

Change-Id: I4b7f30bd3738ce53eb343e5d0e20f3d20faf7e2a
 2016-05-26 02:10:10 +00:00
Yabin Cui
cfb0c5cd91 Merge "adb: retry connecting disconnected emulators instead of always looping." 
am: 50e91fec0e

* commit '50e91fec0e33b92e7991622ac1e8be8817208692':
  adb: retry connecting disconnected emulators instead of always looping.

Change-Id: Ifa2dcddea99aa8070b6cdb1cddabfe20e701aca0
 2016-05-26 01:58:01 +00:00
Yabin Cui
50e91fec0e Merge "adb: retry connecting disconnected emulators instead of always looping." 2016-05-26 01:32:53 +00:00
Michael Ryleev
5a6252b070 Merge "trusty: storageproxyd: use upstream kernel headers" am: ed01d17e1b am: 420d64de7b 
am: d66e05c6c4

* commit 'd66e05c6c45698c69e3368090adfbd56c00fc9a8':
  trusty: storageproxyd: use upstream kernel headers

Change-Id: I95d91887acc3ae6fd86cb8a29973915b723319f7
 2016-05-25 15:54:06 +00:00
Michael Ryleev
d66e05c6c4 Merge "trusty: storageproxyd: use upstream kernel headers" am: ed01d17e1b 
am: 420d64de7b

* commit '420d64de7b3406b3493e42bff8a5ac2631ec3314':
  trusty: storageproxyd: use upstream kernel headers

Change-Id: Iecda534cbd181f9e9f4bf4d28917fe2f8c17d565
 2016-05-25 15:50:50 +00:00
Michael Ryleev
420d64de7b Merge "trusty: storageproxyd: use upstream kernel headers" 
am: ed01d17e1b

* commit 'ed01d17e1bf54edad1989c2da7505e0efb673a9b':
  trusty: storageproxyd: use upstream kernel headers

Change-Id: Ia527c3f104caaced60b0a1597951358861019be1
 2016-05-25 15:47:55 +00:00
Michael Ryleev
ed01d17e1b Merge "trusty: storageproxyd: use upstream kernel headers" 2016-05-25 15:40:05 +00:00
Elliott Hughes
961c7d88d0 resolve merge conflicts of f0d4f38 to nyc-dev am: 1265fd4934 
am: b598abf175

* commit 'b598abf17573e9597753e36136f213245863eb50':

Change-Id: I0d1a3229df7188a571641920295727b8f9cd8a90
 2016-05-25 05:06:52 +00:00
Elliott Hughes
4f0b723224 resolve merge conflicts of f0d4f38 to nyc-dev am: 1265fd4934 
am: f7571ca418

* commit 'f7571ca4185fa57d9671776f821502dd6d6fb4ba':
  Fix scanf %s in lsof.

Change-Id: I86d4cd3054ade48f66bcb574042d64fa3c6aa79e
 2016-05-25 05:04:13 +00:00
Elliott Hughes
b598abf175 resolve merge conflicts of f0d4f38 to nyc-dev 
am: 1265fd4934

* commit '1265fd493471b6e94cc4e9853d9307d7fde2fe98':
  Fix scanf %s in lsof.

Change-Id: I2e581b2dae519f77399a149d3de3c710cf629d29
 2016-05-25 05:01:17 +00:00
Elliott Hughes
f7571ca418 resolve merge conflicts of f0d4f38 to nyc-dev 
am: 1265fd4934

* commit '1265fd493471b6e94cc4e9853d9307d7fde2fe98':
  Fix scanf %s in lsof.

Change-Id: I4d02e7733851aa23f1eadb496b3a7db3652cd9bc
 2016-05-25 05:01:17 +00:00
Elliott Hughes
1265fd4934 resolve merge conflicts of f0d4f38 to nyc-dev 
Change-Id: Ibce10a3c66560c10c67bd51f5b568552f43825f2
 2016-05-24 17:22:51 -07:00
Yabin Cui
b74c6498aa adb: retry connecting disconnected emulators instead of always looping. 
Previously we loop through local ports every second, this patch improves
the strategy by retrying only just disconnected emulators.

Bug: 26468076
Bug: 19974213
Bug: 22920867

Change-Id: I43ccb746922d104202b0f81a3d163d850bbc890e
 2016-05-24 16:38:47 -07:00
Elliott Hughes
f0d4f38773 resolve merge conflicts of 7f5da85 to lmp-dev am: de529e72b6 am: 1a98776aee am: ad0c2bf5f3 am: a17f2802b1 am: 20b1e79563 am: c443a447b2 
am: 5538f8bb63

* commit '5538f8bb63c79d1b9de6e809e085bd78b1027f9c':
  Fix scanf %s in lsof.

Change-Id: I09d37fb2798e6038bb00fb8e210b9d3c5348a4e4
 2016-05-24 23:11:36 +00:00
Elliott Hughes
5538f8bb63 resolve merge conflicts of 7f5da85 to lmp-dev am: de529e72b6 am: 1a98776aee am: ad0c2bf5f3 am: a17f2802b1 am: 20b1e79563 
am: c443a447b2

* commit 'c443a447b2f6e950b03fe472c5f7cb6c54e9ba61':
  Fix scanf %s in lsof.

Change-Id: Ia66e81641532cf7bca669fb52095aeca90158807
 2016-05-24 23:08:36 +00:00
Elliott Hughes
c443a447b2 resolve merge conflicts of 7f5da85 to lmp-dev am: de529e72b6 am: 1a98776aee am: ad0c2bf5f3 am: a17f2802b1 
am: 20b1e79563

* commit '20b1e795637686d3a18c79413cccbba16881e295':
  Fix scanf %s in lsof.

Change-Id: Ic63528dee82e3045020b527c093b9b4fffaf5530
 2016-05-24 23:05:55 +00:00
Elliott Hughes
20b1e79563 resolve merge conflicts of 7f5da85 to lmp-dev am: de529e72b6 am: 1a98776aee am: ad0c2bf5f3 
am: a17f2802b1

* commit 'a17f2802b153b2ee361fea9a6cc37da0613a2e55':
  Fix scanf %s in lsof.

Change-Id: I088944d9c376de58705698bfe7d417a10c708909
 2016-05-24 23:02:26 +00:00
Elliott Hughes
a17f2802b1 resolve merge conflicts of 7f5da85 to lmp-dev am: de529e72b6 am: 1a98776aee 
am: ad0c2bf5f3

* commit 'ad0c2bf5f345a4cdb53a3e4f690db842e8df1685':
  Fix scanf %s in lsof.

Change-Id: I51f630de4cb5ce667ac856a1848206c368816aea
 2016-05-24 22:59:18 +00:00
Elliott Hughes
ad0c2bf5f3 resolve merge conflicts of 7f5da85 to lmp-dev am: de529e72b6 
am: 1a98776aee

* commit '1a98776aee4d02c33d922bbbe3ffdd54099840a9':
  Fix scanf %s in lsof.

Change-Id: I1af0d93d03631f257b1372a08aad158508f652ea
 2016-05-24 22:56:38 +00:00
Elliott Hughes
1a98776aee resolve merge conflicts of 7f5da85 to lmp-dev 
am: de529e72b6

* commit 'de529e72b63c135053711ceb27a043f8d80e308c':
  Fix scanf %s in lsof.

Change-Id: I4dc617bbe052059b04296e4213fb778fbf3cf8eb
 2016-05-24 22:53:55 +00:00
Elliott Hughes
de529e72b6 resolve merge conflicts of 7f5da85 to lmp-dev 
Change-Id: I7a7547426a229ac99d187ec8bfabd49c4da51907
 2016-05-24 15:23:48 -07:00
Elliott Hughes
7f5da85015 Fix scanf %s in lsof. am: 008efb756f 
am: 491dfb11b7

* commit '491dfb11b762f44dc9848496d5d30514082aab64':
  Fix scanf %s in lsof.

Change-Id: Ife17fa56f125dfec08d0d4b0c5c368bdae51106e
 2016-05-24 22:13:03 +00:00
Elliott Hughes
491dfb11b7 Fix scanf %s in lsof. 
am: 008efb756f

* commit '008efb756fea8a9e66a1825b546e9dc392c72bec':
  Fix scanf %s in lsof.

Change-Id: I608ae2094649617308b45571df1b649724ec8ac3
 2016-05-24 22:10:19 +00:00
Michael Ryleev
462461bd28 trusty: storageproxyd: use upstream kernel headers 
Force usage of upstream kernel headers to pull in
definition of rpmb related structures.

This change is required until b/25567964 is resolved.

Change-Id: Ic710d32281dcdd093f6308b82ee937143b692613
Bug: 25567964
 2016-05-24 14:52:38 -07:00
Michael Ryleev
10d5a215e6 Merge changes I40c9ea47,I593aeed5 am: c7878469be am: 5cf2f5946c 
am: 1abb40cf43

* commit '1abb40cf431e620cafb8124b36e44bcf91cc6d19':
  trusty: storage: add tests
  trusty: storage: add client lib for testing

Change-Id: I54a0369342e9f8beccdb1c6aa06ffe3ffcc02311
 2016-05-24 20:18:07 +00:00
Michael Ryleev
1abb40cf43 Merge changes I40c9ea47,I593aeed5 am: c7878469be 
am: 5cf2f5946c

* commit '5cf2f5946c5e9d09d9325a5286fe472b4e75f841':
  trusty: storage: add tests
  trusty: storage: add client lib for testing

Change-Id: I39d2c1b49e92b15190fb92b66aa20e8586716957
 2016-05-24 19:45:30 +00:00
Michael Ryleev
5cf2f5946c Merge changes I40c9ea47,I593aeed5 
am: c7878469be

* commit 'c7878469be6be610a38da4e41ae1fe1d63d431eb':
  trusty: storage: add tests
  trusty: storage: add client lib for testing

Change-Id: I74fb708a0cf211202eb50b1f5e097a9cd587a88d
 2016-05-24 19:37:30 +00:00
Michael Ryleev
c7878469be Merge changes I40c9ea47,I593aeed5 
* changes:
  trusty: storage: add tests
  trusty: storage: add client lib for testing
 2016-05-24 19:23:50 +00:00
Dimitry Ivanov
0bd40f852a Merge "Remove target_sdk_version parameter" into nyc-dev am: 07f46c84e6 
am: 10743a9db6

* commit '10743a9db69c895a64e60eed86c226a9968ab0b2':

Change-Id: I34153ada3479d2960bce70362bfb7fef14f21922
 2016-05-24 17:33:36 +00:00
Dimitry Ivanov
acc90d8e8a Merge "Remove target_sdk_version parameter" into nyc-dev am: 07f46c84e6 
am: fcd4ee48a4

* commit 'fcd4ee48a4f29c3271e4a3d0f5174f9d6a7042c9':
  Remove target_sdk_version parameter

Change-Id: If120c8025891c365d0f72f2488667652b53230f0
 2016-05-24 17:30:15 +00:00
Dimitry Ivanov
10743a9db6 Merge "Remove target_sdk_version parameter" into nyc-dev 
am: 07f46c84e6

* commit '07f46c84e614e2635e8072403dce8f17cc9285ba':
  Remove target_sdk_version parameter

Change-Id: I45ac4ab30053c03e40195dd2f768321b3c1145c1
 2016-05-24 17:24:20 +00:00
Dimitry Ivanov
fcd4ee48a4 Merge "Remove target_sdk_version parameter" into nyc-dev 
am: 07f46c84e6

* commit '07f46c84e614e2635e8072403dce8f17cc9285ba':
  Remove target_sdk_version parameter

Change-Id: Idf4bca526e7a40064518ad0e5ccc5aa1f63dbe75
 2016-05-24 17:15:12 +00:00
TreeHugger Robot
07f46c84e6 Merge "Remove target_sdk_version parameter" into nyc-dev 2016-05-24 16:59:12 +00:00
Dimitry Ivanov
94ee4e690d Remove target_sdk_version parameter 
Since linker-namespaces are enabled for all target_sdk_versions
and there is no longer need in workarounds in libnativeloader -
remove unused target_sdk_version parameter for internal calls.

This also brings libnativeloader closer to aosp/master

Bug: http://b/26040253
Change-Id: I7d6f6ac31be0dca5f3c3f6ea20e6cc87ce3a3c7f
 2016-05-24 08:40:38 -07:00
Android Build Merger (Role)
526cf1adfd Merge "Merge "Fix SharedBuffer. Remove aref." into nyc-dev am: 5668b84f99 am: 4541e93d32" into nyc-mr1-dev-plus-aosp 2016-05-24 04:17:15 +00:00
Hans Boehm
ea3f817ef8 Merge "Fix SharedBuffer. Remove aref." into nyc-dev am: 5668b84f99 
am: d797b5cb8b

* commit 'd797b5cb8b3933631263ae6218815fce90fefb1c':
  Fix SharedBuffer. Remove aref.

Change-Id: Ibecad90eb8a70e471c13c1de8edbc8493bb3b8bb
 2016-05-24 04:17:03 +00:00
Hans Boehm
c6fe50d927 Merge "Fix SharedBuffer. Remove aref." into nyc-dev am: 5668b84f99 
am: 4541e93d32

* commit '4541e93d32bddd1294bbda8aaf5d24f30af7a0f6':
  Fix SharedBuffer. Remove aref.

Change-Id: I16c320c354a150c2ab98978d1b6bc025dd77714e
 2016-05-24 04:17:03 +00:00
Hans Boehm
4541e93d32 Merge "Fix SharedBuffer. Remove aref." into nyc-dev 
am: 5668b84f99

* commit '5668b84f99e3fc467721b45184aedca70f8e6da4':
  Fix SharedBuffer. Remove aref.

Change-Id: Ia97d225bf3ff5ee2f0a430f00f03b442ff67562e
 2016-05-24 04:14:31 +00:00
Hans Boehm
d797b5cb8b Merge "Fix SharedBuffer. Remove aref." into nyc-dev 
am: 5668b84f99

* commit '5668b84f99e3fc467721b45184aedca70f8e6da4':
  Fix SharedBuffer. Remove aref.

Change-Id: I2ffe414bcdc7272b0c7d642bff9d33bffaf2d50e
 2016-05-24 04:14:31 +00:00
Hans Boehm
5668b84f99 Merge "Fix SharedBuffer. Remove aref." into nyc-dev 2016-05-24 04:10:29 +00:00
Yabin Cui
71bf52be5a Merge "adb: close ep0 on disconnection." am: 18013f2083 am: 3082ca20a0 
am: e8b1cfe7d4

* commit 'e8b1cfe7d4ba612749ff0912fd203403583d551c':
  adb: close ep0 on disconnection.

Change-Id: I9b9c5cd6b0501551afb13d53655d44e7cc400fc4
 2016-05-24 02:45:25 +00:00
Yabin Cui
e8b1cfe7d4 Merge "adb: close ep0 on disconnection." am: 18013f2083 
am: 3082ca20a0

* commit '3082ca20a0260967febfed6ec69c0b63f3cdae61':
  adb: close ep0 on disconnection.

Change-Id: I9cd0502456e167d2586cb707bfa2da5bdb40977a
 2016-05-24 02:42:52 +00:00
Yabin Cui
3082ca20a0 Merge "adb: close ep0 on disconnection." 
am: 18013f2083

* commit '18013f2083d9372cc03d9c9281bc3a168e049da9':
  adb: close ep0 on disconnection.

Change-Id: I3d65b981a568ec606c09e35874474a5179f10e6c
 2016-05-24 02:40:28 +00:00
Treehugger Robot
18013f2083 Merge "adb: close ep0 on disconnection." 2016-05-24 02:32:57 +00:00
Yabin Cui
d61544871d Merge "adb: close ep0 on disconnection." into nyc-dev am: fcab9a8507 
am: 11b07091c6

* commit '11b07091c62bedecf334ca99737f9bf53a685f6c':

Change-Id: I9f4db9ad78ae70c28e0a233df095d95db8de990d
 2016-05-24 00:37:13 +00:00