OSDN Git Service

android-x86/frameworks-base.git
7 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 7 Aug 2017 00:08:53 +0000 (17:08 -0700)]
Import translations. DO NOT MERGE

Change-Id: If82f8619d0d6749a01b90dc6b4898eb4019743af
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

7 years agoMerge "Add dirty_image_objects file."
Jeff Hao [Sat, 5 Aug 2017 01:02:04 +0000 (01:02 +0000)]
Merge "Add dirty_image_objects file."
am: 935e0c996a

Change-Id: I022e4349152e8fd8a33b6afe7b659af019ad950e

7 years agoMerge "Add dirty_image_objects file."
Treehugger Robot [Sat, 5 Aug 2017 00:55:48 +0000 (00:55 +0000)]
Merge "Add dirty_image_objects file."

7 years agoMerge "NetworkCapabilities: fix describeImmutableDifferences"
Hugo Benichi [Sat, 5 Aug 2017 00:54:43 +0000 (00:54 +0000)]
Merge "NetworkCapabilities: fix describeImmutableDifferences"
am: 7575ec2240

Change-Id: If38efacdeec8476880835657938e435f9b598525

7 years agoMerge "NetworkCapabilities: fix describeImmutableDifferences"
Hugo Benichi [Sat, 5 Aug 2017 00:43:20 +0000 (00:43 +0000)]
Merge "NetworkCapabilities: fix describeImmutableDifferences"

7 years agoMerge "services.core: remove use of -static hidl java"
Steven Moreland [Fri, 4 Aug 2017 19:22:57 +0000 (19:22 +0000)]
Merge "services.core: remove use of -static hidl java"
am: e1b407d62e  -s ours

Change-Id: I2780994a3fd64460f34fb8af34efa13cb36449ce

7 years agoMerge "services.core: remove use of -static hidl java"
Steven Moreland [Fri, 4 Aug 2017 19:14:48 +0000 (19:14 +0000)]
Merge "services.core: remove use of -static hidl java"

7 years agoMerge "Move inserted method after end of try block"
Colin Cross [Fri, 4 Aug 2017 16:06:02 +0000 (16:06 +0000)]
Merge "Move inserted method after end of try block"
am: b080b22a17

Change-Id: Ie23cd33f1910de23bb651fb27fcca71507269bdf

7 years agoMerge "Move inserted method after end of try block"
Colin Cross [Fri, 4 Aug 2017 15:54:24 +0000 (15:54 +0000)]
Merge "Move inserted method after end of try block"

7 years agoNetworkCapabilities: fix describeImmutableDifferences
Hugo Benichi [Fri, 4 Aug 2017 04:18:40 +0000 (13:18 +0900)]
NetworkCapabilities: fix describeImmutableDifferences

This patch fixes the mask used in describeImmutableDifferences which did
not correctly turn NET_CAPABILITY_NOT_METERED into bit flag.

Bug: 63326103
Test: added unit tests, runtest frameworks-net
Change-Id: Ib6b390b1daef5912859302692af7dcd6cfd3e39a

7 years agoMove inserted method after end of try block
Colin Cross [Thu, 3 Aug 2017 22:58:45 +0000 (15:58 -0700)]
Move inserted method after end of try block

Methods inserted at the end of a synchronized {} block also need to
be outside of the implicit try{} block.  Make sure the next
instruction is the virtual end label for the try block, and put
the inserted method after the label.

Bug: 64301866
Test: locked_region_code_injection test
Test: m -j checkbuild
Change-Id: I6626aa45580b4df692e02fc6127a2947a6075e2e

7 years agoservices.core: remove use of -static hidl java
Steven Moreland [Tue, 1 Aug 2017 23:34:40 +0000 (16:34 -0700)]
services.core: remove use of -static hidl java

These libraries are being removed. Now, the regular java
library can be used as both a static and non-static library,
we are removing these duplicate libraries which cause
several types problems (such as undefined behavior when
both the static and non-static libs are loaded).

Bug: 36376126
Test: boot marlin device
Merged-In: I6acb6a41fd5c62a3070ada373aed11706c423463
Change-Id: Ic3a62e7be36b1efca10a9e2e2d0efc430578d061

7 years agoAdd dirty_image_objects file.
Jeff Hao [Mon, 31 Jul 2017 20:35:01 +0000 (13:35 -0700)]
Add dirty_image_objects file.

Allows grouping of classes with dirty static fields to be grouped
together in the image to have fewer dirty pages.

(cherry-picked from commit 37641ae54ab72509276d0fdd3f0fabeea9988c4a)

Bug: 62554875
Test: mm test-art-host

Merged-In: I6a36120235ee4f47bc1cb1ddc4413cfc561cb9a7
Change-Id: I6a36120235ee4f47bc1cb1ddc4413cfc561cb9a7

7 years agoDO NOT MERGE: Fix searching for overridden methods.
Jeff Sharkey [Mon, 19 Jun 2017 22:27:25 +0000 (16:27 -0600)]
DO NOT MERGE: Fix searching for overridden methods.

