Commit Graph

28272 Commits

Author SHA1 Message Date
Joe Fernandez a067357b5a docs: Instant Apps - enable TOC and navigation for navigation am: f38a01d800
am: 84a8735017

* commit '84a873501701f7846c09b4bff604e65c2c38a9bd':
  docs: Instant Apps - enable TOC and navigation for navigation

Change-Id: I9b9974a0e180139dccea8867f3675473b95ba5be
2016-05-13 23:45:57 +00:00
Joe Fernandez 84a8735017 docs: Instant Apps - enable TOC and navigation for navigation
am: f38a01d800

* commit 'f38a01d800b05187db6515527df919a1a8dec6f5':
  docs: Instant Apps - enable TOC and navigation for navigation

Change-Id: I1b05ae4d00f7ac446274978dc6f32fa98c804d81
2016-05-13 23:43:22 +00:00
Joe Fernandez f38a01d800 docs: Instant Apps - enable TOC and navigation for navigation
Change-Id: I7a259da8618f090a8146d4f42608ebc8baf73af1
2016-05-13 16:15:22 -07:00
Tao Bao fb9e214b8c DO NOT MERGE rangelib.py: Fix the bug in monotonic check. am: 16536a53a0 am: 801dc8925f
am: cb5268ef2e  -s ours

* commit 'cb5268ef2e77073d76847eef6391683a3c288121':
  DO NOT MERGE rangelib.py: Fix the bug in monotonic check.

Change-Id: Ic47389e443ebe2aa91953082dd47ed9119f2f5a6
2016-05-13 22:44:16 +00:00
Tao Bao cb5268ef2e DO NOT MERGE rangelib.py: Fix the bug in monotonic check. am: 16536a53a0
am: 801dc8925f

* commit '801dc8925fcc148f438ceca751b2c14a853bece7':
  DO NOT MERGE rangelib.py: Fix the bug in monotonic check.

Change-Id: I98966afb7be0c91d4985985a5abd05fee05e0d8f
2016-05-13 22:41:42 +00:00
Tao Bao 801dc8925f DO NOT MERGE rangelib.py: Fix the bug in monotonic check.
am: 16536a53a0

* commit '16536a53a057778240b1a3a923b5dde31b79bd90':
  DO NOT MERGE rangelib.py: Fix the bug in monotonic check.

Change-Id: I07d7bf9a34dabd3646f341427d9f53a74e9e8fc9
2016-05-13 22:39:07 +00:00
Tao Bao 16536a53a0 DO NOT MERGE rangelib.py: Fix the bug in monotonic check.
RangeSet("2-10").monotonic gives a wrong result of "False". Fix the bug
and add more tests into test_rangelib.py.

Bug: 28760775
Change-Id: I04780571b45ecafd34040f405756b9745a9e21a5
(cherry picked from commit e8f756137c)
2016-05-13 15:21:26 -07:00
Tianjie Xu f042baf4cc Merge "DO NOT MERGE Monotonic flag sets incorrectly in rangelib" into mnc-dr1.5-dev
am: b0c6b7d072  -s ours

* commit 'b0c6b7d0722917a66aa4338e4f2b258cd221a4be':
  DO NOT MERGE Monotonic flag sets incorrectly in rangelib

Change-Id: I2b969467e56cc9c6197a181545276f75d5188bca
2016-05-13 18:18:57 +00:00
Tianjie Xu fe740bacea DO NOT MERGE Monotonic flag sets incorrectly in rangelib am: 8d11597558 am: 8ae473d182
am: 9e337ed21c  -s ours

* commit '9e337ed21ceb8c31aaafdae67ecaa1a7c7451a47':
  DO NOT MERGE Monotonic flag sets incorrectly in rangelib

