345310 Commits

Author SHA1 Message Date
Treehugger Robot
38c9e614af Merge "Add getter for X509 certificate" 2018-08-07 15:35:27 +00:00
Remi NGUYEN VAN
10c593cf7f Merge "Add logging for private DNS probes" 2018-08-07 01:29:14 +00:00
Nan Zhang
003f49cf0c Merge changes from topic "offlinesdk-docs"
* changes:
  Add more libs for framework docs generation
  Add offline/online-sdk-docs in Soong.
2018-08-07 00:05:27 +00:00
Nan Zhang
f8e12c51d4 Merge "Depend on a module instead of real dir for metalava_merge_annotations_dirs" 2018-08-06 23:43:17 +00:00
David Brazdil
88994b26cc Merge "Remove public API methods from hiddenapi-light-greylist.txt" 2018-08-06 21:00:04 +00:00
Treehugger Robot
56104e6fb8 Merge "Fix the system_error while calling thread::join() in NativeCallbackThread." 2018-08-06 18:04:50 +00:00
rleix
4d5db38cc3 Fix the system_error while calling thread::join() in NativeCallbackThread.
system_server crashed because the system_error "resource_deadlock_would_occur"
occurred while calling thread::join(). It is caused by the value of thread is same
with the calling thread. Correct it using std::this_thread::get_id() to check
whether it is the same thread with the calling thread.

Bug: 70603039
Test step:
     Step 1 : Flash DUT and boot it.
     Step 2 : Connect with PC via USB.
     Step 3 : Run the following adb command and check the DUT: 
              adb shell
              su
              ps -A | grep broadcastradio
              kill xxx(the process id of android.hardware.broadcastradio@intel-service)

Change-Id: Ia21282c4cc631a0788496081b1821be28929fae6
Signed-off-by: Lei,RayX <rayx.lei@intel.com>
2018-08-06 18:04:24 +00:00
Hans Boehm
9c7e9034ab Merge "Clean up MediaMetadataRetriever use" 2018-08-06 16:53:12 +00:00
Treehugger Robot
bce398bfd3 Merge "Clarify which methods return connected sockets" 2018-08-06 15:00:37 +00:00
Treehugger Robot
24f3809258 Merge "Add libcore as owners of relevant android/net files" 2018-08-06 14:58:28 +00:00
Treehugger Robot
44091cdb47 Merge "Add @UnsupportedAppUsage annotations" 2018-08-06 12:23:09 +00:00
Treehugger Robot
f336c03135 Merge "Add @UnsupportedAppUsage annotations" 2018-08-06 12:17:06 +00:00
Treehugger Robot
3d05f769a3 Merge "Add @UnsupportedAppUsage annotations" 2018-08-06 12:11:30 +00:00
Adam Vartanian
98a8217372 Add libcore as owners of relevant android/net files
Test: build/make/tools/checkowners.py frameworks/base/core/java/android/net/OWNERS frameworks/base/core/java/android/net/http/OWNERS
Change-Id: Iebef4381693d6cfadd437ed9e08a7f02bc96e6b7
2018-08-06 11:59:49 +01:00
Mathew Inwood
1532447a7b Add @UnsupportedAppUsage annotations
For packages:
  android.renderscript

This is an automatically generated CL. See go/UnsupportedAppUsage
for more details.

Exempted-From-Owner-Approval: Mechanical changes to the codebase
which have been approved by Android API council and announced on
android-eng@

Bug: 110868826
Test: m
Change-Id: I016f6e720e79c48afe44f4690b5dd99fc81ae780
Merged-In: I1aa8ebca448547031b426a7b305c5c3d6fcf2652
2018-08-06 11:19:48 +01:00
Mathew Inwood
eb85b9bd3c Add @UnsupportedAppUsage annotations
For packages:
  android.filterfw
  android.filterfw.core
  android.filterfw.format
  android.filterfw.geometry
  android.filterfw.io

This is an automatically generated CL. See go/UnsupportedAppUsage
for more details.

Exempted-From-Owner-Approval: Mechanical changes to the codebase
which have been approved by Android API council and announced on
android-eng@