If the superclass is an abstract class, we want to search it for
possibly overridden methods; we don't want to search ourselves.

This bug resulted in (incorrectly) thinking that overridden "default"
methods from interfaces were standalone methods on the class.  (The
expected behavior has always been to omit any overridden methods from
the public API surface area to avoid redundant noise.)

Test: make update-api
Bug: 62675475
Change-Id: Ic92544908692bd9af329d302165e18c7b4738e43
(cherry picked from commit 257529dcae079055d51cb8eb42b249512ae41f36)

7 years agoMerge "Notify the user and turn off tethering when the service is disallowed." into...
Alexandru-andrei Rotaru [Thu, 3 Aug 2017 15:07:29 +0000 (15:07 +0000)]
Merge "Notify the user and turn off tethering when the service is disallowed." into stage-aosp-master

7 years agoMerge "Notify the user and turn off tethering when the service is disallowed."
Alexandru-Andrei Rotaru [Thu, 3 Aug 2017 13:53:53 +0000 (13:53 +0000)]
Merge "Notify the user and turn off tethering when the service is disallowed."
am: 5027dd1026  -s ours

Change-Id: I03d1d03f4e4e1b1dfcf68da3aa21913506739619

7 years agoNotify the user and turn off tethering when the service is disallowed.
Alexandru-Andrei Rotaru [Tue, 18 Jul 2017 15:49:22 +0000 (16:49 +0100)]
Notify the user and turn off tethering when the service is disallowed.

Added UserRestrinctionListener for turning the service off one the
DISALLOW_CONFIG_TETHERING is on into Tethering.  Added notification
about
tethering being turned off. Also added Unit Tests to test the
functionality
of the UserRestrictionListener added.

Bug: 27936525
Test: Turn the tehering service on (either wifi, usb or bluetooth).
Automatically the system should send a notification about the service
being active.Close settings from recents. From TestDPC User Restrictions
switch on DISALLOW_CONFIG_TETHERING. The tethering should be turned off
and a notification should appear informing that the service is inactive.

Merged-In: Ib7ea8885cedc2a842ebd4487c8b366a6666996bc
Change-Id: Ib7ea8885cedc2a842ebd4487c8b366a6666996bc
(cherry picked from commit fa6d5c5ca02f1bfc454bd3cd82e6c043661e7aa7)

7 years agoMerge "Revert "Revert "Default 'persist.sys.timezone' property to GMT if not set...
Przemyslaw Szczepaniak [Thu, 3 Aug 2017 10:30:05 +0000 (10:30 +0000)]
Merge "Revert "Revert "Default 'persist.sys.timezone' property to GMT if not set on init."""
am: 82d2bd4e40

Change-Id: I8d1fe014fdc3cfd190c5ce95ec963fa8c038552c

7 years agoMerge "Notify the user and turn off tethering when the service is disallowed."
Treehugger Robot [Thu, 3 Aug 2017 10:29:55 +0000 (10:29 +0000)]
Merge "Notify the user and turn off tethering when the service is disallowed."

7 years agoMerge "Revert "Revert "Default 'persist.sys.timezone' property to GMT if not set...
Przemyslaw Szczepaniak [Thu, 3 Aug 2017 10:15:24 +0000 (10:15 +0000)]
Merge "Revert "Revert "Default 'persist.sys.timezone' property to GMT if not set on init."""

7 years agoMerge "Fix compile issue"
John Reck [Wed, 2 Aug 2017 23:47:23 +0000 (23:47 +0000)]
Merge "Fix compile issue"
am: 27b56eb03f

Change-Id: I052fdfdc4f3a75f9ddaa6e9e445d706e22574113

7 years agoMerge "Fix compile issue"
Treehugger Robot [Wed, 2 Aug 2017 23:25:32 +0000 (23:25 +0000)]
Merge "Fix compile issue"

7 years agoMerge "com.android.server: use proper nativehelper headers"
Steven Moreland [Wed, 2 Aug 2017 23:19:33 +0000 (23:19 +0000)]
Merge "com.android.server: use proper nativehelper headers"
am: 41a7f5a64f  -s ours

Change-Id: I470a1998cecb2254f38ea62b08e2408b9b3d4567

7 years agoMerge "com.android.server: use proper nativehelper headers"
Treehugger Robot [Wed, 2 Aug 2017 23:02:04 +0000 (23:02 +0000)]
Merge "com.android.server: use proper nativehelper headers"

7 years agoMerge "zygote: always log process exit reason."
Josh Gao [Wed, 2 Aug 2017 22:04:14 +0000 (22:04 +0000)]
Merge "zygote: always log process exit reason."
am: b14694b043

Change-Id: Iaa68234674edb9494e518184ee72b1130831cfc9

7 years agoFix compile issue
John Reck [Wed, 29 Jun 2016 22:11:23 +0000 (15:11 -0700)]
Fix compile issue

