openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
32,952 Commits 2 Branches 1 Tag 197 MiB
Commit Graph

32952 Commits

Author SHA1 Message Date
Jerry Zhang 91fc4fd245 Merge "Revert "adb: Lower EP_ALLOC retry count"" am: 169590c47f am: 935d600800 am: ddcc232493 
am: d3632d3ce1

Change-Id: I2d9698c24d9e03e812fd5d48c7bdfdcfcd1c2c33
 2017-04-28 03:37:12 +00:00
Jaesoo Lee 8477333939 resolve merge conflicts of afc0aa78f to oc-dev-plus-aosp 
am: 1e00517d71

Change-Id: Ic9c11a227c76aca0f0d91531a8bddcd59f5ed821
 2017-04-28 03:36:55 +00:00
Jerry Zhang d3632d3ce1 Merge "Revert "adb: Lower EP_ALLOC retry count"" am: 169590c47f am: 935d600800 
am: ddcc232493

Change-Id: I639db7fc5797ad2ce6dd6b3591284bd6822ab0f0
 2017-04-28 03:34:29 +00:00
Abodunrinwa Toki 3e6e906448 Merge "Initialize textclassifier model update directory" am: a079e453a3 am: f566376046 am: d13dca13e8 
am: 552a4c10b3

Change-Id: I3067795ddd40e8ff1a8eca10fa2188f36c0769ba
 2017-04-28 02:30:47 +00:00
Tom Cherry 272a77eeb7 init: fix last_reboot_reason string am: 704b27bd85 
am: 18c9ce2b93

Change-Id: I8245939809172a02129c38d4de10915d653697a3
 2017-04-28 02:30:32 +00:00
Jerry Zhang af96b5e80b Merge "Move adbd stopped trigger for configfs into core." am: e21b2fb6b4 am: fa14b1de73 am: b3988e670d 
am: ee82936ecd

Change-Id: Ib276a0384eafe25d81a684c76f8d5d58a5596414
 2017-04-28 02:30:11 +00:00
Jaesoo Lee 1e00517d71 resolve merge conflicts of afc0aa78f to oc-dev-plus-aosp 
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I0e1cc5f5367c4840eea5f56670f74a44743f1853
 2017-04-28 10:52:15 +09:00
Jerry Zhang ddcc232493 Merge "Revert "adb: Lower EP_ALLOC retry count"" am: 169590c47f 
am: 935d600800

Change-Id: Id778046511d33f5eb75d533da644b54cbe49fef1
 2017-04-28 01:10:14 +00:00
Jerry Zhang 935d600800 Merge "Revert "adb: Lower EP_ALLOC retry count"" 
am: 169590c47f

Change-Id: Ia31c905eab9cb5c1c51a951896a8d1ed17978927
 2017-04-28 01:08:13 +00:00
Jerry Zhang 169590c47f Merge "Revert "adb: Lower EP_ALLOC retry count"" 2017-04-28 01:06:09 +00:00
Jaesoo Lee afc0aa78f4 Merge changes from topic 'libutils-export-headers' am: 4af3a7966b 
am: 0951ddeb69

Change-Id: I6e82e0ef68e1acdc617efe436873218f22a51412
 2017-04-28 00:57:13 +00:00
Jaesoo Lee 0951ddeb69 Merge changes from topic 'libutils-export-headers' 
am: 4af3a7966b

Change-Id: I390c56cfc6312ded05ee359931faabf9517c4067
 2017-04-28 00:55:51 +00:00
Jaesoo Lee 4af3a7966b Merge changes from topic 'libutils-export-headers' 
* changes:
  libutils_headers: export libcutils_headers
  libutils: export libbacktrace headers
  libutils: export system_headers
 2017-04-28 00:47:35 +00:00
Abodunrinwa Toki 552a4c10b3 Merge "Initialize textclassifier model update directory" am: a079e453a3 am: f566376046 
am: d13dca13e8

Change-Id: Icb4af42818bd715709858abfb75e610c52ce48db
 2017-04-28 00:44:54 +00:00
Jaesoo Lee 1e8ac0fd03 libutils_headers: export libcutils_headers 
These headers are used in headers in libutils_headers and must be
re-exported.

include/utils/Atomic.h:20:#include <cutils/atomic.h>
include/utils/Trace.h:24:#include <cutils/trace.h>
include/utils/Singleton.h:27:#include <cutils/compiler.h>

Test: modules using libutils_headers don't have to have
libcutils_headers include dirs set.
Bug: 33241851

Change-Id: I039aaaad93bf0944d42f04d2a9e6654b4f867042
 2017-04-28 09:42:50 +09:00
Steven Moreland 4ad9d5155b libutils: export libbacktrace headers 
This is used in CallStack.h.

Test: m -j libutils
Test: links
Test: trying to compile with BOARD_VNDK_VERSION := current
Bug: 33241851
Change-Id: I076c9551d356824d6e69b82349b890369bc7eea3
Merged-In: If7258e7b38000a72fd520f725030fb0038f90167
 2017-04-28 09:42:50 +09:00