Bug: 110868826
Test: m
Merged-In: I6110238f11ab2a81cf84d0fbadf924bc25ab9374
Change-Id: I3dc7c93ae9fcfd0e9a1bc3e6ccc678a77e9c4709
2018-08-06 10:56:08 +01:00
Remi NGUYEN VAN
5caebe3415 Merge "Add utils to convert Inet4Address <-> int" 2018-08-06 05:49:52 +00:00
Treehugger Robot
606d3975b2 Merge changes Iaed1cd6b,I681c1e97
* changes:
  Revert^2: Greylist com.google.vr.platform hidden methods
  Revert^2: Start using new list of non-SDK APIs
2018-08-03 13:30:17 +00:00
David Brazdil
a70eb1295a Remove public API methods from hiddenapi-light-greylist.txt
A change in `hiddenapi` now correctly classifies public methods
inherited from package-private classes into public classes as
public API. Remove the corresponding entries from light greylist,
they are now in the whitelist.

Bug: 76424618
Test: m appcompat
Change-Id: Ibdfb2512dfbd6d33ec0a3f6f44338b6f4864e2f5
2018-08-03 13:36:18 +01:00
David Brazdil
bf7bfc88d8 Revert^2: Greylist com.google.vr.platform hidden methods
Enforcement of non-SDK API is being extended to all modules on the
boot class path. This includes the com.google.vr.platform package,
which is used to set up VR on a given device. Two hidden methods
are used by the client static library via reflection. Mark them
@UnsupportedAppUsage so that they remain discoverable.

Bug: 111911841
Test: make
Merged-In: Iaed1cd6bc7419597510bfc1ab30a169f75e4ae3f
Change-Id: Iaed1cd6bc7419597510bfc1ab30a169f75e4ae3f
(cherry picked from commit a1c19e1254d2f256b1acd7c66c918e19f14de9c7)
2018-08-03 11:33:26 +00:00
David Brazdil
80e6ac7d2c Revert^2: Start using new list of non-SDK APIs
The `hiddenapi` build tool has been extended to provide a full list
of non-SDK APIs in an effort to remove dependency on Doclava.
This patch changes the build rules generating non-SDK API lists to
start using hiddenapi's list instead of Doclava's.

Consequences:
(a) some greylist entries change signature (fixing Doclava varargs bug)
(b) cloned public fields are now whitelisted (b/79432238)
(c) new APIs need to be greylisted because they are used by apps

Bug: 79432238
Bug: 79409988
Bug: 76424618
Test: phone boots
Merged-In: I681c1e97d0929cfb1d357b2243ecb210d18f9e87
Change-Id: I681c1e97d0929cfb1d357b2243ecb210d18f9e87
(cherry picked from commit b59c36f51c3c4b7595718f325b38c11352237b2b)
2018-08-03 11:33:07 +00:00
Treehugger Robot
b40b37910d Merge "Add @UnsupportedAppUsage annotations" 2018-08-03 10:31:21 +00:00
Mathew Inwood
d609a40342 Merge "Add @UnsupportedAppUsage annotations" 2018-08-03 09:00:25 +00:00
Remi NGUYEN VAN
0066bda4cf Add utils to convert Inet4Address <-> int
The current utilities map the higher-order bytes of ints to the
lower-order bytes of IPv4 addresses, which makes applying masks and
generating series of addresses confusing.

For example, the current utilities would convert 1.2.3.4 to 0x04030201,
or generate 0x0080ffff for a /17 subnet mask. The utilities in this CL
convert 1.2.3.4 to 0x01020304, and a /17 subnet mask is represented as
0xffff8000.

Includes tests for all the above methods and migration of
NetworkUtilsTest to JUnit4.

Test: added tests pass
Change-Id: I5f5aa2e6e3b054b66b9dc507dab64f41be9139b1
2018-08-03 15:55:24 +09:00
Nan Zhang
dbc253143b Add more libs for framework docs generation
These two libs are not in the default libs which caused droiddoc report
lots of "package not found warning" when generating offline/online docs.

Test: m -j ds-static-docs
Bug: b/70351683
Change-Id: Ibb1f5e1817895abb1b711dc537493bd93c77077b
2018-08-02 16:29:43 -07:00
Nathan Harold
bb67bab55f Merge "Throw on revoked location permission - framework" 2018-08-02 22:16:07 +00:00
Nan Zhang
c3ce78d660 Add offline/online-sdk-docs in Soong.
Since support libraries have been migrated to Soong, these docs modules
currently are ready to be supported in Soong.

