Commit Graph

14947 Commits

Author SHA1 Message Date
Mark Salyzyn 698054a81c am 473a50f1: rootdir: init.trace.rc too early
* commit '473a50f1687e8511ff9efcf370adfa68568669ab':
  rootdir: init.trace.rc too early
2015-06-02 22:02:19 +00:00
Mark Salyzyn 473a50f168 rootdir: init.trace.rc too early
(cherry pick from commit 89357d23a1)

debugfs is mounted on boot

Bug: 21566233
Change-Id: I2ba106fbb1e8164ff3d8b2d5b16a16d7926c2732
2015-06-02 14:40:10 -07:00
Mark Salyzyn c79daf5225 am 1300b16e: am 66e39275: Merge "rootdir: init.trace.rc too early"
* commit '1300b16e51045b0d1235cfaaa031228ded60924b':
  rootdir: init.trace.rc too early
2015-06-02 21:22:37 +00:00
Mark Salyzyn 1300b16e51 am 66e39275: Merge "rootdir: init.trace.rc too early"
* commit '66e39275be57352e357d8c5cdff73bc911758daa':
  rootdir: init.trace.rc too early
2015-06-02 21:09:13 +00:00
Mark Salyzyn 66e39275be Merge "rootdir: init.trace.rc too early" 2015-06-02 21:01:03 +00:00
Mark Salyzyn 89357d23a1 rootdir: init.trace.rc too early
debugfs is mounted on boot

Bug: 21566233
Change-Id: I2ba106fbb1e8164ff3d8b2d5b16a16d7926c2732
2015-06-02 12:51:42 -07:00
Andres Morales c573c517a9 am c6d5cd18: Merge "[gatekeeperd] verify a password after enrolling successfully" into mnc-dev
* commit 'c6d5cd18f86aa78b769ba06e43963231f05bc809':
  [gatekeeperd] verify a password after enrolling successfully
2015-06-02 18:10:41 +00:00
Andres Morales c6d5cd18f8 Merge "[gatekeeperd] verify a password after enrolling successfully" into mnc-dev 2015-06-02 17:44:17 +00:00
Andres Morales 531e3e83c2 [gatekeeperd] verify a password after enrolling successfully
Bug: 20918106
Change-Id: Ia3cb6d1375d9ee2a6e543ee97d37b7c4f0459447
2015-06-02 10:43:21 -07:00
Svetoslav cb0322f536 am 23d84074: Improve adb install help.
* commit '23d84074652b77385431fc0d1505b7d43b7dba9e':
  Improve adb install help.
2015-06-02 14:22:54 +00:00
Mark Salyzyn ecb3ef1de8 am 42ac34f7: logd: test modernization
* commit '42ac34f7401f70c3f19ef176df7e1bc2f47396a0':
  logd: test modernization
2015-06-02 14:20:17 +00:00
Mark Salyzyn ad6099cf8d am 222f8c3a: logd: whitelist should not preserve expire messages
* commit '222f8c3ac7315684ce17d125f5732edad352ab1e':
  logd: whitelist should not preserve expire messages
2015-06-02 14:20:16 +00:00
Mark Salyzyn 9670b8c703 am fbf96b55: logd: KISS & fix preserve a day
* commit 'fbf96b55d98e9042fe6f240fbcf3103faca8650d':
  logd: KISS & fix preserve a day
2015-06-02 14:20:14 +00:00
Mark Salyzyn f2e8cb7d7d resolved conflicts for merge of d4bdb7df to mnc-dev-plus-aosp
Change-Id: I04b87261c2800648af8438b4b1cb3e99ae96ca25
2015-06-02 07:10:54 -07:00
Svetoslav 23d8407465 Improve adb install help.
Bug: 21365060
Change-Id: I0a4ea5cf3a2f37a82161b30f7eec5781d175aa8f
2015-06-01 23:59:20 +00:00
Christopher Ferris a1d6f0960a am 7e2cb84e: Modify the code to avoid potential deadlocks.
* commit '7e2cb84e9c41e993daf7fac0b18335d6fe6f9acb':
  Modify the code to avoid potential deadlocks.
2015-06-01 23:22:44 +00:00
Rom Lemarchand 18bd34d0d3 am 0fc85731: (-s ours) am 1333694c: Merge "system/audio.h: Make function inline"
* commit '0fc857318c8584db8fd927b42265fa488ee20964':
  system/audio.h: Make function inline
