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

21931 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ying Wang
3905db7616 Merge "Also archive adb.exe/fastboot.exe when building win_sdk." am: f666ba41a7 
am: aa88fa5837

* commit 'aa88fa58371930b9b7aef8d942f72d7b9a29c8a7':
  Also archive adb.exe/fastboot.exe when building win_sdk.
 2016-03-01 19:50:46 +00:00
Ying Wang
aa88fa5837 Merge "Also archive adb.exe/fastboot.exe when building win_sdk." 
am: f666ba41a7

* commit 'f666ba41a729834bf15296ab13a92f33c5b0d592':
  Also archive adb.exe/fastboot.exe when building win_sdk.
 2016-03-01 17:30:05 +00:00
Ying Wang
f666ba41a7 Merge "Also archive adb.exe/fastboot.exe when building win_sdk." 2016-03-01 17:27:56 +00:00
Ying Wang
71edfc8b9a Also archive adb.exe/fastboot.exe when building win_sdk. 
On linux we archive both Linux and Windows binaries.

Bug: 27315911
Change-Id: I17d25cd1ea611a9c917f1e78b47f21a8959eea20
 2016-02-29 19:27:06 -08:00
Sami Tolvanen
8baed60b58 Merge "logd: add a comment about untrusted content in the audit log" am: 68de85bda9 
am: 126527e74b

* commit '126527e74bd7f7180e5705d68c7d67a6be9ab5a9':
  logd: add a comment about untrusted content in the audit log
 2016-02-29 22:26:02 +00:00
Sami Tolvanen
126527e74b Merge "logd: add a comment about untrusted content in the audit log" 
am: 68de85bda9

* commit '68de85bda98d7d03f63134209f9e2c149cad1852':
  logd: add a comment about untrusted content in the audit log
 2016-02-29 22:23:59 +00:00
Sami Tolvanen
68de85bda9 Merge "logd: add a comment about untrusted content in the audit log" 2016-02-29 22:22:15 +00:00
Colin Cross
d032b7654e Merge changes from topic \'unreachable\' into nyc-dev 
am: c3dc3304c6

* commit 'c3dc3304c6b19391af8eae727629fb41bb8e4c3e':
  libmemunreachable: fix long timeout on error
  imprecise mark and sweep native memory leak detector
 2016-02-29 22:20:16 +00:00
Colin Cross
c3dc3304c6 Merge changes from topic 'unreachable' into nyc-dev 
* changes:
  libmemunreachable: fix long timeout on error
  imprecise mark and sweep native memory leak detector
 2016-02-29 22:19:41 +00:00
James Hawkins
7b6e1aab70 Merge "crash_reporter: Mark the euid parameter as __unused." am: c625acf217 
am: 974bae41da

* commit '974bae41da9d08c949978eff84b50ab0ddc98d2c':
  crash_reporter: Mark the euid parameter as __unused.
 2016-02-29 22:16:26 +00:00
James Hawkins
974bae41da Merge "crash_reporter: Mark the euid parameter as __unused." 
am: c625acf217

* commit 'c625acf21701af0f8a57a443a16240ea6e499774':
  crash_reporter: Mark the euid parameter as __unused.
 2016-02-29 22:14:47 +00:00
James Hawkins
c625acf217 Merge "crash_reporter: Mark the euid parameter as __unused." 2016-02-29 22:12:51 +00:00
Sami Tolvanen
2060a83775 logd: add a comment about untrusted content in the audit log 
A single space character in search terms separates us from a denial of
service attack that forces the device into safe mode.  This CL adds a
comment that hopefully stops the spaces from being accidentally deleted
in future.

Change-Id: I33b2632ef4211fa1688ac9c8f0cf7d0c667766c1
 2016-02-29 14:10:59 -08:00
Sami Tolvanen
cc68ad0c45 Merge "logd: stop log spam when integrity enforcement is suppressed" into nyc-dev 
am: 78d2766143

* commit '78d2766143fd0479180f99a1ea5e959c7fb68f45':
  logd: stop log spam when integrity enforcement is suppressed
 2016-02-29 21:35:40 +00:00
Dimitry Ivanov
cafd449ada Fix locking of libnativeloader 
am: 34d5a20c8b

* commit '34d5a20c8bb57adae8711c7f9d90a77fbd4043c7':
  Fix locking of libnativeloader
 2016-02-29 21:35:33 +00:00
Sami Tolvanen
78d2766143 Merge "logd: stop log spam when integrity enforcement is suppressed" into nyc-dev 2016-02-29 21:30:46 +00:00
Dimitry Ivanov
34d5a20c8b Fix locking of libnativeloader 
This commit fixes race condition introduced in
d047c925af

