OSDN Git Service
Jack Yu [Wed, 3 Apr 2019 04:31:11 +0000 (21:31 -0700)]
[automerger skipped] Merge changes from topic "am-
ee7381fd1a8845c99ba642b88f8db9d4" into stage-aosp-master
am:
f2b4fcbacc -s ours
am skip reason: change_id Ib152f97711441fded998a36528ef007f9e28ccbf with SHA1
27ff407104 is in history
Change-Id: I91228bb25d5d27440dbb8fe6297dfc91ac83bec5
Jack Yu [Wed, 3 Apr 2019 04:19:15 +0000 (21:19 -0700)]
Merge changes from topic "am-
77824143cfe54e8ebd083716dd4fb16f" into stage-aosp-master
am:
259ea052e8
Change-Id: I9f66f83c96be53f9b27aea8356c6ce2e0e8c1ec1
Android Build Merger (Role) [Wed, 3 Apr 2019 03:58:43 +0000 (03:58 +0000)]
Merge "Merge "Merge "Make CaptivePortalProbeSpec and CaptivePortalProbeResult as a library" am:
3db9cfe660" into stage-aosp-master am:
78d17025e8" into pi-dev-plus-aosp
Paul Hu [Wed, 3 Apr 2019 03:57:51 +0000 (20:57 -0700)]
Merge "Merge "Make CaptivePortalProbeSpec and CaptivePortalProbeResult as a library" am:
3db9cfe660" into stage-aosp-master
am:
78d17025e8
Change-Id: Ide6e0120b57228d2dd4c9895abf716f18b41b1fa
Android Build Merger (Role) [Wed, 3 Apr 2019 03:47:48 +0000 (03:47 +0000)]
Merge "Merge "Make CaptivePortalProbeSpec and CaptivePortalProbeResult as a library" am:
3db9cfe660 am:
2d20cd2378" into pi-dev-plus-aosp
Paul Hu [Wed, 3 Apr 2019 03:47:27 +0000 (20:47 -0700)]
Merge "Make CaptivePortalProbeSpec and CaptivePortalProbeResult as a library" am:
3db9cfe660
am:
2d20cd2378
Change-Id: Ibf8b3f0c986acb156c3705ee569554bf673269f0
Paul Hu [Wed, 3 Apr 2019 03:45:17 +0000 (20:45 -0700)]
Merge "Make CaptivePortalProbeSpec and CaptivePortalProbeResult as a library" am:
3db9cfe660
am:
2d20cd2378
Change-Id: I5a5fd9f900bb1d7217364812d9d0e5477179bfc9
Android Build Merger (Role) [Wed, 3 Apr 2019 03:35:37 +0000 (03:35 +0000)]
Merge changes from topic "am-
ee7381fd1a8845c99ba642b88f8db9d4" into stage-aosp-master
* changes:
Merge changes from topics "lte_ca_support", "ss_provider" am:
8dedf2b5e4
Passing ServiceState as byte array into ServiceStateProvider am:
2d9b4faedc
Android Build Merger (Role) [Wed, 3 Apr 2019 03:34:48 +0000 (03:34 +0000)]
Merge changes from topic "am-
77824143cfe54e8ebd083716dd4fb16f" into stage-aosp-master
* changes:
Merge changes from topics "lte_ca_support", "ss_provider" am:
8dedf2b5e4
Passing ServiceState as byte array into ServiceStateProvider am:
2d9b4faedc
Jack Yu [Wed, 3 Apr 2019 03:34:06 +0000 (20:34 -0700)]
Merge changes from topics "lte_ca_support", "ss_provider"
am:
8dedf2b5e4
Change-Id: I6906070f9df82b57e49c5edf50e8931aa5192cdf
Jack Yu [Wed, 3 Apr 2019 03:33:21 +0000 (20:33 -0700)]
Merge changes from topics "lte_ca_support", "ss_provider"
am:
8dedf2b5e4
Change-Id: I3cb0bad3aa3c6b24b79709c507739baab670c044
Jack Yu [Wed, 3 Apr 2019 03:25:44 +0000 (20:25 -0700)]
Passing ServiceState as byte array into ServiceStateProvider
am:
2d9b4faedc
Change-Id: I8471dc9b1353135b0a9b693d2845c7f358213f6c
Jack Yu [Wed, 3 Apr 2019 03:24:53 +0000 (20:24 -0700)]
Passing ServiceState as byte array into ServiceStateProvider
am:
2d9b4faedc
Change-Id: I26dffc5c5c819a93c04cc64763d49e920f20cb01
Android Build Merger (Role) [Wed, 3 Apr 2019 03:17:56 +0000 (03:17 +0000)]
Merge "Merge "Make CaptivePortalProbeSpec and CaptivePortalProbeResult as a library" am:
3db9cfe660" into stage-aosp-master
Paul Hu [Wed, 3 Apr 2019 03:17:33 +0000 (20:17 -0700)]
Merge "Make CaptivePortalProbeSpec and CaptivePortalProbeResult as a library"
am:
3db9cfe660
Change-Id: I33db2bd452f5b30b382f8e0e913862ad6bcc099e
Paul Hu [Wed, 3 Apr 2019 03:16:43 +0000 (20:16 -0700)]
Merge "Make CaptivePortalProbeSpec and CaptivePortalProbeResult as a library"
am:
3db9cfe660
Change-Id: I387332fd5914474010eb1b29d6543028457599df
Jack Yu [Wed, 3 Apr 2019 02:47:20 +0000 (02:47 +0000)]
Merge changes from topics "lte_ca_support", "ss_provider"
* changes:
Correctly support LTE carrier aggregation
Passing ServiceState as byte array into ServiceStateProvider
Paul Hu [Wed, 3 Apr 2019 02:42:06 +0000 (02:42 +0000)]
Merge "Make CaptivePortalProbeSpec and CaptivePortalProbeResult as a library"
Dan Willemsen [Wed, 3 Apr 2019 01:48:21 +0000 (18:48 -0700)]
Merge "Use LOCAL_REQUIRED_MODULES instead of LOCAL_TARGET_REQUIRED_MODULES" am:
50b59ccafc
am:
d092f8a234
Change-Id: I9db35be9e19d51be23b540340bc5a1066ade0292
Brad Ebinger [Wed, 3 Apr 2019 01:39:55 +0000 (18:39 -0700)]
Merge "Change UT to disabled by default" am:
3c1a889a9c
am:
94c06c609a
Change-Id: I930b6873fcc24aebcf430f356bc1002db665ce5d
Dan Willemsen [Wed, 3 Apr 2019 01:13:51 +0000 (18:13 -0700)]
Merge "Use LOCAL_REQUIRED_MODULES instead of LOCAL_TARGET_REQUIRED_MODULES"
am:
50b59ccafc
Change-Id: Ia61b5c353a0d8316319c9bd9e5723795cfe41957
Brad Ebinger [Wed, 3 Apr 2019 01:05:12 +0000 (18:05 -0700)]
Merge "Change UT to disabled by default"
am:
3c1a889a9c
Change-Id: Id0e575b3e17515667371ff626a4423e1cb82b2c0
Treehugger Robot [Tue, 2 Apr 2019 23:46:52 +0000 (23:46 +0000)]
Merge "Use LOCAL_REQUIRED_MODULES instead of LOCAL_TARGET_REQUIRED_MODULES"
Treehugger Robot [Tue, 2 Apr 2019 23:21:31 +0000 (23:21 +0000)]
Merge "Change UT to disabled by default"
Dan Willemsen [Tue, 2 Apr 2019 21:49:32 +0000 (14:49 -0700)]
Use LOCAL_REQUIRED_MODULES instead of LOCAL_TARGET_REQUIRED_MODULES
LOCAL_TARGET_REQUIRED_MODULES is intended for host -> target
dependencies, not target -> target dependencies (which can use
LOCAL_REQUIRED_MODULES).
Test: treehugger
Change-Id: I84de8adcdd772be0169b6d6b8df6f69b00ce888f
Jack Yu [Mon, 1 Apr 2019 22:01:13 +0000 (15:01 -0700)]
Correctly support LTE carrier aggregation
NetworkRegistrationInfo.getAccessNetworkTechnology() should
report LTE as the network type when modem reports the RAT
LTE_CA. Fixed by adding a flag in data specific registration
info.
Test: Manual
Bug:
129707180
Merged-In: Ib152f97711441fded998a36528ef007f9e28ccbf
Change-Id: Ib152f97711441fded998a36528ef007f9e28ccbf
(cherry picked from commit
05a6543248d87ee918a9019796d5ff8c7799f604)
Jack Yu [Tue, 2 Apr 2019 17:49:35 +0000 (10:49 -0700)]
Passing ServiceState as byte array into ServiceStateProvider
This allows the provider to reconstruct the service state
object correctly. Also we can get rid of all the 'set'
methods in ServiceState, which we'd like to remove in the future.
Test: Manual
Bug:
129768354
Merged-In: I835d30e544b3ed49d5d0b6b1ca981a81e3ee2039
Change-Id: I835d30e544b3ed49d5d0b6b1ca981a81e3ee2039
(cherry picked from commit
2e273b2f0f160487b75f5386a2a0cd688f095727)
Colin Cross [Tue, 2 Apr 2019 17:19:15 +0000 (10:19 -0700)]
Merge "Convert frameworks/base/cmds/* to Android.bp" am:
179e132823
am:
aa9e302a63
Change-Id: I05de333caa6aa5ed6b33389e2c320d845b9a36ee
Colin Cross [Tue, 2 Apr 2019 16:59:30 +0000 (09:59 -0700)]
Merge "Convert frameworks/base/cmds/* to Android.bp"
am:
179e132823
Change-Id: I22698f8a29dfe60b7dc1198ac62af5d59827e9d7
Colin Cross [Tue, 2 Apr 2019 16:39:04 +0000 (16:39 +0000)]
Merge "Convert frameworks/base/cmds/* to Android.bp"
Benjamin Miller [Tue, 2 Apr 2019 15:36:21 +0000 (08:36 -0700)]
Merge "docs: Linked VpnService class description to guide." am:
97f778f0b5
am:
a2443f115e
Change-Id: I2a43d91af59ea51a8f81aecc0970e7ba77eaa3b1
Benjamin Miller [Tue, 2 Apr 2019 15:28:16 +0000 (08:28 -0700)]
Merge "docs: Linked VpnService class description to guide."
am:
97f778f0b5
Change-Id: I567720f4d1410b5d2da415321d7eebc2f79f35f6
Treehugger Robot [Tue, 2 Apr 2019 15:14:28 +0000 (15:14 +0000)]
Merge "docs: Linked VpnService class description to guide."
Andrei-Valentin Onea [Tue, 2 Apr 2019 13:40:33 +0000 (06:40 -0700)]
Merge "Automatically greylist code in 3P packages" am:
1f80714c2d
am:
8b1745650b
Change-Id: I73ba988cc378c6204a95e3f9e6931336aaf3d953
Andrei-Valentin Onea [Tue, 2 Apr 2019 13:29:51 +0000 (06:29 -0700)]
Merge "Automatically greylist code in 3P packages"
am:
1f80714c2d
Change-Id: Icb8a10c22c6ecfb807fa8d1669940f02edfd97c4
Andrei-Valentin Onea [Tue, 2 Apr 2019 13:10:37 +0000 (13:10 +0000)]
Merge "Automatically greylist code in 3P packages"
Junyu Lai [Tue, 2 Apr 2019 11:15:07 +0000 (04:15 -0700)]
Merge "Ignore the asynchronous result while stopping keepalive" am:
7934214f4c
am:
deae9510db
Change-Id: I25daef8b1bbbbe93e636c320a032a486751ebcc9
Junyu Lai [Tue, 2 Apr 2019 11:05:49 +0000 (04:05 -0700)]
Merge "Ignore the asynchronous result while stopping keepalive"
am:
7934214f4c
Change-Id: Idc6d76ca412f7bbae3b32e81756c419d84dc2c80
Junyu Lai [Tue, 2 Apr 2019 10:48:23 +0000 (10:48 +0000)]
Merge "Ignore the asynchronous result while stopping keepalive"
paulhu [Fri, 29 Mar 2019 11:21:30 +0000 (19:21 +0800)]
Make CaptivePortalProbeSpec and CaptivePortalProbeResult as a library
These two classes were added to @SystemApi because they are used
both by NetworkMonitor and CaptivePortalLogin. However it turns
out they are not needed in the framework, so having them as a
library sounds better.
Change-Id: Iadf77ec5952b6da8812dc6d006a39bd4e93d2bd9
Fix:
129433264
Test: atest NetworkStackTests FrameworksNetTests
Paul Hu [Tue, 2 Apr 2019 08:14:24 +0000 (01:14 -0700)]
Merge "Address leftover comments on 923337 and 930217." am:
1e97aab6f4
am:
55a22b5d17
Change-Id: Ibbc8dd7bb869f76515c9f57793db02953dd07804
Paul Hu [Tue, 2 Apr 2019 07:58:18 +0000 (00:58 -0700)]
Merge "Address leftover comments on 923337 and 930217."
am:
1e97aab6f4
Change-Id: I733160ae51b8f0e80f78ab375cdb0a547b74f68d
Paul Hu [Tue, 2 Apr 2019 07:39:04 +0000 (07:39 +0000)]
Merge "Address leftover comments on 923337 and 930217."
Steven Moreland [Tue, 2 Apr 2019 02:50:13 +0000 (19:50 -0700)]
Merge "Revert "Revert "Preload non-bootclasspath Java lib ClassLoaders.""" am:
4b5ca28dfe
am:
4e709ea3fd
Change-Id: Ia5b6280f17a67f0fa791f36544a77e2af99e7e0e
Steven Moreland [Tue, 2 Apr 2019 02:38:43 +0000 (19:38 -0700)]
Merge "Revert "Revert "Preload non-bootclasspath Java lib ClassLoaders."""
am:
4b5ca28dfe
Change-Id: I63fa6d4a8671db24bf9fce898414c27068547ed2
Xiangyu/Malcolm Chen [Tue, 2 Apr 2019 02:26:11 +0000 (19:26 -0700)]
Merge "API Feedback for CBRS" am:
9c706654a2
am:
f9edc9fffd
Change-Id: I7c449a129ab8bd759b40e0aa0a429dd7847ef755
Steven Moreland [Tue, 2 Apr 2019 02:19:44 +0000 (02:19 +0000)]
Merge "Revert "Revert "Preload non-bootclasspath Java lib ClassLoaders."""
Xiangyu/Malcolm Chen [Tue, 2 Apr 2019 02:10:02 +0000 (19:10 -0700)]
Merge "API Feedback for CBRS"
am:
9c706654a2
Change-Id: I6a6d0a81100093696fc6e4b66b32e34dbed49913
Paul Hu [Tue, 2 Apr 2019 02:09:46 +0000 (19:09 -0700)]
Merge "[IPMS] Implement regular maintenance" am:
7f10bb1c11
am:
c308297bc2
Change-Id: Ia9bb46e1ffaf3c3d0a268de1dc0a2fad03b4e240
Paul Hu [Tue, 2 Apr 2019 01:59:35 +0000 (18:59 -0700)]
Merge "Fix IpPrefixTest#testContainsInetAddress fail." am:
66a133858b
am:
9872066d02
Change-Id: I257b51a4f0be974eacf8a6c0f12b5d5aacdc7a5f
Paul Hu [Tue, 2 Apr 2019 01:58:18 +0000 (18:58 -0700)]
Merge "[IPMS] Implement regular maintenance"
am:
7f10bb1c11
Change-Id: I82e4bc47ed3dc2d1b6907c7229df296ba2b4d88e
Remi NGUYEN VAN [Tue, 2 Apr 2019 01:54:02 +0000 (18:54 -0700)]
Merge "Rename NetworkStackPermissionStub" am:
073e73a0c1
am:
63d998d859
Change-Id: Iffecb9d56fe90d9c62e963c2c38094f0c2b21f39
Paul Hu [Tue, 2 Apr 2019 01:47:42 +0000 (18:47 -0700)]
Merge "Fix IpPrefixTest#testContainsInetAddress fail."
am:
66a133858b
Change-Id: I0926ee39c306fefdd158e1c4c7e4c1ba4b7c5f7d
Xiangyu/Malcolm Chen [Tue, 2 Apr 2019 01:46:19 +0000 (01:46 +0000)]
Merge "API Feedback for CBRS"
Remi NGUYEN VAN [Tue, 2 Apr 2019 01:43:14 +0000 (18:43 -0700)]
Merge "Rename NetworkStackPermissionStub"
am:
073e73a0c1
Change-Id: I616fb13add96c3c4708510138a4e920336695239
Paul Hu [Tue, 2 Apr 2019 01:39:38 +0000 (01:39 +0000)]
Merge "[IPMS] Implement regular maintenance"
Paul Hu [Tue, 2 Apr 2019 01:33:02 +0000 (01:33 +0000)]
Merge "Fix IpPrefixTest#testContainsInetAddress fail."
Remi NGUYEN VAN [Tue, 2 Apr 2019 01:31:51 +0000 (01:31 +0000)]
Merge "Rename NetworkStackPermissionStub"
Chalard Jean [Tue, 2 Apr 2019 00:41:35 +0000 (17:41 -0700)]
Merge "Cleanup SystemReady in the network stack" am:
e0ef7ce4f7
am:
4b130e8567
Change-Id: Id1348ffa1406adf08b94eec18b3b1e6da40e84be
Hall Liu [Tue, 2 Apr 2019 00:24:01 +0000 (17:24 -0700)]
Merge "Add a new carrier config to show the WFC location privacy policy UI" am:
4c508d1b03
am:
d94791b712
Change-Id: I435a8b653960e07931bb8c0c11fad3f805431dc6
Jack He [Tue, 2 Apr 2019 00:18:16 +0000 (17:18 -0700)]
Merge "BluetoothHealth: hide auto-created default constructors" am:
463454432b
am:
39a6d731bb
Change-Id: If1410685d139f44a87648bfdb87094cd30ec8462
Remi NGUYEN VAN [Tue, 26 Mar 2019 08:24:48 +0000 (17:24 +0900)]
Rename NetworkStackPermissionStub
Use NetworkStackPermissionConfig instead.
Bug:
129317412
Test: Flashed, booted, WiFi working
Merged-In: I7bdc058dddfa483823074055ad5c9d7d2efd37b9
Change-Id: I45299c12598cd3b33bfd78ae8698d98b77b18dc0
Chalard Jean [Tue, 2 Apr 2019 00:12:06 +0000 (17:12 -0700)]
Merge "Cleanup SystemReady in the network stack"
am:
e0ef7ce4f7
Change-Id: I1a55078b74d5f94afde94da0dc5f6e1d2af10de3
Mathieu Chartier [Tue, 2 Apr 2019 00:11:04 +0000 (17:11 -0700)]
Merge "Pass debug.allocTracker.stackDepth to runtime if it exists" am:
72e80b5b1a
am:
efeaad3225
Change-Id: I16ff57136a2f53e97b494c866ac3497e00996823
Hall Liu [Mon, 1 Apr 2019 23:34:30 +0000 (16:34 -0700)]
Merge "Add a new carrier config to show the WFC location privacy policy UI"
am:
4c508d1b03
Change-Id: I1b3c96de78b909dab372e3e3745c877b8becd2d6
Jack He [Mon, 1 Apr 2019 23:29:30 +0000 (16:29 -0700)]
Merge "BluetoothHealth: hide auto-created default constructors"
am:
463454432b
Change-Id: I51d7f625dd2bcb81fec4bcf25822d1533cbc5cee
Chalard Jean [Mon, 1 Apr 2019 23:28:47 +0000 (23:28 +0000)]
Merge "Cleanup SystemReady in the network stack"
Mathieu Chartier [Mon, 1 Apr 2019 23:24:14 +0000 (16:24 -0700)]
Merge "Pass debug.allocTracker.stackDepth to runtime if it exists"
am:
72e80b5b1a
Change-Id: Iaf05e6a285dbf626854a3b37101bea032af3a7a8
Hall Liu [Mon, 1 Apr 2019 22:55:51 +0000 (22:55 +0000)]
Merge "Add a new carrier config to show the WFC location privacy policy UI"
Jaewoong Jung [Mon, 1 Apr 2019 22:54:33 +0000 (22:54 +0000)]
Merge "Revert "Convert Android.mk to Android.bp"" into pi-dev-plus-aosp
Jaewoong Jung [Mon, 1 Apr 2019 22:43:03 +0000 (22:43 +0000)]
Revert "Convert Android.mk to Android.bp"
This reverts commit
9a7e79112d5d936ace862e565b7df724906ae1de.
Reason for revert: Broke builds
Change-Id: I45b2e49535a12272963a24f1e9f7ef25b31e5360
Merged-In: I80688006411dcf32f8f329556044d25ad12af1ac
Treehugger Robot [Mon, 1 Apr 2019 22:37:43 +0000 (22:37 +0000)]
Merge "BluetoothHealth: hide auto-created default constructors"
Mathieu Chartier [Mon, 1 Apr 2019 22:29:07 +0000 (22:29 +0000)]
Merge "Pass debug.allocTracker.stackDepth to runtime if it exists"
Malcolm Chen [Thu, 21 Mar 2019 03:32:27 +0000 (20:32 -0700)]
API Feedback for CBRS
Bug:
128902411
Test: unittest
Change-Id: I2476834a5048d0e3c2c3413d7168a7a3ad2d7042
Merged-In: I2476834a5048d0e3c2c3413d7168a7a3ad2d7042
Jaewoong Jung [Mon, 1 Apr 2019 22:01:26 +0000 (22:01 +0000)]
Merge "Convert Android.mk to Android.bp" into pi-dev-plus-aosp
Xiangyu/Malcolm Chen [Mon, 1 Apr 2019 21:31:06 +0000 (14:31 -0700)]
Merge "Remove clearDefaultsForInactiveSubIds." am:
1e263e7bc0
am:
4e32ac7754
Change-Id: I8c21ba73807837f999bf3fcc7fbef1d24c7500da
Hall Liu [Mon, 1 Apr 2019 21:14:03 +0000 (14:14 -0700)]
Merge changes from topics "nw-scan-cts", "nw-scan-changes" am:
f276a56215
am:
7e3864bc99
Change-Id: I45112b415f0f1d6a991b65a2f87c04f829a13548
Hall Liu [Mon, 1 Apr 2019 21:08:39 +0000 (14:08 -0700)]
Allow requestNetworkScan to return sanitized info am:
c9d7430685
am:
87217889f1
Change-Id: I601304e6eaedef27a2adc413084e6a240a5e9b97
Xiangyu/Malcolm Chen [Mon, 1 Apr 2019 21:05:57 +0000 (14:05 -0700)]
Merge "Remove clearDefaultsForInactiveSubIds."
am:
1e263e7bc0
Change-Id: I8fb91dd4928cf8a607a876cc304c261bfb762a59
Hall Liu [Mon, 1 Apr 2019 20:54:15 +0000 (13:54 -0700)]
Merge changes from topics "nw-scan-cts", "nw-scan-changes"
am:
f276a56215
Change-Id: I1399e0bd8a6ff26e8df2bfc7d4515e4dbb1d64e4
Xiangyu/Malcolm Chen [Mon, 1 Apr 2019 20:51:54 +0000 (20:51 +0000)]
Merge "Remove clearDefaultsForInactiveSubIds."
Hall Liu [Mon, 1 Apr 2019 20:47:42 +0000 (13:47 -0700)]
Allow requestNetworkScan to return sanitized info
am:
c9d7430685
Change-Id: I91b315cd48095345f34755cc13d059158982a960
Hall Liu [Mon, 1 Apr 2019 20:31:10 +0000 (20:31 +0000)]
Merge changes from topics "nw-scan-cts", "nw-scan-changes"
* changes:
Add shell permissions for CTS testing
Allow requestNetworkScan to return sanitized info
Jack He [Fri, 29 Mar 2019 00:42:26 +0000 (17:42 -0700)]
BluetoothHealth: hide auto-created default constructors
Fixes:
123926561
Test: make
Change-Id: I388472c82eaca245285b5ecf2959c415508d7e69
Jaewoong Jung [Wed, 27 Mar 2019 23:54:43 +0000 (16:54 -0700)]
Convert Android.mk to Android.bp
Bug:
122332340
Test: full build & flash on a Pixel + manual inspection + TreeHugger
Change-Id: I80688006411dcf32f8f329556044d25ad12af1ac
Merged-In: I80688006411dcf32f8f329556044d25ad12af1ac
(cherry picked from commit
edfa8e90a1231df98be89994bc9d43458d96b79a)
Mathieu Chartier [Fri, 29 Mar 2019 20:49:35 +0000 (13:49 -0700)]
Pass debug.allocTracker.stackDepth to runtime if it exists
Since this is no longer called in ART, pass it down in bind application.
Bug:
37291459
Test: test-art-host
Change-Id: I23623e9b8e9ca6261d90cc1ae1c5d8c24cc4eba5
Neil Fuller [Mon, 1 Apr 2019 16:59:59 +0000 (09:59 -0700)]
Merge "Track public android.system API changes in libcore" am:
1423684d1a
am:
0036c64764
Change-Id: I93b2d6742193414b3f6a81cd35e923a4f6b7f2fb
Neil Fuller [Mon, 1 Apr 2019 16:50:56 +0000 (09:50 -0700)]
Merge "Track public android.system API changes in libcore"
am:
1423684d1a
Change-Id: I98319e08a913b8c679579fb52bc4ded61fc5f5b0
paulhu [Mon, 1 Apr 2019 16:49:00 +0000 (00:49 +0800)]
Fix IpPrefixTest#testContainsInetAddress fail.
The argument of IpPreFix#contains() has been marked as @NonNull.
So the IpPrefixTest#testContainsInetAddress should not test
contains() method wiht null object.
Bug: None
Test: atest FrameworksNetTests
atest IpPrefixTest#testContainsInetAddress
Change-Id: I2f6bee19514dc47702f64d2a2bbf02d8b7b1b407
Neil Fuller [Mon, 1 Apr 2019 16:41:11 +0000 (16:41 +0000)]
Merge "Track public android.system API changes in libcore"
Lorenzo Colitti [Mon, 1 Apr 2019 15:47:10 +0000 (08:47 -0700)]
Merge "Unhide ICMP echo constants." am:
82d1361e6d
am:
a09b83fc67
Change-Id: I02db2b7fee8c5334f7e64ffd256cba9d320e0797
paulhu [Mon, 25 Mar 2019 17:39:10 +0000 (01:39 +0800)]
[IPMS] Implement regular maintenance
Implement regular maintenance of IpMemoryStoreService. Regular
maintenance is scheduled for when the device is idle with access
power and a minimum interval of one day.
Bug:
113554482
Test: atest NetworkStackTests
Change-Id: Id3985e30d12307fc2e9fcbe782caaf97a627cef3
Lorenzo Colitti [Mon, 1 Apr 2019 15:34:23 +0000 (08:34 -0700)]
Merge "Unhide ICMP echo constants."
am:
82d1361e6d
Change-Id: I1dad509eb0b56666cde0399dfcbaea050ce30630
Lorenzo Colitti [Mon, 1 Apr 2019 15:08:44 +0000 (15:08 +0000)]
Merge "Unhide ICMP echo constants."
Remi NGUYEN VAN [Mon, 1 Apr 2019 15:02:13 +0000 (08:02 -0700)]
Merge "Add comment for NetworkStack permissions" am:
154a0d0b38
am:
b4493ea049
Change-Id: I4e1299713b3425a5a86f927e58238aa6da2e7c65
Remi NGUYEN VAN [Mon, 1 Apr 2019 14:53:06 +0000 (07:53 -0700)]
Merge "Add comment for NetworkStack permissions"
am:
154a0d0b38
Change-Id: Ib338cd0de2b9a0aa16e096a299d4d4e5a6b25dd9
Tyler Gunn [Mon, 1 Apr 2019 14:45:41 +0000 (07:45 -0700)]
Merge "Mark PROCESS_OUTGOING_CALLS permission as deprecated." am:
70e943ba80
am:
41ab607d3d
Change-Id: I0111b33db6fb43b387b977007180f362ba36e2db
Treehugger Robot [Mon, 1 Apr 2019 14:45:18 +0000 (14:45 +0000)]
Merge "Add comment for NetworkStack permissions"
Tyler Gunn [Mon, 1 Apr 2019 14:32:39 +0000 (07:32 -0700)]
Merge "Mark PROCESS_OUTGOING_CALLS permission as deprecated."
am:
70e943ba80
Change-Id: I20fed9904a6b8d85c0e7a33ae8db8b3f4ae7987e
Andrei Onea [Fri, 29 Mar 2019 15:27:55 +0000 (15:27 +0000)]
Automatically greylist code in 3P packages
generate_hidden_api_lists now receives a file containing package names
which need to be greylisted (although it could be made to work with any
api list required).
Also took the opportunity to clean up the tests to reflect the more
strict code.
Bug:
129387816
Test: m appcompat
Test: frameworks/base/tools/hiddenapi/generate_hiddenapi_lists_test.py
Change-Id: I619f8581d166aa48eda572bc0053d8739d6420eb
OSDN Git Service
