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

24408 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alex Light
7fb98a466c Fix issue where non-AB-ota devices will cause flashall to fail. am: d9ff210e63 
am: be18ac56ae

Change-Id: I645d61ccf94506e85b614d8225665218b92b7b34
 2016-06-17 19:05:45 +00:00
Josh Gao
4bf137dda5 Merge \\\\"adb: make adb root not wait-for-device.\\\\" am: 81e59ca5a7 am: ba7aea829b am: 483d68ece4 
am: eb1be4087d

Change-Id: I7ede9f12f82197b203d125464c99af9256587509
 2016-06-17 19:05:44 +00:00
Alex Light
be18ac56ae Fix issue where non-AB-ota devices will cause flashall to fail. 
am: d9ff210e63

Change-Id: Ice8f096b5a4aecc015c7001e278984fd6324d47c
 2016-06-17 00:31:14 +00:00
Josh Gao
eb1be4087d Merge \\\"adb: make adb root not wait-for-device.\\\" am: 81e59ca5a7 am: ba7aea829b 
am: 483d68ece4

Change-Id: I66cd2297d253ecf95843d85d2670c047ff816548
 2016-06-16 22:49:15 +00:00
Josh Gao
483d68ece4 Merge \\"adb: make adb root not wait-for-device.\\" am: 81e59ca5a7 
am: ba7aea829b

Change-Id: I9c2a95c51aa40e61180e87df84d77db258bffb81
 2016-06-16 22:44:03 +00:00
Josh Gao
ba7aea829b Merge \"adb: make adb root not wait-for-device.\" 
am: 81e59ca5a7

Change-Id: I231ad44c7b6293256f33eb3fd617b4e5da728ca1
 2016-06-16 22:41:08 +00:00
Treehugger Robot
81e59ca5a7 Merge "adb: make adb root not wait-for-device." 2016-06-16 22:26:41 +00:00
Alex Light
d9ff210e63 Fix issue where non-AB-ota devices will cause flashall to fail. 
We now check that a device has slots before trying to get the name of
any of them.

Bug: 29278988

Change-Id: I50f3596e467afae20177ce4e458e697435223c51
 2016-06-16 15:22:22 -07:00
Josh Gao
05824734ac adb: make adb root not wait-for-device. 
`adb root` would hang for devices connected over TCP/IP, because they
never come back. Unfortunately, there doesn't seem to be an easy way to
find out what we're talking to, so replace it with a long sleep for now.

Bug: http://b/27836058
Change-Id: Icd6e6bf817ca9e2124c2961665c37b2f31f7ef29
 2016-06-16 14:02:01 -07:00
Ruchi Kandoi
7e212f481a Merge \\\"logd: logcat -L takes longer causing vold to timeout.\\\" into nyc-dev am: b02819e2af -s ours am: 457ca14c59 
am: f17a937f53

Change-Id: I4b7e01c600531ca2b87b1736671b042a5a4e53a0
 2016-06-16 18:15:19 +00:00
Ruchi Kandoi
d309a1ebcb Merge \\\"logd: logcat -L takes longer causing vold to timeout.\\\" into nyc-dev am: b02819e2af am: 13cf49d8eb -s ours 
am: 1d03239d4a

Change-Id: I2882c7415109a505c994187fc287ba903cf4ea7d
 2016-06-16 18:15:18 +00:00
Ruchi Kandoi
f17a937f53 Merge \\"logd: logcat -L takes longer causing vold to timeout.\\" into nyc-dev am: b02819e2af -s ours 
am: 457ca14c59

Change-Id: I907dafcc53adf69e6c588d9b61c5d62bbec4813a
 2016-06-16 18:09:30 +00:00
Ruchi Kandoi
457ca14c59 Merge \"logd: logcat -L takes longer causing vold to timeout.\" into nyc-dev 
am: b02819e2af  -s ours

Change-Id: Id403d4ce398b7a9ecc604001469dc28d7d07b59e
 2016-06-16 18:06:23 +00:00
Ruchi Kandoi
1d03239d4a Merge \\"logd: logcat -L takes longer causing vold to timeout.\\" into nyc-dev am: b02819e2af 
am: 13cf49d8eb  -s ours

Change-Id: I0707618fa05ece6790761c91e7d0d6768c8cf221
 2016-06-16 18:06:20 +00:00
Ruchi Kandoi
13cf49d8eb Merge \"logd: logcat -L takes longer causing vold to timeout.\" into nyc-dev 
am: b02819e2af

Change-Id: I0c0fe46e74bfa4e3461454d62b14f98a4f71be96
 2016-06-16 17:57:48 +00:00
