Commit Graph

322612 Commits

Author SHA1 Message Date
TreeHugger Robot
fcec79296d Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2017-08-07 04:59:49 +00:00
Bill Yi
4851eef8a4 Import translations. DO NOT MERGE
Change-Id: I4570757171ce669661c9064ed555177d0c26cf1a
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-06 17:04:01 -07:00
Bill Yi
bd66426dd5 Import translations. DO NOT MERGE
Change-Id: I1053ce2f24b423a0a3bccd06b1eb886a196f11e2
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-06 15:42:00 -07:00
Jeff Hao
7dce8cbdeb Merge "Add dirty_image_objects file."
am: 935e0c996a

Change-Id: I022e4349152e8fd8a33b6afe7b659af019ad950e
2017-08-05 01:02:04 +00:00
Treehugger Robot
935e0c996a Merge "Add dirty_image_objects file." 2017-08-05 00:55:48 +00:00
Hugo Benichi
f6346af47e Merge "NetworkCapabilities: fix describeImmutableDifferences"
am: 7575ec2240

Change-Id: If38efacdeec8476880835657938e435f9b598525
2017-08-05 00:54:43 +00:00
Hugo Benichi
7575ec2240 Merge "NetworkCapabilities: fix describeImmutableDifferences" 2017-08-05 00:43:20 +00:00
Steven Moreland
935136689d Merge "services.core: remove use of -static hidl java"
am: e1b407d62e  -s ours

Change-Id: I2780994a3fd64460f34fb8af34efa13cb36449ce
2017-08-04 19:22:57 +00:00
Steven Moreland
e1b407d62e Merge "services.core: remove use of -static hidl java" 2017-08-04 19:14:48 +00:00
Colin Cross
a413870ef5 Merge "Move inserted method after end of try block"
am: b080b22a17

Change-Id: Ie23cd33f1910de23bb651fb27fcca71507269bdf
2017-08-04 16:06:02 +00:00
Colin Cross
b080b22a17 Merge "Move inserted method after end of try block" 2017-08-04 15:54:24 +00:00
Hugo Benichi
2ecb9408f4 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
2017-08-04 15:17:40 +09:00
Colin Cross
cebc382d5f 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
2017-08-03 20:55:37 -07:00
Steven Moreland
be4b610d98 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
2017-08-03 15:19:03 -07:00
Jeff Hao
6aa5d715b4 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 37641ae54a)

Bug: 62554875
Test: mm test-art-host

Merged-In: I6a36120235ee4f47bc1cb1ddc4413cfc561cb9a7
Change-Id: I6a36120235ee4f47bc1cb1ddc4413cfc561cb9a7
2017-08-03 11:02:02 -07:00
Jeff Sharkey
008ddd928d 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 257529dcae)
2017-08-03 17:47:39 +00:00
Alexandru-andrei Rotaru
b9295c7de0 Merge "Notify the user and turn off tethering when the service is disallowed." into stage-aosp-master 2017-08-03 15:07:29 +00:00
Alexandru-Andrei Rotaru
54c1b9e936 Merge "Notify the user and turn off tethering when the service is disallowed."
am: 5027dd1026  -s ours

Change-Id: I03d1d03f4e4e1b1dfcf68da3aa21913506739619
2017-08-03 13:53:53 +00:00
Alexandru-Andrei Rotaru
5469504e6b 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 fa6d5c5ca0)
2017-08-03 13:51:36 +00:00
Przemyslaw Szczepaniak
f9caecd124 Merge "Revert "Revert "Default 'persist.sys.timezone' property to GMT if not set on init."""
am: 82d2bd4e40

Change-Id: I8d1fe014fdc3cfd190c5ce95ec963fa8c038552c
2017-08-03 10:30:05 +00:00
Treehugger Robot
5027dd1026 Merge "Notify the user and turn off tethering when the service is disallowed." 2017-08-03 10:29:55 +00:00
Przemyslaw Szczepaniak
82d2bd4e40 Merge "Revert "Revert "Default 'persist.sys.timezone' property to GMT if not set on init.""" 2017-08-03 10:15:24 +00:00
John Reck
60c65f1a67 Merge "Fix compile issue"
am: 27b56eb03f

Change-Id: I052fdfdc4f3a75f9ddaa6e9e445d706e22574113
2017-08-02 23:47:23 +00:00
Treehugger Robot
27b56eb03f Merge "Fix compile issue" 2017-08-02 23:25:32 +00:00
Steven Moreland
79e124c9c7 Merge "com.android.server: use proper nativehelper headers"
am: 41a7f5a64f  -s ours