Bug: http://b/27189432
Bug: http://b/22548808
Change-Id: I5d94f130937f18d3443878b3521715a8f87427e0
 2016-02-29 13:21:43 -08:00
Sami Tolvanen
89e0429ce7 logd: stop log spam when integrity enforcement is suppressed 
Bug: 27389331
Change-Id: I9f3bc21eb1b85b9fda4fa0a5c5b4da94e5e7cc1c
(cherry pick from commit abda9340e6)
 2016-02-29 13:18:46 -08:00
Sami Tolvanen
b4e8e7f29b Merge "logd: stop log spam when integrity enforcement is suppressed" am: 9218477ae7 
am: 892cda4397

* commit '892cda439712bc40dd7cab2b19e6ac92b7461a22':
  logd: stop log spam when integrity enforcement is suppressed
 2016-02-29 20:33:11 +00:00
Sami Tolvanen
892cda4397 Merge "logd: stop log spam when integrity enforcement is suppressed" 
am: 9218477ae7

* commit '9218477ae7a3561f258e587b225cadfd73f0ed04':
  logd: stop log spam when integrity enforcement is suppressed
 2016-02-29 20:31:12 +00:00
Sami Tolvanen
9218477ae7 Merge "logd: stop log spam when integrity enforcement is suppressed" 2016-02-29 20:28:54 +00:00
Sami Tolvanen
abda9340e6 logd: stop log spam when integrity enforcement is suppressed 
Bug: 27389331
Change-Id: I9f3bc21eb1b85b9fda4fa0a5c5b4da94e5e7cc1c
 2016-02-29 12:08:39 -08:00
Bernhard Rosenkränzer
764ac282d5 Merge "Allow building with Python 3.x" am: a335367bb0 
am: e487732935

* commit 'e487732935e4617c1ca9a0adedbff507ab00c74e':
  Allow building with Python 3.x
 2016-02-29 19:20:13 +00:00
Bernhard Rosenkränzer
e487732935 Merge "Allow building with Python 3.x" 
am: a335367bb0

* commit 'a335367bb02b759e5fa5aab535989f61ba691323':
  Allow building with Python 3.x
 2016-02-29 19:18:27 +00:00
Dan Albert
a335367bb0 Merge "Allow building with Python 3.x" 2016-02-29 19:16:52 +00:00
Dan Willemsen
b42f278681 Merge "liblog: Update Android.bp for Android.mk changes" am: d480a99b0c 
am: ea29d56873

* commit 'ea29d56873e4dfc692722ac90e79849b9a9699ec':
  liblog: Update Android.bp for Android.mk changes
 2016-02-29 19:08:15 +00:00
Dan Willemsen
ea29d56873 Merge "liblog: Update Android.bp for Android.mk changes" 
am: d480a99b0c

* commit 'd480a99b0cefd17a120919c662bfc6d303cffddd':
  liblog: Update Android.bp for Android.mk changes
 2016-02-29 19:06:32 +00:00
Dan Willemsen
d480a99b0c Merge "liblog: Update Android.bp for Android.mk changes" 2016-02-29 19:05:39 +00:00
Dan Willemsen
7d5457e150 liblog: Update Android.bp for Android.mk changes 
Change-Id: I5062583a45efa2774f01339e7601767b817f54ee
 2016-02-29 10:46:18 -08:00
David Pursell
56b3731203 Merge "adb: use TCP keepalive." am: e663c163ac 
am: 89d749dbfc

* commit '89d749dbfc6f9f1544e59de1c1157fc1eadc205e':
  adb: use TCP keepalive.
 2016-02-29 17:46:23 +00:00
David Pursell
89d749dbfc Merge "adb: use TCP keepalive." 
am: e663c163ac

* commit 'e663c163ac5f1931c2f9ebb091bf09a8a588432b':
  adb: use TCP keepalive.
 2016-02-29 17:44:56 +00:00
David Pursell
e663c163ac Merge "adb: use TCP keepalive." 2016-02-29 17:43:35 +00:00
Mattias Nissler
b1a1f55d11 Merge "Remove libmincrypt/tools after move to bootable/recovery" am: 50eb9b29db 
am: e84f68ad5d

* commit 'e84f68ad5d3c84721908969c75b855d87fa26ab4':
  Remove libmincrypt/tools after move to bootable/recovery
 2016-02-29 08:31:55 +00:00
Mattias Nissler
e84f68ad5d Merge "Remove libmincrypt/tools after move to bootable/recovery" 
am: 50eb9b29db

* commit '50eb9b29db783b6bda724da0f021489e7ec7f25a':
  Remove libmincrypt/tools after move to bootable/recovery
 2016-02-29 08:30:27 +00:00
