OSDN Git Service
Tao Bao [Tue, 8 Sep 2015 20:30:51 +0000 (20:30 +0000)]
am
28f6f9c3: releasetools: Always write the last block if it\'s padded.
* commit '
28f6f9c3deb4d23fd627d15631d682a5cfa989fc':
releasetools: Always write the last block if it's padded.
Tao Bao [Sun, 6 Sep 2015 03:35:32 +0000 (20:35 -0700)]
releasetools: Always write the last block if it's padded.
In BBOTAs if the last block of a DataImage is padded, we should always
write the whole block even for incremental OTAs. Because otherwise the
last block may be skipped if unchanged, but would fail the post-install
verification if it has non-zero contents in the padding bytes.
Bug:
23828506
Change-Id: I6f6789eec568ed0b808b9e425f5ecdbea1bdf446
(cherry picked from commit
7589e961a7b8b7d964704db87f83ed8811e97ac6)
Tao Bao [Thu, 3 Sep 2015 18:14:42 +0000 (18:14 +0000)]
am
a6e6afbc: am
39c322ce: releasetools: Fix the bug in symlink deletion.
* commit '
a6e6afbce69da968299898944bb2165f5e799886':
releasetools: Fix the bug in symlink deletion.
Tao Bao [Thu, 3 Sep 2015 17:26:12 +0000 (17:26 +0000)]
am
39c322ce: releasetools: Fix the bug in symlink deletion.
* commit '
39c322cefcc0ecba76a2ffb8881694fd010a87fc':
releasetools: Fix the bug in symlink deletion.
Tao Bao [Wed, 2 Sep 2015 17:28:08 +0000 (10:28 -0700)]
releasetools: Fix the bug in symlink deletion.
For file-based OTAs, symlinks in the source build but not in the target
build will be deleted. However, if a symlink is replaced by a regular
file in the target build, the file will be accidentally deleted when
applying (resuming) the same package again.
Verify the checksum of a symlink that will be unpacked or renamed to.
Delete the file only if it doesn't have the target checksum.
Bug:
23646151
Change-Id: I77bae035e39f2e0be25f7f6d71c5882464e3d50f
(cherry picked from commit
84006eacd05e3f2784a0ecdf36609767f2c34044)
Zach Jang [Wed, 2 Sep 2015 00:10:34 +0000 (00:10 +0000)]
am
9f7c3781: am
057831bc: Merge "Set the Security Patch level with Oct 1 for MNC" into mnc-dev
* commit '
9f7c37811bc65cda63bd863d00ed7b7489c02bd2':
Set the Security Patch level with Oct 1 for MNC
Zach Jang [Wed, 2 Sep 2015 00:04:40 +0000 (00:04 +0000)]
am
057831bc: Merge "Set the Security Patch level with Oct 1 for MNC" into mnc-dev
* commit '
057831bc665b15d7beda970b91b2c332dee417f0':
Set the Security Patch level with Oct 1 for MNC
Zach Jang [Tue, 1 Sep 2015 23:51:02 +0000 (23:51 +0000)]
Merge "Set the Security Patch level with Oct 1 for MNC" into mnc-dev
Badhri Jagan Sridharan [Tue, 1 Sep 2015 23:07:58 +0000 (23:07 +0000)]
am
dfea066f: Merge "Include init.usb.configfs.rc into rootdir" into mnc-dr-dev
* commit '
dfea066f880f14d7203302ab667b9f096b210c08':
Include init.usb.configfs.rc into rootdir
Badhri Jagan Sridharan [Tue, 1 Sep 2015 22:57:27 +0000 (22:57 +0000)]
Merge "Include init.usb.configfs.rc into rootdir" into mnc-dr-dev
Badhri Jagan Sridharan [Sat, 29 Aug 2015 02:44:05 +0000 (19:44 -0700)]
Include init.usb.configfs.rc into rootdir
Bug=
23633457
Change-Id: I26bbc5ff597138b2ccac1de72117753739b31554
Tao Bao [Tue, 1 Sep 2015 19:10:11 +0000 (19:10 +0000)]
am
ccad82c5: Merge "Revert "Temporarily use blockimgdiff v2 for OTA."" into mnc-dr-dev
* commit '
ccad82c52e7c37c70fce579cf14377a88b885ae4':
Revert "Temporarily use blockimgdiff v2 for OTA."
Tao Bao [Tue, 1 Sep 2015 19:02:24 +0000 (19:02 +0000)]
Merge "Revert "Temporarily use blockimgdiff v2 for OTA."" into mnc-dr-dev
smain@google.com [Mon, 31 Aug 2015 21:46:46 +0000 (21:46 +0000)]
am
77c1ff7b: am
4ffdc8fa: Fix bug that caused table of Studio links to result in "stand-alone" tools instructions. bug:
23570662
* commit '
77c1ff7bf983ef4622ecb227d4e5b0c75728c28f':
Fix bug that caused table of Studio links to result in "stand-alone" tools instructions. bug:
23570662
smain@google.com [Mon, 31 Aug 2015 21:36:29 +0000 (21:36 +0000)]
am
4ffdc8fa: Fix bug that caused table of Studio links to result in "stand-alone" tools instructions. bug:
23570662
* commit '
4ffdc8faf2c795027f38b6ef4685dd6d1179878e':
Fix bug that caused table of Studio links to result in "stand-alone" tools instructions. bug:
23570662
Tao Bao [Mon, 31 Aug 2015 21:10:06 +0000 (21:10 +0000)]
am
e337093e: Merge changes from topic \'stash-size\' into mnc-dr-dev
* commit '
e337093e6c5d502f0f4094639b41c001b3048d0f':
Split large files for BBOTA v3.
Revise stash for BBOTAs when needed.
Assert the stash size when generating OTAs.
Tao Bao [Mon, 31 Aug 2015 20:59:48 +0000 (20:59 +0000)]
Merge changes from topic 'stash-size' into mnc-dr-dev
* changes:
Split large files for BBOTA v3.
Revise stash for BBOTAs when needed.
Assert the stash size when generating OTAs.
Zach Jang [Mon, 31 Aug 2015 17:12:17 +0000 (10:12 -0700)]
Set the Security Patch level with Oct 1 for MNC
- MNC currently has security patches from the August OEM bulletin with patch date of Sep 1 plus only critical fixes from September OEM bulletin
- To be cherry-picked if picking up remaining fixes from September OEM bulletin to MNC
Change-Id: I2d1ba9c5a893727962f3f1837df1dd9df49e44f5
smain@google.com [Fri, 28 Aug 2015 23:51:12 +0000 (16:51 -0700)]
Fix bug that caused table of Studio links to result in "stand-alone" tools instructions.
bug:
23570662
Change-Id: I7482eddbeffa581307bf7f76b9653de41966b6f9
Ying Wang [Thu, 27 Aug 2015 01:46:10 +0000 (01:46 +0000)]
am
f4ad2feb: am
4fc14679: am
fc168f84: resolved conflicts for merge of
1a8c6567 to lmp-mr1-ub-dev
* commit '
f4ad2febdb6f87a08e5f8229b0f3b2d8a7dc25de':
Don't fail build of otatools if there are no device certificates
Ying Wang [Thu, 27 Aug 2015 01:46:09 +0000 (01:46 +0000)]
am
d0cc11e8: am
8f7c08ed: am
1e120181: am
473b6a5f: am
fc028e59: Dist the otatools package.
* commit '
d0cc11e89827e4f5b1526b909e138493cfb96da6':
Dist the otatools package.
Ying Wang [Thu, 27 Aug 2015 01:37:54 +0000 (01:37 +0000)]
am
4fc14679: am
fc168f84: resolved conflicts for merge of
1a8c6567 to lmp-mr1-ub-dev
* commit '
4fc1467949aaf9e6a49a6771ed996e3c2c702314':
Don't fail build of otatools if there are no device certificates
Ying Wang [Thu, 27 Aug 2015 01:37:53 +0000 (01:37 +0000)]
am
8f7c08ed: am
1e120181: am
473b6a5f: am
fc028e59: Dist the otatools package.
* commit '
8f7c08ed622d733c0997324d5b0464ba7e57c1fa':
Dist the otatools package.
Ying Wang [Thu, 27 Aug 2015 01:33:15 +0000 (01:33 +0000)]
am
fc168f84: resolved conflicts for merge of
1a8c6567 to lmp-mr1-ub-dev
* commit '
fc168f84695f492f2ad0eed3063145f425bebf45':
Don't fail build of otatools if there are no device certificates
Ying Wang [Thu, 27 Aug 2015 01:27:37 +0000 (01:27 +0000)]
am
1e120181: am
473b6a5f: am
fc028e59: Dist the otatools package.
* commit '
1e120181f0a9240eca61dface4fb4530bf2594ab':
Dist the otatools package.
Ying Wang [Thu, 27 Aug 2015 00:03:18 +0000 (17:03 -0700)]
resolved conflicts for merge of
1a8c6567 to lmp-mr1-ub-dev
Change-Id: Iadb7c55c246705ac10c6822b7bb5d71794ce485b
Tao Bao [Wed, 26 Aug 2015 22:28:35 +0000 (15:28 -0700)]
Revert "Temporarily use blockimgdiff v2 for OTA."
This reverts commit
d07bfc519673fdba66448f0a81ef869b922c3804.
Real fixes [1][2][3] are ready to merge. Time to revert the workaround.
[1] commit
d47d8e14880132c42a75f41c8041851797c75e35
[2] commit
1fc67631eedbfba07e005d85aadae6e1b91d8d93
[3] commit
937847ae493d36b9741f6387a2357d5cdceda3d9
Bug:
22430577
Change-Id: Icd6623e8717c93ad1f12cd1ba43db5e006e928ad
Tao Bao [Tue, 25 Aug 2015 22:10:10 +0000 (15:10 -0700)]
Split large files for BBOTA v3.
For BBOTA v3, we need to stash source blocks to support resumable
feature. However, with the growth of file size and the shrink of the
cache size, source blocks that represent a file are too large to be
stashed as a whole. CL in [1] solves the issue by replacing the diff
command with a "new" command. However, it may increase the generated
package size substantially (e.g. from ~100MB to ~400MB).
With this CL, if a file spans too many blocks, we split it into smaller
pieces by generating multiple commands. For the same case above, it
reduces the package size to ~150MB.
One potential downside is that after splitting, files like .jar,
.apk and .zip can no longer use imgdiff. We may lose the potential
benefit of using imgdiff for patch size reduction.
[1] commit
82c47981bd0602a1c7b50dfabf9a6a2412993bae
Bug:
22430577
Change-Id: Iee1ad6543f3d40368e079e418cc31728e1ab3f48
(cherry picked from commit
9a5caf2c30e5dcb19823dff328de1cfb140a2799)
Tao Bao [Mon, 17 Aug 2015 16:45:13 +0000 (09:45 -0700)]
Revise stash for BBOTAs when needed.
When generating incremental BBOTAs (v2 and above), we need to ensure
that the needed runtime stash is below the given threshold. If it's
running out of space on /cache, we replace the command that uses a
stash with a "new" command instead.
This may increase the OTA package size, since it is carrying more full
blocks instead of patches. It gets even worse for large files that span
a number of blocks, because currently we will store all the blocks for
the file as "new" blocks if stashing cannot be satisfied. We may further
optimize by splitting them into smaller chunks so that most of them can
still be stashed.
Bug:
22430577
Change-Id: Ieae5243d461e3f899f613f76a380f6f7c3edb356
(cherry picked from commit
82c47981bd0602a1c7b50dfabf9a6a2412993bae)
Tao Bao [Thu, 21 May 2015 21:09:49 +0000 (14:09 -0700)]
Assert the stash size when generating OTAs.
With block-based OTA v2 and v3, it requires stash space on the /cache
partition to back up blocks during an update. We need to ensure that
it doesn't exceed the partition size. Since there might be other files
on /cache as well, we use cache_size * threshold as the maximum allowed
size. The threshold defaults to 0.8, which can be overridden by command
line option '--stash_threshold'.
Change-Id: Ieee5d373c9bfb2ea401d85ca8a3adb491579de76
(cherry picked from commit
23ac4042128e47f6fe1ef176e7cb96f907d8e149)
Ying Wang [Wed, 26 Aug 2015 20:17:16 +0000 (20:17 +0000)]
am
473b6a5f: am
fc028e59: Dist the otatools package.
* commit '
473b6a5f2b00f941acb08b5c3df59cbbdf647609':
Dist the otatools package.
Claes Elgemark [Wed, 26 Aug 2015 17:14:49 +0000 (17:14 +0000)]
am
8d771971: Don\'t fail build of otatools if there are no device certificates
* commit '
8d771971212069f77851163f437c782f581bf6db':
Don't fail build of otatools if there are no device certificates
Claes Elgemark [Wed, 1 Apr 2015 09:29:29 +0000 (11:29 +0200)]
Don't fail build of otatools if there are no device certificates
Bug:
23552169
Change-Id: I32723701d952ef2243ce0234132fa9876f0f21b6
Bart Sears [Wed, 26 Aug 2015 03:55:25 +0000 (03:55 +0000)]
am
8a1fa158: am
c69aa42b: Merge "Set the Security Patch level for MNC" into mnc-dev
* commit '
8a1fa15844e0ad73d3b327ff567012e485e7896d':
Set the Security Patch level for MNC
Bart Sears [Wed, 26 Aug 2015 03:49:10 +0000 (03:49 +0000)]
am
c69aa42b: Merge "Set the Security Patch level for MNC" into mnc-dev
* commit '
c69aa42b4331569814d23336412e6754a0495d65':
Set the Security Patch level for MNC
Bart Sears [Wed, 26 Aug 2015 03:40:38 +0000 (03:40 +0000)]
Merge "Set the Security Patch level for MNC" into mnc-dev
Tao Bao [Tue, 25 Aug 2015 23:49:14 +0000 (23:49 +0000)]
am
d3a79db8: am
afc5ab39: am
c6e087ad: resolved conflicts for merge of
2bcfbe7e to lmp-mr1-ub-dev
* commit '
d3a79db8fe09ac4d5bb404f4bb48a5f66d005db2':
add otatools-package target
Tao Bao [Tue, 25 Aug 2015 23:39:51 +0000 (23:39 +0000)]
am
afc5ab39: am
c6e087ad: resolved conflicts for merge of
2bcfbe7e to lmp-mr1-ub-dev
* commit '
afc5ab39d84e9fc5fecbcd3c5a77fe4f956ff825':
add otatools-package target
Tao Bao [Tue, 25 Aug 2015 23:30:14 +0000 (23:30 +0000)]
am
c6e087ad: resolved conflicts for merge of
2bcfbe7e to lmp-mr1-ub-dev
* commit '
c6e087adc420ca08bfea8613c07aa51e1b4a2e3e':
add otatools-package target
Tao Bao [Tue, 25 Aug 2015 23:18:01 +0000 (16:18 -0700)]
resolved conflicts for merge of
2bcfbe7e to lmp-mr1-ub-dev
Change-Id: Ia53581aee207b0a24807767d7e80959a4fc9aff3
Konstantinos Menychtas [Tue, 25 Aug 2015 18:37:34 +0000 (18:37 +0000)]
am
3b8b8657: am
ca19158e: am
e9a8f465: (-s ours) resolved conflicts for merge of
0287a8f6 to lmp-mr1-ub-dev
* commit '
3b8b865734cf457ffa9ff70c3f2b8bb507d1f4fb':
Increasing all emulator system image sizes
Konstantinos Menychtas [Tue, 25 Aug 2015 18:31:01 +0000 (18:31 +0000)]
am
ca19158e: am
e9a8f465: (-s ours) resolved conflicts for merge of
0287a8f6 to lmp-mr1-ub-dev
* commit '
ca19158e034d6e0f5a605698c0f303893a2b9248':
Increasing all emulator system image sizes
Konstantinos Menychtas [Tue, 25 Aug 2015 18:22:28 +0000 (18:22 +0000)]
am
e9a8f465: (-s ours) resolved conflicts for merge of
0287a8f6 to lmp-mr1-ub-dev
* commit '
e9a8f465859137ba37786031b804864205900cb4':
Increasing all emulator system image sizes
Ying Wang [Tue, 25 Aug 2015 18:21:13 +0000 (18:21 +0000)]
am
fc028e59: Dist the otatools package.
* commit '
fc028e59c2bc36297f23cdf2ee4fe9b1b60aa1cd':
Dist the otatools package.
Ying Wang [Tue, 25 Aug 2015 00:13:53 +0000 (17:13 -0700)]
Dist the otatools package.
Bug:
23495952
(cherry picked from commit
267e957373765ad1e3ce89abe61886a305277027)
Change-Id: I49fcb9fed599268a9d37de7b14280eeb65c34788
Konstantinos Menychtas [Tue, 25 Aug 2015 17:20:11 +0000 (10:20 -0700)]
resolved conflicts for merge of
0287a8f6 to lmp-mr1-ub-dev
Change-Id: I1c5e60988d95e8ee73fb4cee632750ecb69b81f5
Bart Sears [Tue, 25 Aug 2015 06:22:20 +0000 (23:22 -0700)]
Set the Security Patch level for MNC
MNC will include the security patches from the August OEM bulletin
which will have a patch date of September 1.
Bug:
23288951
Change-Id: Ia0f313bf35fa7af1efed1787006bfbb614bc8c29
Doug Zongker [Tue, 25 Aug 2015 01:20:34 +0000 (01:20 +0000)]
am
32bf3f32: add otatools-package target
* commit '
32bf3f32651ddff9ffa2168017d71ec4b151a0a9':
add otatools-package target
Doug Zongker [Fri, 22 Aug 2014 15:04:58 +0000 (08:04 -0700)]
add otatools-package target
Add a target to zip up all the otatools and releasetools, for easy
copying to the OTA builder machine.
Change-Id: I55a6d93c1de75ac936d941c0e3ae72897407f563
(cherry picked from commit
f22b0f43efbc16c548692dc239a387edda15d78f)
smain@google.com [Mon, 24 Aug 2015 16:48:53 +0000 (16:48 +0000)]
am
15bb28fc: am
ed7e864a: fix a few bugs in the studio download button behavior: - make button text always white (avoid blue on blue during hover) - revise logic to add the platform name to download button to avoid weird duplicity bug on small screens - remove the
* commit '
15bb28fc73fa30e9c7b8ee0d924c8906724809e0':
fix a few bugs in the studio download button behavior: - make button text always white (avoid blue on blue during hover) - revise logic to add the platform name to download button to avoid weird duplicity bug on small screens - remove the animation script when clicking download before agree because it reloaded the page (unkown cause) depends on: https://googleplex-android-review.git.corp.google.com/#/c/752757/
smain@google.com [Mon, 24 Aug 2015 16:41:18 +0000 (16:41 +0000)]
am
ed7e864a: fix a few bugs in the studio download button behavior: - make button text always white (avoid blue on blue during hover) - revise logic to add the platform name to download button to avoid weird duplicity bug on small screens - remove the animation scr
* commit '
ed7e864a735f004f1dbb4a2db5261855b5693913':
fix a few bugs in the studio download button behavior: - make button text always white (avoid blue on blue during hover) - revise logic to add the platform name to download button to avoid weird duplicity bug on small screens - remove the animation script when clicking download before agree because it reloaded the page (unkown cause) depends on: https://googleplex-android-review.git.corp.google.com/#/c/752757/
smain@google.com [Thu, 20 Aug 2015 00:36:57 +0000 (17:36 -0700)]
fix a few bugs in the studio download button behavior:
- make button text always white (avoid blue on blue during hover)
- revise logic to add the platform name to download button to avoid weird duplicity bug on small screens
- remove the animation script when clicking download before agree because it reloaded the page (unkown cause)
depends on: https://googleplex-android-review.git.corp.google.com/#/c/752757/
Change-Id: I1b2b4ff9c0b0cbbd34f1c77a2b736fe3425a16e4
Tao Bao [Thu, 20 Aug 2015 00:07:50 +0000 (17:07 -0700)]
sparse_img.py: Divide NONZERO blocks into groups.
For squashfs, we currently don't have a system.map. So the whole system
image will be treated as a single file. But for some unknown bug, the
updater will be killed due to OOM when writing back the patched image to
flash (observed on lenok-userdebug MEA49). Prior to getting a real fix,
we evenly divide the non-zero blocks into smaller groups (currently 1024
blocks or 4MB per group).
Bug:
23227672
Change-Id: Ifeddd8d802f01f8cd2a743a1d1217a284fb6e182
Konstantinos Menychtas [Tue, 18 Aug 2015 20:19:10 +0000 (20:19 +0000)]
am
dae79613: Increasing all emulator system image sizes
* commit '
dae79613cb4deb209d3428b108535715aa364f68':
Increasing all emulator system image sizes
Konstantinos Menychtas [Tue, 18 Aug 2015 18:35:07 +0000 (18:35 +0000)]
am
39b32b0d: am
956e4693: Increasing MIPS emulator system image size and user-data image size
* commit '
39b32b0d1f0e016ee99830e5ef4c165a7e0576ce':
Increasing MIPS emulator system image size and user-data image size
Konstantinos Menychtas [Tue, 18 Aug 2015 18:28:45 +0000 (18:28 +0000)]
am
956e4693: Increasing MIPS emulator system image size and user-data image size
* commit '
956e469327b1da4b635f20795ed48f6c36ba10d6':
Increasing MIPS emulator system image size and user-data image size
Konstantinos Menychtas [Tue, 18 Aug 2015 17:27:04 +0000 (10:27 -0700)]
Increasing all emulator system image sizes
Size increase in system image deemed necessary after build
breakage observed on lmp-mr1-dev due to lack of space on
MIPS system image.
All system image sizes updated to match the image size
values set in MNC-dev (avoid merge conflicts, future-proof
all images against similar breakage issues).
This image size increase takes moderate space on host
device and does not affect system image download size
(images are sparse but delivered compressed anyway).
Change-Id: I2bdeb10f2d98030a358a9bc4249ce23c432de5bd
Konstantinos Menychtas [Tue, 18 Aug 2015 17:14:12 +0000 (10:14 -0700)]
Increasing MIPS emulator system image size and user-data image size
Size increase taken as a precaution against recent built breakage
due to lack of space on a number of targets (e.g. x86, ARM64).
System and user-data image sizes set to match currently most common
setup for the emulator: system image: 1.25gb, user-data image 700mb.
Change-Id: I7118eb26dd78f5fa9e4f0006e15c8d47dee8e28c
Dirk Dougherty [Mon, 17 Aug 2015 00:06:12 +0000 (00:06 +0000)]
am
8ea2636c: am
6a8f88cd: adjust image placement for m hero on medium screens.
* commit '
8ea2636c190789263aaf78b89163c8e85bef3417':
adjust image placement for m hero on medium screens.
Dirk Dougherty [Sun, 16 Aug 2015 23:57:48 +0000 (23:57 +0000)]
am
6a8f88cd: adjust image placement for m hero on medium screens.
* commit '
6a8f88cdec931470256ade35ffe6b8097425e36f':
adjust image placement for m hero on medium screens.
Dirk Dougherty [Sat, 15 Aug 2015 04:18:36 +0000 (21:18 -0700)]
adjust image placement for m hero on medium screens.
Change-Id: I644837bf151549ad8dbbfb194f8e699233362933
Joe Fernandez [Thu, 13 Aug 2015 23:15:45 +0000 (23:15 +0000)]
am
a2869db8: am
71e0a80c: Merge "doc change: Add hero image for m and css for landing pages." into mnc-dev
* commit '
a2869db89eb59e57b7f0cdfc5e526d5257b95ecc':
doc change: Add hero image for m and css for landing pages.
Joe Fernandez [Thu, 13 Aug 2015 23:11:45 +0000 (23:11 +0000)]
am
71e0a80c: Merge "doc change: Add hero image for m and css for landing pages." into mnc-dev
* commit '
71e0a80c2c2fdc26bb014685eebb874aa40f782d':
doc change: Add hero image for m and css for landing pages.
Joe Fernandez [Thu, 13 Aug 2015 23:02:37 +0000 (23:02 +0000)]
Merge "doc change: Add hero image for m and css for landing pages." into mnc-dev
Dirk Dougherty [Thu, 13 Aug 2015 19:37:34 +0000 (12:37 -0700)]
doc change: Add hero image for m and css for landing pages.
Change-Id: I52ddba716eebf821f8f5dbd888d6e3519f4284d4
Chris Banes [Thu, 13 Aug 2015 17:41:38 +0000 (17:41 +0000)]
am
98c570ab: am
743938fb: Merge "Make sure only AppCompat (not it\'s tests) are in the docs" into mnc-dev
* commit '
98c570abb2baf6f1b34a2220233257ad903f1de0':
Make sure only AppCompat (not it's tests) are in the docs
Chris Banes [Thu, 13 Aug 2015 17:36:49 +0000 (17:36 +0000)]
am
743938fb: Merge "Make sure only AppCompat (not it\'s tests) are in the docs" into mnc-dev
* commit '
743938fb0d4f56d7d009486fb90891eab9b50897':
Make sure only AppCompat (not it's tests) are in the docs
Chris Banes [Thu, 13 Aug 2015 17:28:32 +0000 (17:28 +0000)]
Merge "Make sure only AppCompat (not it's tests) are in the docs" into mnc-dev
Mike Dodd [Thu, 13 Aug 2015 15:30:09 +0000 (15:30 +0000)]
am
17b06910: am
5bf35d06: Merge "Include new AOSP messaging app in base AOSP telephony builds." into mnc-dev
* commit '
17b069107654c04f0ec2cc44d54da3a44006c710':
Include new AOSP messaging app in base AOSP telephony builds.
Mike Dodd [Thu, 13 Aug 2015 15:22:44 +0000 (15:22 +0000)]
am
5bf35d06: Merge "Include new AOSP messaging app in base AOSP telephony builds." into mnc-dev
* commit '
5bf35d0685ba62ded55cc63f3dd2f23b82cc645d':
Include new AOSP messaging app in base AOSP telephony builds.
Mike Dodd [Thu, 13 Aug 2015 15:16:38 +0000 (15:16 +0000)]
Merge "Include new AOSP messaging app in base AOSP telephony builds." into mnc-dev
Chris Banes [Thu, 13 Aug 2015 08:38:12 +0000 (09:38 +0100)]
Make sure only AppCompat (not it's tests) are in the docs
BUG:
23169683
Change-Id: I6ab3b8c89eba17920f1265021c7960819e4371ab
Dianne Hackborn [Thu, 13 Aug 2015 01:02:21 +0000 (01:02 +0000)]
am
897f3ba8: am
25abc5a3: Merge "Fix issie #
23116383: Include security patch level in Settings" into mnc-dev
* commit '
897f3ba8b1cc402fca16720be345ba9c587c326b':
Fix issie #
23116383: Include security patch level in Settings
Dianne Hackborn [Thu, 13 Aug 2015 00:54:30 +0000 (00:54 +0000)]
am
25abc5a3: Merge "Fix issie #
23116383: Include security patch level in Settings" into mnc-dev
* commit '
25abc5a38e2e7f2962463aa4e5cd407ecdde689c':
Fix issie #
23116383: Include security patch level in Settings
Dianne Hackborn [Thu, 13 Aug 2015 00:46:58 +0000 (00:46 +0000)]
Merge "Fix issie #
23116383: Include security patch level in Settings" into mnc-dev
Dianne Hackborn [Wed, 12 Aug 2015 23:11:20 +0000 (16:11 -0700)]
Fix issie #
23116383: Include security patch level in Settings
Change-Id: I46303c064d1365781a2c8a05bd6087518afb2aec
Mike Dodd [Tue, 11 Aug 2015 20:14:09 +0000 (13:14 -0700)]
Include new AOSP messaging app in base AOSP telephony builds.
b/
23110861
Change-Id: I31ba32f3341c77ba6eb083a189dffa1a08c6c8d4
Ian Pedowitz [Wed, 12 Aug 2015 20:31:50 +0000 (20:31 +0000)]
am
0fd879cd: am
a0372e20: Merge "Removing VisualizationWallpapers as it does not comply with API 23 rules" into mnc-dev
* commit '
0fd879cd65f1c53c409142ca90744b1d43bdbc08':
Removing VisualizationWallpapers as it does not comply with API 23 rules
Ian Pedowitz [Wed, 12 Aug 2015 20:17:30 +0000 (20:17 +0000)]
am
a0372e20: Merge "Removing VisualizationWallpapers as it does not comply with API 23 rules" into mnc-dev
* commit '
a0372e20a24283002c2d27b372194d88e1983a3f':
Removing VisualizationWallpapers as it does not comply with API 23 rules
Ian Pedowitz [Wed, 12 Aug 2015 19:41:54 +0000 (19:41 +0000)]
Merge "Removing VisualizationWallpapers as it does not comply with API 23 rules" into mnc-dev
Mike Dodd [Wed, 12 Aug 2015 19:06:07 +0000 (19:06 +0000)]
am
09baf014: am
745d11cc: Merge "Revert "Include new AOSP messaging app in base builds."" into mnc-dev
* commit '
09baf014917b2c59e43631e7aa4d9ef0ade80ad8':
Revert "Include new AOSP messaging app in base builds."
Mike Dodd [Wed, 12 Aug 2015 18:58:59 +0000 (18:58 +0000)]
am
745d11cc: Merge "Revert "Include new AOSP messaging app in base builds."" into mnc-dev
* commit '
745d11ccd077060b5d3b0e3e53682e8c1f85dd66':
Revert "Include new AOSP messaging app in base builds."
Mike Dodd [Wed, 12 Aug 2015 18:53:47 +0000 (18:53 +0000)]
Merge "Revert "Include new AOSP messaging app in base builds."" into mnc-dev
Mike Dodd [Wed, 12 Aug 2015 18:48:45 +0000 (18:48 +0000)]
Revert "Include new AOSP messaging app in base builds."
This reverts commit
a8b0905e165448857ad45d1633c545c53bd53a5e.
Change-Id: Ia8b8eaf6576937907b073ad97593440e114c0b6f
Ian Pedowitz [Wed, 12 Aug 2015 18:11:55 +0000 (11:11 -0700)]
Removing VisualizationWallpapers as it does not comply with API 23 rules
Bug:
23021372
Change-Id: Ib985ac99bd9068c21f8a1c48e77c72426f69ea79
Mike Dodd [Wed, 12 Aug 2015 17:58:01 +0000 (17:58 +0000)]
am
d95990e6: am
02389bf9: Merge "Include new AOSP messaging app in base builds." into mnc-dev
* commit '
d95990e68568fe5df9e4d8981180d22d9f363a0f':
Include new AOSP messaging app in base builds.
Mike Dodd [Wed, 12 Aug 2015 17:49:48 +0000 (17:49 +0000)]
am
02389bf9: Merge "Include new AOSP messaging app in base builds." into mnc-dev
* commit '
02389bf940f751ffb85c8c2187a7039f0c18dad1':
Include new AOSP messaging app in base builds.
Mike Dodd [Wed, 12 Aug 2015 17:01:24 +0000 (17:01 +0000)]
Merge "Include new AOSP messaging app in base builds." into mnc-dev
Tao Bao [Wed, 12 Aug 2015 07:13:30 +0000 (07:13 +0000)]
am
a749ea4b: am
11cf92aa: am
1dca55fd: skip the merge of
67e7c661 to lmp-mr1-ub-dev
* commit '
a749ea4b47eb3b850225ddc934d4890fc5e77600':
Add support for clobbered blocks
Tao Bao [Wed, 12 Aug 2015 07:03:42 +0000 (07:03 +0000)]
am
11cf92aa: am
1dca55fd: skip the merge of
67e7c661 to lmp-mr1-ub-dev
* commit '
11cf92aa37b9f51176a2055b1ff97b6211404103':
Add support for clobbered blocks
Tao Bao [Wed, 12 Aug 2015 06:55:21 +0000 (06:55 +0000)]
am
1dca55fd: skip the merge of
67e7c661 to lmp-mr1-ub-dev
* commit '
1dca55fde512f1758690fb563f1ffc9cec5f7271':
Add support for clobbered blocks
Tao Bao [Wed, 12 Aug 2015 06:19:06 +0000 (23:19 -0700)]
skip the merge of
67e7c661 to lmp-mr1-ub-dev
The change (
007979ee) was cherry-picked from mnc-dev back to
lmp-mr1-dev. It doesn't need to flow further.
Change-Id: I0469708f1f3a0863f194a5820c7aeda4d163cbb7
Tao Bao [Wed, 12 Aug 2015 05:18:37 +0000 (05:18 +0000)]
am
007979ee: Add support for clobbered blocks
* commit '
007979ee7543a396d97b3e9ada21aca44d503597':
Add support for clobbered blocks
Tao Bao [Tue, 12 May 2015 18:42:31 +0000 (11:42 -0700)]
Add support for clobbered blocks
In ext4 filesystems, some blocks might be changed even being mounted
R/O, such as the superblock (block 0). We need to exclude such blocks
from integrity verification. Plus such blocks should always be
written to the target by copying instead of patching.
Bug: http://b/
20939131
Change-Id: If9efab3d7a0071a87b4d4297daf7963c3b818afe
(cherry picked from commit
ff7778166bd13a90c89fa333591ee2037f587a11)
Ian Pedowitz [Tue, 11 Aug 2015 22:06:16 +0000 (22:06 +0000)]
am
c055f9b5: am
e5a63158: Merge "Increasing arm(64)? emulator partition sizes to 1.5GB" into mnc-dev
* commit '
c055f9b51a67de39a2fd384d3d974b9b8566884e':
Increasing arm(64)? emulator partition sizes to 1.5GB
Ian Pedowitz [Tue, 11 Aug 2015 21:59:25 +0000 (21:59 +0000)]
am
e5a63158: Merge "Increasing arm(64)? emulator partition sizes to 1.5GB" into mnc-dev
* commit '
e5a631585a7b07c329f9ada04c99ed04b6c16b62':
Increasing arm(64)? emulator partition sizes to 1.5GB
Ian Pedowitz [Tue, 11 Aug 2015 21:54:17 +0000 (21:54 +0000)]
Merge "Increasing arm(64)? emulator partition sizes to 1.5GB" into mnc-dev
Clay Murphy [Tue, 11 Aug 2015 21:12:33 +0000 (21:12 +0000)]
am
86e510cc: am
71a33c4d: Merge "Add the ability to display annotations in the generated docs (cherry-picked from commit
87c44d8a11d6f9e94c90197e7f8adf430c949c86) Bug:
8440225 Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20" into mnc-dev
* commit '
86e510cc313a464870ff82a9cd7f7206ea4aeb63':
Add the ability to display annotations in the generated docs (cherry-picked from commit
87c44d8a11d6f9e94c90197e7f8adf430c949c86) Bug:
8440225 Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20
Clay Murphy [Tue, 11 Aug 2015 21:04:24 +0000 (21:04 +0000)]
am
71a33c4d: Merge "Add the ability to display annotations in the generated docs (cherry-picked from commit
87c44d8a11d6f9e94c90197e7f8adf430c949c86) Bug:
8440225 Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20" into mnc-dev
* commit '
71a33c4d5b010757423980b90681445ca2bb2be0':
Add the ability to display annotations in the generated docs (cherry-picked from commit
87c44d8a11d6f9e94c90197e7f8adf430c949c86) Bug:
8440225 Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20
Clay Murphy [Tue, 11 Aug 2015 20:55:24 +0000 (20:55 +0000)]
Merge "Add the ability to display annotations in the generated docs (cherry-picked from commit
87c44d8a11d6f9e94c90197e7f8adf430c949c86) Bug:
8440225 Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20" into mnc-dev