Steven Moreland 2d0dc9966a libutils: export system_headers 
vendor + vendor_available modules built with BOARD_VNDK_VERSION :=
current aren't allowed to use global headers. Since libutils uses
system headers itself, it should export them as well.

Bug: 33241851
Test: building with BOARD_VNDK_VERSION := current produces many fewer
errors.

Change-Id: Icc7d2beb2a17da291434c6282eb1b9eb458f114c
Merged-In: I950821f1dae3ddc110db50869247913d5b1aa638
 2017-04-28 09:42:50 +09:00
Abodunrinwa Toki d13dca13e8 Merge "Initialize textclassifier model update directory" am: a079e453a3 
am: f566376046

Change-Id: Iff8480f7916cb067f8fe131ddeaa8cc33df6e752
 2017-04-28 00:40:44 +00:00
Abodunrinwa Toki f566376046 Merge "Initialize textclassifier model update directory" 
am: a079e453a3

Change-Id: I387317dc16006c110680bfa920246e00affb5564
 2017-04-28 00:38:41 +00:00
Treehugger Robot a079e453a3 Merge "Initialize textclassifier model update directory" 2017-04-28 00:30:26 +00:00
Tom Cherry 18c9ce2b93 init: fix last_reboot_reason string 
am: 704b27bd85

Change-Id: I55df9bc815ca998c46c4c69adb776add1cd85b11
 2017-04-28 00:14:27 +00:00
Jerry Zhang ee82936ecd Merge "Move adbd stopped trigger for configfs into core." am: e21b2fb6b4 am: fa14b1de73 
am: b3988e670d

Change-Id: I303a29c590df9e018d00e18c1818f8ca0f1dd3ce
 2017-04-28 00:04:39 +00:00
Jerry Zhang 423af1a86a Merge "Add ffs.mtp.ready triggers to mtp configs." am: a06ac26dd1 am: c6faf65758 am: 78a4f0f567 
am: c9fd178fb0

Change-Id: I09be5a5f34f81b8594184cf64d6897349aa9c82f
 2017-04-28 00:02:34 +00:00
Jerry Zhang b3988e670d Merge "Move adbd stopped trigger for configfs into core." am: e21b2fb6b4 
am: fa14b1de73

Change-Id: I6cd11d117bb116ad1e64de8d295261d3c04bd127
 2017-04-28 00:00:30 +00:00
Jerry Zhang fa14b1de73 Merge "Move adbd stopped trigger for configfs into core." 
am: e21b2fb6b4

Change-Id: I3b1162d5467fa3443849889564ae3e92bdbea4eb
 2017-04-27 23:59:02 +00:00
Jerry Zhang e21b2fb6b4 Merge "Move adbd stopped trigger for configfs into core." 2017-04-27 23:50:15 +00:00
Jerry Zhang c9fd178fb0 Merge "Add ffs.mtp.ready triggers to mtp configs." am: a06ac26dd1 am: c6faf65758 
am: 78a4f0f567

Change-Id: Ibb785165c83341c098edc254520b0cfeda9c8a79
 2017-04-27 22:25:32 +00:00
Jerry Zhang 78a4f0f567 Merge "Add ffs.mtp.ready triggers to mtp configs." am: a06ac26dd1 
am: c6faf65758

Change-Id: I82328f4dac5a0831fcf7f526f1277da5ad05c431
 2017-04-27 22:20:46 +00:00
Jerry Zhang c6faf65758 Merge "Add ffs.mtp.ready triggers to mtp configs." 
am: a06ac26dd1

Change-Id: I7e3e206172d1385f27bea26d5d3e0471cc13ec8b
 2017-04-27 22:12:31 +00:00
Jerry Zhang 40a8778491 Revert "adb: Lower EP_ALLOC retry count" 
This reverts commit 05fe272a87.

Commit "adb: Do not signal gaget stack unless descriptors are written"
fixed the main issue for configfs devices where device wasn't enabled
until after the ioctl was attempted. Thus it is safe to bring up the
retry count so that the ioctl doesn't fail due to small delays in
usb stack.

Test: use adb, switch configs on configfs devices
 2017-04-27 15:00:13 -07:00
Jerry Zhang 75f8d89a8a Move adbd stopped trigger for configfs into core. 
This trigger resets ffs.ready in situations where
adbd is stopped via commandline.

Test: stop adbd
Change-Id: Ib5028d55c4883a8291d6de2dbcb0641ff8eb7a48
 2017-04-27 14:59:48 -07:00
Jerry Zhang a06ac26dd1 Merge "Add ffs.mtp.ready triggers to mtp configs." 2017-04-27 21:58:44 +00:00
Abodunrinwa Toki 40673e3381 Initialize textclassifier model update directory 
Test: Builds successfully. Directory is initialized on install. Tests pass.
bit FrameworksCoreTests:android.view.textclassifier.TextClassificationManagerTest
Bug: 34780396