Change-Id: I810854509e0fadd4e96ccf5b69c8c17fd29f9226
2016-05-13 18:13:24 +00:00
Baligh Uddin b0c6b7d072 Merge "DO NOT MERGE Monotonic flag sets incorrectly in rangelib" into mnc-dr1.5-dev 2016-05-13 18:11:11 +00:00
Tianjie Xu 9e337ed21c DO NOT MERGE Monotonic flag sets incorrectly in rangelib am: 8d11597558
am: 8ae473d182

* commit '8ae473d18280e25d010c040147393a3b1e3bbc75':
  DO NOT MERGE Monotonic flag sets incorrectly in rangelib

Change-Id: Ibbed631ec32f00f026bdcf4af8a9a1213d87b4e5
2016-05-13 18:10:55 +00:00
Tianjie Xu 8ae473d182 DO NOT MERGE Monotonic flag sets incorrectly in rangelib
am: 8d11597558

* commit '8d1159755849ffcc1bd5c0de2821a4f5fe4ea58d':
  DO NOT MERGE Monotonic flag sets incorrectly in rangelib

Change-Id: Ie0180bab1d41d86d3d2c3f14501b51b50f74635e
2016-05-13 18:08:12 +00:00
Tianjie Xu 245c155394 DO NOT MERGE Monotonic flag sets incorrectly in rangelib
After applying update_target_files_incr_ext4.sh, some files may end up
occupying unsorted block fragments. In one example, an apk file has the
block range [258768-259211,196604]. The monotonic flag in rangelib sets
incorrectly for this example and leads to a bad input file for imgdiff.
After fixing the flag, bsdiff is called instead of imgdiff and the
incremental OTA package generates successfully.

Bug: 28760775
Bug: 28053885
Change-Id: Ib841bf449ff6a29314fc4a1b8fba941a6dc532ac
(cherry picked from commit cd1e16a761)
(cherry picked from commit 8d11597558)
2016-05-13 18:08:00 +00:00
Tianjie Xu 8d11597558 DO NOT MERGE Monotonic flag sets incorrectly in rangelib
After applying update_target_files_incr_ext4.sh, some files may end up
occupying unsorted block fragments. In one example, an apk file has the
block range [258768-259211,196604]. The monotonic flag in rangelib sets
incorrectly for this example and leads to a bad input file for imgdiff.
After fixing the flag, bsdiff is called instead of imgdiff and the
incremental OTA package generates successfully.

Bug: 28760775
Bug: 28053885
Change-Id: Ib841bf449ff6a29314fc4a1b8fba941a6dc532ac
(cherry picked from commit cd1e16a761)
2016-05-13 10:49:02 -07:00
Baligh Uddin 53380a8386 DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev am: f193546d65 -s ours am: d28e7ea333 -s ours am: e038da17f3 -s ours am: e3b631a5d6 -s ours am: 7e806813bb -s ours am: e20dd6dca2 -s ours
am: 63847c39a6  -s ours

* commit '63847c39a64e7ab0a5e8564d887864c02a7ba2a5':
  DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev

Change-Id: I289fc7b1d9ef94d6a298cfbd64ee6f66e8790b64
2016-05-12 23:19:56 +00:00
Baligh Uddin 63847c39a6 DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev am: f193546d65 -s ours am: d28e7ea333 -s ours am: e038da17f3 -s ours am: e3b631a5d6 -s ours am: 7e806813bb -s ours
am: e20dd6dca2  -s ours

* commit 'e20dd6dca20231b7e68f3a8874bccedc1e56c40f':
  DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev

Change-Id: I7391006c948be8188b8b197c1e318b76a826155a
2016-05-12 23:17:37 +00:00
Baligh Uddin e20dd6dca2 DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev am: f193546d65 -s ours am: d28e7ea333 -s ours am: e038da17f3 -s ours am: e3b631a5d6 -s ours
am: 7e806813bb  -s ours

* commit '7e806813bb0c3df85c69aaa78a21d0d5dac7e92b':
  DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev

Change-Id: Ic99ba9bb2041840402829b1d2e75684bfbeb66f2
2016-05-12 23:15:18 +00:00
Baligh Uddin 7e806813bb DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev am: f193546d65 -s ours am: d28e7ea333 -s ours am: e038da17f3 -s ours
am: e3b631a5d6  -s ours