Change-Id: Ic3423cfb23c6057210efb2e9110551b694c0101c
(cherry picked from commit 9688a3d33451134d6ff54f7b60f8db7a338a40f1)

7 years agoMerge "zygote: always log process exit reason."
Treehugger Robot [Wed, 2 Aug 2017 21:50:44 +0000 (21:50 +0000)]
Merge "zygote: always log process exit reason."

7 years agoMerge "services.core: remove use of -static hidl java" into stage-aosp-master
TreeHugger Robot [Wed, 2 Aug 2017 21:22:49 +0000 (21:22 +0000)]
Merge "services.core: remove use of -static hidl java" into stage-aosp-master

7 years agocom.android.server: use proper nativehelper headers
Steven Moreland [Tue, 1 Aug 2017 17:18:40 +0000 (10:18 -0700)]
com.android.server: use proper nativehelper headers

libnativehelper exports headers under nativehelper. These were
available before incorrectly as global headers in order to give
access to jni.h.

Test: com.android.server finds headers
Bug: 63762847
Merged-In: Icb3018f520004f65e8dd565d6e1d563551548eba
Change-Id: Ib36fec53c30760af5dac4097b3eceda6c4c6c7f0

7 years agozygote: always log process exit reason.
Josh Gao [Wed, 2 Aug 2017 19:54:05 +0000 (12:54 -0700)]
zygote: always log process exit reason.

Multiple people have run into problems where apps disappear without a
trace. Always log process exit, so that it's clear when a process is
intentionally exiting. (The amount of extraneous logging this generates
is probably minimal.)

Test: none
Change-Id: I77169da4d0f05dabfe38490757975ad7ad0247b2

7 years agoMerge "fingerprint: remove use of -static hidl java" into stage-aosp-master
TreeHugger Robot [Wed, 2 Aug 2017 17:55:25 +0000 (17:55 +0000)]
Merge "fingerprint: remove use of -static hidl java" into stage-aosp-master

7 years agoMerge "Add owners for the network security config"
Chad Brubaker [Wed, 2 Aug 2017 17:20:16 +0000 (17:20 +0000)]
Merge "Add owners for the network security config"
am: 8773730cd9

Change-Id: I18b8aac4c1ac85bde3e6735e1afe6375f5c0e177

7 years agoMerge "Add owners for the network security config"
Treehugger Robot [Wed, 2 Aug 2017 17:10:11 +0000 (17:10 +0000)]
Merge "Add owners for the network security config"

7 years agoMerge "Add hwbinder library"
Sundong Ahn [Wed, 2 Aug 2017 16:57:50 +0000 (16:57 +0000)]
Merge "Add hwbinder library"
am: 49e2a9a612

Change-Id: I3c7528dcf98bf3b92843594172531fd30a5f29d4

7 years agoMerge "Add hwbinder library"
Treehugger Robot [Wed, 2 Aug 2017 16:46:42 +0000 (16:46 +0000)]
Merge "Add hwbinder library"

7 years agoMerge "Delete dead code function SpotShadow::makeClockwise"
Stan Iliev [Wed, 2 Aug 2017 16:44:22 +0000 (16:44 +0000)]
Merge "Delete dead code function SpotShadow::makeClockwise"
am: 8c9e5c81ad

Change-Id: I5d696089e13dc68115451c223646ef5e0688b330

7 years agoMerge "Delete dead code function SpotShadow::makeClockwise"
Treehugger Robot [Wed, 2 Aug 2017 16:29:23 +0000 (16:29 +0000)]
Merge "Delete dead code function SpotShadow::makeClockwise"

7 years agofingerprint: remove use of -static hidl java
Steven Moreland [Wed, 2 Aug 2017 16:02:13 +0000 (09:02 -0700)]
fingerprint: remove use of -static hidl java

These libraries are being removed. Now, the regular java
library can be used as both a static and non-static library,
we are removing these duplicate libraries which cause
several types problems (such as undefined behavior when
both the static and non-static libs are loaded).

Bug: 36376126
Test: boot marlin, add/use fingerprint, check logs
Change-Id: I546d8f5d5788a31b3f70009e687246a4b7e59569

7 years agoMerge "com.android.server: use proper nativehelper headers" into stage-aosp-master
TreeHugger Robot [Wed, 2 Aug 2017 15:08:37 +0000 (15:08 +0000)]
Merge "com.android.server: use proper nativehelper headers" into stage-aosp-master

7 years agoMerge "Revert "Move getNetworkCountryIso impl from TM to PIM.""
Jonathan Basseri [Wed, 2 Aug 2017 01:58:18 +0000 (01:58 +0000)]
Merge "Revert "Move getNetworkCountryIso impl from TM to PIM.""
am: 85a215bae7

Change-Id: I30dddd90e5984519219865752f563a45962be593