Bug: b/70351683
Test: m -j offline-sdk-docs
Change-Id: I8739d94909c7cc830c30fa3d1047d26761cc5076
Merged-In: I8739d94909c7cc830c30fa3d1047d26761cc5076
2018-08-02 12:16:45 -07:00
Svet Ganov
56c4148e41 Throw on revoked location permission - framework
When we fixed proper handling of location permisison gating
sensitive telephony calls we stopped throwing a security
exception when the permission is not held by the caller.
While this is not a security issue there is no reason to
change this behavior which is checked by CTS. This CL starts
throwing a security exception if the permission is not held.

Test: atest android.permission.cts.NoLocationPermissionTest

bug: 74074103

Merged-In: Ic891d62b408c692f84a345f24503f7f25d583e35
Change-Id: Ic891d62b408c692f84a345f24503f7f25d583e35
(cherry picked from commit 33b150937522ccda37567c1303117ac8f1bb6f7f)
2018-08-02 11:35:00 -07:00
Makoto Onuki
c02b2ec3f1 Merge "use correct userId when startProcess failed" 2018-08-02 17:22:33 +00:00
Treehugger Robot
058b566f90 Merge "Add @UnsupportedAppUsage annotations" 2018-08-02 15:53:55 +00:00
gaoshiqi
075c81a3e2 use correct userId when startProcess failed
use app.userId

Change-Id: I989289e895d4263823cc68bf5ee1e307334aeafb
Merged-in: I1cbc37fdda8530bee6f1cf1d4d7d16776b4ff55d
Signed-off-by: gaoshiqi <gaoshiqi@xiaomi.com>
2018-08-02 15:33:53 +00:00
Treehugger Robot
f892a8ce9f Merge "Add @UnsupportedAppUsage annotations" 2018-08-02 15:11:40 +00:00
Adam Vartanian
acca0090fb Clarify which methods return connected sockets
Some methods in SSLCertificateSocketFactory return connected sockets
and some return unconnected sockets.  Be explicit in each method's
documentation about whether it returns a connected or unconnected
socket.

Bug: 37618511
Test: cts -m CtsNetTestCases -t android.net.cts.SSLCertificateSocketFactoryTest
Change-Id: Ia9c6c8bec15a2d3fbd0d86f8accff13627c79565
2018-08-02 14:54:59 +01:00
Treehugger Robot
92b78539e3 Merge "Add @UnsupportedAppUsage annotations" 2018-08-02 13:27:00 +00:00
Mathew Inwood
6987a91e7c Merge "Add @UnsupportedAppUsage annotations" 2018-08-02 13:26:45 +00:00
Treehugger Robot
20fcc2eb4c Merge "Add @UnsupportedAppUsage annotations" 2018-08-02 10:36:35 +00:00
Mathew Inwood
3b89584a7e Merge "Add @UnsupportedAppUsage annotations" 2018-08-02 09:02:41 +00:00
Treehugger Robot
95f8ca9f74 Merge "Add @UnsupportedAppUsage annotations" 2018-08-02 09:00:47 +00:00
Nan Zhang
e379f40893 Depend on a module instead of real dir for metalava_merge_annotations_dirs
Bug: b/111916275
Test: touch manual/android/support/design/widget/annotations.xml, and m
-j metalava-api-stubs-docs, and check the built output srcjar.

Change-Id: I82e8b51d66f97ebc3f9f4f5aa75ce33066c95089
2018-08-01 22:19:48 +00:00
Hall Liu
2cbf44dc2f Merge "Telecom: Reset the duration after the CDMA call is accepted" 2018-08-01 21:36:56 +00:00
Treehugger Robot
5d669f79f2 Merge "Code formatting change for upcoming annotations." 2018-08-01 14:52:26 +00:00
Mathew Inwood
2845183865 Add @UnsupportedAppUsage annotations
For packages:
  android.ddm

This is an automatically generated CL. See go/UnsupportedAppUsage
for more details.

Exempted-From-Owner-Approval: Mechanical changes to the codebase
which have been approved by Android API council and announced on
android-eng@

