OSDN Git Service
Brad Ebinger [Wed, 17 Jan 2018 23:13:46 +0000 (23:13 +0000)]
Merge "Integrate IMS Registration API" am:
1f00565433
am:
f4d3a4d110
Change-Id: I19e812368d0afd5bd7934b4e3a2aa575d0c1d3a3
yuemingw [Wed, 17 Jan 2018 23:05:16 +0000 (23:05 +0000)]
Merge "Add URL_DPC, URL_FILTERED and URL_ENFORCE_MANAGED as constants." am:
b760295764
am:
10f60a740f
Change-Id: I7e00f153a147c906fe853c1f98e492a0c381850a
Brad Ebinger [Wed, 17 Jan 2018 23:01:03 +0000 (23:01 +0000)]
Merge "Integrate IMS Registration API"
am:
1f00565433
Change-Id: I1bbbdbe612a154c9d13dd5d162e2149d3f94a958
yuemingw [Wed, 17 Jan 2018 22:57:50 +0000 (22:57 +0000)]
Merge "Add URL_DPC, URL_FILTERED and URL_ENFORCE_MANAGED as constants."
am:
b760295764
Change-Id: Ib7ff0f0854c164eb5044649a63bb113ec473609c
jackqdyulei [Wed, 17 Jan 2018 21:21:57 +0000 (21:21 +0000)]
Merge "Add metric for anomaly detection" into oc-mr1-dev
am:
9b1211b353 -s ours
Change-Id: I1c7830ed2c956ed22682e7d0d03860f5fa7c7886
Chen Xu [Wed, 17 Jan 2018 20:49:04 +0000 (20:49 +0000)]
Merge "new carrier id APIs" am:
3d23b90874
am:
7537309843
Change-Id: I8b64968ddb59304543eee89eb1e2dcb4d66517e3
nharold [Wed, 17 Jan 2018 20:39:29 +0000 (20:39 +0000)]
Merge "IpSec - API Tweak for removeTransportModeTransform" am:
6725ff729b
am:
d58b237445
Change-Id: Id9e9ab09669a53f53f03e5a6e0e4757434c3f3f3
Chen Xu [Wed, 17 Jan 2018 20:38:27 +0000 (20:38 +0000)]
Merge "new carrier id APIs"
am:
3d23b90874
Change-Id: Ifaa9e4e2f4ec3ef9703c4bf58e8452a9920b350a
TreeHugger Robot [Wed, 17 Jan 2018 20:36:06 +0000 (20:36 +0000)]
Merge "Add metric for anomaly detection" into oc-mr1-dev
nharold [Wed, 17 Jan 2018 20:31:15 +0000 (20:31 +0000)]
Merge "IpSec - API Tweak for removeTransportModeTransform"
am:
6725ff729b
Change-Id: I0ed7128014bbca8973f84d719449dcf70da45fa2
Brad Ebinger [Wed, 17 Jan 2018 20:29:54 +0000 (20:29 +0000)]
Merge "Integrate IMS Registration API"
Treehugger Robot [Wed, 17 Jan 2018 19:50:40 +0000 (19:50 +0000)]
Merge "Add URL_DPC, URL_FILTERED and URL_ENFORCE_MANAGED as constants."
Arthur Hsu [Wed, 17 Jan 2018 19:21:39 +0000 (19:21 +0000)]
Merge "Skip SystemUI check in BluetoothServiceManager if noHome." am:
fc3b50e9b6
am:
65d0549fde
Change-Id: Ia42f33a0d7becd5a4f3f3f81fc077d13863f94ed
Arthur Hsu [Wed, 17 Jan 2018 19:15:47 +0000 (19:15 +0000)]
Merge "Skip SystemUI check in BluetoothServiceManager if noHome."
am:
fc3b50e9b6
Change-Id: Icf53fb7a223e64a3f73cea475fb0a522b3f96ece
Chen Xu [Wed, 17 Jan 2018 19:09:34 +0000 (19:09 +0000)]
Merge "new carrier id APIs"
nharold [Wed, 17 Jan 2018 19:07:10 +0000 (19:07 +0000)]
Merge "IpSec - API Tweak for removeTransportModeTransform"
Treehugger Robot [Wed, 17 Jan 2018 17:33:41 +0000 (17:33 +0000)]
Merge "Skip SystemUI check in BluetoothServiceManager if noHome."
fionaxu [Tue, 28 Nov 2017 06:53:42 +0000 (22:53 -0800)]
new carrier id APIs
1. New telephony APIs to getCurrentCarrierId
and getCurrentCarrierName
2. New broadcast intent to notify carrier id changed
Bug:
64131637
Test: Build
Change-Id: I9a240ba7df313ad701f98bb3982f29c3d5317da8
(cherry picked from commit
fff6f59a63304be50e7a251fb4fca38ae0090fc4)
Merged-in: I9a240ba7df313ad701f98bb3982f29c3d5317da8
David Brazdil [Wed, 17 Jan 2018 14:17:59 +0000 (14:17 +0000)]
Merge "Pass targetSdkVersion to installd" am:
106a915256
am:
77ba6baab5
Change-Id: Ic0b3323ee46e0bacffd62bd763da15e3256da783
David Brazdil [Wed, 17 Jan 2018 14:10:54 +0000 (14:10 +0000)]
Merge "Pass targetSdkVersion to installd"
am:
106a915256
Change-Id: If9622d593591a4a270e0bb1a16ed3a0c91d43f43
David Brazdil [Wed, 17 Jan 2018 13:42:29 +0000 (13:42 +0000)]
Merge "Pass targetSdkVersion to installd"
yuemingw [Tue, 16 Jan 2018 19:48:10 +0000 (19:48 +0000)]
Add URL_DPC, URL_FILTERED and URL_ENFORCE_MANAGED as constants.
Test: manual
Bug:
68208245
Change-Id: I9416526f4a6e014dae66a936d6d1eb60309ef8ab
nharold [Wed, 17 Jan 2018 10:02:51 +0000 (10:02 +0000)]
Merge "Prevent Closure of Underlying Socket FDs" am:
3cff120fcb
am:
31f05d66ca
Change-Id: I1ecac95dc1c4be573d5411a335f94c6a6511d4bd
nharold [Wed, 17 Jan 2018 09:53:37 +0000 (09:53 +0000)]
Merge changes from topic "ipsec-oneway-transform" am:
809bcfc45e
am:
f2074ea62a
Change-Id: I58fe595ff14e3ee6be5191171367e8a2f7fad6da
Nathan Harold [Wed, 17 Jan 2018 09:50:37 +0000 (09:50 +0000)]
Make Transforms Unidirectional am:
a25233123b
am:
f4fc2714c2
Change-Id: Ie3ca37e14d977fd255a7791ae3332ddda29ab37e
nharold [Wed, 17 Jan 2018 09:47:49 +0000 (09:47 +0000)]
Merge "Prevent Closure of Underlying Socket FDs"
am:
3cff120fcb
Change-Id: I2f8e445f9a12e95cf8d81d63e02fad7ecc17ad36
nharold [Wed, 17 Jan 2018 09:42:03 +0000 (09:42 +0000)]
Merge changes from topic "ipsec-oneway-transform"
am:
809bcfc45e
Change-Id: If98285e2bd41e2eedaf81f1ff0e5f2b2d3827f91
Nathan Harold [Wed, 17 Jan 2018 09:37:57 +0000 (09:37 +0000)]
Make Transforms Unidirectional
am:
a25233123b
Change-Id: I7e80c75b3b227fdd16479120d8b7203cc5f28d1c
Nathan Harold [Wed, 17 Jan 2018 09:00:20 +0000 (01:00 -0800)]
IpSec - API Tweak for removeTransportModeTransform
Because IpSecTransforms are now unidirectional,
and because the only mechanism for removing Transforms
removes it from both directions, the API can no longer
use the Transform parameter to meaningfully validate
that the caller had applied a transform. Since that
functionality was as-yet unimplemented and is now
infeasible, the transform parameter is removed.
Bug:
72079356
Test: cts - IpSecManagerTest; runtest frameworks-net
Change-Id: If19b0d34bdc6daf31a40d6d62bff326dcbca08c0
nharold [Wed, 17 Jan 2018 08:45:29 +0000 (08:45 +0000)]
Merge "Prevent Closure of Underlying Socket FDs"
nharold [Wed, 17 Jan 2018 08:40:37 +0000 (08:40 +0000)]
Merge changes from topic "ipsec-oneway-transform"
* changes:
Update IpSecService UnitTests
Make Transforms Unidirectional
nharold [Wed, 17 Jan 2018 06:59:39 +0000 (06:59 +0000)]
Merge "Update documentation for KEY_CARRIER_NAME_STRING" am:
fa6187510a
am:
03dafac495
Change-Id: I3c0e13153a347e6ef79cfee9f00a6ee6694425d9
nharold [Wed, 17 Jan 2018 06:51:38 +0000 (06:51 +0000)]
Merge "Update documentation for KEY_CARRIER_NAME_STRING"
am:
fa6187510a
Change-Id: I50fe5f4ea30b6923e7ca5c0fe3eb62fa9db3dabf
Nathan Harold [Tue, 16 Jan 2018 20:08:43 +0000 (12:08 -0800)]
Prevent Closure of Underlying Socket FDs
The version of applyTransportModeTransform() and
removeTransportModeTransform() that accepted
Socket and DatagramSocket were closing the underlying
FDs upon return. It's unclear whether this is due to
a behavior change elsewhere in ParcelFileDescriptor,
but either way, converting to using getFileDescriptor$
and then calling dup() explicitly rather than relying
on ParcelFileDescriptor seems like a better idea anyway.
Bug:
72047396
Test: CTS - IpSecManagerTest.testCreateTransform()
Change-Id: Ia2f02564e1289f25bf113dbb861fcfd2240537a7
nharold [Wed, 17 Jan 2018 03:39:44 +0000 (03:39 +0000)]
Merge "Update documentation for KEY_CARRIER_NAME_STRING"
Nathan Harold [Wed, 17 Jan 2018 03:34:01 +0000 (19:34 -0800)]
Update IpSecService UnitTests
The IpSecService Unit tests relied on the
directionality of the IpSecConfig and previously
did not specify a source address. Unit tests
updated without functional change other than to
address these two requirements.
Bug:
71717213
Test: runtest frameworks-net
Change-Id: Iedbed735bc50fd4fdfe985f9e173956062a7b0d1
Ryan Lothian [Wed, 17 Jan 2018 01:59:09 +0000 (01:59 +0000)]
Merge "Handle onBindingDied in notification manager" am:
a13201a99b
am:
d69921cc9a
Change-Id: I91f5642cb8f2d740e8acbbb739fc42f6a2f1bc63
Ryan Lothian [Wed, 17 Jan 2018 01:51:02 +0000 (01:51 +0000)]
Merge "Handle onBindingDied in notification manager"
am:
a13201a99b
Change-Id: I01d3d65fcc6032d5de17f84cdc8eb5119aaeeadf
Android Build Merger (Role) [Tue, 16 Jan 2018 23:54:53 +0000 (23:54 +0000)]
[automerger skipped] RESTRICT AUTOMERGE Preventing recursive referrence in drawables skipped:
cee125012a am:
9b90490d1d
am:
17ef28c5e2
Change-Id: I7e2e495eb815655db3ea365e44d069dfb6227a5a
Android Build Merger (Role) [Tue, 16 Jan 2018 23:42:30 +0000 (23:42 +0000)]
[automerger skipped] RESTRICT AUTOMERGE Preventing recursive referrence in drawables skipped:
cee125012a am:
9b90490d1d
Change-Id: If121edaf0d2edac5688ff2aa4ed48da1d5e1c1c7
Android Build Merger (Role) [Tue, 16 Jan 2018 23:42:24 +0000 (23:42 +0000)]
[automerger skipped] RESTRICT AUTOMERGE Preventing recursive referrence in drawables skipped:
cee125012a
Change-Id: Ie180da5d659b106e1c5299b0a46b6cbf24548ae0
Sunny Goyal [Wed, 1 Nov 2017 18:58:13 +0000 (11:58 -0700)]
RESTRICT AUTOMERGE Preventing recursive referrence in drawables
Bug:
68706673
Bug:
66498711
Test: Added CTS tests
Change-Id: I8034f49d16f9a7bc1749714fd6d6231bba5088d0
(cherry picked from commit I8034f49d16f9a7bc1749714fd6d6231bba5088d0)
Merged-In: I8034f49d16f9a7bc1749714fd6d6231bba5088d0
Ryan Lothian [Tue, 16 Jan 2018 23:31:41 +0000 (23:31 +0000)]
Merge "Handle onBindingDied in notification manager"
Ryan Lothian [Mon, 4 Dec 2017 16:56:58 +0000 (11:56 -0500)]
Handle onBindingDied in notification manager
On Android, if the process containing the service being bound to
crashes before the bind succeeds, the app doing the binding won't
get a success or failure callback.
When that happens in this code, this leaves notif. manager thinking
that a binding is in progress, so it never attempts to rebind until
the device is rebooted.
Bug:
69064494
Test: original CL was manually tested --
crashed listener on proc start, verified not unbound forever
Change-Id: Id2082744208e21a709d9453365f282449a2e9407
(cherry picked from commit
4a86a51b672617b02994fc812e4f96342daf424e)
David Brazdil [Tue, 16 Jan 2018 20:01:47 +0000 (20:01 +0000)]
Pass targetSdkVersion to installd
Dex2oat now accepts targetSdkVersion as a parameter to determine
whether ART should treat the app as "legacy" and allow or restrict
access to private APIs.
We also bump arguments of otapreopt to v4 to accommodate the new value.
Bug:
64382372
Test: manual
Change-Id: Iae3867325dfaf8deaba51626ab04b97ad797d3b6
Ivan Lozano [Tue, 16 Jan 2018 21:49:36 +0000 (21:49 +0000)]
Merge "Fix doFadingAnimationLocked in sanitized builds." am:
05284b6c6a
am:
b327eb682e
Change-Id: I109a08b8ae94cbeca28044f2c64c885a586f680a
Ivan Lozano [Tue, 16 Jan 2018 21:42:07 +0000 (21:42 +0000)]
Merge "Fix doFadingAnimationLocked in sanitized builds."
am:
05284b6c6a
Change-Id: I5822b920fe1dec72f0f49af35256bfbf6d9474fa
Ivan Lozano [Tue, 16 Jan 2018 20:27:36 +0000 (20:27 +0000)]
Merge "Fix doFadingAnimationLocked in sanitized builds."
Andreas Gampe [Tue, 16 Jan 2018 19:59:02 +0000 (19:59 +0000)]
Merge "ActivityThread: Attempt to attach agent with app's classloader" am:
f779d7e3be
am:
9f1f950c31
Change-Id: I0df113aff5a54c5a1dbc5f968679bb9d4f8ea158
Andreas Gampe [Tue, 16 Jan 2018 19:46:36 +0000 (19:46 +0000)]
Merge "ActivityThread: Attempt to attach agent with app's classloader"
am:
f779d7e3be
Change-Id: Id5ae3b90ca4b75046419fb1a6c02ef556d225f77
Nathan Harold [Sat, 6 Jan 2018 03:25:13 +0000 (19:25 -0800)]
Make Transforms Unidirectional
Convert the IpSecTransform from being a bi-directional
pair of SAs to a unidirectional single SA. This CL
also removes the concept of "direction from SAs meaning
that a IpSecTransform may now be applied to a socket
in either direction.
-Make transforms unidirectional
-Add Convert allocateSpi() to use destination rather
than direction and remote address
-Remove directionality from builders for IpSecTransform
-Change applyTransportModeTransform() to take a
direction in which to apply the transform object.
-Additional minor naming updates
-Restrict IpSecConfig to only print keys on eng builds
-Move DIRECTION constants to IpSecManager
-Add sourceAddress parameter to IpSecTransform to provide
additional guarantees about the source address of data;
(explicit failure rather than implicit failure).
-Move SPI to the build() method of IpSecTransform
Bug:
71717213
Test: runtest frameworks-net, CTS - IpSecManagerTest
Change-Id: I0824b37f443f4b8c62536d9801238c63ed8f2a1c
Lorenzo Colitti [Tue, 16 Jan 2018 18:41:46 +0000 (18:41 +0000)]
Merge changes I0d0c0fac,Ifb9b00b6 am:
c3a209382c
am:
bfaf963337
Change-Id: Ie943428132fbcfcc565d54b46830ed297227ef35
Lorenzo Colitti [Tue, 16 Jan 2018 18:32:39 +0000 (18:32 +0000)]
Merge changes I0d0c0fac,Ifb9b00b6
am:
c3a209382c
Change-Id: If8f81cc1906668c82c2393e37600a7697cba2a05
Treehugger Robot [Tue, 16 Jan 2018 18:25:32 +0000 (18:25 +0000)]
Merge "ActivityThread: Attempt to attach agent with app's classloader"
Brad Ebinger [Thu, 14 Dec 2017 22:22:27 +0000 (14:22 -0800)]
Integrate IMS Registration API
Integrates the new IMS Registration API into the framework
and add two APIs for feature parity.
1) Moves ImsRegistrationImplBase to the android.telephony.ims
namespace
2) Expose ImsRegistration AIDL in TelephonyManager as hidden
API.
3) Adds onVoicemailCountUpdate and
onSubscriberAssociatedUriChanged APIs for feature parity.
Bug:
63987047
Test: Telephony unit tests, manual IMS tests
Merged-In: I51a8ae5cf58b81708c21adc1b26a9eb59f6280fd
Change-Id: I51a8ae5cf58b81708c21adc1b26a9eb59f6280fd
Treehugger Robot [Tue, 16 Jan 2018 14:25:13 +0000 (14:25 +0000)]
Merge changes I0d0c0fac,Ifb9b00b6
* changes:
Split updateCapabilities into two methods.
More strictly check NetworkCapabilities callbacks.
Lorenzo Colitti [Tue, 16 Jan 2018 13:34:46 +0000 (13:34 +0000)]
Merge "Update netId to nethandle mapping in NetworkTest." am:
a04d0cc72f
am:
503135596b
Change-Id: I5e8e57f38580742eae38f63f43e37cc647412212
Lorenzo Colitti [Tue, 16 Jan 2018 13:23:05 +0000 (13:23 +0000)]
Merge "Update netId to nethandle mapping in NetworkTest."
am:
a04d0cc72f
Change-Id: Ie4524e17f1839bae832d03248a2208693b1b1e95
Lorenzo Colitti [Mon, 15 Jan 2018 15:52:07 +0000 (00:52 +0900)]
Split updateCapabilities into two methods.
This makes the code a bit easier to follow.
Test: ConnectivityServiceTest continues to pass
Change-Id: I0d0c0facc1e3ba07b53542b35da40ddc096ff92e
Treehugger Robot [Tue, 16 Jan 2018 12:23:02 +0000 (12:23 +0000)]
Merge "Update netId to nethandle mapping in NetworkTest."
Paul Duffin [Tue, 16 Jan 2018 11:40:57 +0000 (11:40 +0000)]
Merge "Replace legacy-test with android.test.base in bp files" am:
2285630e4b
am:
caacf3e7c4
Change-Id: I0fa822af057afc2f4efb6285404653fe57bcd742
Paul Duffin [Tue, 16 Jan 2018 11:29:21 +0000 (11:29 +0000)]
Merge "Replace legacy-test with android.test.base in bp files"
am:
2285630e4b
Change-Id: If956b45e21b7d576daf5dcece9c1acea35d952a0
Paul Duffin [Tue, 16 Jan 2018 10:47:47 +0000 (10:47 +0000)]
Merge "Replace legacy-test with android.test.base in bp files"
Hugo Benichi [Tue, 16 Jan 2018 10:30:20 +0000 (10:30 +0000)]
Merge "MacAddress: add @NonNull annotations" am:
e65a016d76
am:
a7c125e5b2
Change-Id: Icaa08c082797c6dbc3382e0662e24e1c84114175
Hugo Benichi [Tue, 16 Jan 2018 10:18:55 +0000 (10:18 +0000)]
Merge "MacAddress: add @NonNull annotations"
am:
e65a016d76
Change-Id: Ia1ea828cfd33b5287639e4fd3ab248a58650168b
Lorenzo Colitti [Tue, 16 Jan 2018 08:18:17 +0000 (17:18 +0900)]
Update netId to nethandle mapping in NetworkTest.
Bug:
63052780
Test: NetworkTest now passes
Change-Id: I5f1cb3055b7042a19afb5dd62f082912157612ba
Hugo Benichi [Tue, 16 Jan 2018 07:10:50 +0000 (07:10 +0000)]
Merge "MacAddress: add @NonNull annotations"
Lorenzo Colitti [Tue, 16 Jan 2018 05:16:34 +0000 (05:16 +0000)]
Merge "Change the netId to nethandle mapping." am:
9456c020d8
am:
feaf412e19
Change-Id: Idd1b2f462c1c78bdb68b43a4aa77bf2358f7cb52
Lorenzo Colitti [Tue, 16 Jan 2018 05:06:50 +0000 (05:06 +0000)]
Merge "Change the netId to nethandle mapping."
am:
9456c020d8
Change-Id: I605ea54ff9e8e32e4fad6f0346b37849fadbc81a
Hugo Benichi [Fri, 12 Jan 2018 00:46:29 +0000 (09:46 +0900)]
MacAddress: add @NonNull annotations
This patch adds to the MacAddress class:
- getAddressType() method which replaces addressType(), for naming
consistency
- @NonNull annotations on all input and output reference values for
all public methods (@hide and public).
TYPE_UNKNOWN, which currently cannot be observed with a non @hide
method, is also removed from the public api.
Bug:
71866627
Test: $ runtest frameworks-net
Change-Id: I2af70408d46f431b7b32183e6b48ddae9a261a2c
Treehugger Robot [Tue, 16 Jan 2018 02:58:56 +0000 (02:58 +0000)]
Merge "Change the netId to nethandle mapping."
Hugo Benichi [Tue, 16 Jan 2018 02:31:48 +0000 (02:31 +0000)]
Merge "ConnectivityService: synchronize access on mLockdownEnabled" am:
46e9e35835
am:
2d59e3cab0
Change-Id: Icadee616fc95e1c126285524dfe49331fcf87462
Hugo Benichi [Tue, 16 Jan 2018 02:18:29 +0000 (02:18 +0000)]
Merge "ConnectivityService: synchronize access on mLockdownEnabled"
am:
46e9e35835
Change-Id: I2abc857093879955eae62802f152c96c1ee942f3
Hugo Benichi [Tue, 16 Jan 2018 00:20:52 +0000 (00:20 +0000)]
Merge "ConnectivityService: synchronize access on mLockdownEnabled"
Andreas Gampe [Fri, 5 Jan 2018 21:55:15 +0000 (13:55 -0800)]
ActivityThread: Attempt to attach agent with app's classloader
Try to use the app's (main) classloader when an attach-agent request
is handled. If that fails, retry without a classloader.
Add bind-application-time flag to ProfilerInfo. Use the flag to have
a second attach-agent point on app startup. Add --attach-agent-bind
to cmd activity start to expose the difference between pre-bind and
bind-time attaching.
Bug:
70901841
Test: m
Test: cts-tradefed run commandAndExit cts-dev -m CtsJvmtiAttachingHostTestCases
Change-Id: I21698ec3be43a6d095d577100b2adfb22daca7d5
Nathan Harold [Mon, 15 Jan 2018 18:48:00 +0000 (10:48 -0800)]
Update documentation for KEY_CARRIER_NAME_STRING
The documentation for KEY_CARRIER_NAME_STRING was out
of date; documentation updated to support the additional
use case of "fallback" carrier name when SPN is
unavailable.
Bug:
71882065
Test: compilation (docstring-only change)
Change-Id: I8e6a44358f8b18384c3c6e3cc0964e94c2484a11
Lorenzo Colitti [Tue, 5 Sep 2017 02:15:37 +0000 (11:15 +0900)]
Change the netId to nethandle mapping.
Being able to update this handle is necessary to ensure that
system-only OTAs do not break vendor code that relies on
nethandles.
Bug:
63052780
Test: walleye builds, boots, networking works
Test: MultinetworkApiTest CTS tests passes
Change-Id: I049a4ad2610ca68b8f56377b63be7e5e8ce76039
Paul Duffin [Mon, 15 Jan 2018 15:47:47 +0000 (15:47 +0000)]
Replace legacy-test with android.test.base in bp files
The legacy-test target is deprecated and will be replaced by
android.test.base. This replaces a few usages of the legacy-test target
in Android.bp files with android.test.base.
Bug:
30188076
Test: make checkbuild
Change-Id: I3575f638114fe2a3b703e67837496346bde24472
vichang [Mon, 15 Jan 2018 15:40:02 +0000 (15:40 +0000)]
Merge "Add a new API android.icu.util.LocaleData" am:
9cb0b52011
am:
926407257d
Change-Id: I5c9449a9778a8a09df43ae779a3188969077e797
vichang [Mon, 15 Jan 2018 15:26:31 +0000 (15:26 +0000)]
Merge "Add a new API android.icu.util.LocaleData"
am:
9cb0b52011
Change-Id: I159748036ae2a59ea79cf191ec4cf19ba1f5bbad
Lorenzo Colitti [Fri, 12 Jan 2018 07:22:21 +0000 (16:22 +0900)]
More strictly check NetworkCapabilities callbacks.
This change more strictly accounts for onCapabilitiesChanged
callbaks and their values. It exposes several cases where we the
callbacks we send are spurious.
Test: ConnectivityServiceTest continues to pass
Change-Id: Ifb9b00b6f0cae48f8ed41a525100d1744b5f429b
Erik Kline [Mon, 15 Jan 2018 14:38:08 +0000 (14:38 +0000)]
Merge "change NMS removeNetwork to netd binder variant" am:
e61ee4198e
am:
b73571b981
Change-Id: I6de7f38c7081e14d817cc7aad44cb5b6a978328b
Erik Kline [Mon, 15 Jan 2018 14:28:48 +0000 (14:28 +0000)]
Merge "change NMS removeNetwork to netd binder variant"
am:
e61ee4198e
Change-Id: I789653740c8cb1bb879215eaa3101f56d5bf7096
vichang [Mon, 15 Jan 2018 13:55:54 +0000 (13:55 +0000)]
Merge "Add a new API android.icu.util.LocaleData"
vichang [Mon, 15 Jan 2018 13:37:49 +0000 (13:37 +0000)]
Merge "Expose API android.icu.util.IllformedLocaleException" am:
a5fed7f526
am:
3c84896ced
Change-Id: Iea46598fce566f6075428cca9b10279dcb28eae4
vichang [Mon, 15 Jan 2018 13:21:57 +0000 (13:21 +0000)]
Merge "Expose API android.icu.util.IllformedLocaleException"
am:
a5fed7f526
Change-Id: I30faa7bfd7076f86abce9b31c546d1e49e34e7da
Treehugger Robot [Mon, 15 Jan 2018 12:39:09 +0000 (12:39 +0000)]
Merge "change NMS removeNetwork to netd binder variant"
vichang [Mon, 15 Jan 2018 11:56:58 +0000 (11:56 +0000)]
Merge "Expose API android.icu.util.IllformedLocaleException"
Erik Kline [Mon, 15 Jan 2018 08:05:07 +0000 (17:05 +0900)]
change NMS removeNetwork to netd binder variant
Also: require NETWORK_STACK instead of CONNECTIVITY_INTERNAL.
Bug:
34953048
Bug:
64133961
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net
Change-Id: I26f07f51a8a2f4a8bb43a276da7c5e66c355c848
Paul Duffin [Sat, 13 Jan 2018 21:25:58 +0000 (21:25 +0000)]
Merge "Remove junit classes from legacy-android-test" am:
4418418adb
am:
d724c112f3
Change-Id: I82688070910b342152f4076425ac2fedbf41be7c
Paul Duffin [Sat, 13 Jan 2018 21:13:12 +0000 (21:13 +0000)]
Merge "Remove junit classes from legacy-android-test"
am:
4418418adb
Change-Id: Id2966fd487ff95aa5a8e485756366df804765800
Paul Duffin [Sat, 13 Jan 2018 19:33:39 +0000 (19:33 +0000)]
Merge "Remove junit classes from legacy-android-test"
Paul Duffin [Sat, 13 Jan 2018 11:22:25 +0000 (11:22 +0000)]
Merge changes from topic "fix-legacy-android-test-spam" am:
22bd015cba
am:
fdc58270ef
Change-Id: I2f6dca4843d6f61efee1577ba5e88d16844cfbfe
Paul Duffin [Sat, 13 Jan 2018 11:17:46 +0000 (11:17 +0000)]
Move legacy-test to test-base am:
2141827700
am:
3f200744ae
Change-Id: I50ea451e6f8c80e47b7ff28b128d713e24aeb5f0
Paul Duffin [Sat, 13 Jan 2018 11:06:08 +0000 (11:06 +0000)]
Merge changes from topic "fix-legacy-android-test-spam"
am:
22bd015cba
Change-Id: Ib2be0591aba3b4a2f6b06becc9cd3f5de1a40532
Paul Duffin [Sat, 13 Jan 2018 11:00:30 +0000 (11:00 +0000)]
Move legacy-test to test-base
am:
2141827700
Change-Id: I231aa9f47f0bb8d6985eedc4db6630772dcc8c27
Paul Duffin [Fri, 12 Jan 2018 16:08:35 +0000 (16:08 +0000)]
Remove junit classes from legacy-android-test
A mistake during the conversion of the legacy-android-test target from
Android.mk to Android.bp caused some junit classes to be accidentally
included in the legacy-android-test target. That caused some warnings
about duplicate classes to be output during the build.
The junit classes are being included as part of the static library
android.test.runner. This fixes that by adding a new
android.test.runner-minus-junit which excludes the junit classes
and then using that instead.
Test: make checkbuild
Change-Id: Icd00b38c64d3416a55c1055f9716ddb78ec278f8
Paul Duffin [Sat, 13 Jan 2018 09:33:05 +0000 (09:33 +0000)]
Merge changes from topic "fix-legacy-android-test-spam"
* changes:
Added new android.test.base targets
Move legacy-test to test-base
zxuan [Sat, 13 Jan 2018 05:55:22 +0000 (05:55 +0000)]
Merge "Add the user mobile data state into PhoneStateListener so that applications can listen to the change of the user mobile data state." am:
895148087b
am:
5cea30c4ec
Change-Id: Ife2ac4b12d698f6db09bb3194eaea6994357828d
zxuan [Sat, 13 Jan 2018 05:42:00 +0000 (05:42 +0000)]
Merge "Add the user mobile data state into PhoneStateListener so that applications can listen to the change of the user mobile data state."
am:
895148087b
Change-Id: I1c3e4b67c4ab3e21f955b5fffcc2e019c73d6140