* commit 'e3b631a5d62923a381bf0ecb151a1ec9c584380c':
  DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev

Change-Id: I7f17e328de62c50087bc6d2acf3d8c17f5fb541f
2016-05-12 23:12:59 +00:00
Baligh Uddin e3b631a5d6 DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev am: f193546d65 -s ours am: d28e7ea333 -s ours
am: e038da17f3  -s ours

* commit 'e038da17f38eac01e6c971d9f5956ea701a341e2':
  DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev

Change-Id: Ice12c95006ab0b10fa2d2a6413925001249564d8
2016-05-12 23:10:35 +00:00
Baligh Uddin e038da17f3 DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev am: f193546d65 -s ours
am: d28e7ea333  -s ours

* commit 'd28e7ea333986fe820f19f2b34dec074f3b8bc22':
  DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev

Change-Id: I65fd87879662e05d3906d530d5cba3e0d313990c
2016-05-12 23:08:02 +00:00
Baligh Uddin d28e7ea333 DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev
am: f193546d65  -s ours

* commit 'f193546d65d41d40bd0e24e9bfe443001a320d1a':
  DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev

Change-Id: I3fe077a1b75e67963cfbcc7430912afd5143d418
2016-05-12 23:05:19 +00:00
Baligh Uddin f193546d65 DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev
Bug: 23967152
Change-Id: I2e2f1ead28f51f549dafacfc7d1d1e65b0b84bc7
2016-05-12 15:55:26 -07:00
Ian Pedowitz 77df46efec Merge "PLATFORM_PREVIEW_SDK_VERSION == 4 for DP4" into nyc-dev 2016-05-12 18:58:17 +00:00
Amanda Kassay b6a7250084 Removing commented out deprecated download links in sdkpage.cs am: eefc7d441c am: 7387b5861b
am: 494e80cabc

* commit '494e80cabcec97f4052ca15bd1eb8968e7910c35':
  Removing commented out deprecated download links in sdkpage.cs

Change-Id: I332c0b7c12686e868fe24404aecc8966cdcf6f5d
2016-05-12 18:32:29 +00:00
Amanda Kassay 494e80cabc Removing commented out deprecated download links in sdkpage.cs am: eefc7d441c
am: 7387b5861b

* commit '7387b5861b61d22a0c2edffb10611284a6d8fa0b':
  Removing commented out deprecated download links in sdkpage.cs

Change-Id: I40bb1b50cc1d49dd3113e8511b8fa744acdf27b5
2016-05-12 18:29:57 +00:00
Amanda Kassay 7387b5861b Removing commented out deprecated download links in sdkpage.cs
am: eefc7d441c

* commit 'eefc7d441c2c3b235fdae71853921dffff6da755':
  Removing commented out deprecated download links in sdkpage.cs

Change-Id: I95145f9fb614fc875fcffbccfa24f176160138f7
2016-05-12 18:27:28 +00:00
Amanda Kassay eefc7d441c Removing commented out deprecated download links in sdkpage.cs
Change-Id: Iad26e72120b110fa017821be887de0cd07b3889a
2016-05-12 14:17:41 -04:00
Ian Pedowitz 8313541c65 PLATFORM_PREVIEW_SDK_VERSION == 4 for DP4
Bug: 27150977
Change-Id: I0958ee2cc377c5640c616dab8f093323ffd76c29
2016-05-12 10:39:59 -07:00
Joe Fernandez 5b61e4cb61 docs: Wear Preview - TOC and Resource card fixes for DoDS am: 151592490e
am: 10719438d6

* commit '10719438d6faaa1fea500057e211b2d88faf6d74':
  docs: Wear Preview - TOC and Resource card fixes for DoDS

Change-Id: If17971766425bc5fbba0e9860d611ea043d6b8dd
2016-05-12 06:34:58 +00:00
Joe Fernandez 10719438d6 docs: Wear Preview - TOC and Resource card fixes for DoDS
am: 151592490e

