OSDN Git Service
Slava Shklyaev [Mon, 4 Mar 2019 14:39:56 +0000 (14:39 +0000)]
Revert "Revert "Revert "Correct nullability and final constraints on new APIs."""
This reverts commit
b255be1307aeae47ca7e8ee72ab4da670a1c49f1.
Reason for revert: the commit being reverted fixed git_master but broke aosp-master. This revert is aimed to fix aosp-master while not touching git_master.
DO NOT MERGE: This change is aimed at aosp-master only and should not be merged into git_master.
Change-Id: Ie5aaabb211affe2d21daaf87809641276d9d4707
Slava Shklyaev [Mon, 4 Mar 2019 11:47:11 +0000 (11:47 +0000)]
Revert "Revert "Correct nullability and final constraints on new APIs.""
This reverts commit
8462c66bd52f3132c3fa03475fcab2af30618f67.
Reason for revert: Looks like this change broke the build.
Change-Id: I4cff1ec1211e278d5e5734f1594c096722293662
Tyler Gunn [Mon, 4 Mar 2019 05:19:42 +0000 (05:19 +0000)]
Revert "Correct nullability and final constraints on new APIs."
This reverts commit
b6940c3ea6779bc6d062a430d9eebe192943f09a.
Reason for revert: There appears to be a downstream issue with how the test API definitions are created; until I can figure out how to account for this I'll revert in AOSP (this is in internal master and its fine there).
Change-Id: I840c3ed82afa18323408e161913a84858f7a1539
Tyler Gunn [Thu, 28 Feb 2019 19:33:42 +0000 (11:33 -0800)]
Correct nullability and final constraints on new APIs.
Per API review, correct nullability and final constraints on new Telecom
APIs.
Test: Build API.
Fixes:
126700293
Fixes:
126699447
Fixes:
126700465
Fixes:
126702895
Fixes:
126702527
Change-Id: Icec15403493de596194a61b27bb3e1031fdc1099
Merged-In: Icec15403493de596194a61b27bb3e1031fdc1099
Fan Zhang [Thu, 28 Feb 2019 17:48:16 +0000 (17:48 +0000)]
Merge "Update statusbar color,nav divider color of settings theme"
David Brazdil [Thu, 28 Feb 2019 17:14:25 +0000 (17:14 +0000)]
Merge "Move ApplicationInfo to params in AppComponentFactory"
Baligh Uddin [Thu, 28 Feb 2019 15:54:28 +0000 (15:54 +0000)]
Merge "Set networking module APKs version to 10"
Adrian Roos [Thu, 28 Feb 2019 15:27:18 +0000 (15:27 +0000)]
Merge "Apilint: Lint missing nullability annotations"
Treehugger Robot [Thu, 28 Feb 2019 13:34:52 +0000 (13:34 +0000)]
Merge "Fix broken javadoc links"
Treehugger Robot [Thu, 28 Feb 2019 13:01:02 +0000 (13:01 +0000)]
Merge "Update annotations for UiccCardInfo APIs"
Adrian Roos [Wed, 27 Feb 2019 15:45:00 +0000 (16:45 +0100)]
Apilint: Lint missing nullability annotations
Also adds support for limited range blame parsing.
Bug:
124882145
Test: python apilint_test.py
Change-Id: Idbc7f67eeff27902c37ec482278f5888781c6e78
David Brazdil [Wed, 27 Feb 2019 20:15:18 +0000 (20:15 +0000)]
Move ApplicationInfo to params in AppComponentFactory
Tweak AppComponentFactory.instantiateClassLoader() API to accept
ApplicationInfo as an argument instead of an independent getter.
Bug:
124800390
Bug:
111342996
Test: atest CtsClassLoaderFactoryPathClassLoaderTestCases
Test: atest CtsClassLoaderFactoryInMemoryDexClassLoaderTestCases
Merged-In: I4a4d5af842446a5060083c88a0ac5bec014c0c55
Change-Id: I4a4d5af842446a5060083c88a0ac5bec014c0c55
(cherry picked from commit
33bd343596d6272913c47213e1a7d896ba42db00)
Adrian Roos [Thu, 28 Feb 2019 09:57:22 +0000 (09:57 +0000)]
Merge "Apilint: Enforce final builders"
Adrian Roos [Wed, 27 Feb 2019 22:58:13 +0000 (23:58 +0100)]
Apilint: Enforce final builders
Test: run apilint
Bug:
124883027
Change-Id: I7f2866e46bc40be60487846b2af9f8fd7edb7623
Remi NGUYEN VAN [Thu, 28 Feb 2019 04:42:36 +0000 (04:42 +0000)]
Merge "Add Os.connect(fd, SocketAddress) to public API"
Remi NGUYEN VAN [Wed, 27 Feb 2019 06:46:21 +0000 (15:46 +0900)]
Add Os.connect(fd, SocketAddress) to public API
1. There are already related socket API methods that return
SocketAddress, such as Os.getpeername().
2. Having APIs that take SocketAddress are a closer match
to the POSIX APIs that android.system.Os is exposing,
and are more flexible than just taking InetAddress+port
combinations since the latter only supports IPv4 and
IPv6.
This was covered by tests in change:
Iadf9f10e26bbc650c5e1b9d03f32c5dafb6f21b4
And completes Ic496c1212dc2d97cf34db2a7c7d024b02790e8ed.
Test: m
Bug:
123062477
Change-Id: I885bfe1bf24a361bef2bb2f783622b934637ba99
Remi NGUYEN VAN [Thu, 28 Feb 2019 02:28:50 +0000 (11:28 +0900)]
Set networking module APKs version to 10
Up to now the version in output APKs was 28 (platform version by
default). This should make it easier to track and bump up the version.
Test: booted, WiFi works
Test: aapt dump badging shows version 10
Change-Id: I199eb55fd82e16ae748c8b011ce93cf48b505395
Lorenzo Colitti [Wed, 27 Feb 2019 23:37:42 +0000 (23:37 +0000)]
Merge changes from topic "nat64"
* changes:
Catch ServiceSpecificException instead of IllegalStateException.
Manage NAT64 prefix discovery lifecycle in the framework.
Track NAT64 in the framework and start clatd iff NAT64 detected
Change Nat464Xlat lifecycle.
Minor improvements to verifyTcpBufferSizeChange.
Jordan Liu [Wed, 27 Feb 2019 22:44:20 +0000 (14:44 -0800)]
Update annotations for UiccCardInfo APIs
Fixes:
124800040
Test: no change to behavior
Change-Id: I0644eb9bac417b9a8b0fd8eaf691728ed0784527
Harry Zhang [Wed, 27 Feb 2019 21:56:23 +0000 (21:56 +0000)]
Merge "Added a filegroup for statsd config proto definition."
Jordan Liu [Wed, 27 Feb 2019 20:40:31 +0000 (20:40 +0000)]
Merge "Implement isRemovable"
Treehugger Robot [Wed, 27 Feb 2019 20:15:59 +0000 (20:15 +0000)]
Merge "Add OBSERVE_ROLE_HOLDERS permission to shell."
Amruth Ramachandran [Wed, 27 Feb 2019 19:00:44 +0000 (19:00 +0000)]
Merge "Expose DataSpecificRegistrationState as System API"
Nathan Harold [Wed, 27 Feb 2019 18:39:59 +0000 (18:39 +0000)]
Merge "Add Documentation for ACTION_DEBUG_EVENT"
Nicolas Geoffray [Wed, 27 Feb 2019 16:42:39 +0000 (16:42 +0000)]
Merge "No need to pass shared library infos explicitly in performDexOpt."
Nicolas Geoffray [Tue, 26 Feb 2019 21:40:59 +0000 (21:40 +0000)]
No need to pass shared library infos explicitly in performDexOpt.
The method can just infer it from the passed package.
(cherry picked from commit
1158b87c6ea6d809c2ae665cc0db9f464515ced2)
Test: m
Change-Id: I676ee7d49600a36a8bd54893679d7dc900da2012
Merged-In: I676ee7d49600a36a8bd54893679d7dc900da2012
Exempt-From-Owner-Approval: approved in internal.
Adrian Roos [Wed, 27 Feb 2019 15:50:21 +0000 (15:50 +0000)]
Merge "apilint: Correctly parse packages with annotations"
Lorenzo Colitti [Wed, 27 Feb 2019 01:35:10 +0000 (10:35 +0900)]
Catch ServiceSpecificException instead of IllegalStateException.
The old NetworkManagementService methods to start clatd threw
IllegalStateException, but the new netd methods throw
ServiceSpecificException. Update the catch clauses so that if
starting clatd fails, the system doesn't crash.
Also stop logging stack traces but only include the exception
message itself.
Bug:
65674744
Test: atest FrameworksNetTests
Test: connecting/disconnecting to v6-only wifi in a loop does not crash
Change-Id: I4a9ec7f104712fbbe08f4f67e3288df03e8ed873
Chiachang Wang [Wed, 27 Feb 2019 09:14:50 +0000 (17:14 +0800)]
Fix broken javadoc links
Bug:
123683994
Test: Verify with javadoc
Change-Id: I4b1b936e3cf86104ace5fcb6829778710801f2d5
Treehugger Robot [Wed, 27 Feb 2019 09:01:03 +0000 (09:01 +0000)]
Merge "Use public APIs instead of Conscrypt ones"
Treehugger Robot [Wed, 27 Feb 2019 05:56:28 +0000 (05:56 +0000)]
Merge "Add @NonNull annotation to set proxy on VPN parameter."
Jin Dong [Mon, 3 Dec 2018 07:20:09 +0000 (15:20 +0800)]
Update statusbar color,nav divider color of settings theme
Update statusbar color, navigation divider color
of "Theme.DeviceDefault.Settings".
Bug:
126141701
Test: build & manual
Change-Id: Ib4ddb97c6473a91f3dd6c4971bb150d90a48f202
Tor Norbye [Wed, 27 Feb 2019 02:33:15 +0000 (02:33 +0000)]
Merge "Revert "Update MbmsDownloadServiceBase to reflect implements IInterface""
Irina Dumitrescu [Wed, 20 Feb 2019 18:17:06 +0000 (18:17 +0000)]
Add @NonNull annotation to set proxy on VPN parameter.
Test: manual
Bug:
124883120
Change-Id: Ifb4bd98a69a006220b1a824033395fc6f12ea6ce
Hai Zhang [Tue, 26 Feb 2019 23:07:46 +0000 (15:07 -0800)]
Add OBSERVE_ROLE_HOLDERS permission to shell.
This allows testing relevant APIs in CTS tests. The listener itself
only gives the changed role name and user affected.
Bug:
125404675
Test: build
Merged-In: I5c979a26dae103ea1b633c2119c59363d8953aa2
Change-Id: I29ca1827e597d318cbd74ba3e70796c5853a9dc4
Nathan Harold [Wed, 27 Feb 2019 00:42:54 +0000 (16:42 -0800)]
Add Documentation for ACTION_DEBUG_EVENT
The debug event action lost out on the documentation
for DebugEventReporter when it migrated to TM. This
change adds documentation for ACTION_DEBUG_EVENT
EXTRA_DEBUG_EVENT_ID, and EXTRA_DEBUG_EVENT_DESCRIPTION
Bug:
126178766
Test: make offline-sdk-docs (docstring-only change)
Change-Id: I6073d8b181c1258dbd7b47e8d5a45732d619396a
Tor Norbye [Wed, 27 Feb 2019 00:21:39 +0000 (00:21 +0000)]
Revert "Update MbmsDownloadServiceBase to reflect implements IInterface"
This reverts commit
ddc496d62210fd06f7132e701fbc5df0b2c237f6.
Reason for revert: b/
126374865
Change-Id: I53f87d15712a0f2acc5787efcf68c72021e9b831
Treehugger Robot [Tue, 26 Feb 2019 23:22:52 +0000 (23:22 +0000)]
Merge "Log the pid of the forked zygote child."
Harry Zhang [Thu, 21 Feb 2019 04:11:08 +0000 (20:11 -0800)]
Added a filegroup for statsd config proto definition.
This is used in other parts of the framework for serializing some
statsd text proto config at build time. The filegroup allows aprotoc
to access the definitions elsewhere in the source tree.
Bug:
120569785
Test: Build is not affected.
Change-Id: I82a5f8869a2d05ea27d205f471b9c5b5b875fefc
Merged-In: I0e37a9b9a1f22a5dcebbf07ccc5cad98cf76024c
Amruth Ramachandran [Fri, 22 Feb 2019 19:01:00 +0000 (11:01 -0800)]
Expose DataSpecificRegistrationState as System API
LteVopsSupportInfo is currently not accessible for telephony
APK since DataSpecificRegistrationState is @hide api. This info is
required to determine if current LTE network support IMS. This
change exposes DataSpecificRegistrationState and LteVops info
as System API.
Bug:
112194535
Test: atest
Change-Id: Iec5c42ccef88b66c3f8ef05f8f96b2a4133ca63f
Hall Liu [Tue, 26 Feb 2019 21:54:40 +0000 (21:54 +0000)]
Merge "Rename the RTT audio flag in ImsStreamMediaProfile"
Jordan Liu [Sat, 19 Jan 2019 00:43:53 +0000 (16:43 -0800)]
Implement isRemovable
Add resource non_removable_euicc_slots which lists the slot indexes
which refer to non-removable eUICCs chips.
Test: EuiccCardTest
Bug:
122738148
Change-Id: I8836e25acf37527bbb067538902de056e1465b31
Merged-In: I8836e25acf37527bbb067538902de056e1465b31
Josh Gao [Tue, 26 Feb 2019 21:29:42 +0000 (21:29 +0000)]
Merge "Switch LocalSocket to android::base::{Send,Receive}FileDescriptorVector."
Martin Stjernholm [Sat, 23 Feb 2019 02:35:07 +0000 (02:35 +0000)]
Log the pid of the forked zygote child.
Useful to link together the pids of the zygote and its children in logcat
output.
Test: Flash and boot, run "adb logcat"
Change-Id: I524b70aed7d1ce7a378df0e2b2063e23f1f9a454
Treehugger Robot [Tue, 26 Feb 2019 19:49:03 +0000 (19:49 +0000)]
Merge "Fix the build failure with enabling DEBUG_PSS"
Treehugger Robot [Tue, 26 Feb 2019 18:15:51 +0000 (18:15 +0000)]
Merge "Remove unused tests/utils/SleepUtils"
Sasha Smundak [Sun, 24 Feb 2019 22:47:36 +0000 (14:47 -0800)]
Remove unused tests/utils/SleepUtils
The presense of these files hinders the conversion of the makefiles
to the blueprints (causes failure in the internal builds due to lacking
files).
Bug:
122332340
Test: treehugger
Change-Id: I2a3c38cbba7c14ae1b2880c73c7f6514816f0e68
Lorenzo Colitti [Tue, 19 Feb 2019 04:21:56 +0000 (13:21 +0900)]
Manage NAT64 prefix discovery lifecycle in the framework.
Currently NAT64 prefix discovery, which runs in netd, is started
by netd itself when a network is programmed with all-IPv6 DNS
servers. Unfortunately this is not correct because in many cases
we program DNS servers before the network is connected and it's
actually possible to send packets to them.
In general netd does not have enough visibility into network
lifecycle management to decide when to start and stop prefix
discovery. So move it into the framework with the rest of the
464xlat control plane.
Bug:
65674744
Test: atest FrameworksNetTests
Change-Id: I8fa051a9c216d9c05082bf7d0bbb0cbd56000162
Paul Duffin [Tue, 26 Feb 2019 10:59:54 +0000 (10:59 +0000)]
Merge "Revert "Revert "Remove legacy-test and legacy-android-test targets"""
Adrian Roos [Tue, 26 Feb 2019 10:54:40 +0000 (11:54 +0100)]
apilint: Correctly parse packages with annotations
Test: python apilint_test.py
Change-Id: Ifce9fe3836b2bb46b0d0a255b912fd8bf0195621
Adam Vartanian [Thu, 21 Feb 2019 10:59:08 +0000 (10:59 +0000)]
Use public APIs instead of Conscrypt ones
Use the equivalent public APIs on SSLContext instead of reaching into
OpenSSLContextImpl, except for the one place where a
Conscrypt-specific API is needed.
Bug:
123738844
Bug:
119752589
Test: cts -m CtsLibcoreTestCases
Test: atest android.net.SSLCertificateSocketFactoryTest
Change-Id: I61aebac4ad713b8ce53a47e72def0c537b4ab1c9
Xiong Li [Tue, 26 Feb 2019 09:13:54 +0000 (17:13 +0800)]
Fix the build failure with enabling DEBUG_PSS
frameworks/base/services/core/java/com/android/server/am/ActivityManagerService.java:2688:
error: variable pid might not have been initialized
if (DEBUG_PSS) Slog.d(TAG_PSS, "Skipped pss collection of " + pid +
Bug: None
Test: make -j12
Change-Id: Ib668ba2606348f92239355b04039b45cae025cf3
Nicolas Geoffray [Tue, 26 Feb 2019 08:10:12 +0000 (08:10 +0000)]
Merge "Query the enable_apex_image flag from native experiment."
Nicolas Geoffray [Tue, 26 Feb 2019 08:09:17 +0000 (08:09 +0000)]
Merge "Replace generic GC type flag with a specific Generational CC flag."
Nicolas Geoffray [Tue, 26 Feb 2019 08:08:24 +0000 (08:08 +0000)]
Merge "Add a unit test for Android Runtime (Boot) device configuration flags."
Nicolas Geoffray [Tue, 26 Feb 2019 08:07:54 +0000 (08:07 +0000)]
Merge "Read "gctype" flag from namespace "runtime_native_boot"."
Josh Gao [Mon, 11 Feb 2019 22:37:21 +0000 (14:37 -0800)]
Switch LocalSocket to android::base::{Send,Receive}FileDescriptorVector.
The previous implementation allocated an array of size
CMSG_SPACE(count) to store CMSG_LEN(count * sizeof(int)) elements, which
leads to bad things happening for values of count greater than 1 on
32-bit, and 2 on 64-bit.
Test: atest android.net.LocalSocketTest
Test: atest android.net.cts.LocalSocketTest
Change-Id: I0a9502c3358d8fa92d2d20e344c6270d6baedc07
Treehugger Robot [Tue, 26 Feb 2019 06:58:52 +0000 (06:58 +0000)]
Merge "Convert FrameworksCoreTests to Android.bp"
Treehugger Robot [Tue, 26 Feb 2019 06:20:24 +0000 (06:20 +0000)]
Merge "Add more test case and some clean up"
Colin Cross [Tue, 19 Feb 2019 21:54:49 +0000 (13:54 -0800)]
Convert FrameworksCoreTests to Android.bp
See build/soong/README.md for more information.
Bug:
122332340
Test: atest FrameworksCoreTests fails in all the same ways
Change-Id: I2f83f381f914afeff7cdbbb9d8faa67551ed0c61
Merged-In: I2f83f381f914afeff7cdbbb9d8faa67551ed0c61
(cherry picked from commit
85e2be0e908b8c1cf7a518fec7ad4c065f4d0928)
Chiachang Wang [Tue, 26 Feb 2019 03:32:18 +0000 (11:32 +0800)]
Add more test case and some clean up
Bug:
120452078
Test: atest NetworkStackTests
Change-Id: Ifb981ccdaa7818bf2bebec98e91979007222910b
Nathan Harold [Tue, 26 Feb 2019 01:55:49 +0000 (01:55 +0000)]
Merge "Fix Order of Operations for Converting RSSI to ASU"
Nathan Harold [Mon, 25 Feb 2019 18:31:08 +0000 (10:31 -0800)]
Fix Order of Operations for Converting RSSI to ASU
Due to the wrong order of operations, the conversion
from RSSI to ASU was returning bad results. Fix the
equation so that the ASU is correctly calculated.
Bug:
126199198
Test: (force device to GSM) - atest CellInfoTest
verified on aosp_taimen
Change-Id: Iaeb9a2a6d8efb5b39fc1f81e8d2969694cc06422
Chen Xu [Mon, 25 Feb 2019 22:26:05 +0000 (22:26 +0000)]
Merge "getSimLocale should return locale rather than string tag"
Jordan Liu [Mon, 25 Feb 2019 21:49:11 +0000 (21:49 +0000)]
Merge "CallAttributes uses the call network type"
Paul Duffin [Mon, 25 Feb 2019 19:18:37 +0000 (19:18 +0000)]
Revert "Revert "Remove legacy-test and legacy-android-test targets""
Fixes up the android.test.legacy target to stop using sources directly
now that the issue with android.test.runner-minus-junit not being able
to be built against the SDK has been resolved.
Also, fixes a couple of comments.
This reverts commit
7d7af10dc9057a49c617c7c97c174e8b4ec5008c.
Reason for revert: When this was originally applied it broke the
pi-dev-plus-aosp branch as it contained references to these targets.
Those references have now been removed.
Bug:
63127064
Change-Id: I619e92faf4cc38f8fd4f053bde832e9a76a2a2bf
Test: make checkbuild
chen xu [Fri, 22 Feb 2019 07:08:47 +0000 (23:08 -0800)]
getSimLocale should return locale rather than string tag
Bug:
124767220
Test: Build
Change-Id: Ib4938652f2e6541b44894ae1a2b0cb2ea4c899be
Merged-in: I850108ce0905d16e538e46ccd4bbf92a2bcfba42
Nicolas Geoffray [Mon, 25 Feb 2019 17:52:25 +0000 (17:52 +0000)]
Merge "Add gctype device config property for GC experiments"
Treehugger Robot [Mon, 25 Feb 2019 16:10:52 +0000 (16:10 +0000)]
Merge "Check recycled when createBitmap"
Nicolas Geoffray [Mon, 25 Feb 2019 13:26:31 +0000 (13:26 +0000)]
Query the enable_apex_image flag from native experiment.
Bug:
119800099
Test: m
Change-Id: I730ffaae640ad6c427b3fbc898d838af0962fe5f
Roland Levillain [Tue, 19 Feb 2019 18:09:58 +0000 (18:09 +0000)]
Replace generic GC type flag with a specific Generational CC flag.
The "gctype" device configuration flag (from the "runtime_native_boot"
namespace) was a string passed verbatim as an argument to the runtime
option "-Xgc". It was too generic, conveyed no typing information, and
was error-prone (there was no control over what was passed from the
server to the zygote, and then to the runtime).
This change replaces "gctype" with a specific, Boolean
"enable_generational_cc" flag. This new flag better reflects the
nature of the experiment to be conducted (either enable or disable
generational garbage collection in ART's concurrent copying
collector).
Test: core/jni/runtime_native_boot-flags-test.sh
Bug:
72446017
Bug:
120794191
Bug:
123754583
(cherry picked from commit
72b16f0ad0a4f0f81c0db4a24ecd6629348950e0)
Change-Id: I5f30f38914bb44d6ce9dc6870ee2c566ce66278a
Merged-In: I30a73171c0dc3c7bc891c4f164eed0ba42b0f420
Roland Levillain [Wed, 6 Feb 2019 12:00:01 +0000 (12:00 +0000)]
Add a unit test for Android Runtime (Boot) device configuration flags.
These flags live in device configuration namespace
`runtime_native_boot`. Exercise them by checking that they are passed
to the zygote process(es) as a runtime option after a reboot.
At the moment this test only checks flag `gctype`, which is the only
flag currently implemented in namespace `runtime_native_boot`.
Test: core/jni/runtime_native_boot-flags-test.sh
Bug:
72446017
Bug:
120794191
Bug:
123524494
Bug:
123754583
(cherry picked from commit
0645bcb84393b8048ceee9df5f90c5ba2dfa0184)
Change-Id: I015fe475818162f5bbc7f18a64764cb14ab0a768
Merged-In: I6cf43c3ee0d405fb1b69a450587dd712f911358d
Roland Levillain [Mon, 4 Feb 2019 15:48:09 +0000 (15:48 +0000)]
Read "gctype" flag from namespace "runtime_native_boot".
ART does not support changing the garbage collector type/configuration
dynamically at the moment, so we can only change it when the runtime
starts, i.e. at boot time.
Also materialize "gctype" and "runtime_native_boot" as named constants.
Bug:
120794191
Bug:
72446017
Test: adb shell device_config put runtime_native_boot gctype nogenerational_cc && adb reboot
Test: adb shell device_config put runtime_native_boot gctype generational_cc && adb reboot
(cherry picked from commit
7b098c8487a05360de8f80fde48cfd28a3aa8321)
Change-Id: Ied0eacf46ab92ba128d0a538a314f42c18c5b8f5
Merged-In: Ibf765a5f442136d6327be99786ea9ae4b4537d59
Mathieu Chartier [Mon, 28 Jan 2019 19:11:25 +0000 (11:11 -0800)]
Add gctype device config property for GC experiments
Added to the runtime_native namespace.
The new property overrides dalvik.vm.gctype if it's set.
Bug:
120794191
Test: adb shell device_config put runtime_native gctype CC,preverify
Test: adb reboot
(cherry picked from commit
d2a975adb5b97be5e8f86a603666a66bdc934fd6)
Change-Id: I9ca29e9a5a0c94234fb14a725334dae82171679b
Merged-In: I30a2a3bcfb83f502f168c0d8588d80982a5f7d76
Lorenzo Colitti [Tue, 8 Jan 2019 01:04:25 +0000 (10:04 +0900)]
Track NAT64 in the framework and start clatd iff NAT64 detected
Currently, both netd and clatd do NAT64 prefix detection, and we
start clatd on all IPv6-only networks regardless of whether netd
has detected a NAT64 prefix or not.
Instead, track the NAT64 prefix in the framework, and only start
clatd if the prefix is detected. This will allow us to remove
DNS64 detection in clatd, and pass the NAT64 prefix and the IPv6
address to clatd on the command line instead of clatd finding it
itself. That way, netd and the framework will always know how
464xlat is configured, and we'll be able to use that information
in netd.
Test: builds, boots
Test: atest FrameworksNetTests
Change-Id: Ida32d5760c5aecf7aeebef08fdb596291b2ce14a
Lorenzo Colitti [Tue, 8 Jan 2019 05:43:37 +0000 (14:43 +0900)]
Change Nat464Xlat lifecycle.
Currently, NetworkAgentInfo keeps a Nat464Xlat object only on
networks where we're starting clatd (i.e., IPv6-only networks).
Simplify this code by making the Nat464Xlat object final and
always non-null. This allows us to use Nat464Xlat to store
information, such as the NAT64 prefix, even if the clat daemon
has not been started yet.
Also, remove the STOPPING state which waits for the interface to
be removed. Instead, when stop() is called, immediately enter the
IDLE state.
- This is necessary in order to be able to call start() again
before the interface removal notification has arrived.
- It's also arguably more correct than the current code,
because when stop() returns clatd has already terminated
(ClatdController::stopClatd calls waitpid), and thus the tun
fd is already closed and the tun interface is gone.
Also, now that Nat464Xlat objects are reused after stop(), add
test coverage for calling start() after stop, in both cases:
- The notification that the previous interface was removed
arrives before the second start().
- The notification that the previous interface was removed
arrives after the second start() but before the notification
that the second interface was added.
Also fix a couple of lint warnings.
Test: builds, boots
Test: atest FrameworksNetTests
Test: clatd stops when IPv4 address added
Test: clatd restarts after "adb shell killall clatd"
Change-Id: I3dc66d155aa27606681f3473daf2170434d8c6d0
Lorenzo Colitti [Mon, 25 Feb 2019 01:56:06 +0000 (10:56 +0900)]
Minor improvements to verifyTcpBufferSizeChange.
1. Remove "throws Exception" from the signature so it can be used
in tests that do not already throw Exception.
2. Update comment to reflect the fact that TCP buffer sizes are
set on default network switch, not on connect.
3. Move into the method a class-level static constant that is
only used in that method.
Test: atest ConnectivityServiceTest
Change-Id: Ic2e4fbedc23065efc20e45ea84996b577a8e94b6
Treehugger Robot [Sat, 23 Feb 2019 01:27:07 +0000 (01:27 +0000)]
Merge "Fixes for touchpad capture"
Cuiping.x.Shu [Wed, 22 Nov 2017 05:30:31 +0000 (13:30 +0800)]
Check recycled when createBitmap
This is to avoid framework crash when application used
the recycled bitmap memory in createBitmap.
Bug:
123656975
Change-Id: I98f93ce48c7bc91913d0b31bca1dc0a10eb319d7
Treehugger Robot [Fri, 22 Feb 2019 23:27:24 +0000 (23:27 +0000)]
Merge "Remove deleted fields/functions from greylist."
Sahin Caliskan [Fri, 22 Feb 2019 21:56:31 +0000 (21:56 +0000)]
Merge "Hide RcsMessageStore APIs"
Chen Xu [Fri, 22 Feb 2019 21:52:00 +0000 (21:52 +0000)]
Merge "API council feedbacks for preciseCall APIs"
Tyler Gunn [Fri, 22 Feb 2019 21:13:28 +0000 (21:13 +0000)]
Merge "Change data types on CallIdentification API."
Nathan Harold [Fri, 22 Feb 2019 20:42:03 +0000 (20:42 +0000)]
Merge "Add Class-Filtered getCellSignalStrengths"
Tyler Gunn [Sat, 16 Feb 2019 00:04:13 +0000 (16:04 -0800)]
Change data types on CallIdentification API.
Per API council feedback update the call identification name, details,
description and app name to use CharSequence.
Test: Update apis, run tests.
Bug:
123241094
Merged-In: I42df17506535c1dd598ffd61a44cb0d0440b8159
Change-Id: I42df17506535c1dd598ffd61a44cb0d0440b8159
chen xu [Fri, 22 Feb 2019 03:17:22 +0000 (19:17 -0800)]
API council feedbacks for preciseCall APIs
Bug:
125346540
Test: Build
Change-Id: I3a9a8d3e2168d937f085624b80a891b6baddd0e5
Neil Fuller [Fri, 22 Feb 2019 18:32:13 +0000 (18:32 +0000)]
Merge "Update RulesManagerService after APEX files"
Jack Yu [Fri, 22 Feb 2019 17:35:15 +0000 (17:35 +0000)]
Merge "Fixed incorrect data network type when device is on IWLAN"
Neil Fuller [Mon, 18 Feb 2019 10:49:15 +0000 (10:49 +0000)]
Update RulesManagerService after APEX files
Context
=======
The "time zone updates via APK" feature was implemented in O-MR1 to enable
devices to take time zone updates via an APK update and without needing
an OTA. RulesManagerService is an important part of the time zone updates via
APK feature. When RulesManagerService was implemented things were simple; there
was a copy of time zone data in /system. A new (optional) copy was introduced
in /data that could be managed / updated by the RulesManagerService.
Since there were only two copies the /system copy was referred to as the
"system" data.
With the introduction of the runtime APEX and time zone data APEX things
have become more complicated. Android devices can have time zone data in
several places:
1 The copy in /system/usr/share/zoneinfo/ is partially complete and remains
for legacy usecases, e.g. binaries that "know" about the /system path and
cannot be updated, or binaries which run before /apex paths are mounted.
2 The copy in /apex/com.android.runtime/ is a complete set of time zone
data that can be used by libraries on the device.
3 The copy in /apex/com.android.tzdata/ is the "overlay" copy for use when
the time zone data APEX can be updated. For devices that can take APEX
updates it will be present and is expected to start with the same version as
present in /apex/com.android.runtime. Note: Nothing in the code *requires*
this copy to be present but it is expected to be present in most cases.
RulesManagerService is being kept around for devices that may not have the
capability of updating their APEX files but which still want to update time
zone data without taking an OTA. It is assumed that RulesManagerService will
*only* be turned on in these situations and *not* when the time zone
data in /apex/com.android.tzdata/ might actually be updated independently of
the copy in /apex/com.android.runtime/.
The RulesManagerService therefore adds the fourth copy of the data that *could*
be present:
4 The copy /data/misc/zoneinfo/ managed by RulesManagerService.
Important libraries / binaries on device know about all 4 copies and
prioritize them in order 4, 3, 2, 1. i.e. the libraries will use the
first copy of data found in that order.
In scenarios where RulesManagerService is disabled, 4 will not be present
and therefore 3 will be used (or 2 if 3 is also not present).
In scenarios where RulesManagersService is enabled, 4 is present iff an
APK update has been received. It is assumed that *if* /apex/com.android.tzdata/
is present, it contains the same version of tz data as in
/apex/com.android.runtime/, will never be updated, and can therefore
be ignored by RulesManagerService.
The changes
===========
This commit and others in the same topic do the following:
1) Change RulesManagerService references to "system" data to "base" data in a
valiant attempt to limit confusion until it can be removed.
2) Switch RulesManagerService over from using the data in
/system/usr/share/zoneinfo/ as base data to the data in
/apex/com.android.runtime/. As part of this change, the RulesManagerService
can now use the tz_version file to identify the version of tzdb in "base"
rather than reading the header of the tzdata file, so that is done
here too.
3) Update imports neccessary to meet pre-upload check requirements.
Note: tzdatacheck, an independent binary that manages time zone data
after OTA, was updated to use /apex/com.android.runtime/ instead of
/system/usr/share/zoneinfo/ in commit
c6a2737e0861472d1726ed472708d7762ab1e802.
Bug:
119293618
Bug:
113373927
Test: atest FrameworksCoreTests:android.app.timezone
Test: atest FrameworksServicesTests:com.android.server.timezone
Test: CTS: run cts-dev -m CtsLibcoreTestCases -t libcore.libcore.timezone.ZoneInfoDBTest
Test: CTS: run cts-dev -m CtsLibcoreTestCases -t libcore.libcore.icu.TimeZoneIntegrationTest
Change-Id: Idabe245c7ad337938c202b1796ce9d89ec68bbd6
Nandana Dutt [Fri, 22 Feb 2019 08:43:48 +0000 (08:43 +0000)]
Merge "Add a new error code for disallowing concurrent bugreports"
Lorenzo Colitti [Fri, 22 Feb 2019 07:39:20 +0000 (07:39 +0000)]
Merge "Fix RouterAdvertisementDaemon thread leakage problem"
Sooraj Sasindran [Fri, 22 Feb 2019 06:16:45 +0000 (06:16 +0000)]
Merge "use putLong for long config"
Chiachang Wang [Fri, 22 Feb 2019 05:12:42 +0000 (05:12 +0000)]
Merge "Injecting data stall event to statsd"
Chiachang Wang [Fri, 22 Feb 2019 03:13:07 +0000 (11:13 +0800)]
Injecting data stall event to statsd
Bug:
121185319
Bug:
120452078
Test: - Build and test against data stall code
- atest NetworkStackTests
Change-Id: I2ee16085e7861d38bcd203c98ffd682f86fdc867
Treehugger Robot [Fri, 22 Feb 2019 02:30:51 +0000 (02:30 +0000)]
Merge "Convert Android.mk file to Android.bp"
Sudheer Shanka [Fri, 22 Feb 2019 01:24:03 +0000 (01:24 +0000)]
Merge "Fix potential crash when per-procstate cpu times tracking is turned on."
Michele Berionne [Fri, 22 Feb 2019 01:18:41 +0000 (01:18 +0000)]
Merge "Add checks on multisim capabilities."
Sooraj Sasindran [Fri, 22 Feb 2019 00:41:29 +0000 (00:41 +0000)]
Merge "Allow UiAutomation to adopt the shell permission indentity"
Sahin Caliskan [Thu, 21 Feb 2019 23:35:44 +0000 (15:35 -0800)]
Hide RcsMessageStore APIs
This feature is punted from Android Q. This change hides the APIs.
Test: infeasible
Bug:
109759350
Change-Id: Ic278d45ab573b267a7cbf4c930496cc2044fa855
Sasha Smundak [Tue, 12 Feb 2019 17:38:16 +0000 (09:38 -0800)]
Convert Android.mk file to Android.bp
See build/soong/README.md for more information.
Bug:
122332340
Test: treehugger
Change-Id: I23d8d5a019155a0f3296f7ab75e9b44b7621f3c8
Merged-In: I23d8d5a019155a0f3296f7ab75e9b44b7621f3c8