Mattias Nissler
50eb9b29db Merge "Remove libmincrypt/tools after move to bootable/recovery" 2016-02-29 08:28:11 +00:00
Elliott Hughes
78989327e0 Merge "Remove another test for a private API I\'m about to remove." am: f71553cbe7 
am: b57e7786d6

* commit 'b57e7786d6e8f2e8e8bdd75cc54f9c067ce93d64':
  Remove another test for a private API I'm about to remove.
 2016-02-27 17:12:20 +00:00
Elliott Hughes
b57e7786d6 Merge "Remove another test for a private API I\'m about to remove." 
am: f71553cbe7

* commit 'f71553cbe7465f6094ad54fcdacc79cf9ce08d72':
  Remove another test for a private API I'm about to remove.
 2016-02-27 17:12:05 +00:00
Elliott Hughes
f71553cbe7 Merge "Remove another test for a private API I'm about to remove." 2016-02-27 17:11:26 +00:00
Nick Kralevich
c684aad2dd Revert "logd: Don\'t trigger an integrity failure on permissive SELinux denials" 
am: 99fb01e42a

* commit '99fb01e42a184fa8a206c84be12b7e34cc2947bb':
  Revert "logd: Don't trigger an integrity failure on permissive SELinux denials"
 2016-02-27 16:38:42 +00:00
Nick Kralevich
99fb01e42a Revert "logd: Don't trigger an integrity failure on permissive SELinux denials" 
external/sepolicy commit bca98efa575bedab68f2d5eaee2cd1fd1741962b
ensures that no permissive domains can be on user builds, and
external/sepolicy commit 3872ee396898fcb23bdc49c37fd02d81014aaa5f
re-enables enforcing mode on cameraserver.

The conditions which lead to the integrity failure detection
triggering can no longer occur. Revert the patch which relaxed
the detection.

This reverts commit 33ee84f871.

Bug: 27313768
Bug: 26902605
Change-Id: I8ee97d0858345695f9df8240de4e696f4a9ba008
 2016-02-27 08:31:57 -08:00
Elliott Hughes
74c9052fe4 Remove another test for a private API I'm about to remove. 
Change-Id: I541d1de549aa62d43867889f41bd0757ed414636
 2016-02-26 22:04:26 -08:00
Nick Kralevich
6b203d7306 logd: Don\'t trigger an integrity failure on permissive SELinux denials 
am: 33ee84f871

* commit '33ee84f87115f1e0a2a3a6bf61dc89b97a96daa2':
  logd: Don't trigger an integrity failure on permissive SELinux denials
 2016-02-27 04:20:02 +00:00
Josh Gao
e561a8bc4f Merge "adb: fix directory creation logic." am: a887c4faca 
am: 8564dc9085

* commit '8564dc9085b9a8cccf4021a441f76b3af364d3ca':
  adb: fix directory creation logic.
 2016-02-27 01:57:21 +00:00
Josh Gao
8564dc9085 Merge "adb: fix directory creation logic." 
am: a887c4faca

* commit 'a887c4faca223765956200a86316eee196a49b43':
  adb: fix directory creation logic.
 2016-02-27 01:55:38 +00:00
Josh Gao
a887c4faca Merge "adb: fix directory creation logic." 2016-02-27 01:54:16 +00:00
Elliott Hughes
bfe3d014b4 Merge "Remove a test for an API I\'m removing." am: 0962ecd4e3 
am: e3473f3a4c

* commit 'e3473f3a4c8b607524686859e1fefd4300de3a20':
  Remove a test for an API I'm removing.
 2016-02-27 01:28:32 +00:00
Elliott Hughes
e3473f3a4c Merge "Remove a test for an API I\'m removing." 
am: 0962ecd4e3

* commit '0962ecd4e38b39331088081ab26fb182140bbb3d':
  Remove a test for an API I'm removing.
 2016-02-27 01:27:07 +00:00
Elliott Hughes
0962ecd4e3 Merge "Remove a test for an API I'm removing." 2016-02-27 01:26:30 +00:00
Nick Kralevich
33ee84f871 logd: Don't trigger an integrity failure on permissive SELinux denials 
Only trigger an integrity failure if a policy is reloaded or
SELinux is disabled. Don't trigger the integrity failure if
we see a permissive=1 denial, which could occur if an SELinux
domain is in permissive mode.

Bug: 27313768
Bug: 26902605
Change-Id: Ib85a2799eb6378ae8acdb965b1812d691183fdd3
 2016-02-26 17:00:15 -08:00
Elliott Hughes
9ce327200c Remove a test for an API I'm removing. 
Change-Id: I44ee84b92fdbf561551e5cf90e0c44df535de83f
 2016-02-26 16:57:54 -08:00