322633 Commits

Author SHA1 Message Date
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
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
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 fa6d5c5ca02f1bfc454bd3cd82e6c043661e7aa7)
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 9688a3d33451134d6ff54f7b60f8db7a338a40f1)
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