7 years agoMerge "Revert "Move getNetworkCountryIso impl from TM to PIM.""
Jonathan Basseri [Wed, 2 Aug 2017 01:44:09 +0000 (01:44 +0000)]
Merge "Revert "Move getNetworkCountryIso impl from TM to PIM.""

7 years agoRevert "Move getNetworkCountryIso impl from TM to PIM."
Jonathan Basseri [Wed, 2 Aug 2017 01:10:47 +0000 (01:10 +0000)]
Revert "Move getNetworkCountryIso impl from TM to PIM."

This reverts commit 6f4657363cac93ddcc718d9716e3b138f770f2e2.

Change-Id: Ie0062369198af03441c531cd2181ed9c12b8f012

7 years agoDelete dead code function SpotShadow::makeClockwise
Stan Iliev [Wed, 27 Jul 2016 22:08:06 +0000 (18:08 -0400)]
Delete dead code function SpotShadow::makeClockwise

Delete SpotShadow::makeClockwise, which is unused and does
not link when compiler optimizations are disabled (for debugging).
SpotShadow::makeClockwise calls non-existent function
ShadowTessellator::isClockwise, which only works because the
optimizer deletes the function.

Change-Id: Ib8a014bf168782772faa1da7d75a079c1fd28ed9
(cherry picked from commit fdb625a309755fb762c448dd8c2c4e3a7cc26021)

7 years agoservices.core: remove use of -static hidl java
Steven Moreland [Tue, 1 Aug 2017 23:34:40 +0000 (16:34 -0700)]
services.core: remove use of -static hidl java

These libraries are being removed. Now, the regular java
library can be used as both a static and non-static library,
we are removing these duplicate libraries which cause
several types problems (such as undefined behavior when
both the static and non-static libs are loaded).

Bug: 36376126
Test: boot marlin device
Merged-In: I6acb6a41fd5c62a3070ada373aed11706c423463
Change-Id: I6acb6a41fd5c62a3070ada373aed11706c423463

7 years agoAdd owners for the network security config
Chad Brubaker [Tue, 1 Aug 2017 20:03:06 +0000 (13:03 -0700)]
Add owners for the network security config

Test: build/make/tools/checkowners.py -c -v OWNERS
Change-Id: I9bb8f5ceaae4a1af8c93f5416a6a5cea42915c62

7 years agoMerge "Move getNetworkCountryIso impl from TM to PIM."
Jonathan Basseri [Tue, 1 Aug 2017 22:34:44 +0000 (22:34 +0000)]
Merge "Move getNetworkCountryIso impl from TM to PIM."
am: 58bbef15d8

Change-Id: I8a97c049b97eca25a03f7cfcbe57eb6729c6741b

7 years agoMerge "Move getNetworkCountryIso impl from TM to PIM."
Jonathan Basseri [Tue, 1 Aug 2017 22:25:28 +0000 (22:25 +0000)]
Merge "Move getNetworkCountryIso impl from TM to PIM."

7 years agoMove getNetworkCountryIso impl from TM to PIM.
Jonathan Basseri [Wed, 19 Jul 2017 20:44:31 +0000 (13:44 -0700)]
Move getNetworkCountryIso impl from TM to PIM.

This moves the implementation of getNetworkCountryIso from
TelephonyManager into PhoneInterfaceManager so that we can perform an
additional IWLAN check.

Bug: 63050313
Test: no compilation errors
Change-Id: I8463af8ed427b73b57a4076c0ff79f055c697657

7 years agoMerge "Set default value for T3T_PMM."
Ruchi Kandoi [Tue, 1 Aug 2017 20:40:33 +0000 (20:40 +0000)]
Merge "Set default value for T3T_PMM."
am: 7770adf755

Change-Id: I31da06276b222d597b3834b4b912f4e0930ee6bc

7 years agoMerge "Set default value for T3T_PMM."
Ruchi Kandoi [Tue, 1 Aug 2017 20:30:50 +0000 (20:30 +0000)]
Merge "Set default value for T3T_PMM."

7 years agocom.android.server: use proper nativehelper headers
Steven Moreland [Tue, 1 Aug 2017 17:18:40 +0000 (10:18 -0700)]
com.android.server: use proper nativehelper headers

libnativehelper exports headers under nativehelper. These were
available before incorrectly as global headers in order to give
access to jni.h.

Test: com.android.server finds headers
Bug: 63762847
Change-Id: Icb3018f520004f65e8dd565d6e1d563551548eba

7 years agoSet default value for T3T_PMM.
Love Khanna [Tue, 1 Aug 2017 13:02:59 +0000 (18:32 +0530)]
Set default value for T3T_PMM.

If HCEF Application does not provide the T3T PMM value, set the
default value (FFFFFFFFFFFFFFFF) as per NCI specification.

Bug: 64112415
Test: CTS Verifier; HCE-F Reader/Emulator Test
Change-Id: I24f212d9bebd978342e4dd04d618572132e7eb4b

