322899 Commits

Author SHA1 Message Date
Hugo Benichi
a22fbf4534 Merge "Connectivity OWNERS: let owners modify Android.mk"
am: 05be68698b

Change-Id: Iff94ca7089c074cc44f8e09cbce01f741c0b5c67
2017-08-08 07:34:39 +00:00
Hugo Benichi
7d752a872d Merge "Fix flaky IpPrefixTest."
am: 2cbce2cb27  -s ours

Change-Id: Iabc8a365a6c18c19754da7ddfcc0385eb5b0f768
2017-08-08 07:28:32 +00:00
Hugo Benichi
05be68698b Merge "Connectivity OWNERS: let owners modify Android.mk" 2017-08-08 07:20:07 +00:00
Treehugger Robot
2cbce2cb27 Merge "Fix flaky IpPrefixTest." 2017-08-08 07:16:48 +00:00
Hugo Benichi
24f5d8f866 Merge "Add OWNERS to com.android.server.net"
am: 0a00151bd1

Change-Id: Ib9938dd15a173d459ca67e5dc19430da57c29115
2017-08-08 07:16:12 +00:00
Treehugger Robot
0a00151bd1 Merge "Add OWNERS to com.android.server.net" 2017-08-08 07:07:25 +00:00
Hugo Benichi
4478840931 DO NOT MERGE Fix some broken tests in frameworks-net with native dependencies
Rational for do not merge: the list of native libraries needed in
Android.mk is not consistent at the moment for aosp master and for
internal branches. Furthermore it is not consistent within internal
branches either. This patch only attempts to fix the tests of the
branches where it matters for development. Otherwise the cost of merge
conflicts makes it undesirable.

Test: All tests in runtest frameworks-net pass.
Merged-In: Ie0b8baa38ca39e92fbd698ebcead86dac0a67708

(cherry pick from commit 99e8ab6e46eec5dbd1b059b3732672d537b3cf34)

Change-Id: Ic732b3dafc3497235e455b8748ac4f99cf02b221
2017-08-08 16:06:54 +09:00
Hugo Benichi
e4d461c0c8 Add OWNERS to com.android.server.net
Test: build
Change-Id: I9236489814103ab20b077ebfc30155dcdb66d411
2017-08-08 16:06:53 +09:00
Hugo Benichi
41494c10e6 Fix flaky IpPrefixTest.
Test: IpPrefixTest passes
Bug: 32561414
Merged-In: Ib4bffe9d33a6d4f5c2bd97798073de0f66d77645

(cherry pick from commit 32c687040301cb3601fd110281a742159a963aa9)

Change-Id: Ibaf11aae9b13af868bebff820c9e7615b63c8eb2
2017-08-08 14:54:08 +09:00
naoyuki kato
132bb86070 Prevent data usage dialog from being displayed again
The data usage dialog is displayed every time rotating the device.
To solve this issue, prevent NetworkOverLimitActivity from being
re-created when rotating the device.

Bug: 36801016
Test: manual - show NetworkOverLimitActivity and rotate the device

Change-Id: I51429aa49157756107e9b3fa9d450f82f894dcab
2017-08-08 03:44:50 +00:00
Hugo Benichi
afd2346bcc Connectivity OWNERS: let owners modify Android.mk
Since per-file overwrites the directory default, just allowing
build.master@android.com for Android.mk with a per-file rule prevents
the owners of the directory to modify Android.mk files without bypassing
OWNERS check in gerrit.

This patch fixes this issue for Connectivity OWNERS files by explicitly
listing Connectivity members for a few Android.mk files.

Test: build
Change-Id: I9c2a2519c3e7dd27e66334b090e074968b408cbc
2017-08-08 10:46:57 +09:00
Lorenzo Colitti
8c253ade20 Minor fixes for netd restarts and StrictController.
1. Ensure we don't change strict mode network policy for a given
   UID from a non-accept policy to another non-accept policy,
   as netd does not support this.
2. Move the "strict enable" and "bandwidth enable" commands
   inside the lock. This improves correctness, and it is safe to
   do now that those commands now only take a few milliseconds,
   instead of several hundred milliseconds.
3. Fix an NPE in connectNativeNetdService which causes the system
   to crash when netd crashes.

Bug: 28362720
Test: bullhead builds, boots
Test: "adb shell killall netd" no longer crashes the system
Change-Id: Icdaa9d1e2288accf35de21df56bc6bd2b0628255
2017-08-08 10:32:56 +09:00
Colin Cross
94d5456d0e Merge "Use class retention for VisibleForTesting annotations"
am: 5724841581