* commit '151592490e22253eeb5355bd2861c56c80ecf437':
  docs: Wear Preview - TOC and Resource card fixes for DoDS

Change-Id: I2e8521069969baaa1696adbef2f4cb901b636fb9
2016-05-12 06:32:49 +00:00
Joe Fernandez 151592490e docs: Wear Preview - TOC and Resource card fixes for DoDS
b/28004352

Change-Id: Iff222f71508c21e0b35a3d41c846c062755605cd
2016-05-11 23:07:26 -07:00
Baligh Uddin 1e516a7ecf DO NOT MERGE ANYWHERE - Add verifiedboot keys to otatoools.zip. am: 16690162c3 -s ours
am: 1ae509ad7b  -s ours

* commit '1ae509ad7bd3efaea1e66292f25faa63d27e756d':
  DO NOT MERGE ANYWHERE - Add verifiedboot keys to otatoools.zip.

Change-Id: I9bebf65953a49a48bfd17373d6fd4bc749a9e764
2016-05-11 23:42:40 +00:00
Baligh Uddin 1ae509ad7b DO NOT MERGE ANYWHERE - Add verifiedboot keys to otatoools.zip.
am: 16690162c3  -s ours

* commit '16690162c3eac9a40824c400822cb7023414a75b':
  DO NOT MERGE ANYWHERE - Add verifiedboot keys to otatoools.zip.

Change-Id: I299c80c92c58cd11f7f7914942728956c896cf50
2016-05-11 23:39:21 +00:00
Baligh Uddin 16690162c3 DO NOT MERGE ANYWHERE - Add verifiedboot keys to otatoools.zip.
This is needed for nemo* signing off emerald-dev.

Bug: 28726512
2016-05-11 16:32:17 -07:00
Alex Klyubin f59ad14c1f Fix handling of version codes in minSdkVersion when signing.
The APK signing tool, build/tools/signapk, needs to know the API Level
of the oldest platform supported by the APK. The APK's minSdkVersion
may reference that using a number (API Level) or a version code. To
handle the version code case, the existing logic was to see if it
matches $PLATFORM_VERSION_CODENAME and then substitute it with
$PLATFORM_SDK_VERSION.

However, some platforms support multiple version codes. To handle this
scenario, this commit changes the logic for computing the min API
Level for signing purposes to treat any non-numeric minSdkVersion as
$PLATFORM_SDK_VERSION.

Bug: 28715556
Change-Id: I292c96e8928b7e2f8d9716ef2be33a23a87764c4
2016-05-11 12:11:11 -07:00
smain@google.com aae9e8b623 Merge "remove silly css hack that\'s no longer needed in the new site design, but which now actually causes layout problems." into mnc-mr-docs am: 547111f16c am: 1db6c2f315
am: 9594b9991f

* commit '9594b9991f78e9891b530eccdb5c72c0e7343c75':
  remove silly css hack that's no longer needed in the new site design, but which now actually causes layout problems.

Change-Id: I91789079b83a42ab562bf1be84c6313c47185d3a
2016-05-11 17:43:36 +00:00
Scott Main 9594b9991f Merge "remove silly css hack that\'s no longer needed in the new site design, but which now actually causes layout problems." into mnc-mr-docs am: 547111f16c
am: 1db6c2f315

* commit '1db6c2f315c5bb4068325eb2f431a36c8d3c14ba':
  remove silly css hack that's no longer needed in the new site design, but which now actually causes layout problems.

Change-Id: I050f42c42fd200ce4b6613945ffdc3a92f9fd0a9
2016-05-11 17:40:36 +00:00
Dirk Dougherty 03d6d05559 Custom data names for reference extensions. am: ceb4a59409 am: c72ec756c2
am: a890553c51

* commit 'a890553c5137284a136f9391db78a0a2aa527c18':
  Custom data names for reference extensions.