7 years agoRevert "Revert "Default 'persist.sys.timezone' property to GMT if not set on init.""
Przemyslaw Szczepaniak [Fri, 28 Jul 2017 13:21:48 +0000 (13:21 +0000)]
Revert "Revert "Default 'persist.sys.timezone' property to GMT if not set on init.""

This reverts commit 27c461ab3c683ecb9cce7a0b1950672371b3079f.

I'm taking alternative approach, telephony code will treat "GMT" value as it would be unset. This is fine because GMT is a synthetic value that would never be set from other sources.

Change-Id: I889a844bfd75b7730a5d967065d27de03ef3ce2f
Test: flashed device, tested manually
Bug: 64056758

7 years agoAdd hwbinder library
Sundong Ahn [Thu, 13 Jul 2017 07:34:01 +0000 (16:34 +0900)]
Add hwbinder library

HAL impls will depend hwbinder.jar instead of framework.jar on
build-time, but on runtime framework.jar will be used.

This is to cut the circular dependency when using configstore from
Android framework. Also added JNI call to HwBinder.java to cut
configstore's dependency on systemproperty in framework.jar.

Note that hwbinder.jar is LOCAL_UNINSTALLABLE_MODULE and so it won't be
installed in an actual image.

Bug: 35771640
Test: build & run
Change-Id: I2420298cf9df5d6bbcead3e4451b703ce9bc3e29

7 years agoSurfaceTexture.cpp: use proper nativehelper headers
Steven Moreland [Fri, 28 Jul 2017 17:21:47 +0000 (10:21 -0700)]
SurfaceTexture.cpp: use proper nativehelper headers

libnativehelper exports headers under nativehelper. These were
available before incorrectly as global headers in order to give
access to jni.h.

Test: SurfaceTexture.cpp finds headers
Bug: 63762847
Change-Id: I3ec1b888c226c2894649d9f9a8f8203891c1ab02
(cherry picked from commit 849252c469396a759c394dc6382470a6a07d6587)

7 years agoMerge "Remove redundant TODOs from PackageTracker"
Neil Fuller [Mon, 31 Jul 2017 13:00:50 +0000 (13:00 +0000)]
Merge "Remove redundant TODOs from PackageTracker"
am: 01d686b85e

Change-Id: If74fa1bcd6be188079de231e7903795ea7d0b5be

7 years agoMerge "Remove redundant TODOs from PackageTracker"
Neil Fuller [Mon, 31 Jul 2017 12:51:05 +0000 (12:51 +0000)]
Merge "Remove redundant TODOs from PackageTracker"

7 years agoMerge "Logging improvements when NetworkCapabilities change"
Hugo Benichi [Mon, 31 Jul 2017 01:50:38 +0000 (01:50 +0000)]
Merge "Logging improvements when NetworkCapabilities change"
am: f60a38e152

Change-Id: I886e39db8969eb1ac1dfe06c6f448e53a90fd92c

7 years agoMerge "Logging improvements when NetworkCapabilities change"
Treehugger Robot [Mon, 31 Jul 2017 01:38:29 +0000 (01:38 +0000)]
Merge "Logging improvements when NetworkCapabilities change"

7 years agoLogging improvements when NetworkCapabilities change
Hugo Benichi [Tue, 25 Jul 2017 02:40:56 +0000 (11:40 +0900)]
Logging improvements when NetworkCapabilities change

This patch improves the wtf() logging in updateCapabilities to
better distinguish between the cases of a changed specifiers, changed
transports, or changed capabilities. The case of NOT_METERED being added
or removed is ignored.

Bug: 63326103
Test: runtest frameworks-net, runtest frameworks-wifi
Merged-In: I05c6e78891e1eac658f1cf883223af520a9a4f8f
Merged-In: I4f6cbc0adb461cef6610460daeba72ca38b8f10c
Merged-In: I165a8bbe8362100f1e2bb909459fb45b1c68d5ae
Merged-In: Iec6d92e9a3a12bab87c5adfaf17f776465077060
Merged-In: I633d6347a7f852c27c03fc96b36ca2a60f70c73c
Merged-In: I38739184fc0db105bfd3b4c02cce01e803739e5d
Merged-In: Ia58b877056e2442136cc8b145ac8f4e6560cfc2c

(cherry pick from commit 683ea489d302b494ab40c0d5dc97d352a59d8aa9)

Change-Id: Id32ca66068c8ff549627e8e8c0e50897ef928c58

7 years agoRemove redundant TODOs from PackageTracker
Neil Fuller [Fri, 28 Jul 2017 16:33:19 +0000 (17:33 +0100)]
Remove redundant TODOs from PackageTracker

The permission checks are either not required (for the data app)
or have been moved to validateUpdaterAppManifest()
(for the updater app).

Bug: 64142062
Test: make droid
Change-Id: Ie1791d64484f53ea2c2476f866fbd75358960de3

