OSDN Git Service
Mohamad Ayyash [Wed, 15 Jun 2016 16:58:36 +0000 (16:58 +0000)]
Merge \"Pass block_list param to mksquashfs\" into nyc-dev
am:
3bddf74752
Change-Id: I713c6a60d10ef1e85475e462bb34c89751f74e7d
Tao Bao [Wed, 15 Jun 2016 16:58:35 +0000 (16:58 +0000)]
Merge \"releasetools: Disable using imgdiff for squashfs.\" into nyc-dev
am:
a8d3741f1a
Change-Id: Iec58dd45df569d4c558ed0114b576db0f5cb101a
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
Jeff Hao [Tue, 14 Jun 2016 02:15:40 +0000 (02:15 +0000)]
Skip uses-library check for preopted apps.
am:
b00263f96a
Change-Id: I216faedc383fa289df564ba73e7ae093dad1517c
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
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>
Tao Bao [Mon, 13 Jun 2016 16:43:44 +0000 (16:43 +0000)]
Merge "Track the name change for wipe_ab." into nyc-mr1-dev
Tianjie Xu [Fri, 10 Jun 2016 17:30:29 +0000 (17:30 +0000)]
Add build.version.incremental to metadata
am:
d06f07eef4
Change-Id: Id13fbae7fdc6232cd44b8a3cceba0d936a890f92
Tao Bao [Fri, 10 Jun 2016 17:11:54 +0000 (10:11 -0700)]
Track the name change for wipe_ab.
Bug:
27253717
Change-Id: I0d4c91e99267afdc4846ea50e602a2383898b9b4
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
Vineeta Srivastava [Thu, 9 Jun 2016 18:11:43 +0000 (11:11 -0700)]
Whitelist verizon as local module owner.
Change-Id: I807ac61688e6f5862de521e3c9b960dd64eed1f6
Ian Pedowitz [Wed, 8 Jun 2016 03:24:13 +0000 (20:24 -0700)]
Revert "Removing N from PLATFORM_VERSION_ALL_CODENAMES"
This reverts commit
5fcdec083edf0eb3cbc8cdf05626d1713df677f1.
Bug:
29194920
Bug:
28809789
Ian Pedowitz [Wed, 8 Jun 2016 03:09:44 +0000 (03:09 +0000)]
Merge \"Removing N from PLATFORM_VERSION_ALL_CODENAMES\" into nyc-dev
am:
ddc0c5e0a0
Change-Id: I9c08a086b508b78ddecc53e0aae08d25460f0595
Ian Pedowitz [Wed, 8 Jun 2016 03:05:39 +0000 (03:05 +0000)]
Merge "Removing N from PLATFORM_VERSION_ALL_CODENAMES" into nyc-dev
Gustav Sennton [Tue, 7 Jun 2016 16:32:33 +0000 (16:32 +0000)]
Merge "Add variable PRODUCT_SHIPPING_API_LEVEL." into nyc-dev
am:
837b86aa56
* commit '
837b86aa5696fea28a0acfde7361a3c5d5824624':
Add variable PRODUCT_SHIPPING_API_LEVEL.
Change-Id: I8beb5632ed9db8cade04bf8792b5874f761c039e
Gustav Sennton [Tue, 7 Jun 2016 16:21:15 +0000 (16:21 +0000)]
Merge "Add variable PRODUCT_SHIPPING_API_LEVEL." into nyc-dev
Ian Pedowitz [Mon, 6 Jun 2016 17:27:28 +0000 (10:27 -0700)]
resolve merge conflicts of
7a50757 to nyc-mr1-dev
Change-Id: Ia2ef0a8289d53f9eac47e42336a1fd5f01124a57
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 15:23:22 +0000 (15:23 +0000)]
Merge "Add default values for pm.dexopt.core-app." into nyc-dev
am:
da147a7c20
* commit '
da147a7c20bf73f9b3736f6c479f3a8f3f56ab9e':
Add default values for pm.dexopt.core-app.
Change-Id: I11b1338f33e7e1bb99341e086bd6bcd7fb5f47f9
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
Ian Pedowitz [Fri, 3 Jun 2016 19:33:43 +0000 (12:33 -0700)]
resolve merge conflicts of
f2304ce to nyc-mr1-dev
Change-Id: I0a2777aaf06ab70a1b0dfe96ff6ba6b165b0101b
Ian Pedowitz [Fri, 3 Jun 2016 18:11:03 +0000 (18:11 +0000)]
Merge "Revert "Revert "Setting PLATFORM_VERSION(_CODENAME)? to NMR1""" into nyc-mr1-dev
Ian Pedowitz [Tue, 31 May 2016 22:32:31 +0000 (15:32 -0700)]
NYC is now REL
PLATFORM_VERSION_ALL_CODENAMES needs to include N for now
Bug:
28810934
Bug:
29117805
Change-Id: Ibf44e1e02077e7830d9bf92b87fb8ccae029c121
Gustav Sennton [Fri, 27 May 2016 13:07:54 +0000 (14:07 +0100)]
Add variable PRODUCT_SHIPPING_API_LEVEL.
PRODUCT_SHIPPING_API_LEVEL declares which API level a device first
shipped with.
We use this variable to set a read-only property that can be used in
CTS/GTS tests.
Bug:
26381401
Change-Id: I9dfeaf423146c35f57e69ac26c27e8a9e205bc4f
Tao Bao [Thu, 2 Jun 2016 21:46:07 +0000 (21:46 +0000)]
Merge "Add support for TARGET_RECOVERY_BRICK." into nyc-mr1-dev
Narayan Kamath [Thu, 2 Jun 2016 15:34:37 +0000 (16:34 +0100)]
Add default values for pm.dexopt.core-app.
bug:
28998083
Change-Id: Iec4415ad7e5122c1168024f6ccf39b5e342cc7fd
Daniel Micay [Thu, 2 Jun 2016 02:05:15 +0000 (02:05 +0000)]
disable unpriv perf by default in user{,debug} builds
am:
888a623881
* commit '
888a6238810b4c3c00108cb92f9755e74acd9ecf':
disable unpriv perf by default in user{,debug} builds
Change-Id: Ifd28052fe19232461afe26bbde7be42f7f11d9fb
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
fe01f56c0d5c42508e1e82f5976e4c10bb00f632)
Bug:
29054680
Change-Id: If04bc63fc366006cde842a50b7c764f89d7449a6
Tao Bao [Wed, 1 Jun 2016 06:56:23 +0000 (23:56 -0700)]
Add support for TARGET_RECOVERY_BRICK.
TARGET_RECOVERY_BRICK specifies the file that lists all the partitions
to be bricked under recovery. The file, if present, will be copied to
'$(TARGET_RECOVERY_ROOT_OUT)/etc/recovery.brick'.
Bug:
27253717
Change-Id: Id84195b5ee1031a83bf7a077be070a3728416580
Ian Pedowitz [Tue, 31 May 2016 22:38:00 +0000 (22:38 +0000)]
Revert "Revert "Setting PLATFORM_VERSION(_CODENAME)? to NMR1""
This reverts commit
295ad1f1f160e229417d604e62483e1871f20f4a.
Bug:
28713307
Change-Id: Icd4d48f54840cd831780e11386a74c3e1c5ae370
Lance Chang [Sat, 28 May 2016 18:43:57 +0000 (18:43 +0000)]
Merge "Add build number to apps\' version name for non-platform build" into nyc-dev
am:
1059f37377
* commit '
1059f37377fd37cc311db522b4b5689086480d17':
Add build number to apps' version name for non-platform build
Change-Id: Ib3cbad8f4a242341319b9c3dbe0322588d63b4ea
Lance Jin-woong Chang [Sat, 28 May 2016 18:28:39 +0000 (18:28 +0000)]
Merge "Add build number to apps' version name for non-platform build" into nyc-dev
Baligh Uddin [Fri, 27 May 2016 23:48:04 +0000 (23:48 +0000)]
Add system/extras/verity/build_verity_metadata.py to otatools am:
e718501021 am:
5d77e7e0c1 am:
9f527d5222
am:
b4e6eb0e56
* commit '
b4e6eb0e56d125321b7f5ae0141b24f7b0f4e8d7':
Add system/extras/verity/build_verity_metadata.py to otatools
Change-Id: I55e28a9f7152c9ad8596386e50750fc3ed64bbe1
Baligh Uddin [Fri, 27 May 2016 23:45:56 +0000 (23:45 +0000)]
Add system/extras/verity/build_verity_metadata.py to otatools am:
e718501021 am:
5d77e7e0c1
am:
9f527d5222
* commit '
9f527d52229c973fddd94b926b803a6be68ae440':
Add system/extras/verity/build_verity_metadata.py to otatools
Change-Id: Ie7d8b7401ee58ace28a089f97eeb4bc00c43c100
Baligh Uddin [Fri, 27 May 2016 23:42:55 +0000 (23:42 +0000)]
Add system/extras/verity/build_verity_metadata.py to otatools am:
e718501021
am:
5d77e7e0c1
* commit '
5d77e7e0c1425c8d1ed60dd5425267ce79ef4648':
Add system/extras/verity/build_verity_metadata.py to otatools
Change-Id: I6a242bbdf47b588064c94b90f47ffdd5dabef1cc
Baligh Uddin [Fri, 27 May 2016 23:40:04 +0000 (23:40 +0000)]
DO NOT MERGE ANYWHERE - am:
442ae0fe5c -s ours am:
a21a89051e -s ours am:
88582dfa7b -s ours
am:
3200f49a5c -s ours
* commit '
3200f49a5cff8be4ee699e08d97db7e6facd5fb0':
DO NOT MERGE ANYWHERE -
Change-Id: I5c84dbeb236627b6858edfece00e4d67f3f2fa64
Baligh Uddin [Fri, 27 May 2016 23:40:02 +0000 (23:40 +0000)]
Add system/extras/verity/build_verity_metadata.py to otatools
am:
e718501021
* commit '
e718501021dd039875745d3ff829341c2bb05248':
Add system/extras/verity/build_verity_metadata.py to otatools
Change-Id: I25d3edc76e97f1249768bd9e9bbbecdf8fc5fe79
Baligh Uddin [Fri, 27 May 2016 23:37:47 +0000 (23:37 +0000)]
DO NOT MERGE ANYWHERE - am:
442ae0fe5c -s ours am:
a21a89051e -s ours
am:
88582dfa7b -s ours
* commit '
88582dfa7bb9be8e87b091a7fa705b6669390f8d':
DO NOT MERGE ANYWHERE -
Change-Id: Ia1ead07bfb9a89d85de883ca25c403a7b8d18042
Baligh Uddin [Fri, 27 May 2016 23:34:54 +0000 (23:34 +0000)]
DO NOT MERGE ANYWHERE - am:
442ae0fe5c -s ours
am:
a21a89051e -s ours
* commit '
a21a89051e1b4fdef4aa06f7d17f188d6fbcefe6':
DO NOT MERGE ANYWHERE -
Change-Id: I647de52990f81a5a713f1cdd6064dd4a853144d5
Baligh Uddin [Fri, 27 May 2016 23:32:09 +0000 (23:32 +0000)]
DO NOT MERGE ANYWHERE -
am:
442ae0fe5c -s ours
* commit '
442ae0fe5c76ddabe52e595689a86838820ecbf1':
DO NOT MERGE ANYWHERE -
Change-Id: I5bbd69cd7d85e3b4257d365efe07c38586d45433
Baligh Uddin [Fri, 27 May 2016 23:28:36 +0000 (16:28 -0700)]
Add system/extras/verity/build_verity_metadata.py to otatools
Bug:
29008004
Baligh Uddin [Fri, 27 May 2016 23:19:57 +0000 (23:19 +0000)]
DO NOT MERGE ANYWHERE -
Broke the build in mnc-dr-dev
Revert "Add system/extras/verity/build_verity_metadata.py to otatools"
Bug:
29008004
This reverts commit
d26a99c3c6903c02c5435ec5f0123f057527b0a9.
Change-Id: Ic56a3d382a48a68f6c6f97684c045ec943be1423
Baligh Uddin [Fri, 27 May 2016 22:52:42 +0000 (22:52 +0000)]
Add system/extras/verity/build_verity_metadata.py to otatools am:
d26a99c3c6 am:
1e7c1290c6 am:
b25a7f38a8
am:
b637cb2e99
* commit '
b637cb2e996febbab295b83af8176ec39b864186':
Add system/extras/verity/build_verity_metadata.py to otatools
Change-Id: Id9010ec71abb8f7db351914e2f99eec5e62f6f81
Baligh Uddin [Fri, 27 May 2016 22:43:20 +0000 (22:43 +0000)]
Add system/extras/verity/build_verity_metadata.py to otatools am:
d26a99c3c6 am:
1e7c1290c6
am:
b25a7f38a8
* commit '
b25a7f38a876ee2f9acd90123021401ce73d3aac':
Add system/extras/verity/build_verity_metadata.py to otatools
Change-Id: I44dd9e4662d3c4b87545f278f7b22c9535b06356
Baligh Uddin [Fri, 27 May 2016 22:40:22 +0000 (22:40 +0000)]
Add system/extras/verity/build_verity_metadata.py to otatools am:
d26a99c3c6
am:
1e7c1290c6
* commit '
1e7c1290c68263c727d20cdfffa845fea0fdc4b1':
Add system/extras/verity/build_verity_metadata.py to otatools
Change-Id: Ic2f9e99d76369335edc481e6f13316bb99107e8d
Baligh Uddin [Fri, 27 May 2016 22:37:29 +0000 (22:37 +0000)]
Add system/extras/verity/build_verity_metadata.py to otatools
am:
d26a99c3c6
* commit '
d26a99c3c6903c02c5435ec5f0123f057527b0a9':
Add system/extras/verity/build_verity_metadata.py to otatools
Change-Id: I94f04639338cdb961f3c378b12b8778c89fed232
Baligh Uddin [Fri, 27 May 2016 21:59:48 +0000 (14:59 -0700)]
Add system/extras/verity/build_verity_metadata.py to otatools
Bug:
29008004
Bjoern Johansson [Fri, 27 May 2016 17:26:22 +0000 (17:26 +0000)]
Merge "Remove Dev Settings app from emulator images" into nyc-dev
am:
4f2f58791f
* commit '
4f2f58791f31a66a61865e6c6095a2113609577a':
Remove Dev Settings app from emulator images
Change-Id: I4c7e6621f647c57e43db3368cb28eb4688544263
Bjoern Johansson [Fri, 27 May 2016 17:19:12 +0000 (17:19 +0000)]
Merge "Remove Dev Settings app from emulator images" into nyc-dev
Badhri Jagan Sridharan [Fri, 27 May 2016 15:46:05 +0000 (15:46 +0000)]
Merge "Extract public key ID from cert" into nyc-mr1-dev
Dirk Dougherty [Fri, 27 May 2016 00:54:18 +0000 (00:54 +0000)]
Fix improper date reference in blog reader. am:
2732bb762a am:
0f6d425804 am:
53cd365b2d
am:
a5bce98621
* commit '
a5bce98621ef4aa7632ead4de267118f4832d6c2':
Fix improper date reference in blog reader.
Change-Id: I2538657326e83df01099859a463dc23a4b1abd96
Badhri Jagan Sridharan [Sat, 30 Apr 2016 01:20:13 +0000 (18:20 -0700)]
Extract public key ID from cert
Extracts keyid inline using openssl commands.
The keyid is passed as one of the kernel command line parameters
for the dm-android-verity module to mount root fs(system)
with verity enabled.
BUG:
28384658
Change-Id: I8efbe1b0e415ef1d396f9b51cfa4b3fa01b22484
Dirk Dougherty [Thu, 26 May 2016 23:49:38 +0000 (23:49 +0000)]
Fix improper date reference in blog reader. am:
2732bb762a am:
0f6d425804
am:
53cd365b2d
* commit '
53cd365b2d2c2b074d628147a8a382275075bd1d':
Fix improper date reference in blog reader.
Change-Id: I300892c3c4439354917872839c18e4c029160df1
Dirk Dougherty [Thu, 26 May 2016 23:46:18 +0000 (23:46 +0000)]
Fix improper date reference in blog reader. am:
2732bb762a
am:
0f6d425804
* commit '
0f6d425804d7fd60dc82b9fe0c4ce585aa9e5eed':
Fix improper date reference in blog reader.
Change-Id: I9641b21d8841f2847836c691eba8bfb89497417d
Dirk Dougherty [Thu, 26 May 2016 23:43:35 +0000 (23:43 +0000)]
Fix improper date reference in blog reader.
am:
2732bb762a
* commit '
2732bb762a00828f36bda77c43c7fd14c7495cde':
Fix improper date reference in blog reader.
Change-Id: I5ff0d1d2b16ae712b6e92ef64c023574d2e7bfe5
Dirk Dougherty [Thu, 26 May 2016 20:05:10 +0000 (13:05 -0700)]
Fix improper date reference in blog reader.
Change-Id: I9f1a32a68da2d21ea02b95df8cd7dfc4396a445f
Lance Chang [Thu, 26 May 2016 19:32:30 +0000 (12:32 -0700)]
Add build number to apps' version name for non-platform build
If TARGET_BUILD_WITH_APPS_VERSION_NAME is defined, the build system
will add build number to the apps' default version name.
Bug:
28982976
Change-Id: I536f273b557fe7c935cc4ef1052c3297f8029863
Amanda Kassay [Thu, 26 May 2016 18:41:12 +0000 (18:41 +0000)]
Revert "Updated default.css and docs.js for DoD transition fallback." am:
8bac6eb880 am:
0eefec03a7 am:
ecaacf87cd
am:
7bea848abd
* commit '
7bea848abda31862aad104657f87859b7e67677d':
Revert "Updated default.css and docs.js for DoD transition fallback."
Change-Id: I186e9e14dfc5942a188c0bdb3e737556e9e55e17
Amanda Kassay [Thu, 26 May 2016 18:33:54 +0000 (18:33 +0000)]
Revert "Updated default.css and docs.js for DoD transition fallback." am:
8bac6eb880 am:
0eefec03a7
am:
ecaacf87cd
* commit '
ecaacf87cd038beb4aad5d6ddc6c1cc1725dca4a':
Revert "Updated default.css and docs.js for DoD transition fallback."
Change-Id: I07e3e36f3dd322fde3067e63a66ac9f5e87e7385
Amanda Kassay [Thu, 26 May 2016 18:28:40 +0000 (18:28 +0000)]
Revert "Updated default.css and docs.js for DoD transition fallback." am:
8bac6eb880
am:
0eefec03a7
* commit '
0eefec03a76e5e0201293331dd67baf52dc13ceb':
Revert "Updated default.css and docs.js for DoD transition fallback."
Change-Id: I9dc0292d9615d5cd1f888a4ac92b45b0b3d6ffb4
Amanda Kassay [Thu, 26 May 2016 18:22:56 +0000 (18:22 +0000)]
Revert "Updated default.css and docs.js for DoD transition fallback."
am:
8bac6eb880
* commit '
8bac6eb880992e0a4dd37b0f1cf039feebb483ae':
Revert "Updated default.css and docs.js for DoD transition fallback."
Change-Id: I33f169f14f2e7b993e30c00fe59016357242f288
Amanda Kassay [Thu, 26 May 2016 17:58:23 +0000 (17:58 +0000)]
Revert "Updated default.css and docs.js for DoD transition fallback."
This reverts commit
4d5bcbf62a0cc6ec1db0c860a818b6166dceed74.
Change-Id: I45dc33a7711f435fd35b51bb0cb44445e6edd918
Bjoern Johansson [Thu, 26 May 2016 01:26:14 +0000 (18:26 -0700)]
Remove Dev Settings app from emulator images
The Dev Settings app currently just launches an intent that is received
by the regular Settings app. However, since N the Settings app only
receives the intent when developer mode is enabled. If it is not enabled
the Dev Settings app will crash. Since the Dev Settings app doesn't
really add much benefit this change removes it from the emulator system
images to prevent this issue. The user will have to access the developer
settings from the regular Settings app just like on a physical device.
BUG:
27549126
Change-Id: I8191f9003bb452ef76c4b236b965368b48be3d25
Adam Powell [Thu, 26 May 2016 01:19:50 +0000 (01:19 +0000)]
Merge "N is API 24" into nyc-dev
am:
f211cae2ed
* commit '
f211cae2ede701b58228ff0090bb894f17c0557f':
N is API 24
Change-Id: I8c04bfc700731a1441365f8d0d86a2c54aa3a305
TreeHugger Robot [Thu, 26 May 2016 01:03:06 +0000 (01:03 +0000)]
Merge "N is API 24" into nyc-dev
Adam Powell [Wed, 25 May 2016 23:48:56 +0000 (16:48 -0700)]
N is API 24
Change-Id: I8e4fbc1d64a6cd3eb0b4765f696ae48170264d52
Zach Jang [Wed, 25 May 2016 21:11:11 +0000 (21:11 +0000)]
Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am:
ab6c08949f am:
e7660e56ad am:
7cc20fe0a0 am:
bf5d08ecf4 am:
db34ed5f83 am:
4af9b20fbd am:
cf227d4401
am:
e29b42ffef
* commit '
e29b42ffef47991c090ca8008a9addb9e479fc2a':
Updating security string to 2016-07-05
Change-Id: Ide9c0807d54ed1bab3dc65e0f1c04a4bb856ace2
Tianjie Xu [Wed, 25 May 2016 21:02:21 +0000 (21:02 +0000)]
Merge "Report error codes in the OTA update script" into nyc-dev
am:
654e4fb023
* commit '
654e4fb02368b05cbfba3246b4c634512fa84464':
Report error codes in the OTA update script
Change-Id: Ic8d04a484bdf6d08af5109a71967c3d5f8f0be27
Zach Jang [Wed, 25 May 2016 21:02:20 +0000 (21:02 +0000)]
Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am:
ab6c08949f am:
e7660e56ad am:
7cc20fe0a0 am:
bf5d08ecf4 am:
db34ed5f83 am:
4af9b20fbd
am:
cf227d4401
* commit '
cf227d440176f5c10b252ff75fdc6aabf7d4829d':
Updating security string to 2016-07-05
Change-Id: Iffcc0c0b77df8d1bbb69bfd69f9ef0818e469c68
Zach Jang [Wed, 25 May 2016 20:57:46 +0000 (20:57 +0000)]
DO NOT MERGE Updating security string to 2016-07-05 am:
f885e95375 am:
555c5af89a am:
60270ec785 -s ours am:
79770b1927 -s ours am:
1fc50f59ff am:
e496a955f4 am:
afbf826576 -s ours am:
4c9d484078 am:
2823643ecd am:
d5e1f1ee8e am:
6a974cf124 -s ours
am:
18fb257140
* commit '
18fb25714020b3016e2a8c6d0edd01f8006783f8':
DO NOT MERGE Updating security string to 2016-07-05
Change-Id: Idc98a2ddeb831563164373022a9a7d80b6f35ff3
Zach Jang [Wed, 25 May 2016 20:57:41 +0000 (20:57 +0000)]
Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am:
ab6c08949f am:
e7660e56ad am:
7cc20fe0a0 am:
bf5d08ecf4 am:
db34ed5f83
am:
4af9b20fbd
* commit '
4af9b20fbd847ffab365a4677de0e9752737c4f3':
Updating security string to 2016-07-05
Change-Id: I9e5d40dc3710efa07a7fa365d99f3bf6d6dc2109
Tianjie Xu [Wed, 25 May 2016 20:57:20 +0000 (20:57 +0000)]
Merge "Report error codes in the OTA update script" into nyc-dev
Zach Jang [Wed, 25 May 2016 20:52:58 +0000 (20:52 +0000)]
DO NOT MERGE Updating security string to 2016-07-05 am:
f885e95375 am:
555c5af89a am:
60270ec785 -s ours am:
79770b1927 -s ours am:
1fc50f59ff am:
e496a955f4 am:
afbf826576 -s ours am:
4c9d484078 am:
2823643ecd am:
d5e1f1ee8e
am:
6a974cf124 -s ours
* commit '
6a974cf124727c19496f202576b7520cd22175d1':
DO NOT MERGE Updating security string to 2016-07-05
Change-Id: I268b1e3d67c2b8cf579c5b88d582ab3b93592aec
Zach Jang [Wed, 25 May 2016 20:52:57 +0000 (20:52 +0000)]
Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am:
ab6c08949f am:
e7660e56ad am:
7cc20fe0a0 am:
bf5d08ecf4
am:
db34ed5f83
* commit '
db34ed5f83efc646f37eae8ee61233ee2c2e4979':
Updating security string to 2016-07-05
Change-Id: I9fa607cd71960ac309a5a791e8572a7e183a54d0
Zach Jang [Wed, 25 May 2016 20:44:23 +0000 (20:44 +0000)]
DO NOT MERGE Updating security string to 2016-07-05 am:
f885e95375 am:
555c5af89a am:
60270ec785 -s ours am:
79770b1927 -s ours am:
1fc50f59ff am:
e496a955f4 am:
afbf826576 -s ours am:
4c9d484078 am:
2823643ecd
am:
d5e1f1ee8e
* commit '
d5e1f1ee8e3ba4051785fd7bc2b2ec384870a829':
DO NOT MERGE Updating security string to 2016-07-05
Change-Id: I93652c1e6e3bc3b8a2bd48a50cb8f1dbafac9d59
Zach Jang [Wed, 25 May 2016 20:44:22 +0000 (20:44 +0000)]
Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am:
ab6c08949f am:
e7660e56ad am:
7cc20fe0a0
am:
bf5d08ecf4
* commit '
bf5d08ecf4cce47611ee58dbe6b0685e04725c87':
Updating security string to 2016-07-05
Change-Id: I7de8ef605de344ceba9e634ea4f7eb127b91fcf7
Zach Jang [Wed, 25 May 2016 20:39:29 +0000 (20:39 +0000)]
DO NOT MERGE Updating security string to 2016-07-05 am:
f885e95375 am:
555c5af89a am:
60270ec785 -s ours am:
79770b1927 -s ours am:
1fc50f59ff am:
e496a955f4 am:
afbf826576 -s ours am:
4c9d484078
am:
2823643ecd
* commit '
2823643ecdbfd8ad700834dd292fa2b827072634':
DO NOT MERGE Updating security string to 2016-07-05
Change-Id: I1a9612e6c22d631d634cdab47a733e0e22b285a4
Zach Jang [Wed, 25 May 2016 20:39:28 +0000 (20:39 +0000)]
Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am:
ab6c08949f am:
e7660e56ad
am:
7cc20fe0a0
* commit '
7cc20fe0a058f3e2e323da12b0d5eb3c5d6311cb':
Updating security string to 2016-07-05
Change-Id: I365f9fb0c5e2a29bbf93ea6476d3d697998b90b3
Zach Jang [Wed, 25 May 2016 20:34:47 +0000 (20:34 +0000)]
DO NOT MERGE Updating security string to 2016-07-05 am:
f885e95375 am:
555c5af89a am:
60270ec785 -s ours am:
79770b1927 -s ours am:
1fc50f59ff am:
e496a955f4 am:
afbf826576 -s ours
am:
4c9d484078
* commit '
4c9d484078d45bef09147e5beaf475f9aba96eb4':
DO NOT MERGE Updating security string to 2016-07-05
Change-Id: If826c11507df71dc36228d0b5b845078080e37a2
Zach Jang [Wed, 25 May 2016 20:34:46 +0000 (20:34 +0000)]
Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am:
ab6c08949f
am:
e7660e56ad
* commit '
e7660e56ad330c8469857014c448130143c86856':
Updating security string to 2016-07-05
Change-Id: I88edd89acdbdd63433fb595a2c7e7a048cd9cdfe
Zach Jang [Wed, 25 May 2016 20:30:15 +0000 (20:30 +0000)]
DO NOT MERGE Updating security string to 2016-07-05 am:
f885e95375 am:
555c5af89a am:
60270ec785 -s ours am:
79770b1927 -s ours am:
1fc50f59ff am:
e496a955f4
am:
afbf826576 -s ours
* commit '
afbf826576540aa15310d018235f90f8cfd6c6fc':
DO NOT MERGE Updating security string to 2016-07-05
Change-Id: I83310642258499e75c191cc9969da5ffa2d91c3d
Zach Jang [Wed, 25 May 2016 20:30:14 +0000 (20:30 +0000)]
Merge "Updating security string to 2016-07-05" into lmp-mr1-dev
am:
ab6c08949f
* commit '
ab6c08949f2a96867b1eda536eeb74982a49d5d3':
Updating security string to 2016-07-05
Change-Id: I2357ba1f5ba742ffdeed1fbcd9359405cbb436d8
Zach Jang [Wed, 25 May 2016 20:25:14 +0000 (20:25 +0000)]
DO NOT MERGE Updating security string to 2016-07-05 am:
f885e95375 am:
555c5af89a am:
60270ec785 -s ours am:
79770b1927 -s ours am:
1fc50f59ff
am:
e496a955f4
* commit '
e496a955f40fafb3073f7aef8be89c704ce0f01c':
DO NOT MERGE Updating security string to 2016-07-05
Change-Id: I24dd5be0560f7b6826dfd4700510f2517f1604ff
Zach Jang [Wed, 25 May 2016 20:21:24 +0000 (20:21 +0000)]
Merge "Updating security string to 2016-07-05" into lmp-mr1-dev
Zach Jang [Wed, 25 May 2016 20:20:57 +0000 (20:20 +0000)]
DO NOT MERGE Updating security string to 2016-07-05 am:
f885e95375 am:
555c5af89a am:
60270ec785 -s ours am:
79770b1927 -s ours
am:
1fc50f59ff
* commit '
1fc50f59ff732131122d8fbcdbb497561e434364':
DO NOT MERGE Updating security string to 2016-07-05
Change-Id: I65cc7edc2d2b69fb7d3fc3745dc3662ddb59be63
Zach Jang [Wed, 25 May 2016 20:16:34 +0000 (20:16 +0000)]
DO NOT MERGE Updating security string to 2016-07-05 am:
f885e95375 am:
555c5af89a am:
60270ec785 -s ours
am:
79770b1927 -s ours
* commit '
79770b192771b7e332f1537fef3e3719b07bcf14':
DO NOT MERGE Updating security string to 2016-07-05
Change-Id: Ie757679100cd217973d8371de8a72adc89392bbc
Zach Jang [Wed, 25 May 2016 20:11:54 +0000 (20:11 +0000)]
DO NOT MERGE Updating security string to 2016-07-05 am:
f885e95375 am:
555c5af89a
am:
60270ec785 -s ours
* commit '
60270ec78531308f91221ca09c74edee6701ec34':
DO NOT MERGE Updating security string to 2016-07-05
Change-Id: Ia89f4840478991109628844f889e6c97677b0d50
Zach Jang [Wed, 25 May 2016 20:07:30 +0000 (20:07 +0000)]
DO NOT MERGE Updating security string to 2016-07-05 am:
f885e95375
am:
555c5af89a
* commit '
555c5af89a4b25f61ff827431b0081be7b70d5fe':
DO NOT MERGE Updating security string to 2016-07-05
Change-Id: I7f662a6d72179678beee82b3cfb87525eae2b2c2
Zach Jang [Wed, 25 May 2016 20:03:05 +0000 (20:03 +0000)]
DO NOT MERGE Updating security string to 2016-07-05
am:
f885e95375
* commit '
f885e95375a48aeefd7d2451a5c61a48100bac77':
DO NOT MERGE Updating security string to 2016-07-05
Change-Id: Ic58e87cd25747728aa105047cf81a32253d4aba4
Zach Jang [Wed, 25 May 2016 19:41:59 +0000 (12:41 -0700)]
DO NOT MERGE Updating security string to 2016-07-05
b/
28912173
Change-Id: I81301d51fd62932005a24178c57a0731566910a6
Zach Jang [Wed, 25 May 2016 19:38:46 +0000 (12:38 -0700)]
Updating security string to 2016-07-05
b/
28912173
Change-Id: I5dafe754c226eeb3f0beb3b23b219df2b82ef372
Tianjie Xu [Wed, 25 May 2016 00:34:52 +0000 (17:34 -0700)]
Report error codes in the OTA update script
Modify the abort() function in the OTA update generation script to
report an error code. The recoveryimage will parse the code and write it
into last_install for further data analysis.
Bug:
28934032
Change-Id: I2d62f81fd352c3102fb84f054972ac0ecb965a21
Nick Kralevich [Wed, 25 May 2016 05:17:42 +0000 (05:17 +0000)]
goldfish_setup: grant /system/bin/sh exec access
am:
501c88c029
* commit '
501c88c0290eb2308c110398f106411260863bb8':
goldfish_setup: grant /system/bin/sh exec access
Change-Id: Ib4ee988474a69deca4aac9f22b36572d8b026fcc
Nick Kralevich [Wed, 25 May 2016 00:36:23 +0000 (17:36 -0700)]
goldfish_setup: grant /system/bin/sh exec access
The goldfish_setup shell script needs the ability to execute
the shell script interpreter. Allow it.
Addresses the following denial:
avc: denied { getattr } for pid=1220 comm="init.goldfish.s"
path="/system/bin/sh" dev="vda" ino=442 scontext=u:r:goldfish_setup:s0
tcontext=u:object_r:shell_exec:s0 tclass=file permissive=0
Bug:
28941573
Change-Id: I22d26e90f107c8d801229354a5e0513c37e6c31d
Mohamad Ayyash [Tue, 24 May 2016 19:59:30 +0000 (12:59 -0700)]
Pass squashfs block size as a parameter
BUG:
28920352
Change-Id: Ifed02bd1565131814047991ec87fa61691bfe240
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
Zach Jang [Tue, 24 May 2016 01:34:46 +0000 (01:34 +0000)]
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am:
89f6f7aa01 am:
0bdac8fba3 am:
2ee84bf0a5 -s ours am:
e495d379de -s ours am:
8b961c808b am:
3cba9b15f7 am:
8ebaeae1f6 -s ours am:
9ae8c7356e am:
bc60af7bfd am:
37e618fef8 am:
c3d3f6bad9 -s ours
am:
2af23a3c20
* commit '
2af23a3c208b4480998923edc1479919093bc6b9':
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only
Change-Id: Ia0b764a4ff323bd52e92d0c1814e0940ed3dfd2d
Zach Jang [Tue, 24 May 2016 01:32:29 +0000 (01:32 +0000)]
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am:
89f6f7aa01 am:
0bdac8fba3 am:
2ee84bf0a5 -s ours am:
e495d379de -s ours am:
8b961c808b am:
3cba9b15f7 am:
8ebaeae1f6 -s ours am:
9ae8c7356e am:
bc60af7bfd am:
37e618fef8
am:
c3d3f6bad9 -s ours
* commit '
c3d3f6bad9371e7d4b1cdf100b17692e9dc2922e':
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only
Change-Id: I3c573b10baba8ebd7b881b5f5bd4ebb10633a9a9
OSDN Git Service
