Justin Harrison
d2d9747199
am b89ec381
: am 070eea05
: am ffd4fee9
: Merge "Revert "Allow system images larger than 2GiB."" into lmp-mr1-dev
...
* commit 'b89ec38113a22d09b0832ed2d3cb8fc413a14a75':
Revert "Allow system images larger than 2GiB."
2015-02-13 20:44:23 +00:00
Justin Harrison
b89ec38113
am 070eea05
: am ffd4fee9
: Merge "Revert "Allow system images larger than 2GiB."" into lmp-mr1-dev
...
* commit '070eea05f2f2d47aa873fd1e79160eb8529a0eb8':
Revert "Allow system images larger than 2GiB."
2015-02-13 20:37:10 +00:00
Justin Harrison
ffd4fee911
Merge "Revert "Allow system images larger than 2GiB."" into lmp-mr1-dev
2015-02-13 18:48:17 +00:00
Justin Harrison
2de68bbbf4
Revert "Allow system images larger than 2GiB."
...
This reverts commit cd082d4bfe
.
Change-Id: Ie63e1ba70d907d2849164871bc7ec71c245f7af9
2015-02-13 18:47:51 +00:00
Michael Runge
cad78c12fb
Do not use block_verify on target-files where feature is missing.
...
This will only be used when the block file format is at least
version 3. For V1/V2 (L, L MR1) block versions, fall back to
the old range_sha1 check.
Bug: 19357591
Change-Id: I7cb178b70d48ec3c98cdb88ed1c94cf7797a01d0
2015-02-11 19:28:08 -08:00
smain@google.com
f8136017fa
am 1cd422cd
: am 19b8c2f7
: am 8cde3e71
: am cf80e847
: am d162be5b
: change video analytics to distinguish between start and resume events. also scrub out any additional parameters from the videoId before passing to analytics
...
* commit '1cd422cd3d67c0821b29c75e91cac764ce4d1b47':
change video analytics to distinguish between start and resume events. also scrub out any additional parameters from the videoId before passing to analytics
2015-02-11 02:54:59 +00:00
smain@google.com
1cd422cd3d
am 19b8c2f7
: am 8cde3e71
: am cf80e847
: am d162be5b
: change video analytics to distinguish between start and resume events. also scrub out any additional parameters from the videoId before passing to analytics
...
* commit '19b8c2f776036288dfad8983e38419c3d4316fc9':
change video analytics to distinguish between start and resume events. also scrub out any additional parameters from the videoId before passing to analytics
2015-02-10 23:21:02 +00:00
smain@google.com
8cde3e71e7
am cf80e847
: am d162be5b
: change video analytics to distinguish between start and resume events. also scrub out any additional parameters from the videoId before passing to analytics
...
* commit 'cf80e8479bc71538902ac07df91fff8d544a174e':
change video analytics to distinguish between start and resume events. also scrub out any additional parameters from the videoId before passing to analytics
2015-02-10 19:12:49 +00:00
smain@google.com
cf80e8479b
am d162be5b
: change video analytics to distinguish between start and resume events. also scrub out any additional parameters from the videoId before passing to analytics
...
* commit 'd162be5b5f65ba0311374242d48303f120398d48':
change video analytics to distinguish between start and resume events. also scrub out any additional parameters from the videoId before passing to analytics
2015-02-10 19:05:42 +00:00
Jesse Zhao
4ec52a93d8
am 234d122e
: am c6af9b8f
: am 28b2b00a
: Merge "Update vendor fingerprint." into lmp-mr1-dev
...
* commit '234d122ea62a43aa3a1d6cfbf11a75e5dbe3f8e0':
Update vendor fingerprint.
2015-02-09 04:14:09 +00:00
Dan Albert
39a68ab310
am f8f91c94
: am 3907eaf8
: am cd082d4b
: Allow system images larger than 2GiB.
...
* commit 'f8f91c94706a953f91bf75e919b4302db6a9a99f':
Allow system images larger than 2GiB.
2015-02-09 04:14:08 +00:00
Jesse Zhao
234d122ea6
am c6af9b8f
: am 28b2b00a
: Merge "Update vendor fingerprint." into lmp-mr1-dev
...
* commit 'c6af9b8f4a09cc4208ad119218f57022d6fead5b':
Update vendor fingerprint.
2015-02-07 00:06:13 +00:00
Dan Albert
f8f91c9470
am 3907eaf8
: am cd082d4b
: Allow system images larger than 2GiB.
...
* commit '3907eaf8b7c6f7209c4cb11a6b8b66a34f292151':
Allow system images larger than 2GiB.
2015-02-07 00:06:10 +00:00
Jesse Zhao
28b2b00adb
Merge "Update vendor fingerprint." into lmp-mr1-dev
2015-02-06 22:21:06 +00:00
Dan Albert
cd082d4bfe
Allow system images larger than 2GiB.
...
Python 2.7's zipfile implementation wrongly thinks that zip64 is
required for files larger than 2GiB. We can work around this by
adjusting their limit. Note that `zipfile.writestr()` will not work
for strings larger than 2GiB. The Python interpreter sometimes rejects
strings that large (though it isn't clear to me exactly what
circumstances cause this). `zipfile.write()` must be used directly to
work around this.
This mess can be avoided if we port to python3.
Bug: 18015246
Change-Id: I8a476d99c5efdef6ea408373b706e9fbd3a798be
2015-02-06 13:24:06 -08:00
Jesse Zhao
2625d27151
Update vendor fingerprint.
...
Change-Id: I5d4abdff8b7b13e01271440f4d4f2ffe1b015b71
Bug: 19257598
2015-02-06 09:50:06 -08:00
Sami Tolvanen
431d42f857
Merge "Change transfer list format to include block hashes"
2015-02-06 10:27:11 +00:00
smain@google.com
d162be5b5f
change video analytics to distinguish between start and resume events.
...
also scrub out any additional parameters from the videoId before passing to analytics
Change-Id: Idf3351028e62d0d03c0f680a904bb83ef8353797
2015-02-05 17:49:49 -08:00
Ying Wang
18202932d1
am f4bd044f
: am d51b0fd3
: Merge "Fail even dev build when property value exceeds length limit."
...
* commit 'f4bd044f09529430bdc9ac3cba083a39867dfab4':
Fail even dev build when property value exceeds length limit.
2015-02-05 02:36:41 +00:00
Ying Wang
f4bd044f09
am d51b0fd3
: Merge "Fail even dev build when property value exceeds length limit."
...
* commit 'd51b0fd3e4b3b39a36019bb1cd06fe29979f4ee8':
Fail even dev build when property value exceeds length limit.
2015-02-05 02:31:30 +00:00
Ying Wang
38df101343
Fail even dev build when property value exceeds length limit.
...
Let developers know the issue earlier when they set up new
products.
Change-Id: I3f2ecbc3a833c1a8a84bd75407a5c035e5fea70a
2015-02-04 15:10:59 -08:00
Ying Wang
3e9b20e430
am 16ba2ed8
: resolved conflicts for merge of 4c178ebc
to lmp-mr1-dev-plus-aosp
...
* commit '16ba2ed82bc084d5355477a381cc0bcc8b60a7bd':
Remove support of factory ramdisk/bundle.
2015-02-04 19:33:14 +00:00
Ying Wang
16ba2ed82b
resolved conflicts for merge of 4c178ebc
to lmp-mr1-dev-plus-aosp
...
Change-Id: If84527e9333b855d406dc7ac317868f4cfd3f1f2
2015-02-04 11:28:56 -08:00
Ying Wang
14cc23d433
Remove support of factory ramdisk/bundle.
...
Bug: 18779515
Change-Id: Ia6d51d43965447e2e95944a7d2b4b41adb121cb7
2015-02-04 11:00:01 -08:00
Sami Tolvanen
cac671a9d1
Change transfer list format to include block hashes
...
Add source and target block hashes as parameters to transfer list
commands that copy or patch data to a partition. This allows the
updater to verify the status of each command in the transfer list
and makes resuming block based OTAs possible. Due to the changes,
update the transfer list version to 3.
Needs matching changes from
I1e752464134aeb2d396946348e6041acabe13942
Bug: 18262110
Change-Id: Ia5c56379f570047f10f0aa7373a1025439495c98
2015-01-30 11:34:27 +00:00
Jesse Zhao
3de822dd3c
am 5827eec0
: am fbc8c145
: am 0c9384d5
: Merge "verify system and vendor image together before patching." into lmp-mr1-dev
...
* commit '5827eec013e88279b87cfed1b96bc675a1f1329d':
verify system and vendor image together before patching.
2015-01-29 17:21:12 +00:00
Jesse Zhao
5827eec013
am fbc8c145
: am 0c9384d5
: Merge "verify system and vendor image together before patching." into lmp-mr1-dev
...
* commit 'fbc8c1454e8f2167635398078bb53033dc90f15d':
verify system and vendor image together before patching.
2015-01-28 23:42:18 +00:00
Jesse Zhao
0c9384d512
Merge "verify system and vendor image together before patching." into lmp-mr1-dev
2015-01-28 23:30:54 +00:00
Narayan Kamath
41759234f0
am 675a726f
: resolved conflicts for merge of 8f5fc9e2
to lmp-mr1-dev-plus-aosp
...
* commit '675a726fe4ca70beb1ecccb8c5f78dcc8f65cac8':
Add ro.product.locale
2015-01-22 19:58:04 +00:00
Narayan Kamath
675a726fe4
resolved conflicts for merge of 8f5fc9e2
to lmp-mr1-dev-plus-aosp
...
Change-Id: Ie1587a4e2434b9cfbca16bc764e99e94511f8212
2015-01-22 18:53:59 +00:00
Dirk Dougherty
b5b67b7544
am 4433ac85
: am d1283889
: am 48141e05
: am 5a97f244
: am 529a107f
: Add new subtab under Distribute tab.
...
* commit '4433ac859c90192914c31f3f8d39230aac41852c':
Add new subtab under Distribute tab.
2015-01-16 20:06:35 +00:00
Dirk Dougherty
4433ac859c
am d1283889
: am 48141e05
: am 5a97f244
: am 529a107f
: Add new subtab under Distribute tab.
...
* commit 'd12838890563b2fb4532630373760a995970f687':
Add new subtab under Distribute tab.
2015-01-16 18:17:59 +00:00
Dirk Dougherty
48141e0599
am 5a97f244
: am 529a107f
: Add new subtab under Distribute tab.
...
* commit '5a97f24411df6ca7221343ac93f25decb99b6bea':
Add new subtab under Distribute tab.
2015-01-16 18:03:42 +00:00
Narayan Kamath
baf3eb93ee
Add ro.product.locale
...
This is a BCP-47 language tag representing the default locale for a
given device. Support for the earlier mechanism of supplying a language
and region via ro.product.locale.region/language has been removed. This
change also removes support for supplying these properties via
PRODUCT_ADDITIONAL_PROPERTY_OVERRIDES. Devices that need to override
this should either rearrange their PRODUCT_LANGUAGES or supply a custom
.prop file.
bug: 17691569
Change-Id: I00c74098542b49b9c514a6ca39ea8d08179546c1
2015-01-16 10:16:52 +00:00
Dirk Dougherty
5a97f24411
am 529a107f
: Add new subtab under Distribute tab.
...
* commit '529a107f9de5051b734fad4cecf1f971998aeade':
Add new subtab under Distribute tab.
2015-01-16 00:58:59 +00:00
Dirk Dougherty
529a107f9d
Add new subtab under Distribute tab.
...
Change-Id: I991c3295dea40629fdb9dde4a8ccbecad25f8136
2015-01-15 16:27:39 -08:00
Jesse Zhao
75bcea0267
verify system and vendor image together before patching.
...
Change-Id: Ia43657ed6cd8860b0edb78cc2dd6388c761e1f8b
Bug: 17919909
2015-01-07 21:44:09 +00:00
David Turner
0d30007b38
am 7a864af1
: am aa112716
: Merge "build_image: Set file system labels on disk images"
...
* commit '7a864af1b72a278d7e83f2f1f6ac6da587d658c8':
build_image: Set file system labels on disk images
2015-01-07 20:41:57 +00:00
David Turner
7a864af1b7
am aa112716
: Merge "build_image: Set file system labels on disk images"
...
* commit 'aa112716067167d58d1db37aaf8adc49b83b59a1':
build_image: Set file system labels on disk images
2015-01-07 20:28:17 +00:00
Jeff Arneson
af7cc3eea6
am 579be067
: am 35764d6f
: am ef789fa1
: am bb9eda64
: am 2ff97d99
: am d194c6ac
: Merge "Fix Documentation typo when showAnnotations is used with doclava" into lmp-docs
...
* commit '579be0670507ca380d361ffdbc2cff7f53e9d0cd':
Fix Documentation typo when showAnnotations is used with doclava
2015-01-06 19:55:04 +00:00
Jeff Arneson
579be06705
am 35764d6f
: am ef789fa1
: am bb9eda64
: am 2ff97d99
: am d194c6ac
: Merge "Fix Documentation typo when showAnnotations is used with doclava" into lmp-docs
...
* commit '35764d6f99761ed63d2d762be4bddf0a3a1e5e0a':
Fix Documentation typo when showAnnotations is used with doclava
2015-01-06 02:27:21 +00:00
Jeff Arneson
ef789fa152
am bb9eda64
: am 2ff97d99
: am d194c6ac
: Merge "Fix Documentation typo when showAnnotations is used with doclava" into lmp-docs
...
* commit 'bb9eda64a300bbbeffc58798f9af04d332544557':
Fix Documentation typo when showAnnotations is used with doclava
2015-01-06 02:00:09 +00:00
Christoffer Dall
8ed01f3816
build_image: Set file system labels on disk images
...
When building images set the mount point (data,cache,system) as the
filesystem label on the generated image. This is required for the
Android Emulator.
IMPORTANT: This depends on the following patch to system/extras/:
https://android-review.googlesource.com/#/c/120047/
which has already been submitted to AOSP and merged into the
internal tree.
Change-Id: Iaeb45462570c26d37980f1cc5d8a1b929e476c89
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org >
2015-01-05 17:49:37 +01:00
smain@google.com
4c67290d5a
am cc717505
: am e6bf9dcd
: am 02be1804
: am fdb9fa0e
: am 351c908b
: am 94e0b530
: fix bug that allowed only one video in the shadowbox per page bug: 18777918
...
* commit 'cc717505e4590d29ec544a0d58ac26f3ce8d0e24':
fix bug that allowed only one video in the shadowbox per page bug: 18777918
2014-12-19 17:30:59 +00:00
smain@google.com
8123730d50
am be8b1630
: am fa963c73
: am 2fbb4e30
: am 39bac022
: am bfe3fc64
: am bf644aa5
: remove the Helpouts recruitment banner
...
* commit 'be8b1630aa638e83c1b21c2d509a4251bc9f1d8d':
remove the Helpouts recruitment banner
2014-12-19 17:30:58 +00:00
smain@google.com
cc717505e4
am e6bf9dcd
: am 02be1804
: am fdb9fa0e
: am 351c908b
: am 94e0b530
: fix bug that allowed only one video in the shadowbox per page bug: 18777918
...
* commit 'e6bf9dcde7d150885a98519512c725066601db10':
fix bug that allowed only one video in the shadowbox per page bug: 18777918
2014-12-19 17:24:04 +00:00
smain@google.com
be8b1630aa
am fa963c73
: am 2fbb4e30
: am 39bac022
: am bfe3fc64
: am bf644aa5
: remove the Helpouts recruitment banner
...
* commit 'fa963c7379e8e7c9d0fce2c6e24f599bce90b396':
remove the Helpouts recruitment banner
2014-12-19 17:24:03 +00:00
smain@google.com
02be18043c
am fdb9fa0e
: am 351c908b
: am 94e0b530
: fix bug that allowed only one video in the shadowbox per page bug: 18777918
...
* commit 'fdb9fa0e2bdbcc8ffa6b33def29b74bab4ce91ac':
fix bug that allowed only one video in the shadowbox per page bug: 18777918
2014-12-19 17:08:33 +00:00
smain@google.com
2fbb4e30e2
am 39bac022
: am bfe3fc64
: am bf644aa5
: remove the Helpouts recruitment banner
...
* commit '39bac0222bf10bc9f7dd1f3d58391903d669d35a':
remove the Helpouts recruitment banner
2014-12-19 17:08:05 +00:00
Jeff Arneson
bb9eda64a3
am 2ff97d99
: am d194c6ac
: Merge "Fix Documentation typo when showAnnotations is used with doclava" into lmp-docs
...
* commit '2ff97d99266623997c09f5af937f98bc8bb2ee65':
Fix Documentation typo when showAnnotations is used with doclava
2014-12-18 17:05:23 +00:00