Change-Id: Iaa9262ad627b49d58b46760d7aecd3a985c3a79a
2017-08-07 19:32:21 +00:00
Treehugger Robot
5724841581 Merge "Use class retention for VisibleForTesting annotations" 2017-08-07 19:17:33 +00:00
Colin Cross
5be3cbad27 Use class retention for VisibleForTesting annotations
The VisibleForTesting annotations are used by proguard to prevent
stripping code that is needed at runtime for tests.  The annotations
were marked with source retention, which worked fine with Jack's
proguard implementation.  When we switched back to javac + proguard,
the VisibleForTesting annotations are gone by the time proguard
sees the classes, so the annotated classes and methods can still
be stripped.

Move the VisibleForTesting annotation to class retention, which
matches guava's equivalent annotation.

Bug: 64365384
Test: m -j MtpDocumentsProvider &&
      javap -cp out/target/common/obj/APPS/MtpDocumentsProvider_intermediates/classes-proguard.jar com.android.mtp.MtpRoot

Change-Id: I63a467c2f0a21383eb9e4c9563fd6de2d994a373
Merged-In: I63a467c2f0a21383eb9e4c9563fd6de2d994a373
(cherry picked from commit 8e846143ddc285117d391561de7abd670078d27f)
2017-08-07 11:07:15 -07:00
TreeHugger Robot
4e9a4d81d2 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2017-08-07 05:12:45 +00:00
TreeHugger Robot
c733eac940 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2017-08-07 05:12:04 +00:00
TreeHugger Robot
06a47f450a Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2017-08-07 05:09:59 +00:00
TreeHugger Robot
e4f2ebbd25 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2017-08-07 05:08:40 +00:00
TreeHugger Robot
1d14f1ada0 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2017-08-07 05:08:08 +00:00
TreeHugger Robot
73dfb82d48 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2017-08-07 05:07:30 +00:00
TreeHugger Robot
68203dee07 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2017-08-07 05:05:38 +00:00
TreeHugger Robot
3af6f0a522 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2017-08-07 05:04:31 +00:00
TreeHugger Robot
ee4e599681 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2017-08-07 05:03:27 +00:00
TreeHugger Robot
fcec79296d Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2017-08-07 04:59:49 +00:00
Bill Yi
af6bec5db7 Import translations. DO NOT MERGE
Change-Id: If82f8619d0d6749a01b90dc6b4898eb4019743af
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-06 17:08:53 -07: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
Bill Yi
544db798f4 Import translations. DO NOT MERGE
Change-Id: I54df9444d8466bc63aca95417f8b5c49ec5568e1
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-06 15:36:51 -07:00
Bill Yi
c5b06289e0 Import translations. DO NOT MERGE
Change-Id: I149ea5a3d107bd0e5cdad51d242366bf14d1f698
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-06 15:22:38 -07:00
Bill Yi
910980bc38 Import translations. DO NOT MERGE
Change-Id: I9e2e91f54e7f1add2fb3b12dd1d131899380af64
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-06 15:17:51 -07:00
Bill Yi
bc8dbd6020 Import translations. DO NOT MERGE
Change-Id: I84ca884466c9fbd5489c7f47b0518fd336306099
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-06 15:09:48 -07:00
Bill Yi
ae25755e96 Import translations. DO NOT MERGE
Change-Id: I3629af0eb29095e5657e68cfee82f98eb14e34ea
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-06 15:05:09 -07:00
Bill Yi
385add5198 Import translations. DO NOT MERGE
Change-Id: I772efbffcbd3837cd39fe75cc74c8a94772e3bc9
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-06 14:59:06 -07:00
Bill Yi
efe3bb8670 Import translations. DO NOT MERGE
Change-Id: I74ba347c5a9424ce65c02cff2cec531ba01f7428
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-06 14:52:16 -07:00
Bill Yi
3cbac8d8af Import translations. DO NOT MERGE
Change-Id: I324f912c470060a8e63d5ab1c307507959a0a0ec
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-06 09:53:45 -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
Calin Juravle
cd8fbd25d3 Update DexLoadReporter to comply with the new reporting API
This is a partial cherry pick of commit
3bec94d78b0a66c4fa5cebd851ea33bcc51916b0.

It is partial because it only adapts DexLoadReporter to use the new
reporter BaseDexClassLoader.Reporter API.

Bug: 38138251
Test: make
Merged-In: I2486522fb811f9fc58a44b92642f43a41e7d5bac

(cherry picked from commit 3bec94d78b0a66c4fa5cebd851ea33bcc51916b0)

Change-Id: I4c41dbeb8a9297caac8b0eb936cf74832569f33e
2017-08-03 15:28:36 -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 37641ae54ab72509276d0fdd3f0fabeea9988c4a)

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 257529dcae079055d51cb8eb42b249512ae41f36)
2017-08-03 17:47:39 +00:00