Commit Graph

27747 Commits

Author SHA1 Message Date
Prathmesh Prabhu 61ec9aed12 Merge "Allow smooth upgrade of AVD's from older API's." into nyc-dev 2016-02-20 01:02:03 +00:00
Lingfeng Yang ae74914ed9 Allow smooth upgrade of AVD's from older API's.
If we are using an old API for the emulator
(API 19 for example) and then upgrade the AVD
to API 23 through the AVD settings, we get a bunch
of crashes in the TelephonyProvider,
as it is looking for a file that does not exist
that concerns upgrading from old "apn"'s.

This CL adds this file to the files to be copied
to /etc in the system image.

BUG: b.android.com/200390
BUG=27273457

RELEASE NOTE: Fixed telephony service crashes on startup when upgrading from an old API.

Change-Id: I227713880bf20541c759aab588c00197ac7aebfd
(cherry picked from commit e5083159401edf1df5109b56d1aedbbb739584e6)
2016-02-20 00:34:21 +00:00
Bjoern Johansson d2cd53a41b Explicitly use messaging app in SDK phone builds
This change explicitly includes only the messaging app instead of all of
aosp_base_telephony. This fixes the issue where on initial boot the user
was prompted to select a Home app. This happened because the
aosp_base_telephony makefile includes other makefiles that in turn add
the package Provision which has an activity with an intent filter for
handling HOME. SdkSetup already had such an activity so with two choices
it was left to the user to decide which one to use.

BUG=27273457

Change-Id: I42e77b892ce235a5fa858561325ae37973cfb0cd
(cherry picked from commit 12de252f451b34cfa67f7256027dad84dcfd984d)
2016-02-19 23:25:46 +00:00
Zach Jang 17edabb183 Updating security string patch to 2016-04-01 am: e182d2a95c am: 054bbb9766 am: 7e6a1633c8 am: eb651e2e45 am: 3f53b385de am: fc30358acb
am: c4d9b64a68

* commit 'c4d9b64a686dbfbc8e2f91d96203a7328249f5dd':
  Updating security string patch to 2016-04-01
2016-02-19 22:34:03 +00:00
Zach Jang c4d9b64a68 Updating security string patch to 2016-04-01 am: e182d2a95c am: 054bbb9766 am: 7e6a1633c8 am: eb651e2e45 am: 3f53b385de
am: fc30358acb

* commit 'fc30358acbfaa41e2c3282832ceb3607a0c2fcb9':
  Updating security string patch to 2016-04-01
2016-02-19 22:28:35 +00:00
Zach Jang fc30358acb Updating security string patch to 2016-04-01 am: e182d2a95c am: 054bbb9766 am: 7e6a1633c8 am: eb651e2e45
am: 3f53b385de

* commit '3f53b385dec6b45d0e4d07a29ce43b3c510b1d10':
  Updating security string patch to 2016-04-01
2016-02-19 22:22:57 +00:00
Zach Jang 3f53b385de Updating security string patch to 2016-04-01 am: e182d2a95c am: 054bbb9766 am: 7e6a1633c8
am: eb651e2e45

* commit 'eb651e2e450f1756e6acea4f570379af7d146920':
  Updating security string patch to 2016-04-01
2016-02-19 22:17:28 +00:00
Zach Jang eb651e2e45 Updating security string patch to 2016-04-01 am: e182d2a95c am: 054bbb9766
am: 7e6a1633c8

* commit '7e6a1633c8ebb622271020cbb0aedae355e6501a':
  Updating security string patch to 2016-04-01
2016-02-19 22:11:32 +00:00
Zach Jang 7e6a1633c8 Updating security string patch to 2016-04-01 am: e182d2a95c
am: 054bbb9766

* commit '054bbb9766312a2caefd5375341d49074a6d25bf':
  Updating security string patch to 2016-04-01
2016-02-19 22:06:14 +00:00
Zach Jang 054bbb9766 Updating security string patch to 2016-04-01
am: e182d2a95c

* commit 'e182d2a95c52e37d2a6f924c8ff386b52b08a0c9':
  Updating security string patch to 2016-04-01
2016-02-19 22:00:21 +00:00
Zach Jang e182d2a95c Updating security string patch to 2016-04-01
b/27272697

