OSDN Git Service
The Android Automerger [Wed, 29 Jun 2016 07:03:34 +0000 (00:03 -0700)]
"NRD90"
The Android Automerger [Wed, 29 Jun 2016 07:02:20 +0000 (00:02 -0700)]
merge in nyc-release history after reset to nyc-dev
The Android Automerger [Wed, 29 Jun 2016 02:32:52 +0000 (19:32 -0700)]
"NRD89B"
The Android Automerger [Wed, 29 Jun 2016 02:30:37 +0000 (19:30 -0700)]
merge in nyc-release history after reset to nyc-dev
Allen Hair [Tue, 28 Jun 2016 17:45:17 +0000 (17:45 +0000)]
Merge "DO NOT MERGE Skip emma instrumentation if we're using jack." into nyc-dev
The Android Automerger [Tue, 28 Jun 2016 07:06:28 +0000 (00:06 -0700)]
"NRD89"
The Android Automerger [Tue, 28 Jun 2016 07:02:25 +0000 (00:02 -0700)]
merge in nyc-release history after reset to nyc-dev
Allen Hair [Mon, 27 Jun 2016 19:32:50 +0000 (12:32 -0700)]
DO NOT MERGE Skip emma instrumentation if we're using jack.
Bug:
29777843
Change-Id: I09071ef08e0b2fe64a78cfd6d81c73aa9b80967f
The Android Automerger [Mon, 27 Jun 2016 07:04:33 +0000 (00:04 -0700)]
"NRD88"
The Android Automerger [Mon, 27 Jun 2016 07:02:26 +0000 (00:02 -0700)]
merge in nyc-release history after reset to nyc-dev
Ian Pedowitz [Sun, 26 Jun 2016 22:50:44 +0000 (22:50 +0000)]
Merge "The easter egg is now its own APK." into nyc-dev
Dan Sandler [Sat, 25 Jun 2016 14:54:39 +0000 (10:54 -0400)]
The easter egg is now its own APK.
It should be included wherever SystemUI is.
Bug:
27376882
Change-Id: Ibe2688c86e58bdfb8a5278c9c4939d7cdb524078
The Android Automerger [Sun, 26 Jun 2016 07:05:29 +0000 (00:05 -0700)]
"NRD87"
The Android Automerger [Sun, 26 Jun 2016 07:02:29 +0000 (00:02 -0700)]
merge in nyc-release history after reset to nyc-dev
The Android Automerger [Fri, 24 Jun 2016 18:06:48 +0000 (11:06 -0700)]
"NRD84D"
The Android Automerger [Fri, 24 Jun 2016 17:51:45 +0000 (10:51 -0700)]
"NRD84C"
The Android Automerger [Fri, 24 Jun 2016 04:04:55 +0000 (21:04 -0700)]
"NRD84B"
The Android Automerger [Fri, 24 Jun 2016 04:00:45 +0000 (21:00 -0700)]
merge in nyc-release history after reset to nyc-dev
Jeff Vander Stoep [Thu, 23 Jun 2016 22:04:24 +0000 (15:04 -0700)]
resolve merge conflicts of
012144f to nyc-dev
Change-Id: If918f56d5c33db10978b4efc51cf3fe42ed71f1a
Daniel Micay [Thu, 23 Jun 2016 21:10:35 +0000 (21:10 +0000)]
Merge \\\"disable unpriv perf by default in user{,debug} builds\\\" into mnc-dev am:
11c84f95fb am:
a0c61fc832
am:
3cceebf11e
Change-Id: Ia91276546041b5e36ddeeb4d855d8efac6101da5
Jeffrey Vander Stoep [Thu, 23 Jun 2016 21:07:28 +0000 (21:07 +0000)]
Merge \\"disable unpriv perf by default in user{,debug} builds\\" into mnc-dev am:
11c84f95fb
am:
a0c61fc832
Change-Id: I3eb533e3084fe53f1739a0428ffe5ff583b1ba91
Daniel Micay [Thu, 23 Jun 2016 21:04:53 +0000 (21:04 +0000)]
Merge \"disable unpriv perf by default in user{,debug} builds\" into mnc-dev
am:
11c84f95fb
Change-Id: Ic82b49068c2d6c834bafb01ea3f698bb9e84d1ac
Jeffrey Vander Stoep [Thu, 23 Jun 2016 21:00:03 +0000 (21:00 +0000)]
Merge "disable unpriv perf by default in user{,debug} builds" into mnc-dev
The Android Automerger [Thu, 23 Jun 2016 18:20:09 +0000 (11:20 -0700)]
"NRD84"
The Android Automerger [Thu, 23 Jun 2016 18:18:35 +0000 (11:18 -0700)]
merge in nyc-release history after reset to nyc-dev
The Android Automerger [Thu, 23 Jun 2016 07:07:02 +0000 (00:07 -0700)]
"NRD84"
The Android Automerger [Thu, 23 Jun 2016 07:02:58 +0000 (00:02 -0700)]
merge in nyc-release history after reset to nyc-dev
The Android Automerger [Wed, 22 Jun 2016 17:47:02 +0000 (10:47 -0700)]
"NRD83B"
The Android Automerger [Wed, 22 Jun 2016 07:06:53 +0000 (00:06 -0700)]
"NRD83"
The Android Automerger [Wed, 22 Jun 2016 07:02:33 +0000 (00:02 -0700)]
merge in nyc-release history after reset to nyc-dev
Tianjie Xu [Wed, 22 Jun 2016 05:11:24 +0000 (05:11 +0000)]
Merge "Limit the number of blocks in command zero" into nyc-dev
Zach Jang [Wed, 22 Jun 2016 01:43:47 +0000 (01:43 +0000)]
resolve merge conflicts of
12db224 to lmp-mr1-dev am:
0c672afc40 am:
cf51c6cb29 am:
cbf1e2cc94 am:
9fc3cf7ba2 am:
3749025ccb am:
e7bc1542db
am:
1be6c69524
Change-Id: If5d6ea4889550f45ef2a8f0ebf53a1e656c39010
Zach Jang [Wed, 22 Jun 2016 01:41:13 +0000 (01:41 +0000)]
resolve merge conflicts of
12db224 to lmp-mr1-dev am:
0c672afc40 am:
cf51c6cb29 am:
cbf1e2cc94 am:
9fc3cf7ba2 am:
3749025ccb
am:
e7bc1542db
Change-Id: I316c25839b0e111bda05ba586733e3712eda5a32
Zach Jang [Wed, 22 Jun 2016 01:38:31 +0000 (01:38 +0000)]
resolve merge conflicts of
12db224 to lmp-mr1-dev am:
0c672afc40 am:
cf51c6cb29 am:
cbf1e2cc94 am:
9fc3cf7ba2
am:
3749025ccb
Change-Id: Idadb32ede7b3699e0db8ce632d37e7d2cf99e82b
Zach Jang [Wed, 22 Jun 2016 01:35:58 +0000 (01:35 +0000)]
resolve merge conflicts of
12db224 to lmp-mr1-dev am:
0c672afc40 am:
cf51c6cb29 am:
cbf1e2cc94
am:
9fc3cf7ba2
Change-Id: Idcd5da62fd7c36da94af3a15f35d179e1a3940f2
Zach Jang [Wed, 22 Jun 2016 01:33:23 +0000 (01:33 +0000)]
resolve merge conflicts of
12db224 to lmp-mr1-dev am:
0c672afc40 am:
cf51c6cb29
am:
cbf1e2cc94
Change-Id: I72cff95d6f8878b5d3707f0b0f9c0541c89b9aa5
Zach Jang [Wed, 22 Jun 2016 01:30:23 +0000 (01:30 +0000)]
resolve merge conflicts of
12db224 to lmp-mr1-dev am:
0c672afc40
am:
cf51c6cb29
Change-Id: Id5206a36ff4cee1de3e15f9d5efc64ee731434ee
Zach Jang [Wed, 22 Jun 2016 01:27:49 +0000 (01:27 +0000)]
resolve merge conflicts of
12db224 to lmp-mr1-dev
am:
0c672afc40
Change-Id: Ibfaa4fa1c68fff09bbee52855a99e296bb603d45
Zach Jang [Wed, 22 Jun 2016 01:23:46 +0000 (18:23 -0700)]
resolve merge conflicts of
12db224 to lmp-mr1-dev
Change-Id: I8ef3cd2c1d9eb2e4aefe3c678f0a6bb0fdf74c29
Zach Jang [Wed, 22 Jun 2016 01:13:17 +0000 (18:13 -0700)]
resolve merge conflicts of
24cfbfa to lmp-dev
Change-Id: I5a634582647d154238c5d5bc07ccf1d0fa869132
Zach Jang [Wed, 22 Jun 2016 00:44:33 +0000 (00:44 +0000)]
Updating security string to 2016-08-05 am:
5b14c1f7ce
am:
26acdf0c13
Change-Id: I5fa856d2a68d672f314f36c315c3f1857fd386ba
Zach Jang [Wed, 22 Jun 2016 00:41:51 +0000 (00:41 +0000)]
Updating security string to 2016-08-05
am:
5b14c1f7ce
Change-Id: I5b2665a6e208d676169b33c08c6761d9de8b8320
Tianjie Xu [Tue, 21 Jun 2016 22:54:09 +0000 (15:54 -0700)]
Limit the number of blocks in command zero
Limit the number of blocks in command zero to 1024 blocks. This
prevents the target size of one command from being too large and
might help to avoid fsync errors during the OTA update.
Bug:
29535618
Change-Id: Ic630cea2599138516162bd0029e2e4b2af75bf4f
(cherry picked from commit
bb848c54a78572ec2ded3e8ed05ee01f5e8290d9)
The Android Automerger [Tue, 21 Jun 2016 07:05:06 +0000 (00:05 -0700)]
"NRD82"
The Android Automerger [Tue, 21 Jun 2016 07:02:36 +0000 (00:02 -0700)]
merge in nyc-release history after reset to nyc-dev
The Android Automerger [Mon, 20 Jun 2016 23:11:53 +0000 (16:11 -0700)]
"NRD81B"
Zach Jang [Mon, 20 Jun 2016 21:30:52 +0000 (14:30 -0700)]
Updating security string to 2016-08-05
b/
29513589
Change-Id: I5ab4a0aa9d26a95dd0e85d87dcc487867b3f284b
The Android Automerger [Mon, 20 Jun 2016 07:04:09 +0000 (00:04 -0700)]
"NRD81"
The Android Automerger [Mon, 20 Jun 2016 07:02:20 +0000 (00:02 -0700)]
merge in nyc-release history after reset to nyc-dev
The Android Automerger [Sun, 19 Jun 2016 07:10:55 +0000 (00:10 -0700)]
"NRD80"
The Android Automerger [Sun, 19 Jun 2016 07:02:53 +0000 (00:02 -0700)]
merge in nyc-release history after reset to nyc-dev
The Android Automerger [Fri, 17 Jun 2016 22:51:02 +0000 (15:51 -0700)]
NRD77D
The Android Automerger [Fri, 17 Jun 2016 22:21:46 +0000 (15:21 -0700)]
"NRD77C"
Mohamad Ayyash [Wed, 15 Jun 2016 22:53:07 +0000 (15:53 -0700)]
squashfs: make disable-4k-align a parameter
BUG:
29388879
Change-Id: I121d2b76db5fb269e2f7152abb2e78098437a0d5
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
The Android Automerger [Thu, 16 Jun 2016 21:48:48 +0000 (14:48 -0700)]
"NRD77B"
Vikas Marwaha [Thu, 16 Jun 2016 20:47:30 +0000 (20:47 +0000)]
Merge "Added make files for variable PRODUCT_SHIPPING_API_LEVEL. Bug:
26381401" into nyc-dev
Mohamad Ayyash [Thu, 16 Jun 2016 16:24:33 +0000 (16:24 +0000)]
Merge "squashfs: make disable-4k-align a parameter" into nyc-dev
The Android Automerger [Thu, 16 Jun 2016 07:06:59 +0000 (00:06 -0700)]
"NRD77"
The Android Automerger [Thu, 16 Jun 2016 07:02:38 +0000 (00:02 -0700)]
merge in nyc-release history after reset to nyc-dev
Mohamad Ayyash [Wed, 15 Jun 2016 22:53:07 +0000 (15:53 -0700)]
squashfs: make disable-4k-align a parameter
BUG:
29388879
Change-Id: I121d2b76db5fb269e2f7152abb2e78098437a0d5
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
Mohamad Ayyash [Wed, 15 Jun 2016 16:03:08 +0000 (16:03 +0000)]
Merge "Pass block_list param to mksquashfs" into nyc-dev
Mohamad Ayyash [Wed, 15 Jun 2016 16:03:08 +0000 (16:03 +0000)]
Merge "releasetools: Disable using imgdiff for squashfs." into nyc-dev
The Android Automerger [Wed, 15 Jun 2016 07:12:37 +0000 (00:12 -0700)]
"NRD76"
The Android Automerger [Wed, 15 Jun 2016 07:02:27 +0000 (00:02 -0700)]
merge in nyc-release history after reset to nyc-dev
The Android Automerger [Tue, 14 Jun 2016 07:04:32 +0000 (00:04 -0700)]
"NRD75"
The Android Automerger [Tue, 14 Jun 2016 07:02:46 +0000 (00:02 -0700)]
merge in nyc-release history after reset to nyc-dev
The Android Automerger [Tue, 14 Jun 2016 00:48:32 +0000 (17:48 -0700)]
"NRD74C"
The Android Automerger [Tue, 14 Jun 2016 00:46:18 +0000 (17:46 -0700)]
merge in nyc-release history after reset to nyc-dev
Jeff Hao [Mon, 13 Jun 2016 23:53:11 +0000 (16:53 -0700)]
Skip uses-library check for preopted apps.
Bug:
26880306
Change-Id: I97c75cceca30624b5f0c984a5032fdfaf632a90a
The Android Automerger [Mon, 13 Jun 2016 23:16:58 +0000 (16:16 -0700)]
"NRD74B"
Tao Bao [Sat, 11 Jun 2016 19:19:23 +0000 (12:19 -0700)]
releasetools: Disable using imgdiff for squashfs.
We use imgdiff to handle files in zip format (e.g. jar/zip/apk) for
higher compression ratio.
For system/vendor in squashfs, a) all files are compressed in LZ4
format; b) we use 4096-byte block size in their sparse images, but the
files in squashfs may not be laid out as 4K-aligned. So the blocks for
a given file as listed in block map may not form a valid zip file, which
may fail the patch generation with imgdiff.
Disable using imgdiff for squashfs images, and use bsdiff instead.
Bug:
22322817
Change-Id: Ie76aa4cece5c9d38cb1d1a34c505a4a8f37512d3
Mohamad Ayyash [Mon, 13 Jun 2016 16:46:58 +0000 (09:46 -0700)]
Pass block_list param to mksquashfs
Needed to generate image.map and to optimize the OTA size
BUG:
22322817
Change-Id: I7802f4dbb9116a94ea99a00b68c3a7ff180ef08a
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
The Android Automerger [Mon, 13 Jun 2016 07:04:13 +0000 (00:04 -0700)]
"NRD74"
The Android Automerger [Mon, 13 Jun 2016 07:02:25 +0000 (00:02 -0700)]
merge in nyc-release history after reset to nyc-dev
Daniel Micay [Tue, 17 May 2016 04:40:52 +0000 (00:40 -0400)]
disable unpriv perf by default in user{,debug} builds
(Cherry picked from commit
f2ac912b19ccbcc15d5176ec52c99744810adce7)
Bug:
29054680
Change-Id: If04bc63fc366006cde842a50b7c764f89d7449a6
The Android Automerger [Sun, 12 Jun 2016 07:09:50 +0000 (00:09 -0700)]
"NRD73"
The Android Automerger [Sun, 12 Jun 2016 07:02:42 +0000 (00:02 -0700)]
merge in nyc-release history after reset to nyc-dev
The Android Automerger [Fri, 10 Jun 2016 22:38:32 +0000 (15:38 -0700)]
"NRD70E"
Tianjie Xu [Thu, 9 Jun 2016 21:18:45 +0000 (14:18 -0700)]
Add build.version.incremental to metadata
Add the build property "build.version.incremental" of the source (if
present) and target files to the metadata of the ota update package.
Example of metadata:
....
post-build-incremental=
2951741
post-timestamp=
1465345123
pre-build-incremental=
2943039
pre-device=bullhead
...
Bug:
28658632
Change-Id: I889e8ccf39633b1b35590751001a42d1b05d5514
The Android Automerger [Fri, 10 Jun 2016 00:01:56 +0000 (17:01 -0700)]
NRD70C
The Android Automerger [Thu, 9 Jun 2016 21:56:48 +0000 (14:56 -0700)]
"NRD70B"
The Android Automerger [Thu, 9 Jun 2016 07:18:41 +0000 (00:18 -0700)]
"NRD70"
The Android Automerger [Thu, 9 Jun 2016 07:02:48 +0000 (00:02 -0700)]
merge in nyc-release history after reset to nyc-dev
The Android Automerger [Wed, 8 Jun 2016 07:06:50 +0000 (00:06 -0700)]
"NRD69"
The Android Automerger [Wed, 8 Jun 2016 07:02:26 +0000 (00:02 -0700)]
merge in nyc-release history after reset to nyc-dev
Ian Pedowitz [Wed, 8 Jun 2016 03:05:39 +0000 (03:05 +0000)]
Merge "Removing N from PLATFORM_VERSION_ALL_CODENAMES" into nyc-dev
The Android Automerger [Wed, 8 Jun 2016 00:05:38 +0000 (17:05 -0700)]
"NRD68B"
Vikas Marwaha [Tue, 7 Jun 2016 22:08:27 +0000 (15:08 -0700)]
Added make files for variable PRODUCT_SHIPPING_API_LEVEL.
Bug:
26381401
Change-Id: I8f2e630118cfa474564eb21911448bc813fcfec7
Gustav Sennton [Tue, 7 Jun 2016 16:21:15 +0000 (16:21 +0000)]
Merge "Add variable PRODUCT_SHIPPING_API_LEVEL." into nyc-dev
The Android Automerger [Tue, 7 Jun 2016 07:06:26 +0000 (00:06 -0700)]
"NRD68"
The Android Automerger [Tue, 7 Jun 2016 07:02:26 +0000 (00:02 -0700)]
merge in nyc-release history after reset to nyc-dev
The Android Automerger [Mon, 6 Jun 2016 23:56:15 +0000 (16:56 -0700)]
NRD67B
Ian Pedowitz [Wed, 1 Jun 2016 00:36:44 +0000 (17:36 -0700)]
NYC is 7.0
Bug:
29056633
Change-Id: Ib0186c5affd16b5223ba547b2cfff49d830dac1c
Ian Pedowitz [Mon, 6 Jun 2016 17:06:39 +0000 (10:06 -0700)]
Removing N from PLATFORM_VERSION_ALL_CODENAMES
Change-Id: I328dfa703faf2bd3232f68102d5c7f4b379df030
Fixes:
29117805
Narayan Kamath [Mon, 6 Jun 2016 14:48:03 +0000 (14:48 +0000)]
Merge "Add default values for pm.dexopt.core-app." into nyc-dev
The Android Automerger [Mon, 6 Jun 2016 07:04:55 +0000 (00:04 -0700)]
"NRD67"
The Android Automerger [Mon, 6 Jun 2016 07:02:23 +0000 (00:02 -0700)]
merge in nyc-release history after reset to nyc-dev
The Android Automerger [Sun, 5 Jun 2016 07:08:07 +0000 (00:08 -0700)]
"NRD66"
The Android Automerger [Sun, 5 Jun 2016 07:02:59 +0000 (00:02 -0700)]
merge in nyc-release history after reset to nyc-dev
The Android Automerger [Fri, 3 Jun 2016 23:05:11 +0000 (16:05 -0700)]
"NRD63C"
OSDN Git Service