Bug: 110868826
Test: m
Change-Id: I9f1ac383f0f71b8c9437756e3d526ee64ad0c558
Merged-In: Ia3e508bf6fbb48ca0fad3dc7b6dc722aac29c191
2018-08-01 15:35:51 +01:00
Mathew Inwood
4dc66d3c58 Add @UnsupportedAppUsage annotations
For packages:
  android.bluetooth.le
  android.bluetooth

This is an automatically generated CL. See go/UnsupportedAppUsage
for more details.

Exempted-From-Owner-Approval: Mechanical changes to the codebase
which have been approved by Android API council and announced on
android-eng@

Bug: 110868826
Test: m
Change-Id: Ifcf24c0617acd7facc0e03f30a95c3a6b09b205c
Merged-In: I88a1311e27c5f9a5f9d1035db76034f86f650efc
2018-08-01 15:07:20 +01:00
Mathew Inwood
61beb3399e Add @UnsupportedAppUsage annotations
For packages:
  android.animation

This is an automatically generated CL. See go/UnsupportedAppUsage
for more details.

Exempted-From-Owner-Approval: Mechanical changes to the codebase
which have been approved by Android API council and announced on
android-eng@

Bug: 110868826
Test: m
Change-Id: I6702ce1fb26452971e5eee8da15d5816dd75bb12
Merged-In: If0667154031b254fd632e1332fb65e9b08955755
2018-08-01 14:42:25 +01:00
Mathew Inwood
62992f1bb0 Add @UnsupportedAppUsage annotations
For packages:
  android.accessibilityservice

This is an automatically generated CL. See go/UnsupportedAppUsage
for more details.

Exempted-From-Owner-Approval: Mechanical changes to the codebase
which have been approved by Android API council and announced on
android-eng@

Bug: 110868826
Test: m
Change-Id: Ic677593dc2d206335275ecbad4d4a1020972ef38
Merged-In: I9437532ae617eda28aa5ae796563e985cc0ddbca
2018-08-01 14:28:00 +01:00
Mathew Inwood
45321deeef Add @UnsupportedAppUsage annotations
For packages:
  com.android.ims.internal.uce.uceservice
  com.android.ims.internal.uce.presence
  com.android.ims.internal.uce.options
  com.android.ims.internal.uce.common
  com.android.ims.internal
  com.android.ims

This is an automatically generated CL. See go/UnsupportedAppUsage
for more details.

Exempted-From-Owner-Approval: Mechanical changes to the codebase
which have been approved by Android API council and announced on
android-eng@

Bug: 110868826
Test: m
Change-Id: I9e39973bf43a80f17038f7e239a94ef2209e6e2a
Merged-In: Ib1819d4d15e730c0f224b45fb72f3225b0dddf91
2018-08-01 14:07:13 +01:00
Mathew Inwood
c092f2317b Code formatting change for upcoming annotations.
Putting /** @hide */ on the same line results in the automated annotation
addition putting the annotation the previous line, which then results in
the @hide javadoc annotation being ignored (since it's now no longer
strictly before the method declaration).

Bug: 110868826
Test: m
Change-Id: I1b5c290a17ead46effd2f2ff3f4b33884efbc116
2018-08-01 13:52:03 +01:00
Treehugger Robot
60c8cfdd0f Merge "Code reformatting for upcoming annotations." 2018-08-01 12:18:10 +00:00
Mathew Inwood
42346d1dd2 Add @UnsupportedAppUsage annotations
For packages:
  android.telecom.Logging
  android.telecom

This is an automatically generated CL. See go/UnsupportedAppUsage
for more details.

Exempted-From-Owner-Approval: Mechanical changes to the codebase
which have been approved by Android API council and announced on
android-eng@

Bug: 110868826
Test: m
Change-Id: I540cb034b933c0d1417a138747ed347fcf0748d7
Merged-In: I04a94d7555be608dc3958787554a3d33b72158ec
2018-08-01 11:33:05 +01:00
Mathew Inwood
efb481646e Code reformatting for upcoming annotations.
@UnsupportedAppUsage annotations are added automatically, but this does
not work when there are multiple definitions on the same line.

Test: m
Bug: 110868826
Change-Id: I2c26c136cdfa557e45cf1ee0b39dab9c17abde56
2018-08-01 10:24:49 +01:00