Change-Id: I99c2c892a21f4c36226ea5f8d94689d6218ccf7e
2016-02-19 13:50:29 -08:00
dcashman cb1fb3156c Label ranchu block devices.
Address the following denials:
avc:  denied  { getattr } for  pid=1166 comm="e2fsck" path="/dev/block/vdc" dev="tmpfs" ino=2880 scontext=u:r:fsck:s0 tcontext=u:object_r:block_device:s0 tclass=blk_file permissive=0
avc:  denied  { read write } for  pid=1166 comm="e2fsck" name="vdc" dev="tmpfs" ino=2880 scontext=u:r:fsck:s0 tcontext=u:object_r:block_device:s0 tclass=blk_file permissive=0

Bug: 27224003
Change-Id: I4792420822d238e6ad1bf757634c924b95150515
2016-02-19 05:32:02 +00:00
Stephen Hines 83bb581788 Merge "Define a class for renderscript bitcode files" into nyc-dev 2016-02-19 03:35:16 +00:00
bohu 6b7006a3bf Revert "emulator.mk: Add ethernet permission"
ranchu device now has gsm working properly, remove ethernet.

This reverts commit 9dcb26902571b6d8aa1a41e28be6fb87fd483425.
(cherry picked from commit 58d066f7ccb65cc1f2fc69aff5e95fbfc7f5f0f7)

Change-Id: I05ced00f7e24cb2af6654fc38d71d63453ce4944
2016-02-19 01:48:20 +00:00
Dan Willemsen c12ad5c5c0 Define a class for renderscript bitcode files
These have been using SHARED_LIBRARIES, but aren't elf shared libraries.
Continue installing them to /system/lib[64], but do not apply any other
normal shared library logic to them.

(cherry picked from commit c6e194ffad)

Change-Id: I0041650af92cd8063ca33215010d5eff514a89bc
2016-02-18 17:34:53 -08:00
Chaoren Lin 72fb84651d emulator: Include the ranchu gps library
Change-Id: I45b8bec7739b42744766852b68580b01b4ce26a0
(cherry picked from commit b8b6638dd0183c68e12ed88f1a4cbdce84c09a15)
2016-02-19 00:53:54 +00:00
Prathmesh Prabhu df389138cd Merge "Add camera.ranchu.* to target/product/emulator.mk" into nyc-dev 2016-02-19 00:39:05 +00:00
Alex Klyubin 29664e1cdb Merge "Switch to production constant for v2 signing scheme ID." into nyc-dev 2016-02-18 02:03:32 +00:00
Lingfeng Yang aae222f5f7 Add camera.ranchu.* to target/product/emulator.mk
This is for QEMU2 camera support in
the new emulator.

Change-Id: I036773719eff97619594e9d9ac161c10b5e218b5
(cherry picked from commit 6a3bbdce10aae72727d97ab09d90c967cfd51b9c)
2016-02-17 13:23:54 -08:00
Ying Wang 150fd17a40 Use LOCAL_COMPATIBILITY_SUPPORT_FILES relative to $(TOP).
So that you can have LOCAL_COMPATIBILITY_SUPPORT_FILES generated in the
out directory.

Change-Id: I3e011fc3db5de170f7befcb12841d230283671a6
(cherry picked from commit c3e4b2f390)
2016-02-17 20:36:15 +00:00
Alex Klyubin 8d8c3de3b1 Switch to production constant for v2 signing scheme ID.
Bug: 25794543

(cherry picked from commit 97dd58a071)

Change-Id: Iefb8eec4e512115bc6a0f5126249e8b2c8b66ddb
2016-02-17 10:44:58 -08:00
Colin Cross d2f35846e4 makeparallel: unset MAKEFLAGS and MAKELEVEL
makeparallel inherits values for MAKEFLAGS and MAKELEVEL from make
through the environment, but they should not be propagated to the child
process in case the child process tries to run make again.

Bug: 26071246
Change-Id: I4c5df10ea8055cd1f1f61a892d5b1a7acb287bbb
(cherry picked from commit d8f0d68b78)
2016-02-16 13:10:40 -08:00
Jeff Tinker 980bd4c1ba Merge "Add mediadrm service" into nyc-dev 2016-02-13 08:08:34 +00:00
Jeff Tinker 1fefb8270e Add mediadrm service
Part of media security hardening