7 years agoMerge "Un-hide the MBMS streaming APIs"
Hall Liu [Fri, 28 Jul 2017 02:40:20 +0000 (02:40 +0000)]
Merge "Un-hide the MBMS streaming APIs"
am: a50e17aea2

Change-Id: Icd8ebf0e351914cdfb0f0c15343e2d2024706d6b

7 years agoMerge "Un-hide the MBMS streaming APIs"
Treehugger Robot [Fri, 28 Jul 2017 02:31:52 +0000 (02:31 +0000)]
Merge "Un-hide the MBMS streaming APIs"

7 years agoUn-hide the MBMS streaming APIs
Hall Liu [Tue, 18 Jul 2017 18:30:27 +0000 (11:30 -0700)]
Un-hide the MBMS streaming APIs

Unhides the MBMS streaming APIs and modifies the vendor base classes to
no longer pass raw AIDLs to the vendor code.

Test: builds
Change-Id: I56030d646c2a1160277d85779c6ed431cda4efa7

7 years agoEnable multi-dex for dx
Colin Cross [Tue, 20 Jun 2017 22:38:05 +0000 (15:38 -0700)]
Enable multi-dex for dx

Add LOCAL_DX_FLAGS := --multi-dex where it is enabled for jack.
Also stop enabling multi-dex when coverge is enabled, since
multi-dex is now enalbed unconditionally.

Test: builds
Change-Id: I67fedcdd5bb5d7091468bddcb0c22bab720a51d2
Merged-In: I67fedcdd5bb5d7091468bddcb0c22bab720a51d2
(cherry picked from commit 17ffa24277380c69bf365fa595e7d4e6e51825eb)

7 years agoMerge "ActivityManagerService: fix nativehelper includes"
Steven Moreland [Thu, 27 Jul 2017 17:13:38 +0000 (17:13 +0000)]
Merge "ActivityManagerService: fix nativehelper includes"
am: c372715beb  -s ours

Change-Id: I57d45557c585238f9e98e0bf81c06058235d7e74

7 years agoMerge "ActivityManagerService: fix nativehelper includes"
Treehugger Robot [Thu, 27 Jul 2017 17:00:13 +0000 (17:00 +0000)]
Merge "ActivityManagerService: fix nativehelper includes"

7 years agoMerge "Tidy up RulesManagerService code"
Neil Fuller [Thu, 27 Jul 2017 16:58:02 +0000 (16:58 +0000)]
Merge "Tidy up RulesManagerService code"
am: d5517c39e8

Change-Id: I56afb0031c2768ea5aed0797b64c9ebda91be8e8

7 years agoMerge "Tidy up RulesManagerService code"
Neil Fuller [Thu, 27 Jul 2017 16:48:58 +0000 (16:48 +0000)]
Merge "Tidy up RulesManagerService code"

7 years agoActivityManagerService: fix nativehelper includes
Steven Moreland [Wed, 26 Jul 2017 19:21:58 +0000 (12:21 -0700)]
ActivityManagerService: fix nativehelper includes

Bug: 63762847
Test: none

Merged-In: I9f9497990fbf0697d05445f563ad46a28d6d6eeb
Change-Id: I964c88cb74f0287dfc6634fbfcd3210a7d984213

7 years agoMerge "NetworkNotificationManager: correctly handle existing notifications"
Hugo Benichi [Thu, 27 Jul 2017 14:43:48 +0000 (14:43 +0000)]
Merge "NetworkNotificationManager: correctly handle existing notifications"
am: 3451fb6156

Change-Id: I4432f66067ea1ab02e1d2dfe42530bcdafa52df6

7 years agoMerge "NetworkNotificationManager: correctly handle existing notifications"
Treehugger Robot [Thu, 27 Jul 2017 14:36:47 +0000 (14:36 +0000)]
Merge "NetworkNotificationManager: correctly handle existing notifications"

7 years agoMerge "Alter condition for starting RulesManagerService"
Neil Fuller [Thu, 27 Jul 2017 13:35:23 +0000 (13:35 +0000)]
Merge "Alter condition for starting RulesManagerService"
am: a338679173

Change-Id: I442dd6a30f022f92fb3fd8a0a5cca58d4ec77208

7 years agoMerge "Alter condition for starting RulesManagerService"
Treehugger Robot [Thu, 27 Jul 2017 13:25:49 +0000 (13:25 +0000)]
Merge "Alter condition for starting RulesManagerService"

7 years agoMerge "Revert "Default 'persist.sys.timezone' property to GMT if not set on init.""
Przemyslaw Szczepaniak [Thu, 27 Jul 2017 13:11:44 +0000 (13:11 +0000)]
Merge "Revert "Default 'persist.sys.timezone' property to GMT if not set on init.""
am: 9b9e823096

Change-Id: I54b658a7911d604af79916f92c8406472e3c9ccb

7 years agoMerge "Revert "Default 'persist.sys.timezone' property to GMT if not set on init.""
Treehugger Robot [Thu, 27 Jul 2017 13:01:05 +0000 (13:01 +0000)]
Merge "Revert "Default 'persist.sys.timezone' property to GMT if not set on init.""