Ruchi Kandoi
b02819e2af Merge "logd: logcat -L takes longer causing vold to timeout." into nyc-dev 2016-06-16 17:44:30 +00:00
Vitalii Tomkiv
c9a21ef605 Merge \\\\"Set zygote process priority to -20 to speed up VM startup time.\\\\" am: 92774329dd am: bf5f0fae07 am: b20a94398b 
am: 7a1a6b91a7

Change-Id: I59cd191b21693481ab004a8d1abc092620b178ed
 2016-06-16 17:28:10 +00:00
Vitalii Tomkiv
7a1a6b91a7 Merge \\\"Set zygote process priority to -20 to speed up VM startup time.\\\" am: 92774329dd am: bf5f0fae07 
am: b20a94398b

Change-Id: I65c0b4e96718c89ff3706516727cd6e6fed3d66b
 2016-06-16 17:18:30 +00:00
Vitalii Tomkiv
b20a94398b Merge \\"Set zygote process priority to -20 to speed up VM startup time.\\" am: 92774329dd 
am: bf5f0fae07

Change-Id: I510a476fe26d9df94249a4f91422db13eaffb896
 2016-06-16 17:12:38 +00:00
Vitalii Tomkiv
bf5f0fae07 Merge \"Set zygote process priority to -20 to speed up VM startup time.\" 
am: 92774329dd

Change-Id: I3c70a90e4d4e07f7c733a3a2738b0067ac09b6dd
 2016-06-16 17:09:36 +00:00
Vitalii Tomkiv
92774329dd Merge "Set zygote process priority to -20 to speed up VM startup time." 2016-06-16 16:54:43 +00:00
Elliott Hughes
45164db9e9 Merge \\\\"Better diagnostics from \\\\"adb sideload\\\\".\\\\" am: edd401e24e am: c63439ae7f am: 5a4ab064ec 
am: dc369af487

Change-Id: Ic549647df21c282c5ec4cb82ab71de10ad5b4b4b
 2016-06-15 23:46:57 +00:00
Elliott Hughes
dc369af487 Merge \\\"Better diagnostics from \\\"adb sideload\\\".\\\" am: edd401e24e am: c63439ae7f 
am: 5a4ab064ec

Change-Id: I52499a4186780fe0249e42bddd9c7726529154a3
 2016-06-15 23:39:19 +00:00
Alex Light
43ea55ed65 Merge \\"Make fastboot flash \\'B\\' partitions automatically.\\" into nyc-mr1-dev am: a3ffde1402 
am: a32dc7fe23

Change-Id: Id022aace200cb49e9378590de2aa796dbfca3cbe
 2016-06-15 23:37:41 +00:00
Elliott Hughes
2f79132d44 Merge \\\\"Minor adb style fixes.\\\\" am: 35151f49ca am: b94f3c597c am: 4d6559af5b 
am: f9e0583e8e

Change-Id: I4746e6873450df2f24a7a5d262fdc47d9daa61a4
 2016-06-15 23:37:41 +00:00
Elliott Hughes
5a4ab064ec Merge \\"Better diagnostics from \\"adb sideload\\".\\" am: edd401e24e 
am: c63439ae7f

Change-Id: Iba368cdb974292d8e2cce1cfac7a96ef93809e1f
 2016-06-15 23:31:47 +00:00
Elliott Hughes
c63439ae7f Merge \"Better diagnostics from \"adb sideload\".\" 
am: edd401e24e

Change-Id: I36b23f7533bbd4d6d9d9e171c297155846734a63
 2016-06-15 23:29:30 +00:00
Treehugger Robot
edd401e24e Merge "Better diagnostics from "adb sideload"." 2016-06-15 23:18:52 +00:00
Alex Light
a32dc7fe23 Merge \"Make fastboot flash \'B\' partitions automatically.\" into nyc-mr1-dev 
am: a3ffde1402

Change-Id: I634486ddffcf7d734cf20341c364addd465304c7
 2016-06-15 23:13:51 +00:00
TreeHugger Robot
a3ffde1402 Merge "Make fastboot flash 'B' partitions automatically." into nyc-mr1-dev 2016-06-15 23:09:26 +00:00
Elliott Hughes
f9e0583e8e Merge \\\"Minor adb style fixes.\\\" am: 35151f49ca am: b94f3c597c 
am: 4d6559af5b

Change-Id: If2c53cc93bf2a565df873d5b81eb8248562d45f9
 2016-06-15 23:08:02 +00:00
Elliott Hughes
4d6559af5b Merge \\"Minor adb style fixes.\\" am: 35151f49ca 
am: b94f3c597c

Change-Id: I206cb0709281db0817ff2b70dab0597d66f634ee
 2016-06-15 22:54:59 +00:00
Elliott Hughes
b94f3c597c Merge \"Minor adb style fixes.\" 
am: 35151f49ca