Change-Id: I5cb49898b977dbabba014aff5c45f5d902d719c1
2016-05-11 17:37:46 +00:00
smain@google.com 1db6c2f315 Merge "remove silly css hack that\'s no longer needed in the new site design, but which now actually causes layout problems." into mnc-mr-docs
am: 547111f16c

* commit '547111f16c6ee7418a20a9ef1f4e7d34e524d440':
  remove silly css hack that's no longer needed in the new site design, but which now actually causes layout problems.

Change-Id: I4256cbf5f4cfe5187d7f5b58d7c0315c9d89ca27
2016-05-11 17:37:45 +00:00
Dirk Dougherty a890553c51 Custom data names for reference extensions. am: ceb4a59409
am: c72ec756c2

* commit 'c72ec756c27ccd0cde5e80a7242d3809398be19d':
  Custom data names for reference extensions.

Change-Id: If1ac0af6c4f0a78295fec643e5c1352f2597271b
2016-05-11 17:34:56 +00:00
Scott Main 547111f16c Merge "remove silly css hack that's no longer needed in the new site design, but which now actually causes layout problems." into mnc-mr-docs 2016-05-11 17:34:29 +00:00
Dirk Dougherty c72ec756c2 Custom data names for reference extensions.
am: ceb4a59409

* commit 'ceb4a5940959248284af443971d831f8be5d1312':
  Custom data names for reference extensions.

Change-Id: Ic3ffd1044067e3328709441234621c0e62677a13
2016-05-11 17:32:16 +00:00
smain@google.com 0be54fdd34 remove silly css hack that's no longer needed in the new site design,
but which now actually causes layout problems.

Change-Id: I27859f6103ea0538442b22cd67b64d970d831d93
2016-05-11 10:17:42 -07:00
Nicholas Sauer 40ef6697be Merge "Add org.apache.harmony.tests.javax.xml to old cts" into nyc-dev 2016-05-11 14:35:15 +00:00
Dirk Dougherty ceb4a59409 Custom data names for reference extensions.
Change-Id: I55088a1ddb40fc3648dc8b983c94330084bb65f1
2016-05-10 20:28:58 -07:00
Dirk Dougherty 6598f78068 For reference extension builds, update book_path to reference the appropriate file location. am: 8dbd7b96cf am: ce46b86219
am: 1d2dbfe4f5

* commit '1d2dbfe4f5d929d5c671a1d73ec38d8246b1b17a':
  For reference extension builds, update book_path to reference the appropriate file location.

Change-Id: Id5ddec169d92b36f05a1d29b189b92f74396acb5
2016-05-11 02:01:49 +00:00
Dirk Dougherty 1d2dbfe4f5 For reference extension builds, update book_path to reference the appropriate file location. am: 8dbd7b96cf
am: ce46b86219

* commit 'ce46b86219b973a5f90d16e5e59073952ef01519':
  For reference extension builds, update book_path to reference the appropriate file location.

Change-Id: Icc7e68ec871661b3d2824452a4c12b24f9a83aee
2016-05-11 01:58:57 +00:00
Dirk Dougherty ce46b86219 For reference extension builds, update book_path to reference the appropriate file location.
am: 8dbd7b96cf

* commit '8dbd7b96cfd667866f992d8bf5252eb8bef29ccc':
  For reference extension builds, update book_path to reference the appropriate file location.

Change-Id: I2555dee5e78998d8e042cfe22c45d9dadd469149
2016-05-11 01:56:11 +00:00
Dirk Dougherty 8dbd7b96cf For reference extension builds, update book_path to reference the appropriate file location.
Change-Id: I1eab8fcde8348e7cd7efa90c5c1768b1103e5b97
2016-05-10 17:56:19 -07:00
Nicholas Sauer 088230cb34 Add org.apache.harmony.tests.javax.xml to old cts
bug: 28556024
Change-Id: I7903ce93f27aef55f55acc9231e631d11a463f1b
2016-05-10 12:54:32 -07:00