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

24114 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Sehr
bc3ff3a7a2 add /data/misc/profman for output am: 0eb24e1bc7 am: cdc503c13b 
am: 0be76bb96f

* commit '0be76bb96f718d802cfed09b41202fb07ba867af':
  add /data/misc/profman for output

Change-Id: Ic2c4c42e2cb59cfb609963a36b29325f7044041d
 2016-06-01 14:13:40 +00:00
David Sehr
0be76bb96f add /data/misc/profman for output am: 0eb24e1bc7 
am: cdc503c13b

* commit 'cdc503c13b153c8a9216725dcd0f03ee6414161e':
  add /data/misc/profman for output

Change-Id: I60764f97eacd6853f17baed62bb6beee67fbc6fa
 2016-06-01 14:05:15 +00:00
David Sehr
cdc503c13b add /data/misc/profman for output 
am: 0eb24e1bc7

* commit '0eb24e1bc7317eb5764567223cdd9405d16aefa7':
  add /data/misc/profman for output

Change-Id: I8d8ebc0dc37aee1ac54f8e50e374cad77a6fe77a
 2016-06-01 14:01:10 +00:00
David Sehr
0eb24e1bc7 add /data/misc/profman for output 
Bug: 28748264
Change-Id: Ib57ccc570de446e03ea8c27ce8e404929138b213
 2016-05-31 17:36:41 -07:00
Erik Kline
745b40e8fb Merge "Merge "Add /vendor/xbin to the list of directories of executables" into nyc-dev am: 088f0e7c40 am: deb4e6e596" into nyc-mr1-dev-plus-aosp 
am: 380693666d

* commit '380693666d6521f28ea0dcb9c19f703272682e8b':

Change-Id: Ia0e0d5e29c733ea75c540335ecea327ec43f328c
 2016-05-30 02:45:06 +00:00
Erik Kline
f9276c8777 Merge "Add /vendor/xbin to the list of directories of executables" into nyc-dev am: 088f0e7c40 am: b927c6c39d 
am: 9bff938588

* commit '9bff9385880fb70777277e9d2a50a3dfdbc6fa47':
  Add /vendor/xbin to the list of directories of executables

Change-Id: Ie067cc09018512e488aae639215b91b243198a4f
 2016-05-30 02:45:05 +00:00
Android Build Merger (Role)
380693666d Merge "Merge "Add /vendor/xbin to the list of directories of executables" into nyc-dev am: 088f0e7c40 am: deb4e6e596" into nyc-mr1-dev-plus-aosp 2016-05-30 02:41:16 +00:00
Erik Kline
9bff938588 Merge "Add /vendor/xbin to the list of directories of executables" into nyc-dev am: 088f0e7c40 
am: b927c6c39d

* commit 'b927c6c39d5f43b0bd68c3f85f5bf3786f081378':
  Add /vendor/xbin to the list of directories of executables

Change-Id: I491fd8ec7cfa611ee63ac51c657d70636ed392c2
 2016-05-30 02:41:03 +00:00
Erik Kline
6e65e345e7 Merge "Add /vendor/xbin to the list of directories of executables" into nyc-dev am: 088f0e7c40 
am: deb4e6e596

* commit 'deb4e6e59660b60f643eec90453aee27d094cad9':
  Add /vendor/xbin to the list of directories of executables

Change-Id: I3fee39f704da30c8e1067a2ceb5d12a27a4051bc
 2016-05-30 02:41:03 +00:00
Erik Kline
deb4e6e596 Merge "Add /vendor/xbin to the list of directories of executables" into nyc-dev 
am: 088f0e7c40

* commit '088f0e7c40a1cc66505f2bd73c54f3bab9908986':
  Add /vendor/xbin to the list of directories of executables

Change-Id: Ib1172d5a5f0f0f1a82ce5ca260ef4539761ef679
 2016-05-30 02:36:42 +00:00
Erik Kline
b927c6c39d Merge "Add /vendor/xbin to the list of directories of executables" into nyc-dev 
am: 088f0e7c40

* commit '088f0e7c40a1cc66505f2bd73c54f3bab9908986':
  Add /vendor/xbin to the list of directories of executables

Change-Id: Ia48ba1bdab767ddd146aeb090c2c1a9bbc304e3d
 2016-05-30 02:36:41 +00:00
Erik Kline
088f0e7c40 Merge "Add /vendor/xbin to the list of directories of executables" into nyc-dev 2016-05-30 02:31:46 +00:00
Elliott Hughes
772787b359 Merge "Kill adb\'s ScopedFd for unique_fd." am: 0f3fde210d am: b8901de2ad am: 8d96370fb2 
am: 6e1ec81f31