2015-06-01 22:48:54 +00:00
Rom Lemarchand 0fc857318c am 1333694c: Merge "system/audio.h: Make function inline"
* commit '1333694c859d7e09f6a80546cb2cdc225430c897':
  system/audio.h: Make function inline
2015-06-01 22:14:51 +00:00
Rom Lemarchand 1333694c85 Merge "system/audio.h: Make function inline" 2015-06-01 22:08:30 +00:00
Mark Salyzyn 2beb86ed1a am 6a9dda6c: am a8b6131d: Merge "logd: test modernization"
* commit '6a9dda6c060e7cdf34b3a80deecd8fb2cada92b9':
  logd: test modernization
2015-06-01 22:02:30 +00:00
Mark Salyzyn 9e7df8e304 am 7aca9310: am 10a124d3: Merge "logd: whitelist should not preserve expire messages"
* commit '7aca9310aa4367674ddbf7413f1dc57c807e909a':
  logd: whitelist should not preserve expire messages
2015-06-01 22:02:29 +00:00
Mark Salyzyn 44376fe56f am abc3d43a: am fba413d8: Merge changes I04fad67e,I5ab24bc7
* commit 'abc3d43a9da698c5362eb0cb1eb594e241e1884d':
  logd: KISS & fix preserve a day
  logd: deal with sloppy leading expire messages
2015-06-01 22:02:28 +00:00
Christopher Ferris ae9c829777 am acd574c1: am 7a67c335: Merge "Modify the code to avoid potential deadlocks."
* commit 'acd574c1a7f3e8e79ab14aef942b896019349798':
  Modify the code to avoid potential deadlocks.
2015-06-01 22:02:27 +00:00
Mark Salyzyn 42ac34f740 logd: test modernization
(cherry pick from commit 62d6a2a921)

Bug: 19603976
Change-Id: Ie920c128e7e6a436fea7a96c7d68bc39e13a2ad4
2015-06-01 14:27:02 -07:00
Mark Salyzyn 222f8c3ac7 logd: whitelist should not preserve expire messages
(cherry pick from commit c5bf3b8304)

Change-Id: I56275c73191b96aa21e7b4049d401e1f44211f9b
2015-06-01 14:27:02 -07:00
Mark Salyzyn fbf96b55d9 logd: KISS & fix preserve a day
(cherry pick from commit 5921276a16)

Code in 833a9b1e38 was borken,
simpler approach is to simply check last entry (to save a
syscall) minus EXPIRE_HOUR_THRESHOLD. This does make longer logs
less likely to call upon the spam detection than the algorithm
being replaced, but sadly we ended up with a log entry in the
future at the beginning of the logs confounding the previous
algorithm.

Bug: 21555259
Change-Id: I04fad67e95c8496521dbabb73b5f32c19d6a16c2
2015-06-01 14:27:02 -07:00
Mark Salyzyn d4bdb7df9b logd: deal with sloppy leading expire messages
(cherry pick from commit 5392aac95d)

The odds of chatty content also leading the logs is pretty high eg:

 1799 12017 I logd: uid=10007 chatty comm=Binder_B, expire 4 lines
 1799  1829 I logd: uid=10007 chatty comm=Binder_2, expire 4 lines
 1919 20637 I logd: uid=10007 chatty comm=m.sersistent, expire 1 line
 1919 20638 I logd: uid=10007 chatty comm=s.persistent, expire 1 line
 1919  2316 I logd: uid=10007 chatty comm=UlrDispatch, expire 4 lines
19379 20634 I logd: uid=10045 chatty, expire 14 lines
19379 19388 I logd: uid=10045 chatty comm=lizerDaemon, expire 4 lines
  591  4396 I logd: uid=1000 chatty comm=Thread-220, expire 5 lines
  591  1377 I logd: uid=1000 chatty comm=Thread-92, expire 4 lines
 1919  2267 I logd: uid=10007 chatty comm=WifiScanner, expire 4 lines
  591  4397 I logd: uid=1000 chatty comm=DhcpClient, expire 4 lines
  591  4398 I logd: uid=1000 chatty comm=Thread-222, expire 4 lines
  226   580 D CommandListener: Setting iface cfg