This is an intermediate step toward moving
mediadrm to a new service separate from mediaserver.
This first step allows mediadrmservice to run based
on the system property media.mediadrmservice.enable
so it can be selectively enabled on devices that
support using native_handles for secure buffers.

bug: 22990512
Change-Id: I9fecb59158d560201f64721cdc026f5604cc3945
2016-02-12 09:00:49 -08:00
Aurimas Liutikas af1d741182 Fix 2 unused parameter warnings in zipalign.
ZipFile parameter was not used and therefore can be removed.

Bug: 26936282
Change-Id: Id2b6e693b40571b7e7486304a6effaedc1b3c940
2016-02-12 02:13:30 +00:00
Alex Klyubin 0c5c50997b Merge "Sign APKs using SHA-256 instead of SHA-1 when possible." into nyc-dev 2016-02-11 18:50:12 +00:00
Tao Bao fdd2693b65 Makefile: Add the missing library in otatools.zip.
With the change in [1], delta_generator now needs
libprotobuf-cpp-lite.so instead of libprotobuf-cpp-lite-rtti.so to
generate A/B payloads.

[1] commit ab5bd668f6be600a8cceb8772e426c0aa902a5e1

Bug: 27145830
Change-Id: Ib9a93bf0fbe7fa44fc5fb94668d17fa1a2e07b05
2016-02-11 09:53:51 -08:00
Sebastien Hertz b0a15c4d9f Merge "Remove usages of jill.jar, use jack instead" into nyc-dev 2016-02-11 09:49:07 +00:00
Alex Klyubin b05b62df2e Sign APKs using SHA-256 instead of SHA-1 when possible.
This changes the build system to provide the signapk tool with the
minSdkVersion of the APK being signed. signapk in turn will then use
SHA-256 instead of SHA-1 if minSdkVersion is 18 (JB MR2) or higher
(see c2c49ed0c1).

To avoid increasing incremental OTA update package sizes for already
released platforms, release build scripts disable the above logic when
signing target files ZIPs for pre-N platforms.

Bug: 25643280

(cherry picked from commit 2cfd1d108c)

Change-Id: I38450d07ddc05c705de40313f843beada8db7d98
2016-02-10 17:19:08 -08:00
Sami Tolvanen 405e71dcd3 Fix metadata location when file system doesn't span the partition
Pad the sparse image with a zero fill chunk to correctly position
verity and FEC metadata at the end of the partition.

Bug: 27073791
Change-Id: I9f70d579a42e5007d50e9c02a98a608d2815f0ed
(cherry picked from commit 6a8781a251)
2016-02-10 10:53:47 -08:00
Alex Klyubin fb5ac541a4 Merge "Use Jan 1 2009 as timestamp in OTA update ZIPs." into nyc-dev 2016-02-10 18:15:26 +00:00
Tao Bao b4cfca530c releasetools: Add two new entries to metadata.
Add "ota-required-cache" into the metadata file in an OTA package,
which shows the minimum free space on /cache to apply the update.

Add "ota-type" into the metadata file, which shows the OTA type for
this package (i.e. one of FILE, BLOCK and AB).

Also add the cache free space check into updater-script when generating
block-based incremental OTAs (we only had such lines for file-based
incrementals before).

Bug: 26731903
Change-Id: Id6ff0fc4cdfb1443636b0b3800b0f8bddb5bb1d0
(cherry picked from commit d8d14bec0d)
2016-02-10 09:37:40 -08:00
Tao Bao ebadc3bd8e Merge "improve performance of blockimgdiff" into nyc-dev 2016-02-10 17:36:59 +00:00
Doug Zongker 6ab2a5017e improve performance of blockimgdiff
Substantially improves the performance of some BlockImageDiff steps on
large images.  GenerateDigraph and AssertSequenceGood are now linear in
the number of blocks in the target image rather than quadratic in the
size of the partition.  FindVertexSequence tracks the score of each
vertex, the set of sources and sinks, and maintains a heap for finding
the best vertex to use for the greedy step, instead of repeatedly
re-scanning the set of remaining vertexes.