Change-Id: I84187cdafe76026ac58d90f4510979cff4e2afe5
 2016-06-15 22:48:43 +00:00
Treehugger Robot
35151f49ca Merge "Minor adb style fixes." 2016-06-15 22:41:57 +00:00
Elliott Hughes
14415142c9 Better diagnostics from "adb sideload". 
Well, slightly less bad diagnostics, anyway.

Change-Id: Idf5612f7dcb9bdbd7252163889e2612ba197426d
 2016-06-15 15:09:47 -07:00
Elliott Hughes
ffc73a39fd Minor adb style fixes. 
Change-Id: Ic4b45828dfdf88ef6c0fc468f66df3e62d2fbe51
 2016-06-15 14:46:56 -07:00
Alex Light
6c60ea8c45 Make fastboot flash 'B' partitions automatically. 
Also add ability to specify --slot active to suppress this behavior.

Bug: 29278988

Change-Id: I3ff184be74f9e2d1cb3abc80bd206b4b9faf8a35
 2016-06-15 14:42:22 -07:00
Sami Tolvanen
022484697d resolve merge conflicts of a742d10 to nyc-dev-plus-aosp am: 589994504a 
am: 6ef3e51b62

Change-Id: Ib6b3e9864d504d22316dd4edbf7500127d1dccf2
 2016-06-14 23:30:19 +00:00
Sami Tolvanen
6ef3e51b62 resolve merge conflicts of a742d10 to nyc-dev-plus-aosp 
am: 589994504a

Change-Id: Id907340d77f2d18facb0b1576b7546667bce4f6e
 2016-06-14 23:27:47 +00:00
Sami Tolvanen
d4c41f9da5 resolve merge conflicts of 998f507 to nyc-mr1-dev-plus-aosp 
am: 55986c02fa

Change-Id: I302a81a45b9eb788fe3ca17154cc2f25efe034fd
 2016-06-14 23:21:52 +00:00
Sami Tolvanen
55986c02fa resolve merge conflicts of 998f507 to nyc-mr1-dev-plus-aosp 
Change-Id: Ifa8ee7044170afe869e4ebb7d80032a92db9a93d
 2016-06-14 15:58:49 -07:00
Sami Tolvanen
589994504a resolve merge conflicts of a742d10 to nyc-dev-plus-aosp 
Change-Id: Icf3257ee8a47f31ba812a5f47899b8022f4eedb7
 2016-06-14 15:55:40 -07:00
Sami Tolvanen
998f50749e Revert \"logd: enforce policy integrity\" 
am: a742d10277

Change-Id: Idb721b2ff7a57643b671b3d87cb09bb96f1ad465
 2016-06-14 22:28:26 +00:00
Ruchi Kandoi
c1b26acae2 logd: logcat -L takes longer causing vold to timeout. 
Temporary fix to prevent device from getting stuck at boot.

Bug: 28788401
Change-Id: Ie4246fc3c9eb7a3af2cb909546811c85997515da
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
 2016-06-14 15:26:30 -07:00
Dan Stoza
d59f006c23 Merge \\"add android_flex_layout for describing all flexible formats.\\" into nyc-mr1-dev am: c873d44942 
am: a571d887a2

Change-Id: Ic0f1d25b8b5b6095766975cb9b15ca8163b666ce
 2016-06-14 20:14:35 +00:00
Lajos Molnar
a571d887a2 Merge \"add android_flex_layout for describing all flexible formats.\" into nyc-mr1-dev 
am: c873d44942

Change-Id: I57c6c6e708935841b9195f2be3ea7becef3a8dbd
 2016-06-14 20:04:09 +00:00
Dan Stoza
c873d44942 Merge "add android_flex_layout for describing all flexible formats." into nyc-mr1-dev 2016-06-14 19:59:38 +00:00
Sami Tolvanen
a742d10277 Revert "logd: enforce policy integrity" 
This reverts commit 0bdad0f231.

Bug: 26902605
Change-Id: I6ce8fa7bef63c45821628265c379970eb64963a2
 2016-06-14 11:14:51 -07:00
Tao Bao
6a85f9bc36 Merge \\\\"fs_mgr: Track the bootloader_message struct change.\\\\" am: 4d34653720 am: 6f110854ce am: e96a44e26c 
am: df4a278398

Change-Id: I6b3ef062e5fa2513b5bd101a2aa7c9442dbdfab3
 2016-06-14 16:32:24 +00:00
Tao Bao
df4a278398 Merge \\\"fs_mgr: Track the bootloader_message struct change.\\\" am: 4d34653720 am: 6f110854ce 
am: e96a44e26c

Change-Id: Icbd6307328440c7c615e6af51a6e9ea4945e3d7d
 2016-06-14 16:27:37 +00:00