Change-Id: I5ab24bc7bf5d2690bae7e789831b07f23ff8bcc6
2015-06-01 14:27:02 -07:00
Mark Salyzyn 6a9dda6c06 am a8b6131d: Merge "logd: test modernization"
* commit 'a8b6131ddf5ce6f72115d53c44ac54a44c24ea02':
  logd: test modernization
2015-06-01 21:23:38 +00:00
Mark Salyzyn 7aca9310aa am 10a124d3: Merge "logd: whitelist should not preserve expire messages"
* commit '10a124d342530b4c366f08d3a899474c4e5eb7fc':
  logd: whitelist should not preserve expire messages
2015-06-01 21:23:37 +00:00
Mark Salyzyn abc3d43a9d am fba413d8: Merge changes I04fad67e,I5ab24bc7
* commit 'fba413d831766c3ed871b9787f60d9111045b36f':
  logd: KISS & fix preserve a day
  logd: deal with sloppy leading expire messages
2015-06-01 21:23:35 +00:00
Mark Salyzyn a8b6131ddf Merge "logd: test modernization" 2015-06-01 21:16:58 +00:00
Mark Salyzyn 10a124d342 Merge "logd: whitelist should not preserve expire messages" 2015-06-01 21:16:57 +00:00
Christopher Ferris acd574c1a7 am 7a67c335: Merge "Modify the code to avoid potential deadlocks."
* commit '7a67c3359dec33f6287d6fb061ec95a0c5220c63':
  Modify the code to avoid potential deadlocks.
2015-06-01 21:16:40 +00:00
Mark Salyzyn fba413d831 Merge changes I04fad67e,I5ab24bc7
* changes:
  logd: KISS & fix preserve a day
  logd: deal with sloppy leading expire messages
2015-06-01 21:16:11 +00:00
Christopher Ferris 7e2cb84e9c Modify the code to avoid potential deadlocks.
If the signal to dump a thread is never delivered, then it's
possible for a deadlock. The signal handler is responsible for
unlocking and deleting the ThreadEntry created for the pid/tid
combination. This means if the signal is lost, the ThreadEntry
gets stuck locked and never deleted. If a second attempt to get
a backtrace of this thread occurs, there is a deadlock.

Also, decrease the timeout from 10 seconds to 5 seconds. The original
10 seconds was because the unwind was actually done in the signal
handler. Now the signal handler does nothing but copy the ucontext
structure and let the caller do the unwind.

Bug: 21086132
(cherry picked from commit 2d09171758)

Change-Id: I414c500eb08983a5017caf3fce4f499465575a9d
2015-06-01 14:10:17 -07:00
Christopher Ferris 7a67c3359d Merge "Modify the code to avoid potential deadlocks." 2015-06-01 21:08:36 +00:00
Christopher Ferris 2d09171758 Modify the code to avoid potential deadlocks.
If the signal to dump a thread is never delivered, then it's
possible for a deadlock. The signal handler is responsible for
unlocking and deleting the ThreadEntry created for the pid/tid
combination. This means if the signal is lost, the ThreadEntry
gets stuck locked and never deleted. If a second attempt to get
a backtrace of this thread occurs, there is a deadlock.

Also, decrease the timeout from 10 seconds to 5 seconds. The original
10 seconds was because the unwind was actually done in the signal
handler. Now the signal handler does nothing but copy the ucontext
structure and let the caller do the unwind.

Bug: 21086132
Change-Id: Idc735dbf6147ec879d35bd4f034c5d227e26a98d
2015-06-01 13:51:51 -07:00
Mark Salyzyn 5921276a16 logd: KISS & fix preserve a day
Code in 833a9b1e38 was borken,
simpler approach is to simply check last entry (to save a
syscall) minus EXPIRE_HOUR_THRESHOLD. This does make longer logs
less likely to call upon the spam detection than the algorithm
being replaced, but sadly we ended up with a log entry in the
future at the beginning of the logs confounding the previous
algorithm.

Bug: 21555259
Change-Id: I04fad67e95c8496521dbabb73b5f32c19d6a16c2
2015-06-01 13:06:35 -07:00
Mark Salyzyn 5392aac95d logd: deal with sloppy leading expire messages
The odds of chatty content also leading the logs is pretty high eg:

 1799 12017 I logd: uid=10007 chatty comm=Binder_B, expire 4 lines
 1799  1829 I logd: uid=10007 chatty comm=Binder_2, expire 4 lines
 1919 20637 I logd: uid=10007 chatty comm=m.sersistent, expire 1 line
 1919 20638 I logd: uid=10007 chatty comm=s.persistent, expire 1 line
 1919  2316 I logd: uid=10007 chatty comm=UlrDispatch, expire 4 lines