7 years agoNetworkNotificationManager: correctly handle existing notifications
Hugo Benichi [Tue, 25 Jul 2017 12:57:51 +0000 (21:57 +0900)]
NetworkNotificationManager: correctly handle existing notifications

This patch corrects a regression added by commit fb2609d3eee1 that did
not take into account the case of multiple notifications shown for a
single network id. Given how network notifications are triggered, it can
happen that NO_INTERNET and SIGN_IN notifications are both triggered for
the same network when captive portal detection is slow.

Contrary to the situation before commit fb2609d3eee1, a notification
priority order is introduced so that SIGN_IN always overrides
NO_INTERNET, and NO_INTERNET is ignored if SIGN_IN is already present.

Bug: 63676954
Bug: 62503737
Test: runtest frameworks-net, added new unit tests
Change-Id: Ib8658601e8d4dc6c41b335ab7dd8caa0cccd9531

7 years agoMerge "Remove CoreTests: HeapTest"
Narayan Kamath [Thu, 27 Jul 2017 11:37:02 +0000 (11:37 +0000)]
Merge "Remove CoreTests: HeapTest"
am: c3fd3b8c7d

Change-Id: If6565f8bc8a655d3d7422f57db3dd6160459b092

7 years agoMerge "Remove CoreTests: HeapTest"
Narayan Kamath [Thu, 27 Jul 2017 11:26:10 +0000 (11:26 +0000)]
Merge "Remove CoreTests: HeapTest"

7 years agoRevert "Default 'persist.sys.timezone' property to GMT if not set on init."
Przemyslaw Szczepaniak [Wed, 26 Jul 2017 12:12:43 +0000 (12:12 +0000)]
Revert "Default 'persist.sys.timezone' property to GMT if not set on init."

Telephony code depends on persist.sys.timezone not being set as a signal
to deduce a timezone from sim card information.

This reverts commit 20e020536ebf999c4acb759960ae6e4bfff6ba67.

Bug: 64056758
Change-Id: I8db204bcffbdb960124b1ae0e02d53b27dd310a4

7 years agoTidy up RulesManagerService code
Neil Fuller [Wed, 26 Jul 2017 12:56:25 +0000 (13:56 +0100)]
Tidy up RulesManagerService code

1) Remove error handling TODO; no obvious issues.
2) Avoid avoid a NullPointerException in dumpsys code when current
state cannot be read.
3) Remove unnecessary public modifier.

Bug: 31008728
Test: make
Change-Id: Iab5fae74b74f54bf9d19410f0f4c9ed94365a162

7 years agoRemove CoreTests: HeapTest
Lucas Gomez Jimenez [Tue, 25 Jul 2017 13:11:35 +0000 (15:11 +0200)]
Remove CoreTests: HeapTest

It is largely redundant due to other tests in art/ and libcore/

Test: Run CoreTests

Change-Id: I97485c522fed157d650b95225ad6641e4184d7bf

7 years agoAlter condition for starting RulesManagerService
Neil Fuller [Wed, 26 Jul 2017 11:11:58 +0000 (12:11 +0100)]
Alter condition for starting RulesManagerService

Modify the condition used for starting RulesManagerService:
use mOnlyCore rather than disableNonCoreServices. mOnlyCore is
important for the secure lock screen and when mOnlyCore is true
the RulesManagerService cannot perform trust checks. Therefore,
disable the RulesManagerService when mOnlyCore == true.

disableNonCoreServices is apparently not used.

Bug: 64057583
Test: Boot device with time zone updates enabled and with a lock
pattern set.
Merged-In: Idd7cb6e11b1a91dfe7394f6c98f8fa3e0eec9dce
Change-Id: Idd7cb6e11b1a91dfe7394f6c98f8fa3e0eec9dce

7 years agoMerge "Silence a memory leak warning from the static analyzer"
George Burgess IV [Wed, 26 Jul 2017 00:26:12 +0000 (00:26 +0000)]
Merge "Silence a memory leak warning from the static analyzer"
am: f44ebf5fcb

Change-Id: Ic0b97fb0689b4d322aa6ed25fe55ec192bff07a5

7 years agoMerge "Silence a memory leak warning from the static analyzer"
Treehugger Robot [Wed, 26 Jul 2017 00:12:51 +0000 (00:12 +0000)]
Merge "Silence a memory leak warning from the static analyzer"

7 years agoSilence a memory leak warning from the static analyzer
George Burgess IV [Tue, 25 Jul 2017 21:22:07 +0000 (14:22 -0700)]
Silence a memory leak warning from the static analyzer

The analyzer assumes that the given `put` operation may fail. This
shouldn't be the case, so mark it with a LOG_ALWAYS_FATAL_IF. Doing so
silences a warning about potential memory leaks originating from
TessellationCache::getRoundRect.

