OSDN Git Service
David Brazdil [Wed, 10 Apr 2019 23:47:32 +0000 (16:47 -0700)]
Merge "Update AppComponentFactory.instantiateClassLoader docs"
am:
352021b4aa
Change-Id: I467b2db20f58adddcfe785abf317d1de6bdc43ba
David Brazdil [Wed, 10 Apr 2019 22:18:02 +0000 (22:18 +0000)]
Merge "Update AppComponentFactory.instantiateClassLoader docs"
David Brazdil [Tue, 9 Apr 2019 16:18:31 +0000 (17:18 +0100)]
Update AppComponentFactory.instantiateClassLoader docs
Clarify the intended use and properties of the default class loader.
Bug:
128524313
Test: n/a
Change-Id: Iae82554f9294d5248b98f1fa72fc1a47993e86fd
Nathan Harold [Wed, 10 Apr 2019 18:05:40 +0000 (11:05 -0700)]
Merge "Update Javadocs for CellInfo Classes"
am:
a49f1b725f
Change-Id: Ib49e00661155178b6303f88258128cdb3d1a8691
Benedict Wong [Wed, 10 Apr 2019 18:00:10 +0000 (11:00 -0700)]
Merge changes I98573a5c,Ic7394f24
am:
c6ce6fc841
Change-Id: I2ffeb6ef1a19f7b2982c3631fe2c040024fb53cb
Nathan Harold [Wed, 10 Apr 2019 17:29:01 +0000 (17:29 +0000)]
Merge "Update Javadocs for CellInfo Classes"
Benedict Wong [Wed, 10 Apr 2019 17:06:17 +0000 (17:06 +0000)]
Merge changes I98573a5c,Ic7394f24
* changes:
Enable checks for MANAGE_TEST_NETWORKS in TestNetworkService
Cleanup of Test Network service
Cody Kesting [Wed, 10 Apr 2019 15:29:13 +0000 (08:29 -0700)]
Merge "Update TelMan API for testing Line1NumberForDisplay."
am:
d09bd9d9f6
Change-Id: I7cbd7e2a6ea11279d5eed8d8b307b00c30b73b89
Cody Kesting [Wed, 10 Apr 2019 15:15:14 +0000 (15:15 +0000)]
Merge "Update TelMan API for testing Line1NumberForDisplay."
Tobias Thierer [Wed, 10 Apr 2019 11:51:08 +0000 (04:51 -0700)]
Merge "Add missing @Deprecated annotation."
am:
498562c3cb
Change-Id: I8e744a739a5772e68fb87cf64747d9e7c03bf416
Treehugger Robot [Wed, 10 Apr 2019 11:38:24 +0000 (11:38 +0000)]
Merge "Add missing @Deprecated annotation."
Lorenzo Colitti [Wed, 10 Apr 2019 09:46:48 +0000 (02:46 -0700)]
Merge "Add lifecycle tests to NetworkMonitorTest"
am:
047940eff0
Change-Id: Ifdf54cf403c5038e666bce346287a5909102a946
Tobias Thierer [Wed, 10 Apr 2019 09:32:04 +0000 (10:32 +0100)]
Add missing @Deprecated annotation.
make warns when a @deprecated javadoc tag is not matched by
a corresponding annotation. The other @deprecated fields in
this class have both.
Fixes:
71706673
Test: Treehugger
Change-Id: I3749a54acc9f63dabdacac77849add34d4085561
Lorenzo Colitti [Wed, 10 Apr 2019 09:30:03 +0000 (09:30 +0000)]
Merge "Add lifecycle tests to NetworkMonitorTest"
Narayan Kamath [Wed, 10 Apr 2019 08:20:37 +0000 (01:20 -0700)]
Merge "Shell: Grant CACHE_CONTENT to Shell"
am:
dd2e005d2f
Change-Id: I5a409357fa9a4acd2cc7cbdf707b7388557e8643
Narayan Kamath [Wed, 10 Apr 2019 07:57:27 +0000 (07:57 +0000)]
Merge "Shell: Grant CACHE_CONTENT to Shell"
Remi NGUYEN VAN [Wed, 10 Apr 2019 06:54:09 +0000 (23:54 -0700)]
Merge "Fix comment on StaticIpConfiguration#getDomains"
am:
a1e48f3c9a
Change-Id: Ia664b08eabe344470a5c08e5510f1a8f7132ac73
Chenbo Feng [Wed, 10 Apr 2019 06:50:10 +0000 (23:50 -0700)]
Merge "Add smoke test for jni library"
am:
b0b166054d
Change-Id: Iedb44739539f63090b067c1a25d4e83c333caddb
Treehugger Robot [Wed, 10 Apr 2019 06:30:55 +0000 (06:30 +0000)]
Merge "Fix comment on StaticIpConfiguration#getDomains"
Treehugger Robot [Wed, 10 Apr 2019 06:30:26 +0000 (06:30 +0000)]
Merge "Add smoke test for jni library"
Benedict Wong [Tue, 9 Apr 2019 23:29:43 +0000 (16:29 -0700)]
Enable checks for MANAGE_TEST_NETWORKS in TestNetworkService
This commit re-enables enforcement of the MANAGE_TEST_NETWORK
permission, which is only granted to the shell. CTS tests using this
permission should use UiAutomation.adoptShellPermissionIdentity() to
gain access.
Bug:
72950854
Test: IPsec CTS tests using this passing
Change-Id: I98573a5c68e45abbbaddef01f6ac74a6a18e26f9
Chiachang Wang [Wed, 10 Apr 2019 04:14:56 +0000 (21:14 -0700)]
Merge "Move data stall definitions out from Setting"
am:
e9a39ceb6b
Change-Id: Iff3db380ed6210811965ec8919acb6c06fbbf1da
Chiachang Wang [Wed, 10 Apr 2019 03:27:19 +0000 (03:27 +0000)]
Merge "Move data stall definitions out from Setting"
Chiachang Wang [Mon, 8 Apr 2019 11:06:21 +0000 (19:06 +0800)]
Move data stall definitions out from Setting
From mainline perspective, we should use android flag api
instead of using Settings. Thus, move the definitions into
NetworkStack.
Bug:
120013793
Test: atest NetworkStackTests SettingsBackupTest
Change-Id: I8e1fb5b47fff3bf624131ba1f5732daabd991e6d
Merged-In: I8e1fb5b47fff3bf624131ba1f5732daabd991e6d
Merged-In: I0a2a1e5d3de14ea86556ca471e26064df3481412
Chiachang Wang [Wed, 10 Apr 2019 02:37:20 +0000 (19:37 -0700)]
Merge "Enforce NETWORK_STACK permission for calling NSS#forceUpdateIfaces"
am:
c72f456b19
Change-Id: Id5922a41d07c95958090f88a65d22ef5883aefff
Remi NGUYEN VAN [Wed, 10 Apr 2019 02:30:57 +0000 (19:30 -0700)]
Merge "Crash the system server if network stack is lost"
am:
825181be4c
Change-Id: Ieddb968a162c20af90dd290c2b26b48659a480a9
Chiachang Wang [Wed, 10 Apr 2019 02:27:30 +0000 (02:27 +0000)]
Merge "Enforce NETWORK_STACK permission for calling NSS#forceUpdateIfaces"
Remi NGUYEN VAN [Wed, 10 Apr 2019 01:41:20 +0000 (01:41 +0000)]
Merge "Crash the system server if network stack is lost"
Kiyoung Kim [Wed, 10 Apr 2019 00:51:24 +0000 (17:51 -0700)]
Merge "Check if product app is unbundled from property."
am:
2ed229287d
Change-Id: I26d106c372f584939e012dd6c2a1eaa5dfcef8c3
Kiyoung Kim [Wed, 10 Apr 2019 00:34:54 +0000 (00:34 +0000)]
Merge "Check if product app is unbundled from property."
Amit Mahajan [Wed, 10 Apr 2019 00:31:59 +0000 (17:31 -0700)]
Merge "Make sure APN type ALL does not include types that are not wild cardable"
am:
0d4f48f49d
Change-Id: Icc3d660c4639490adaf275a7bbc744ac1c8dfff1
Amit Mahajan [Wed, 10 Apr 2019 00:08:43 +0000 (00:08 +0000)]
Merge "Make sure APN type ALL does not include types that are not wild cardable"
Benedict Wong [Wed, 13 Mar 2019 04:54:16 +0000 (21:54 -0700)]
Cleanup of Test Network service
This follow-up change performs some cleanup changes without affecting
functionality
Bug:
72950854
Test: Compiles, CTS tests using this pass
Change-Id: Ic7394f24f11d713c9374b438182e29d2a02ea236
Amit Mahajan [Mon, 8 Apr 2019 21:07:45 +0000 (14:07 -0700)]
Make sure APN type ALL does not include types that are not wild cardable
Test: manual, atest FrameworksTelephonyTests:ApnSettingTest
Bug:
130167974
Merged-in: Ia029df91781ee125078a2b4cc4d0364919c95fd6
Change-Id: Ia029df91781ee125078a2b4cc4d0364919c95fd6
(cherry picked from commit
72ea0fd5a757ec128271f127c1af6f1627627216)
Chenbo Feng [Fri, 5 Apr 2019 21:14:55 +0000 (14:14 -0700)]
Add smoke test for jni library
Since the Framework net test require jni library
libnetworkstatsfactorytestjni, but the test fails to load that library
unless *all* the dependencies of that library are explicitly listed in
jni_libs, whenever any of the dependencies changes the framework net
test will start failing and it might not be catched since the change
might not related to frameworks/base. And this smoke test is aimed to
spot those native library changes and it should be stable enough to put
in global presubmit.
Bug:
124764595
Test: FrameworksNetSmokeTests
Change-Id: Id24e7f0558b5643e4ad7393e85f1f0a2bd875615
Nathan Harold [Tue, 9 Apr 2019 02:21:02 +0000 (19:21 -0700)]
Update Javadocs for CellInfo Classes
-Add nullability annotations for getMccString
and getMncString.
-Add IntRange to CellSignalStrength#getLevel()
-Fix a few docstring errors.
Bug:
129902021
Test: make && make update-api && make offline-sdk-docs
(no functional change)
Merged-In: I61d645f79a23226ab902fc657fe7b07ffd674a0b
Change-Id: I61d645f79a23226ab902fc657fe7b07ffd674a0b
Neil Fuller [Tue, 9 Apr 2019 18:03:25 +0000 (11:03 -0700)]
Merge "Switch to HexEncoding from ByteStringUtils"
am:
46a93ae8f8
Change-Id: Iabd1b701d3c3f44b50642d25eb3f2960eaebc48d
Narayan Kamath [Mon, 8 Apr 2019 16:32:33 +0000 (17:32 +0100)]
Shell: Grant CACHE_CONTENT to Shell
Required to test ContentResover#[get|put]Cache
Bug:
127711435
Test: atest CtsContentTestCases
(cherry picked from commit
a31ed1bbdd45625036ac65bb41d2f1d462e14a04)
Merged-In: I5eb72772a0a35897611dd6db95c68a2d2e971e9a
Change-Id: I91a91a2969db175d88e9f41938869bc751f7b108
Shuo Qian [Tue, 9 Apr 2019 17:54:30 +0000 (10:54 -0700)]
Merge "Use Received Uri as Gateway Uri"
am:
211771cf79
Change-Id: Ibf96f72717f99d9aab112161c4ce354e1cf9e6c2
Neil Fuller [Tue, 9 Apr 2019 17:45:29 +0000 (17:45 +0000)]
Merge "Switch to HexEncoding from ByteStringUtils"
Benedict Wong [Tue, 9 Apr 2019 17:39:16 +0000 (10:39 -0700)]
Merge "Fix remove-before-add for IpSecService RefcountedResource"
am:
3102fa42a7
Change-Id: Ief286a54a93efd731deeff9fc32815663ab7695d
Shuo Qian [Tue, 9 Apr 2019 17:29:19 +0000 (17:29 +0000)]
Merge "Use Received Uri as Gateway Uri"
Benedict Wong [Tue, 9 Apr 2019 17:22:56 +0000 (17:22 +0000)]
Merge "Fix remove-before-add for IpSecService RefcountedResource"
Leland Miller [Tue, 9 Apr 2019 16:49:18 +0000 (09:49 -0700)]
Merge "Create new RcsThreadQueryResultParcelable"
am:
ad2928ac86
Change-Id: Ife195a2760bf81bf5da0cc9d72fde1b6038778d4
Treehugger Robot [Tue, 9 Apr 2019 16:29:13 +0000 (16:29 +0000)]
Merge "Create new RcsThreadQueryResultParcelable"
Lorenzo Colitti [Mon, 8 Apr 2019 12:51:41 +0000 (21:51 +0900)]
Add lifecycle tests to NetworkMonitorTest
- Ensure that NetworkMonitor quits when notifyNetworkDisconnected
is called.
- Ensure that BroadcastReceivers are registered when a captive
portal is detected and unregistered when the network validates
or when NetworkMonitor quits.
Bug:
122164725
Test: atest FrameworksNetTests NetworkStackTests
Test: atest --generate-new-metrics 10 NetworkStackTests:com.android.server.connectivity.NetworkMonitorTest
Test: test fails if "Don't leak captive portal broadcast receivers." change reverted
Change-Id: I1202626face33cc1e1ec02016b95da487b3335c8
vichang [Tue, 9 Apr 2019 12:47:34 +0000 (05:47 -0700)]
Merge "Remove the feature flag for time zone picker"
am:
3183cbf6dc
Change-Id: I60e028709d06d26377a3d8d1db53822987620e7e
Junyu Lai [Tue, 9 Apr 2019 12:43:18 +0000 (05:43 -0700)]
Merge "Fix onBlockedStatusChanged does not work on multiple networks"
am:
289b565dba
Change-Id: Ia8edf1e9d0f49da5be2bac1889cd0001010a869b
Chalard Jean [Tue, 9 Apr 2019 12:39:12 +0000 (05:39 -0700)]
Merge "Move the latest AIDL update to the bottom"
am:
fb08776087
Change-Id: Ic976eb8fa91644fc5a3bcadf2165bdf46af89088
vichang [Tue, 9 Apr 2019 12:23:19 +0000 (12:23 +0000)]
Merge "Remove the feature flag for time zone picker"
Junyu Lai [Tue, 9 Apr 2019 12:13:26 +0000 (12:13 +0000)]
Merge "Fix onBlockedStatusChanged does not work on multiple networks"
Chalard Jean [Tue, 9 Apr 2019 12:06:03 +0000 (12:06 +0000)]
Merge "Move the latest AIDL update to the bottom"
Chiachang Wang [Tue, 9 Apr 2019 11:42:52 +0000 (19:42 +0800)]
Enforce NETWORK_STACK permission for calling NSS#forceUpdateIfaces
ConnectivityManager and its usages are removed from
NetworkStatsService. After that, forceUpdateIfaces requires
information that only ConnectivityService has, hence
restricting the calling permission to NETWORK_STACK or
MAINLINE_NETWORK_STACK permission. The required permission
will be changed from READ_NETWORK_USAGE_HISTORY to
NETWORK_STACK or MAINLINE_NETWORK_STACK. This change would make
it impossible to call outside the system.
Bug:
126830974
Test: atest FrameworksNetTests
Change-Id: I776484921b2dbb6735d7940c558fb5e4baed6d1e
Neil Fuller [Tue, 9 Apr 2019 10:11:50 +0000 (03:11 -0700)]
Merge "Switch to HexEncoding from ByteStringUtils"
am:
70f7a0bf04
Change-Id: I36db54949275402b7f25d8e2a1ea2ed6558a44d2
Neil Fuller [Tue, 9 Apr 2019 09:50:59 +0000 (09:50 +0000)]
Merge "Switch to HexEncoding from ByteStringUtils"
Remi NGUYEN VAN [Tue, 19 Feb 2019 03:54:04 +0000 (12:54 +0900)]
Crash the system server if network stack is lost
Crash the system server if it cannot bind to the network stack, or if
the network stack crashes. This is better than keeping the system
running in a bad state where all networking would be broken.
Before the network stack was moved to a different process, the whole
system would go down when it encountered a crash.
Test: added crash in NetworkStack, verified system_server restart
Bug:
130028724
Change-Id: Ia8ee7699c4b15ba4b1116c7ba9171bf6034b52c3
Neil Fuller [Mon, 8 Apr 2019 21:03:14 +0000 (22:03 +0100)]
Switch to HexEncoding from ByteStringUtils
Migration in preparation for deletion of ByteStringUtils.
Bug:
124232146
Test: build only
Merged-In: I07983ca596443a3e00616b63355c6504376f3e7c
Change-Id: I07983ca596443a3e00616b63355c6504376f3e7c
Orion Hodson [Tue, 9 Apr 2019 07:03:22 +0000 (00:03 -0700)]
Merge "ActivityManager: process stop needs a process to stop"
am:
e467620566
Change-Id: I9316853c0625b8a9f352f321208f0414184e2d43
Treehugger Robot [Tue, 9 Apr 2019 06:50:43 +0000 (06:50 +0000)]
Merge "ActivityManager: process stop needs a process to stop"
Chalard Jean [Tue, 9 Apr 2019 06:38:53 +0000 (23:38 -0700)]
Merge "Address leftover comments on aosp/894233"
am:
8781aa3fbe
Change-Id: I87f120778b2dc6743edc7fdd4e5390b68de05590
Tej Singh [Tue, 9 Apr 2019 06:34:40 +0000 (23:34 -0700)]
Merge "Mainline logging to statsd: native static libs"
am:
fe3ebab0b3
Change-Id: I7c241f209b133ec5465a47e384528c16c4026744
Remi NGUYEN VAN [Tue, 9 Apr 2019 06:29:46 +0000 (23:29 -0700)]
Merge "Expose captive portal urls for configuration"
am:
7bb487a582
Change-Id: If5970fdafa7c624855ef9d29921542e2fb6fdfa0
Xin Li [Tue, 9 Apr 2019 06:21:50 +0000 (23:21 -0700)]
[automerger skipped] Merge "DO NOT MERGE -- Merge PPRL.190405.003 into master"
am:
a4431ffb7a -s ours
am skip reason: subject contains skip directive
Change-Id: I8245f3d001b3c331c2dc586b4d835db2219e1986
Chalard Jean [Tue, 9 Apr 2019 05:51:18 +0000 (05:51 +0000)]
Merge "Address leftover comments on aosp/894233"
Treehugger Robot [Tue, 9 Apr 2019 05:42:12 +0000 (05:42 +0000)]
Merge "Mainline logging to statsd: native static libs"
Xin Li [Tue, 9 Apr 2019 05:15:43 +0000 (22:15 -0700)]
[automerger skipped] DO NOT MERGE -- Merge PPRL.190405.003 into master
am:
1eaefb3010 -s ours
am skip reason: subject contains skip directive
Change-Id: I140518e96feabfc9f22622f88ba321bec18212e1
Remi NGUYEN VAN [Tue, 9 Apr 2019 04:37:48 +0000 (04:37 +0000)]
Merge "Expose captive portal urls for configuration"
Xin Li [Tue, 9 Apr 2019 04:29:22 +0000 (04:29 +0000)]
Merge "DO NOT MERGE -- Merge PPRL.190405.003 into master"
Xin Li [Tue, 9 Apr 2019 04:28:38 +0000 (04:28 +0000)]
Merge "DO NOT MERGE - Merge PPRL.190405.003 into stage-aosp-master" into stage-aosp-master
Lorenzo Colitti [Tue, 9 Apr 2019 03:34:03 +0000 (20:34 -0700)]
Merge "Don't leak captive portal broadcast receivers."
am:
873badbd1c
Change-Id: I33a70877db8ae1af5e2e2130b22670437f6ac34f
Chris Wailes [Tue, 9 Apr 2019 03:30:12 +0000 (20:30 -0700)]
Merge "Removed log spam from the Zygote."
am:
130b5bf146
Change-Id: I0d9053ac8af771e831b79e1ce1997a754e46f376
Chalard Jean [Mon, 8 Apr 2019 11:28:44 +0000 (20:28 +0900)]
Address leftover comments on aosp/894233
Bug:
129510344
Test: m, boots, wifi connects, resolves DNS
Change-Id: Idf24f42a86bbfcc89e3ea8cf50d1b705d72ac613
Lorenzo Colitti [Tue, 9 Apr 2019 02:45:42 +0000 (02:45 +0000)]
Merge "Don't leak captive portal broadcast receivers."
Xin Li [Tue, 9 Apr 2019 01:56:15 +0000 (18:56 -0700)]
DO NOT MERGE -- Merge PPRL.190405.003 into master
Bug:
130175407
Change-Id: I0f7d294680477f7ee8b25d2b8622f3ff05bc4f41
Benedict Wong [Fri, 1 Mar 2019 04:28:48 +0000 (20:28 -0800)]
Fix remove-before-add for IpSecService RefcountedResource
This patch fixes a bug where if a binder dies before the linkToDeath
call, the cleanup will be performed before the entry is added to the
array. While it is safe in that quotas and tracking performs as per
normal, the RefcountedRecord may not be cleaned up.
Rethrowing this exception is safe, since the only paths that would hit
this are all on binder threads coming from applications. Further, it
seems there is only one real way of this getting hit - if the app that
called the creation died during the binder call.
Bug:
126802451
Test: Compiled, CTS tests passing
Change-Id: I6db75853da9f29e1573512e26351623f22770c5d
Treehugger Robot [Tue, 9 Apr 2019 01:35:15 +0000 (01:35 +0000)]
Merge "Removed log spam from the Zygote."
Niklas Lindgren [Fri, 7 Dec 2018 10:08:04 +0000 (11:08 +0100)]
Expose captive portal urls for configuration
Carriers in Mainland China need to customize certain captive portal
urls. The main issue is that google servers are not accessible in
Mainland China.
Added the following captive portal resources to be targeted for overlay.
- config_captive_portal_http_url
- config_captive_portal_https_url
- config_captive_portal_fallback_urls (string-array)
- config_captive_portal_fallback_probe_specs (string-array)
These values can be customized for e g diffent countries
Bug:
111819230
Test: atest FrameworksNetTests NetworkStackTests
Test: Add a product RRO that targets a specific country code,
insert a SIM card that matches that country code and check the log
what URL is used.
Change-Id: I38a294a5e14417f65e96e76235ea153c53c4d7cc
sqian [Sat, 6 Apr 2019 23:21:53 +0000 (16:21 -0700)]
Use Received Uri as Gateway Uri
Gateway information is the core component to perform redirection.
We should clarify the uri we received from
CallRedirectionService is gateway Uri. And apply it in Telecom.
Test: Treehugger; Manual
Bug:
130048865
Change-Id: I3599377406b88751ee11139e9a1aa5afab734f7c
Leland Miller [Fri, 22 Mar 2019 21:20:50 +0000 (14:20 -0700)]
Create new RcsThreadQueryResultParcelable
This parcelable class now backes RcsThreadQueryResult. This change will
allow injection of API layer dependencies into RcsThreadQueryResult.
Change-Id: I2c273513e2a3bfcab7cd84fc7a2f89cc2ad12c75
Test: Existing tests pass
Bug:
123699565
Chris Wailes [Mon, 8 Apr 2019 22:52:40 +0000 (15:52 -0700)]
Removed log spam from the Zygote.
This patch removes several debugging log messages. These messages were
useful when the `FDs to ignore` list was usually empty, but with the
addition of USAPs this has become spammy.
Test: Build
Bug:
130172109
Change-Id: Id166990a63f20efb3bf6ffd5b697efd436d50921
Nathan Harold [Mon, 8 Apr 2019 22:51:59 +0000 (15:51 -0700)]
Merge changes from topic "tdscdma-rscp"
am:
891f195a23
Change-Id: I0fb6c54779d7505d7fc4239ac2bc07db11601a5f
Cody Kesting [Thu, 4 Apr 2019 23:56:34 +0000 (16:56 -0700)]
Update TelMan API for testing Line1NumberForDisplay.
CTS testing is being added for
TelephonyManager#setLine1NumberForDisplay. This requires making the
getter for alphaTag visible for testing with the @TestApi annotation.
Bug:
31963371
Test: API change. tests are unaffected.
Change-Id: I85887cf05f395f4ac4ca8dc6800e29f4fc9f8de4
Xiangyu/Malcolm Chen [Mon, 8 Apr 2019 22:43:09 +0000 (15:43 -0700)]
Merge changes from topics "
126864501", "
129296702"
am:
9f80ec1d51
Change-Id: Iadd23b2af9d4f85d88f6915d042641d2f481a784
Nathan Harold [Mon, 8 Apr 2019 22:42:35 +0000 (22:42 +0000)]
Merge changes from topic "tdscdma-rscp"
* changes:
Fix getLevel for CellSignalStrengthTdscdma
Rename LevelCalculationMethod Constant
Xiangyu/Malcolm Chen [Mon, 8 Apr 2019 22:29:36 +0000 (22:29 +0000)]
Merge changes from topics "
126864501", "
129296702"
* changes:
Changing default phone capability.
Remove hidden IntDef in java doc.
Add @hide API to return whether a modem stack is enabled or not.
Jack Yu [Mon, 8 Apr 2019 22:24:45 +0000 (15:24 -0700)]
Merge "Fixed incorrect service state populated"
am:
5f8b1bfe66
Change-Id: I5213f601645025f3df5b8e8a5ba8e61d6b9901e1
Xin Li [Mon, 8 Apr 2019 21:32:39 +0000 (14:32 -0700)]
DO NOT MERGE - Merge PPRL.190405.003 into stage-aosp-master
Bug:
130175407
Change-Id: Ic724f91a019ee4e81e0f921eda72229730ca8d4c
Jack Yu [Mon, 8 Apr 2019 21:19:54 +0000 (21:19 +0000)]
Merge "Fixed incorrect service state populated"
Neil Fuller [Mon, 8 Apr 2019 20:57:53 +0000 (21:57 +0100)]
Switch to HexEncoding from ByteStringUtils
Migration in preparation for deletion of ByteStringUtils.
Bug:
124232146
Test: build only
Change-Id: I9f18bb56eccf5bd628e1fd9068285f75623f7caf
Malcolm Chen [Fri, 29 Mar 2019 02:27:58 +0000 (19:27 -0700)]
Changing default phone capability.
Bug:
126864501
Test: manual
Change-Id: I3d50fb30980b5e2d2240bd186fb15c7f2a7c21ab
Merged-In: I3d50fb30980b5e2d2240bd186fb15c7f2a7c21ab
Malcolm Chen [Sat, 30 Mar 2019 01:30:23 +0000 (18:30 -0700)]
Remove hidden IntDef in java doc.
Bug:
128456336
Test: build
Change-Id: If016aabda5092d299eca2e858f26057614767297
Merged-In: If016aabda5092d299eca2e858f26057614767297
Malcolm Chen [Thu, 28 Mar 2019 02:21:11 +0000 (19:21 -0700)]
Add @hide API to return whether a modem stack is enabled or not.
Bug:
129296702
Test: TelephonyManagerTestApp
Change-Id: I7ef4ad8322cf85e5a159363e90dde303ac7240de
Merged-In: I7ef4ad8322cf85e5a159363e90dde303ac7240de
sqian [Mon, 8 Apr 2019 18:17:28 +0000 (11:17 -0700)]
Merge "Fix documentation of CallRedirectionService"
am:
820a7b5144
Change-Id: I5025ba7b17ee7597e05f7b8c466d9b4d0a2ca80c
android-build-team Robot [Mon, 8 Apr 2019 18:00:14 +0000 (18:00 +0000)]
Snap for
5310204 from
1b1681a8b0a3f95062c8f6f7fe31890629264e37 to pi-platform-release
Change-Id: Id8efd34958658db735305602cdace27a8a73394a
Treehugger Robot [Mon, 8 Apr 2019 17:35:24 +0000 (17:35 +0000)]
Merge "Fix documentation of CallRedirectionService"
Jack Yu [Mon, 8 Apr 2019 08:10:27 +0000 (01:10 -0700)]
Fixed incorrect service state populated
ServiceState.setStateOutOfService does not correctly
clean up the information so the old WLAN registration info
got populated for the next time use.
Bug:
130048577
Test: Telephony sanity tests
Merged-In: I7fab7090c22390914af024c44bffd643c13f33e5
Change-Id: I7fab7090c22390914af024c44bffd643c13f33e5
(cherry picked from commit
9302618da657959c77943d2ecc7705ddf77612ba)
Lorenzo Colitti [Mon, 8 Apr 2019 08:14:35 +0000 (17:14 +0900)]
Don't leak captive portal broadcast receivers.
Since aosp/937885, mLaunchCaptivePortalAppBroadcastReceiver is
nulled out, but not unregistered, when exiting MaybeNotifyState.
This causes the BroadcastReceiver to be leaked because it is no
longer unregistered when processing CMD_NETWORK_DISCONNECTED.
Fix this by unregistering the receiver in MaybeNotifyState#exit.
Also remove the unregister call in CMD_NETWORK_DISCONNECTED: it
is no longer necessary, because StateMachine, before quitting,
will call the exit method of the current state and all its
parent states.
Bug:
122164725
Test: atest FrameworksNetTests NetworkStackTests
Change-Id: I447b3cfd3821dda19482ed962dd59ec61fc5fc9b
Remi NGUYEN VAN [Mon, 8 Apr 2019 10:32:49 +0000 (03:32 -0700)]
[automerger skipped] Merge "Add FrameworksNetTests dependency on libcgrouprc"
am:
3729b26f8a -s ours
am skip reason: change_id Ifcfe4df81caf8ede2e4e66a76552cb3200378fa8 with SHA1
f2f1f27098 is in history
Change-Id: Ic374e952cc1ccdd422baf9cbb709f1e37268e220
Treehugger Robot [Mon, 8 Apr 2019 10:19:26 +0000 (10:19 +0000)]
Merge "Add FrameworksNetTests dependency on libcgrouprc"
Orion Hodson [Mon, 8 Apr 2019 09:12:02 +0000 (10:12 +0100)]
ActivityManager: process stop needs a process to stop
Make process a required argument for am process stop to avoid silent
failure.
Minor usage clean-up for am process commands.
Bug:
129892812
Test: manual
Change-Id: Ib5f3c225c79af65f66c22b24abbef210bb383c8e