19379 20634 I logd: uid=10045 chatty, expire 14 lines
19379 19388 I logd: uid=10045 chatty comm=lizerDaemon, expire 4 lines
  591  4396 I logd: uid=1000 chatty comm=Thread-220, expire 5 lines
  591  1377 I logd: uid=1000 chatty comm=Thread-92, expire 4 lines
 1919  2267 I logd: uid=10007 chatty comm=WifiScanner, expire 4 lines
  591  4397 I logd: uid=1000 chatty comm=DhcpClient, expire 4 lines
  591  4398 I logd: uid=1000 chatty comm=Thread-222, expire 4 lines
  226   580 D CommandListener: Setting iface cfg

Change-Id: I5ab24bc7bf5d2690bae7e789831b07f23ff8bcc6
2015-06-01 13:04:09 -07:00
Andreas Gampe bbf2d92587 am e2452b4b: LibNativeBridge: Version 2
* commit 'e2452b4bf3c247fbfd759d047e3c5dedfb6f3202':
  LibNativeBridge: Version 2
2015-06-01 18:49:40 +00:00
Jeff Brown 0778b4b3d8 am 20432c23: Merge "Work around spurious epoll notifications." into mnc-dev
* commit '20432c237c082506cf7d45c377b778c94879b5ae':
  Work around spurious epoll notifications.
2015-06-01 17:07:37 +00:00
Paul Lawrence e52a854a8d am 0a423d99: (-s ours) DO NOT MERGE Securely encrypt the master key
* commit '0a423d994a0dbd05924ae6cff702b5d4d7dd43f0':
  DO NOT MERGE Securely encrypt the master key
2015-06-01 17:07:37 +00:00
Vineeta Srivastava 3b6ada4a87 am 0aab7983: Merge "fastboot: Add support for fastboot flashing commands" into mnc-dev
* commit '0aab798312364971ad3d2052306f3c9a8aed6c57':
  fastboot: Add support for fastboot flashing commands
2015-06-01 14:31:24 +00:00
Andreas Gampe e2452b4bf3 LibNativeBridge: Version 2
Add a callback function to retrieve "signal handler" from the bridge,
if the bridge wants it to be managed by the runtime. The signal handler
will be invoked after the runtime's own one, and before any other
chained handler.

Add a callback function to check compatibility of the bridge with the
library.

Add a function to expose the native bridge version. Add a test for this
function.

Bug: 20217701

(cherry picked from commit a6ac9ce98b)

Change-Id: Ic23a60b949f119c7d8b0e7cb27a61e6c16532a23
2015-05-31 16:58:24 -07:00
Elliott Hughes 06e914eb8e am 5dd45034: am ce817c38: Merge "Fix error handling/reporting for "adb forward" and "adb reverse"."
* commit '5dd45034c3785792c59b3ef663ac2b669637d607':
  Fix error handling/reporting for "adb forward" and "adb reverse".
2015-05-30 01:56:48 +00:00
Elliott Hughes 5dd45034c3 am ce817c38: Merge "Fix error handling/reporting for "adb forward" and "adb reverse"."
* commit 'ce817c38d208c5a8349504e95c37f1a43f1f3a74':
  Fix error handling/reporting for "adb forward" and "adb reverse".
2015-05-30 01:42:50 +00:00
Evgeniy Stepanov 41ddac8dd3 am 48e9dbfb: am 5788769d: Merge "Revert "Fix ODR issues in ART.""
* commit '48e9dbfb9a4fb0627ebd53da508da23f03902edb':
  Revert "Fix ODR issues in ART."
2015-05-30 01:42:28 +00:00
Elliott Hughes ce817c38d2 Merge "Fix error handling/reporting for "adb forward" and "adb reverse"." 2015-05-30 01:29:20 +00:00
Evgeniy Stepanov 48e9dbfb9a am 5788769d: Merge "Revert "Fix ODR issues in ART.""
* commit '5788769ddcb9ab33a36fdf4d078f90a4ef022d8d':
  Revert "Fix ODR issues in ART."
2015-05-30 01:28:36 +00:00
Evgeniy Stepanov 5788769ddc Merge "Revert "Fix ODR issues in ART."" 2015-05-30 01:16:54 +00:00