Change-Id: Ifeea5053d80ef4f06a5aa239c9a1797dd5e47841
(cherry picked from commit 2d2dd1526d)
2016-02-10 09:36:22 -08:00
Yohann Roussel d87cc99af2 Remove usages of jill.jar, use jack instead
Bug: 27113650
(cherry picked from commit d0bb7bdf5a)

Change-Id: I218ed2bda032b00bee4c52994a0aadce6d699133
2016-02-10 18:05:38 +01:00
Alex Klyubin b9f720a18b Use Jan 1 2009 as timestamp in OTA update ZIPs.
This is a follow-up to 6c41036bcf where
I forgot to update a section of OTA update ZIP code.

Bug: 26864066

(cherry picked from commit f735851fa9)

Change-Id: I4f85ce170ac72d13a9c8636414927a295e350458
2016-02-10 09:04:49 -08:00
Marco Nelissen 299b39f6d4 Merge "Add mediacodec binary for codec process" into nyc-dev 2016-02-10 05:46:34 +00:00
Patrick Tjin e11aa50bb2 Add compressor options for squashfs vendor images
Change-Id: I4f9f5d62e24654cb37d436cb73dd5893aed30fa8
2016-02-09 15:41:07 -08:00
Patrick Tjin 426ec55b41 Allow squashfs for vendor image only
Previously, the squashfs dependencies were included only if
the system image was squashfs.  Allow the vendor image trigger
the dependency.

Change-Id: I5b1c513e9c13d83efc3ca6a904f08a91d9cca85f
2016-02-09 14:12:47 -08:00
Marco Nelissen 2a88eb3be2 Add mediacodec binary for codec process
Bug: 22775369

Change-Id: If8087fd289968a6eb09a7f038243447ade5dd9d3
2016-02-08 13:28:28 -08:00
Alex Deymo f9f0a6180c Merge "ota_from_target_files: Include the payload properties." am: db82f72752
am: 07085a5113

* commit '07085a511385a9dfa71414735641f96119ec342c':
  ota_from_target_files: Include the payload properties.
2016-02-05 23:43:38 +00:00
Alex Deymo 07085a5113 Merge "ota_from_target_files: Include the payload properties."
am: db82f72752

* commit 'db82f72752532bf2b98103171b3d7cd8405b88e4':
  ota_from_target_files: Include the payload properties.
2016-02-05 23:16:47 +00:00
Alex Deymo db82f72752 Merge "ota_from_target_files: Include the payload properties." 2016-02-05 23:11:18 +00:00
Dan Willemsen 6fca454c41 Merge "Fix unused src tracking for generated .o files" am: 478913f88f
am: d02bb7bfc5

* commit 'd02bb7bfc51343ab88eb2e05157155673ddf8130':
  Fix unused src tracking for generated .o files
2016-02-05 18:20:34 +00:00
Dan Willemsen d02bb7bfc5 Merge "Fix unused src tracking for generated .o files"
am: 478913f88f

* commit '478913f88fdafc61015e87129486e12ddeb7d184':
  Fix unused src tracking for generated .o files
2016-02-05 18:18:20 +00:00
Dan Willemsen 478913f88f Merge "Fix unused src tracking for generated .o files" 2016-02-05 18:12:20 +00:00
Alex Deymo 19241c11bd ota_from_target_files: Include the payload properties.
When building an A/B OTA package, include the payload.bin properties as
a key-value pairs text file, so it can easily be passed to
update_engine during payload application.

Bug: 26991255
TEST=`ota_from_target_files out/dist/${BOARD}-target_files.zip full-ota.zip` includes the properties.

Change-Id: I445c8a8e412a8e16b48b6ee626db8e27d48a38a9
2016-02-04 23:29:50 -08:00
Colin Cross c2f1d01eec Merge "Don\'t build otatools for PDK" am: 9e8866f4a4
am: 3611f2f440

* commit '3611f2f440944dadd74b36a235c41c7957a6963c':
  Don't build otatools for PDK
2016-02-05 00:04:43 +00:00
Colin Cross 3611f2f440 Merge "Don\'t build otatools for PDK"
am: 9e8866f4a4

* commit '9e8866f4a4ec60778d55366afaf29f7d2e22e9ee':
  Don't build otatools for PDK
2016-02-05 00:01:49 +00:00
Colin Cross 9e8866f4a4 Merge "Don't build otatools for PDK" 2016-02-04 23:49:41 +00:00