Change-Id: I470a1998cecb2254f38ea62b08e2408b9b3d4567
2017-08-02 23:19:33 +00:00
Treehugger Robot
41a7f5a64f Merge "com.android.server: use proper nativehelper headers" 2017-08-02 23:02:04 +00:00
Josh Gao
1453059ae3 Merge "zygote: always log process exit reason."
am: b14694b043

Change-Id: Iaa68234674edb9494e518184ee72b1130831cfc9
2017-08-02 22:04:14 +00:00
John Reck
83a2c63f0e Fix compile issue
Change-Id: Ic3423cfb23c6057210efb2e9110551b694c0101c
(cherry picked from commit 9688a3d334)
2017-08-02 15:04:07 -07:00
Treehugger Robot
b14694b043 Merge "zygote: always log process exit reason." 2017-08-02 21:50:44 +00:00
TreeHugger Robot
e79a0931f7 Merge "services.core: remove use of -static hidl java" into stage-aosp-master 2017-08-02 21:22:49 +00:00
Steven Moreland
f91ca58ec4 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
2017-08-02 14:19:20 -07:00
Josh Gao
6d747cacae 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
2017-08-02 12:54:05 -07:00
TreeHugger Robot
5de8c0ee40 Merge "fingerprint: remove use of -static hidl java" into stage-aosp-master 2017-08-02 17:55:25 +00:00
Chad Brubaker
e9d50c793a Merge "Add owners for the network security config"
am: 8773730cd9

Change-Id: I18b8aac4c1ac85bde3e6735e1afe6375f5c0e177
2017-08-02 17:20:16 +00:00
Treehugger Robot
8773730cd9 Merge "Add owners for the network security config" 2017-08-02 17:10:11 +00:00
Sundong Ahn
811027ede7 Merge "Add hwbinder library"
am: 49e2a9a612

Change-Id: I3c7528dcf98bf3b92843594172531fd30a5f29d4
2017-08-02 16:57:50 +00:00
Treehugger Robot
49e2a9a612 Merge "Add hwbinder library" 2017-08-02 16:46:42 +00:00
Stan Iliev
98eaf41eec Merge "Delete dead code function SpotShadow::makeClockwise"
am: 8c9e5c81ad

Change-Id: I5d696089e13dc68115451c223646ef5e0688b330
2017-08-02 16:44:22 +00:00
Treehugger Robot
8c9e5c81ad Merge "Delete dead code function SpotShadow::makeClockwise" 2017-08-02 16:29:23 +00:00
Steven Moreland
3068930f99 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
2017-08-02 16:18:54 +00:00
TreeHugger Robot
7d7c269944 Merge "com.android.server: use proper nativehelper headers" into stage-aosp-master 2017-08-02 15:08:37 +00:00
Jonathan Basseri
7728849a39 Merge "Revert "Move getNetworkCountryIso impl from TM to PIM.""
am: 85a215bae7

Change-Id: I30dddd90e5984519219865752f563a45962be593
2017-08-02 01:58:18 +00:00
Jonathan Basseri
85a215bae7 Merge "Revert "Move getNetworkCountryIso impl from TM to PIM."" 2017-08-02 01:44:09 +00:00
Jonathan Basseri
379128e5c2 Revert "Move getNetworkCountryIso impl from TM to PIM."
This reverts commit 6f4657363c.

Change-Id: Ie0062369198af03441c531cd2181ed9c12b8f012
2017-08-02 01:10:47 +00:00
Stan Iliev
2db5825d25 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 fdb625a309)
2017-08-01 18:05:12 -07:00
Steven Moreland
997ee258e7 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
2017-08-01 17:10:27 -07:00
Chad Brubaker
1ec48fc770 Add owners for the network security config
Test: build/make/tools/checkowners.py -c -v OWNERS
Change-Id: I9bb8f5ceaae4a1af8c93f5416a6a5cea42915c62
2017-08-01 15:50:22 -07:00
Jonathan Basseri
02cc8151a6 Merge "Move getNetworkCountryIso impl from TM to PIM."
am: 58bbef15d8

Change-Id: I8a97c049b97eca25a03f7cfcbe57eb6729c6741b
2017-08-01 22:34:44 +00:00
Jonathan Basseri
58bbef15d8 Merge "Move getNetworkCountryIso impl from TM to PIM." 2017-08-01 22:25:28 +00:00
Jonathan Basseri
6f4657363c 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
2017-08-01 22:24:05 +00:00