Bug: 27101951
Test: mma. Warning is gone.
Change-Id: I3adeacd6c2c9c03caecd989e2a1267c51e8ef905

7 years agoMerge "Adding 4 standard short codes required by Android Constellation"
Carlos Vinueza [Tue, 25 Jul 2017 16:27:10 +0000 (16:27 +0000)]
Merge "Adding 4 standard short codes required by Android Constellation"
am: d00de318f9

Change-Id: Ib17b53a72e737a7b584c65b63c89bd7524c1a2c4

7 years agoMerge "Adding 4 standard short codes required by Android Constellation"
Treehugger Robot [Tue, 25 Jul 2017 16:12:23 +0000 (16:12 +0000)]
Merge "Adding 4 standard short codes required by Android Constellation"

7 years agoMerge "Remove TODO related to WakeLocks"
Neil Fuller [Tue, 25 Jul 2017 14:54:46 +0000 (14:54 +0000)]
Merge "Remove TODO related to WakeLocks"
am: 12d08bf9a0

Change-Id: Id94118a9b687493f6f6879bf6bbe23cfad86dfa9

7 years agoMerge "Remove TODO related to WakeLocks"
Treehugger Robot [Tue, 25 Jul 2017 14:42:40 +0000 (14:42 +0000)]
Merge "Remove TODO related to WakeLocks"

7 years agoMerge "Bootstrap IpReachabilityMonitor unit tests"
Hugo Benichi [Tue, 25 Jul 2017 14:33:45 +0000 (14:33 +0000)]
Merge "Bootstrap IpReachabilityMonitor unit tests"
am: a9889c94aa

Change-Id: Ic3b145159a4c0430cc248a19b8527af40fa67696

7 years agoMerge "Bootstrap IpReachabilityMonitor unit tests"
Treehugger Robot [Tue, 25 Jul 2017 13:05:47 +0000 (13:05 +0000)]
Merge "Bootstrap IpReachabilityMonitor unit tests"

7 years agoRemove TODO related to WakeLocks
Neil Fuller [Tue, 25 Jul 2017 12:14:32 +0000 (13:14 +0100)]
Remove TODO related to WakeLocks

There's no need to keep a WakeLock in the RulesManager - if
the device goes to sleep it should continue the work when
it wakes up again. All I/O is handled via AtomicFile and should
be robust to corruption, etc. and this reduces the likelihood
of issues caused by sudden sleeps.

Bug: 31008728
Test: make
Change-Id: I3d5076ca7d2f39076f76bdb745cedde214eac21b

7 years agoBootstrap IpReachabilityMonitor unit tests
Hugo Benichi [Mon, 24 Jul 2017 00:30:52 +0000 (09:30 +0900)]
Bootstrap IpReachabilityMonitor unit tests

Bug: 62918393
Test: runtest frameworks-net

Change-Id: I236029f460dc3631ef9f5d8312dc1c6faf9807df

7 years agoMerge "Add dump info to IpSecService"
ludi [Tue, 25 Jul 2017 03:07:00 +0000 (03:07 +0000)]
Merge "Add dump info to IpSecService"
am: ec5fc4872e

Change-Id: Idd4c051e4536d32504718fdfd201c7effdeb62e3

7 years agoMerge "Add dump info to IpSecService"
Treehugger Robot [Tue, 25 Jul 2017 02:38:47 +0000 (02:38 +0000)]
Merge "Add dump info to IpSecService"

7 years agoMerge "Zygote: Increase wrap-pid timeout to thirty seconds"
Andreas Gampe [Tue, 25 Jul 2017 00:18:19 +0000 (00:18 +0000)]
Merge "Zygote: Increase wrap-pid timeout to thirty seconds"
am: 81f66ce5ab

Change-Id: I1cc8856ebb68ee83a8d3e62d86b48d497d0eb237

7 years agoMerge "Zygote: Increase wrap-pid timeout to thirty seconds"
Treehugger Robot [Tue, 25 Jul 2017 00:06:02 +0000 (00:06 +0000)]
Merge "Zygote: Increase wrap-pid timeout to thirty seconds"

7 years agoAdd dump info to IpSecService
ludi [Mon, 22 May 2017 17:52:23 +0000 (10:52 -0700)]
Add dump info to IpSecService

Bug:38350824

Test: runtest frameworks-net

Change-Id: Ifa11d55e9d337016ad865baada627db3aa8c2db3

7 years agoUpdate DexFile#getDexOptNeeded usages to reflect API change
Shubham Ajmera [Mon, 24 Jul 2017 22:21:04 +0000 (15:21 -0700)]
Update DexFile#getDexOptNeeded usages to reflect API change

Test: make and boot
Merged-in: I68f9f617d6722a7ba8b00aa2181cb38a165cfc51
Bug: 36598475
(partially cherry-picked from commit 246dccf9327631597767afe418ce43ae6d07d102)

Change-Id: Idfc9276eb2b61244bbd634f49a3912dab6fcabfa