* commit '6e1ec81f31b004fe770de621422f88eb06c1aae5':
  Kill adb's ScopedFd for unique_fd.

Change-Id: I5c575d516fb1ccb4625d366a0bfb1df2c751a2d2
 2016-05-28 02:22:21 +00:00
Elliott Hughes
6e1ec81f31 Merge "Kill adb\'s ScopedFd for unique_fd." am: 0f3fde210d am: b8901de2ad 
am: 8d96370fb2

* commit '8d96370fb2e13afc53d00f64822065b9da257110':
  Kill adb's ScopedFd for unique_fd.

Change-Id: I636d6fc5b7d591df3c3e769e4c75363f9e491f05
 2016-05-28 02:19:50 +00:00
Elliott Hughes
8d96370fb2 Merge "Kill adb\'s ScopedFd for unique_fd." am: 0f3fde210d 
am: b8901de2ad

* commit 'b8901de2adca421ad10d91cdfd35851f0473464a':
  Kill adb's ScopedFd for unique_fd.

Change-Id: Idb0559a08423b9985058866ba906580353e5a7e5
 2016-05-28 02:17:19 +00:00
Elliott Hughes
b8901de2ad Merge "Kill adb\'s ScopedFd for unique_fd." 
am: 0f3fde210d

* commit '0f3fde210d01263e780aa331472878813fbec8b8':
  Kill adb's ScopedFd for unique_fd.

Change-Id: Ibe1eec278f70212faeb59185a5a79c0bfe9ba245
 2016-05-28 02:14:27 +00:00
Treehugger Robot
0f3fde210d Merge "Kill adb's ScopedFd for unique_fd." 2016-05-28 02:06:18 +00:00
Elliott Hughes
2ce86e527b Kill adb's ScopedFd for unique_fd. 
It's the adb unique_fd, but at least it's the same API...

Change-Id: If5d6642457e145c450374fde6f1358e5ac386a96
 2016-05-27 17:51:24 -07:00
Elliott Hughes
e3cfe5438e Merge "Kill load_file." am: b42e4a6b63 am: 198a727891 am: 500c7e5bc7 
am: c4600fb81a

* commit 'c4600fb81aa436c5d93a36b6869a288863372ff1':
  Kill load_file.

Change-Id: Ica4191e6d55cd303e105f0f01c4a8037ddd175dc
 2016-05-28 00:41:31 +00:00
Yurii Zubrytskyi
00754a70ad Merge "[adb] Followup CL to clean up adb_auth_host.cpp" am: 9c7f9215e4 am: 979998b965 am: e5635175ab 
am: c9ff51e16b

* commit 'c9ff51e16b2612e7b22b27cc7f4aa62c691d538f':
  [adb] Followup CL to clean up adb_auth_host.cpp

Change-Id: Ibd2196a4c18440c1925de2fa4919042f6cc37906
 2016-05-28 00:41:30 +00:00
Chih-Hung Hsieh
82eb0debf8 resolve merge conflicts of 5fb629a to nyc-mr1-dev-plus-aosp 
am: 496e073864

* commit '496e073864b3c08fb4d24152ceaad69f12d56ab3':
  Fix misc-macro-parentheses warnings in init and other core modules.

Change-Id: Iae175962bca1b55bc44396445ab25de7c34a1652
 2016-05-28 00:41:30 +00:00
Jeremy Compostella
1a14ebd770 Merge "fs_mgr: update block device reference in verity metadata" into nyc-mr1-dev am: 8024f8f9ea -s ours 
am: 3efa16ba35

* commit '3efa16ba35e8a16f88aa4e27663c23c0bf0e7223':
  fs_mgr: update block device reference in verity metadata

Change-Id: Ic60d31d7bbc51b6bf6c078a4071132753b3e95ce
 2016-05-28 00:41:29 +00:00
Elliott Hughes
c4600fb81a Merge "Kill load_file." am: b42e4a6b63 am: 198a727891 
am: 500c7e5bc7

* commit '500c7e5bc7f9288631fe1ed575f6633027c5edf8':
  Kill load_file.

Change-Id: I062db2d26a71cd334980bfe784bf28ee60f5a25e
 2016-05-28 00:33:02 +00:00
Elliott Hughes
500c7e5bc7 Merge "Kill load_file." am: b42e4a6b63 
am: 198a727891

* commit '198a727891aef33469d82b263fc222e4f4335b1b':
  Kill load_file.