Change-Id: Icbf7962f11b66579931f48053132da6e03e62c61
 2017-04-27 22:56:43 +01:00
Steven Moreland b4e59c8c59 Merge "libtrusty: Android.mk -> Android.bp" am: de70e33092 am: 3257727096 am: bb3e2e96c7 
am: 2483070b48

Change-Id: Ie923224a1d668530b9b8ca0f0803b669c5e6225b
 2017-04-27 20:59:24 +00:00
Tom Cherry ffc791f045 Merge "init: fix last_reboot_reason string" am: 59c74a3bd1 am: 2be5884903 am: 8705f89826 
am: 07ea1a8833

Change-Id: I8a0cacba81809ad93c118d28a3adf8e15514c3c9
 2017-04-27 20:59:06 +00:00
Steven Moreland 2483070b48 Merge "libtrusty: Android.mk -> Android.bp" am: de70e33092 am: 3257727096 
am: bb3e2e96c7

Change-Id: Idf05d910d19b603b0b608ff351bf6b425990a069
 2017-04-27 20:29:53 +00:00
Tom Cherry 07ea1a8833 Merge "init: fix last_reboot_reason string" am: 59c74a3bd1 am: 2be5884903 
am: 8705f89826

Change-Id: Idaf8218594f50b860fdd9e5d12b8e6f7a4fe0e68
 2017-04-27 20:29:32 +00:00
Steven Moreland bb3e2e96c7 Merge "libtrusty: Android.mk -> Android.bp" am: de70e33092 
am: 3257727096

Change-Id: I9587460646d9d83a3bfcc41be0ec71167a45db08
 2017-04-27 20:24:46 +00:00
Steven Moreland 3257727096 Merge "libtrusty: Android.mk -> Android.bp" 
am: de70e33092

Change-Id: Ic18c86fd29f3793026fb830d91ad44d62b3aed42
 2017-04-27 20:20:45 +00:00
Treehugger Robot de70e33092 Merge "libtrusty: Android.mk -> Android.bp" 2017-04-27 20:02:17 +00:00
Tom Cherry 8705f89826 Merge "init: fix last_reboot_reason string" am: 59c74a3bd1 
am: 2be5884903

Change-Id: Ia1587bdd33faae3d0b3c0d31e3e799efff6d4642
 2017-04-27 20:00:02 +00:00
Tom Cherry 704b27bd85 init: fix last_reboot_reason string 
This got moved when refactoring the reboot commands.

Bug: 37540660
Test: verify bullhead's last_reboot_reason is correct
Change-Id: I3b86496fc469ca41645df7e7ba8bb51dd25b6b38
(cherry picked from commit 47336cebc3)
 2017-04-27 12:52:37 -07:00
Tom Cherry 2be5884903 Merge "init: fix last_reboot_reason string" 
am: 59c74a3bd1

Change-Id: I77a91f303ffce4f040d774047d2c72920c1acaee
 2017-04-27 19:49:30 +00:00
Treehugger Robot 59c74a3bd1 Merge "init: fix last_reboot_reason string" 2017-04-27 19:39:53 +00:00
Elliott Hughes dac872bb82 Merge "Make "fastboot update" respect $TMPDIR." am: 8e0ccc9ff3 am: 8e0ded0c6c am: d38d487304 
am: 7f95f97bdd

Change-Id: Id5535f99097011af18ba02926c421c41311373f3
 2017-04-27 15:59:54 +00:00
Elliott Hughes 7f95f97bdd Merge "Make "fastboot update" respect $TMPDIR." am: 8e0ccc9ff3 am: 8e0ded0c6c 
am: d38d487304

Change-Id: I61e6f9833c37529ef772ab091101a0e85856ffa7
 2017-04-27 15:57:53 +00:00
Elliott Hughes d38d487304 Merge "Make "fastboot update" respect $TMPDIR." am: 8e0ccc9ff3 
am: 8e0ded0c6c

Change-Id: I26b8ac39b30d623e8903b5b1887244a0af689489
 2017-04-27 15:54:53 +00:00
Elliott Hughes 8e0ded0c6c Merge "Make "fastboot update" respect $TMPDIR." 
am: 8e0ccc9ff3

Change-Id: I74e6b2fb1e69de03960dfb0bfdd711af9e9cbd8f
 2017-04-27 15:52:22 +00:00
Elliott Hughes 8e0ccc9ff3 Merge "Make "fastboot update" respect $TMPDIR." 2017-04-27 15:40:03 +00:00
Randy Pan e2cdc58c25 Merge "Revert "Remove capability setting for legacy_wifi_hal"" into oc-dev am: df54d0efc3 
am: f7e92a235f

Change-Id: Ie5c31fdc751d59b7261e7667167a43076d486ff4
 2017-04-27 03:54:23 +00:00