Change-Id: I81d715153b8b882ace9deb073abfc4dde5535811
 2016-05-28 00:30:31 +00:00
Elliott Hughes
198a727891 Merge "Kill load_file." 
am: b42e4a6b63

* commit 'b42e4a6b635aa6749901bb2c6794a43da4a1722d':
  Kill load_file.

Change-Id: I179be388a76da1c5ba5e96d4e15009b127ca886c
 2016-05-28 00:28:02 +00:00
Treehugger Robot
b42e4a6b63 Merge "Kill load_file." 2016-05-28 00:17:10 +00:00
Yurii Zubrytskyi
c9ff51e16b Merge "[adb] Followup CL to clean up adb_auth_host.cpp" am: 9c7f9215e4 am: 979998b965 
am: e5635175ab

* commit 'e5635175ab84195d908e23a464ac5ee6d5b672cf':
  [adb] Followup CL to clean up adb_auth_host.cpp

Change-Id: I22756abfb7fb8435dca53b2d865968b44292157e
 2016-05-28 00:07:09 +00:00
Stephen Hines
496e073864 resolve merge conflicts of 5fb629a to nyc-mr1-dev-plus-aosp 
Change-Id: I6424b08182637e7885b57119bc5eb6d5e3708c45
 2016-05-27 17:01:44 -07:00
Jeremy Compostella
3efa16ba35 Merge "fs_mgr: update block device reference in verity metadata" into nyc-mr1-dev 
am: 8024f8f9ea  -s ours

* commit '8024f8f9eaec4449e98610690b639ae5935aedac':
  fs_mgr: update block device reference in verity metadata

Change-Id: I91b5ef559823a331f29491a3c98f4f1f3dd3bd9f
 2016-05-27 23:42:54 +00:00
Yurii Zubrytskyi
e5635175ab Merge "[adb] Followup CL to clean up adb_auth_host.cpp" am: 9c7f9215e4 
am: 979998b965

* commit '979998b9655ab1a306c1cfbda427ffd8847796ee':
  [adb] Followup CL to clean up adb_auth_host.cpp

Change-Id: I6e2adcb89004594cb0fca9d9f133dd470602feaa
 2016-05-27 23:21:49 +00:00
TreeHugger Robot
8024f8f9ea Merge "fs_mgr: update block device reference in verity metadata" into nyc-mr1-dev 2016-05-27 23:14:16 +00:00
Elliott Hughes
e8b663fec3 Kill load_file. 
Change-Id: I6c332f7d8e94d513605295b3d4d32c4e1cf878dc
 2016-05-27 16:14:02 -07:00
Yurii Zubrytskyi
979998b965 Merge "[adb] Followup CL to clean up adb_auth_host.cpp" 
am: 9c7f9215e4

* commit '9c7f9215e4f877a1c039be3951702a0399ed1d4f':
  [adb] Followup CL to clean up adb_auth_host.cpp

Change-Id: I324472c709921b319bce59034f25375c011760dd
 2016-05-27 23:13:04 +00:00
Treehugger Robot
9c7f9215e4 Merge "[adb] Followup CL to clean up adb_auth_host.cpp" 2016-05-27 23:08:06 +00:00
Elliott Hughes
632a943ddd resolve merge conflicts of 91ed21a to nyc-dev-plus-aosp am: 70ca8dcb0b 
am: 3ace495a5d

* commit '3ace495a5da92d4e0423d8f8a55d7efe2f325d05':
  [adb] Issue the "auth" emulator command before any other one

Change-Id: I67310a37243ac834c12386359771af4f2de82ab7
 2016-05-27 23:05:29 +00:00
Chih-Hung Hsieh
5fb629a212 resolve merge conflicts of e845c04 to nyc-dev-plus-aosp 
Change-Id: I423f722dcc3821b9be52613d68640b49cbac70a6
 2016-05-27 16:04:21 -07:00
Chih-Hung Hsieh
e845c04f12 Merge "Fix misc-macro-parentheses warnings in init and other core modules." 
am: ac080d2128

* commit 'ac080d21280f0448f554315c76993e788c764e8f':
  Fix misc-macro-parentheses warnings in init and other core modules.

Change-Id: I48c8de08f334d9b2ae45679c53a4d523bc1358fd
 2016-05-27 22:55:22 +00:00
Chih-hung Hsieh
ac080d2128 Merge "Fix misc-macro-parentheses warnings in init and other core modules." 2016-05-27 22:44:15 +00:00
Yurii Zubrytskyi
3ace495a5d resolve merge conflicts of 91ed21a to nyc-dev-plus-aosp 
am: 70ca8dcb0b

* commit '70ca8dcb0b1753778ac373a16c9b0f275ee14ce9':
  [adb] Issue the "auth" emulator command before any other one

Change-Id: I77856dee30b17497fd94af9e0aa527d93ba25681
 2016-05-27 22:00:07 +00:00
Elliott Hughes
70ca8dcb0b resolve merge conflicts of 91ed21a to nyc-dev-plus-aosp 
Change-Id: Id8d69ba8c0e04e6772c8b9a6318380de26d47b2a
 2016-05-27 14:50:58 -07:00
Yurii Zubrytskyi
dace015269 [adb] Followup CL to clean up adb_auth_host.cpp 
Get rid of unused includes + replace a fixed-size buffer with an
std::string

(cherry-pick of 049ebb810f466d916ec9e73cdf28624b57a8c25d.)

Change-Id: I4f9927b900a79a012b5d52908b9d22ac3d2a401c
 2016-05-27 14:43:26 -07:00
Yurii Zubrytskyi
91ed21a30e Merge "[adb] Issue the "auth" emulator command before any other one" 
am: 7c0835f66b

* commit '7c0835f66b6881d342f9b23de7e355db4e63a7f2':
  [adb] Issue the "auth" emulator command before any other one

Change-Id: I398529783d415fab6469b384f57ecc36a5fed618
 2016-05-27 21:36:49 +00:00
Treehugger Robot
7c0835f66b Merge "[adb] Issue the "auth" emulator command before any other one" 2016-05-27 21:23:56 +00:00
Yurii Zubrytskyi
83df4b0b9f [adb] Followup CL to clean up adb_auth_host.cpp am: 049ebb810f am: 1098c529d1 
am: bcd4058f47

* commit 'bcd4058f47203f7620e7f433a53c845edf35512b':

Change-Id: I914c7860b75ff8eac82b1ba3b573cc3e224d08e2
 2016-05-27 20:52:05 +00:00
Yurii Zubrytskyi
630a59319f [adb] Followup CL to clean up adb_auth_host.cpp am: 049ebb810f am: 998496bc66 
am: eb58df6eed

* commit 'eb58df6eedf532338b20e68d15ded473612baa0b':
  [adb] Followup CL to clean up adb_auth_host.cpp

Change-Id: I1f6c663d7f8f9469b6d0c087caed357bf42fa1ba
 2016-05-27 20:52:04 +00:00
Yurii Zubrytskyi
cbe66c6d41 resolve merge conflicts of a9e2b99 to nyc-dev-plus-aosp am: f48adf6351 
am: ef319c5f46

* commit 'ef319c5f4663484e0db9005fb487b694f4cc5e39':

Change-Id: I25505cb9bdfb0ecdedd2396796e7e063cb9ba9e3
 2016-05-27 20:52:02 +00:00
Yurii Zubrytskyi
344eca379e resolve merge conflicts of 204e3fa to nyc-mr1-dev-plus-aosp 
am: 2cdb924831

* commit '2cdb924831f5e9d35d677ae457b2739c7ed1bb00':
  [adb] Issue the "auth" emulator command before any other one

Change-Id: I64b7f25e51fe099be6cc7de2302ad2eaa1efb3bf
 2016-05-27 20:52:01 +00:00
Paul Lawrence
b7a3dba0be Make file encryption type available am: 4e898a01fd 
am: 7c198d3eef

* commit '7c198d3eef7db3b87d8d299a56bc98f9082cf649':
  Make file encryption type available

Change-Id: I48a64f008de85664a02ce92bf1103340a3edd2c0
 2016-05-27 20:51:24 +00:00
Yurii Zubrytskyi
376b27532c [adb] Issue the "auth" emulator command before any other one 
Emulator console now requires authentication; this means
'adb emu ...' commands silently fail because of it.
This CL adds an 'auth <token>' command to each user command,
making sure it won't be silently ignored.

(cherry-pick of a9e2b99a7fdd31bcd6d852c6db26fe592236a24f.)

Bug: https://code.google.com/p/android/issues/detail?id=211233
Change-Id: Id9ca4999fd2e6393cc88278eaf444243e13c0ec0
 2016-05-27 13:34:40 -07:00
Yurii Zubrytskyi
bcd4058f47 [adb] Followup CL to clean up adb_auth_host.cpp am: 049ebb810f 
am: 1098c529d1

* commit '1098c529d1dd41a03f6ca75bc1776e13b448f46b':

Change-Id: Ib4a7d8eb90000a5674429cc8482aa994eb6e7c8a
 2016-05-27 19:41:16 +00:00