OSDN Git Service
Nandana Dutt [Wed, 3 Oct 2018 09:51:59 +0000 (09:51 +0000)]
Merge "Warn about sensitive bugreport contents."
Nandana Dutt [Wed, 3 Oct 2018 08:55:01 +0000 (08:55 +0000)]
Merge "Synchronize access to sNotificationBundle."
Jack Yu [Wed, 3 Oct 2018 04:02:24 +0000 (04:02 +0000)]
Merge changes from topic "fcc_2019"
* changes:
Added new cell broadcast channels
Use locale language instead of harcoded langauge
Nathan Harold [Wed, 3 Oct 2018 01:21:17 +0000 (01:21 +0000)]
Merge "Use SDK Constant for NeighboringCellInfo Docstring"
Jack Yu [Tue, 2 Oct 2018 23:34:15 +0000 (23:34 +0000)]
Merge "Reworked getNetworkRegistrationStates API"
Nathan Harold [Tue, 2 Oct 2018 22:55:36 +0000 (15:55 -0700)]
Use SDK Constant for NeighboringCellInfo Docstring
As per API council feedback, when documenting
SDK-level-specific behavior and recommendations, the
document should use and link to the SDK constant rather
than its value. Update the docstring accordingly, and
also some minor verbiage tweaks.
Bug:
117154674
Test: compilation; docstring-only change
Change-Id: I0ee56a4d76a311a8e0136766ef45aeda46cd12b4
Tyler Gunn [Tue, 2 Oct 2018 22:27:14 +0000 (22:27 +0000)]
Merge "Add handleCallIntent method in TelecomManager."
Jack Yu [Wed, 12 Sep 2018 21:32:27 +0000 (14:32 -0700)]
Added new cell broadcast channels
Added new cell broadcast channels for public safety messages
and state/local test alert required by FCC of the United States.
Test: Build
Bug:
110754638,
71497689,
110896497
Merged-In: I05c57b66d85ea7f2b67d7fc421230442f5c7694f
Change-Id: I05c57b66d85ea7f2b67d7fc421230442f5c7694f
(cherry picked from commit
78921f09257d62236b19aee20bbafc00e0320fd8)
(cherry picked from commit
4353217a778c33f4831a8b74d9c12ea22cf442cd)
Jack Yu [Mon, 17 Sep 2018 17:46:40 +0000 (10:46 -0700)]
Use locale language instead of harcoded langauge
Used the locale language instead of the hardcoded language since
ISO 639 is not a stable standard. Some language codes changed before.
This is part of the cell broadcast language filtering feature
added per U.S. FCC requirement.
Test: Manual
Bug:
110754638,
71497689,
110896497
Merged-In: I3cf42eb037cdbb40597c1053fedb36b478277fc9
Change-Id: I3cf42eb037cdbb40597c1053fedb36b478277fc9
(cherry picked from commit
28e9684705e63b5bb6c4a6d30fcf0809801b483f)
(cherry picked from commit
232b237b0fdc68cbe234d9d987161f8a7922995c)
Treehugger Robot [Tue, 2 Oct 2018 21:46:01 +0000 (21:46 +0000)]
Merge "Remove unused / invalid import"
Treehugger Robot [Tue, 2 Oct 2018 21:34:07 +0000 (21:34 +0000)]
Merge "Dismiss Dialog in post instead of immediately"
Jayant Chowdhary [Tue, 2 Oct 2018 20:14:37 +0000 (20:14 +0000)]
Merge "Add libbinderthreadstate to LOCAL_JNI_SHARED_LIBS for some tests"
Jack Yu [Tue, 2 Oct 2018 18:14:38 +0000 (11:14 -0700)]
Reworked getNetworkRegistrationStates API
Added two new APIs for getting network registration states
from domain and transport type. Deprecated the old APIs.
Test: Manual
Bug:
73659459
Change-Id: I3143df320f2942213aa0f10fe3cca9851bd82bb8
Treehugger Robot [Tue, 2 Oct 2018 17:09:16 +0000 (17:09 +0000)]
Merge "Allow wifi and ethenet connected at same time."
Felipe Leme [Fri, 21 Sep 2018 23:37:53 +0000 (16:37 -0700)]
Synchronize access to sNotificationBundle.
Otherwise Shell can crash due to ConcurrentModificationException
Test: atest BugreportReceiverTest
Test: manual verification
Fixes:
116280360
Change-Id: I138acd43b313d2a7a9d945fb44a9d63e1ad798eb
Merged-In: I138acd43b313d2a7a9d945fb44a9d63e1ad798eb
(cherry picked from commit
ee72fa19a97f2b0677a130204e3527bc3233e4d9)
Jeff Sharkey [Thu, 13 Sep 2018 17:49:54 +0000 (11:49 -0600)]
Warn about sensitive bugreport contents.
We show this message when clicking a notification, but we also want
to alert users when they're picking files to attach/share.
Bug:
114711671
Test: manual
Change-Id: I23e249c93d6fa9cf960ef2a61d3fe769eb56ddf5
Merged-In: I23e249c93d6fa9cf960ef2a61d3fe769eb56ddf5
(cherry picked from commit
59137825eb11e6ca4c53e43a9973983ebdd09b33)
Chen Xu [Tue, 2 Oct 2018 04:26:23 +0000 (04:26 +0000)]
Merge "using the correct intent extra for subId"
Chih-hung Hsieh [Tue, 2 Oct 2018 00:37:46 +0000 (00:37 +0000)]
Merge "Add noexcept to move constructors and assignment operators."
Treehugger Robot [Tue, 2 Oct 2018 00:28:15 +0000 (00:28 +0000)]
Merge "Prototype XML view compiler"
Treehugger Robot [Mon, 1 Oct 2018 23:37:31 +0000 (23:37 +0000)]
Merge "Do not use StringPiece in ExtractJavaIdentifier"
Jayant Chowdhary [Fri, 28 Sep 2018 19:56:05 +0000 (12:56 -0700)]
Add libbinderthreadstate to LOCAL_JNI_SHARED_LIBS for some tests
libbinder and libhwbinder now also depend on libbinderthreadstate. Add
this dependency to LOCAL_JNI_SHARED_LIBS since these libraries need to
be packaged together.
Bug:
110364143
Test: atest FrameworksNetTests
Test: atest FrameworksServiceTests (no new failures)
Test: atest FrameworksUiServiceTests
Change-Id: Ibc63f041b8ee23cc4d0e9d82a508a128104e6025
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
chen xu [Fri, 28 Sep 2018 22:53:43 +0000 (15:53 -0700)]
using the correct intent extra for subId
Some telephony subscription related intent uses hidden extra
PhoneConstants.SUBSCRIPTION_KEY. We should sent the public extra
SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX instead.
Bug:
116754807
Test: telephony unit test
Change-Id: I842df9b3fa7c0c8efed2db6ac5cd6a8c34ab3ee4
Eric Holk [Wed, 5 Sep 2018 17:43:31 +0000 (10:43 -0700)]
Prototype XML view compiler
This is an initial step towards a tool for pre-compiling layout XML files. It
accepts an XML file and produces a Java language class called CompiledView with
a static method, inflate. Calling CompiledView.inflate should then return a view
object that is equivalent to calling LayoutInflater.inflate on the same
resource.
There are still several important limitations, but this works well enough to do
some experimentation. The limitations include:
* Currently only one layout can be compiled at a time.
* `merge` and `include` nodes are not supported.
* View compilation is a manual process that requires code changes in the
application.
* The tests in this CL do not yet exercise any interesting behavior.
Bug:
111895153
Change-Id: I3e6880b08c52087d24ae7486495bd7fa282f4ff7
Brad Ebinger [Mon, 1 Oct 2018 20:58:56 +0000 (20:58 +0000)]
Merge "Revert isResolvingImsBinding ITelephony interface"
Chih-Hung Hsieh [Tue, 25 Sep 2018 19:01:21 +0000 (12:01 -0700)]
Add noexcept to move constructors and assignment operators.
Bug:
116614593
Test: build with WITH_TIDY=1
Change-Id: Ic3993d88eb3066aef402d74c4d543c56a1dfd5c3
Treehugger Robot [Mon, 1 Oct 2018 19:08:22 +0000 (19:08 +0000)]
Merge "Add TEST_MAPPING for DexManager etc."
Jeff Sharkey [Mon, 1 Oct 2018 17:49:03 +0000 (17:49 +0000)]
Merge changes from topic "bugfix_content_path"
* changes:
Add OEM_SOUNDS_DIR variable
Fix the bug that secondary storage path is judged as internal
Revert "MediaStore.Audio.Media.getContentUriForPath() returns unexpected content"
Treehugger Robot [Mon, 1 Oct 2018 17:26:56 +0000 (17:26 +0000)]
Merge "Check for null socket name in socket_connect_local."
Treehugger Robot [Mon, 1 Oct 2018 17:04:20 +0000 (17:04 +0000)]
Merge "Fix: statsd path in whilelist of native processes"
Leif Hendrik Wilden [Wed, 2 May 2018 19:05:24 +0000 (12:05 -0700)]
Allow wifi and ethenet connected at same time.
This will improve the user experience on Android TV devices,
see bug for details.
In addition when connecting adb to the device by ethernet
for cts, wifi will not connect, causing lots of tests to fail.
For example:
[CTS7.1]android.net.wifi.cts.WifiInfoTest#testWifiInfoProperties
[CTS7.1]android.net.cts.ConnectivityManagerTest#testConnectivityChanged_
manifestRequestOnlyPreN_shouldReceiveIntent
Use command:settings to put global wifi_data_always_on 1 to enable it.
Bug:
26102779
Test: Manual, CTS.
Change-Id: I711d93061a6bc7164d98a858912f781e1b967406
Alan Stokes [Mon, 1 Oct 2018 10:42:22 +0000 (11:42 +0100)]
Add TEST_MAPPING for DexManager etc.
Test: atest
Change-Id: I2a92ab9f32faf905aa6dc591e1991ba30c6a26c9
Rafal Slawik [Mon, 1 Oct 2018 10:39:58 +0000 (11:39 +0100)]
Fix: statsd path in whilelist of native processes
This whitelist is used when calling Process.getPidsForCommands. That
method reads all pid directories under /proc and returns only those
which /proc/pid/cmdline matches the whitelist. Statsd returns
/system/bin/statsd in its cmdline and therefore was not included in the
results and ignored from reporting.
Bug:
116784348
Test: cat /proc/pid/cmdline for statsd
Change-Id: I2c37a25dd26baac1ac043f9a559a391bdc32041e
Neil Fuller [Mon, 1 Oct 2018 10:32:36 +0000 (11:32 +0100)]
Remove unused / invalid import
NavigationBarCompat imports sun.misc.Resource though
it doesn't need it.
Bug:
113148576
Test: build only
Change-Id: I26d6e0b3d9a8948333fdf9f3659b87b3b46a75d5
Treehugger Robot [Mon, 1 Oct 2018 08:48:49 +0000 (08:48 +0000)]
Merge "Cleanup."
Luke Huang [Mon, 1 Oct 2018 07:28:42 +0000 (07:28 +0000)]
Merge "ConnectivityService get INetd directly."
Treehugger Robot [Mon, 1 Oct 2018 06:33:29 +0000 (06:33 +0000)]
Merge "Remove spurious WTF in rematching networks."
Treehugger Robot [Mon, 1 Oct 2018 05:36:28 +0000 (05:36 +0000)]
Merge "Make requestRouteToHost a no-op for system callers."
Lorenzo Colitti [Mon, 1 Oct 2018 04:16:55 +0000 (13:16 +0900)]
Remove spurious WTF in rematching networks.
By construction, this WTF should never happen, since it's in an
if (nri.request.isRequest()) and by definition requests can only
be satisfied by one network at a time.
I don't think we've ever seen this particular WTF in an APR
report, which suggests that it's not happening in practice.
Test: atest FrameworksNetTests CtsNetTestCasesLegacyApi22 CtsNetTestCasesLegacyPermission22 android.net.cts.ConnectivityManagerTest
Change-Id: Icf4c7d2bb1da3c7db695cf0bcebc5806190a1677
Chalard Jean [Mon, 1 Oct 2018 03:58:19 +0000 (12:58 +0900)]
Cleanup.
Test: runtest FrameworksNetTests
Change-Id: I8abb6de84dad79f6b15ef3af80da49da1d356cff
Luke Huang [Thu, 27 Sep 2018 11:33:11 +0000 (19:33 +0800)]
ConnectivityService get INetd directly.
This is the first step for ConnectivityService
call into INetd directly.
Import INetd and get it by using NetdService.
Test: runtest frameworks-net passes
Test: manual testing of wakeupAdd/DelInterface works
Change-Id: I643dba5206c66958134152d062f3f3a19a34cf2c
Lorenzo Colitti [Fri, 28 Sep 2018 02:31:55 +0000 (11:31 +0900)]
Make requestRouteToHost a no-op for system callers.
Everything in the system should now be using proper multinetwork
APIs instead of this insecure and error-prone API.
Make this method do nothing when called by the system. For now,
keep the code around for backwards compatibility for apps
targeting Android releases before M.
Bug:
25824776
Bug:
25876485
Test: FrameworksNetTests pass
Test: CtsNetTestCasesLegacyApi22 pass
Test: CtsNetTestCasesLegacyPermission22 pass
Test: android.net.cts.ConnectivityManagerTest passes
Change-Id: I9b3557faccccc95c7b954db6a13b853b4c7edea0
Luke Huang [Mon, 1 Oct 2018 03:02:25 +0000 (03:02 +0000)]
Merge "Tether-related commands porting"
Luke Huang [Mon, 1 Oct 2018 03:01:33 +0000 (03:01 +0000)]
Merge "Rename object mNetd to mNetworkManagementService"
Chiachang Wang [Mon, 1 Oct 2018 02:20:23 +0000 (02:20 +0000)]
Merge "Fix idle timer rule leakage"
Treehugger Robot [Mon, 1 Oct 2018 02:18:46 +0000 (02:18 +0000)]
Merge changes I0f997d30,I288ba1f4
* changes:
Enable new DHCP server by default
Use new DHCP server in TetheringTest
Treehugger Robot [Sat, 29 Sep 2018 07:39:04 +0000 (07:39 +0000)]
Merge "Handling potential SIGPIPE signals."
Treehugger Robot [Sat, 29 Sep 2018 07:38:59 +0000 (07:38 +0000)]
Merge "Increasing TombstoneSection timeout to 2 minutes."
Treehugger Robot [Sat, 29 Sep 2018 01:08:18 +0000 (01:08 +0000)]
Merge "Replace libsuspend with android.system.suspend@1.0"
Treehugger Robot [Sat, 29 Sep 2018 00:33:11 +0000 (00:33 +0000)]
Merge "Add vendor notice header at the top of Third-party licenses"
Treehugger Robot [Sat, 29 Sep 2018 00:16:11 +0000 (00:16 +0000)]
Merge "InetDiagSocketTest: enable UDP unit tests on all devices"
Tyler Gunn [Fri, 28 Sep 2018 23:16:20 +0000 (16:16 -0700)]
Add handleCallIntent method in TelecomManager.
This is an @hide method usable only from within Telecom itself in order to
trampoline an ACTION_CALL intent from the UserCallActivity to
Telecom's system service.
Bug:
116719392
Test: Verify that calls initiated via CALL intent no longer get rebroadcast
and are instead sent directly to Telecom.
Change-Id: Ie765631bef8329a8ed12723d9c037a44b4f80882
Hall Liu [Fri, 28 Sep 2018 23:15:03 +0000 (23:15 +0000)]
Merge "Add config to only allow auto select of networks"
Nathan Harold [Fri, 28 Sep 2018 21:40:47 +0000 (21:40 +0000)]
Merge "Remove getNeighboringCell API"
Jin Dong [Fri, 24 Aug 2018 09:34:54 +0000 (17:34 +0800)]
Add vendor notice header at the top of Third-party licenses
Vendor can add notice header at the top of "Third-party licenses"
by overlay the string notice_header.
Fixes:
116298367
Change-Id: If80d69180664970441d0addccd81d65d7ab55c3b
Merged-In: If80d69180664970441d0addccd81d65d7ab55c3b
Brad Ebinger [Thu, 14 Jun 2018 00:11:50 +0000 (17:11 -0700)]
Revert isResolvingImsBinding ITelephony interface
Reverting the only user of this interface.
Bug:
109762920
Bug:
116766786
Test: GTS/Unit tests for ImsService
Merged-In: I9c8cc1c4401590865f33fa13402152287063cecf
Change-Id: Id2e1ac2e4fbbcb7f019e79568f21ee56c94b6c1f
Treehugger Robot [Fri, 28 Sep 2018 18:35:47 +0000 (18:35 +0000)]
Merge "Don't check qtaguid file unless using them"
Tri Vo [Thu, 30 Aug 2018 04:11:37 +0000 (21:11 -0700)]
Replace libsuspend with android.system.suspend@1.0
This change only replaces libsuspend's suspend loop with the one in
android.system.suspend@1.0.
Native wake lock behavior is unaffected as they are still handled via
/sys/power/wake_[un]lock.
Bug:
78888165
Test: device boots, suspends when left alone
Change-Id: I5e1e9048b0fc316aa6692687684ac11f44466f7e
Jeff Vander Stoep [Fri, 28 Sep 2018 14:54:56 +0000 (07:54 -0700)]
InetDiagSocketTest: enable UDP unit tests on all devices
Bug:
116849885
Test: atest InetDiagSocketTest
Change-Id: I3b036818cccd0959feb3a93bc722d70e3ef2c4d7
Torne (Richard Coles) [Thu, 16 Mar 2017 15:52:46 +0000 (15:52 +0000)]
Check for null socket name in socket_connect_local.
socket_bind_local checks if the name is null before using it, but
socket_connect_local doesn't, resulting in a segfault if you pass null
as the socket name. Check for this and convert it to
NullPointerException to make the crash more reasonable.
Test: am instrument -w -e class android.net.LocalSocketTest com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I67dedbe9ca1be6425e047496d0ead92eb7f64691
Chiachang Wang [Fri, 28 Sep 2018 14:42:48 +0000 (22:42 +0800)]
Fix idle timer rule leakage
Idle timer rule is not cleared as expected if there is a
default network replacement.
Bug:
37080406
Test: 1.run frameworks-net
2.check iptables rule with default network replacement
Change-Id: I6bd29d79e4ca3e8de4b867c4fcb5f81d02ba6de4
Treehugger Robot [Fri, 28 Sep 2018 14:06:36 +0000 (14:06 +0000)]
Merge "Call clearSettingsProvider before and after test"
Nicolas Geoffray [Fri, 28 Sep 2018 12:12:12 +0000 (12:12 +0000)]
Merge "Add new DelegateLastClassLoader API"
Luke Huang [Thu, 27 Sep 2018 08:58:23 +0000 (16:58 +0800)]
Rename object mNetd to mNetworkManagementService
No functionality change
Test: runtest frameworks-net passes
Change-Id: Ic3977eed9a86deb76ef0e4e12ffa17597bdecc30
Remi NGUYEN VAN [Fri, 28 Sep 2018 05:33:11 +0000 (14:33 +0900)]
Call clearSettingsProvider before and after test
FakeSettingsProvider requires this method to be called before and after
use. Without this, the settings value or content provider may be cached
statically, so the test will be affected by code accessing settings
before it is run.
Bug: b/
116668105
Test: atest FrameworksNetTests
Change-Id: I1480f3f3bbb17791752582a70327bb5c7c348d7c
Remi NGUYEN VAN [Wed, 26 Sep 2018 09:11:48 +0000 (18:11 +0900)]
Enable new DHCP server by default
Regression tests pass with aosp/764042.
Test: regression automated tests, manual (verified WiFi, bluetooth
tethering working).
Bug: b/
109584964
Change-Id: I0f997d302a1d85930b24139af76e9b9c9a1b5f78
Remi NGUYEN VAN [Fri, 28 Sep 2018 02:34:15 +0000 (11:34 +0900)]
Use new DHCP server in TetheringTest
Run most tests with TETHER_ENABLE_LEGACY_DHCP_SERVER set to 0 (will be
the default value). Add one test to verify that the new server is not
started when TETHER_ENABLE_LEGACY_DHCP_SERVER is 1.
Bug: b/
109584964
Test: atest FrameworksNetTests
Change-Id: I288ba1f434918e62ff29f7ace00856108c9730f7
Remi NGUYEN VAN [Fri, 28 Sep 2018 01:08:59 +0000 (01:08 +0000)]
Merge "Don't throw a NPE in SharedLog#e"
Nathan Harold [Thu, 27 Sep 2018 23:55:01 +0000 (23:55 +0000)]
Merge "Catch IllegalArgumentException on NetworkScan.stopScan"
Xiangyu/Malcolm Chen [Thu, 27 Sep 2018 20:51:00 +0000 (20:51 +0000)]
Merge "Implement equal method in SubscriptionInfo."
Malcolm Chen [Sat, 15 Sep 2018 01:07:02 +0000 (18:07 -0700)]
Implement equal method in SubscriptionInfo.
Bug:
115541873 92796390
Test: manual with test app
Change-Id: I217f9d612df5cecac8f0359649f3e79a60a95dde
Merged-In: I217f9d612df5cecac8f0359649f3e79a60a95dde
Nathan Harold [Wed, 26 Sep 2018 03:10:48 +0000 (20:10 -0700)]
Catch IllegalArgumentException on NetworkScan.stopScan
IllegalArgumentException is thrown when a terminated
scan calls stop. This change softens the exception and
error type that is logged and considers this normal.
Bug:
113823866
Test: compilation
Change-Id: I7ce60d6badfac52156cceca83b39c1afe21b4eda
Mattias Nilsson [Mon, 11 Dec 2017 12:45:40 +0000 (13:45 +0100)]
Add config to only allow auto select of networks
Make it possible for carriers to prevent users from
doing a manual search of networks when in the home network.
This affects Advanced Networks Settings when the user
is not roaming.
This is sometimes called "Permanent automatic mode".
Test: Add an entry in vendor.xml
Bug:
70499144
Change-Id: I9fe91a8510683e4bb3d51efb168c0d159dbb4591
Lalit Maganti [Thu, 27 Sep 2018 15:00:12 +0000 (15:00 +0000)]
Merge "Revert "Revert "new System API for preferred network mode"""
Lalit Maganti [Thu, 27 Sep 2018 14:57:06 +0000 (14:57 +0000)]
Revert "Revert "new System API for preferred network mode""
This reverts commit
dada4c60d83730d706c4ebe549c3460e596a187e.
Reason for revert: Breaking aosp-master builds.
Change-Id: Ie48b2125025878ce13953706a7eec24bce38594b
Jean-Michel Trivi [Thu, 27 Sep 2018 14:35:13 +0000 (14:35 +0000)]
Merge "Make pre-scale for absolute volume configurable"
Lalit Maganti [Thu, 27 Sep 2018 12:17:40 +0000 (12:17 +0000)]
Merge "Revert "new System API for preferred network mode""
Lalit Maganti [Thu, 27 Sep 2018 10:33:47 +0000 (10:33 +0000)]
Revert "new System API for preferred network mode"
This reverts commit
8a8832fd810710fd8fbd7868be49abff270a1013.
Reason for revert: Causing failures on git_pi-dev-plus-aosp for docs and aosp_sailfish.
Change-Id: I1801188e66420a67244b3223e26334c4650d56be
Merged-In: Ic108c484905f80783982a22e8152609257d684b5
Remi NGUYEN VAN [Thu, 27 Sep 2018 02:33:24 +0000 (11:33 +0900)]
Don't throw a NPE in SharedLog#e
Some DhcpServer error code paths could cause a NPE, when the logError
callback was called without an exception. Allowing SharedLog#e to be
called with a null Throwable is less error-prone.
Bug: b/
109584964
Test: atest FrameworksNetTests
Change-Id: Idbcdd330a9d1951b27aaf525aaf12e52e102872c
Treehugger Robot [Thu, 27 Sep 2018 02:20:30 +0000 (02:20 +0000)]
Merge "Fix trial run in AppLaunch test"
Chen Xu [Thu, 27 Sep 2018 00:30:29 +0000 (00:30 +0000)]
Merge "new System API for preferred network mode"
Tomoharu Kasahara [Thu, 6 Sep 2018 11:04:38 +0000 (20:04 +0900)]
Make pre-scale for absolute volume configurable
Audio gain for lower volume steps are restricted for
Bluetooth Absolute Volume scenario, but it's better
not to use the fixed value.
This CL makes it possible to configure the value of
pre-scale.
Bug:
114220617
Test: manual - gain is restricted as per the configuration
Change-Id: I1fd0c77476386ba9518e1819d5ea2c7b0c344a40
Merged-In: I1fd0c77476386ba9518e1819d5ea2c7b0c344a40
Jordan Liu [Wed, 26 Sep 2018 23:42:55 +0000 (23:42 +0000)]
Merge "Dismiss SIM lock page after correct SIM"
Ryan Mitchell [Wed, 26 Sep 2018 21:58:44 +0000 (21:58 +0000)]
Merge "Change FileStream test buffer from char* void*"
Tyler Gunn [Wed, 26 Sep 2018 21:55:36 +0000 (21:55 +0000)]
Merge "Cleanup deprecated or removed telephony methods."
Ryan Mitchell [Wed, 26 Sep 2018 17:26:53 +0000 (10:26 -0700)]
Change FileStream test buffer from char* void*
It seems like GoogleTest prints string parameters before checking them.
This can be a problem in FileStream tests since these buffers are not
null terminated. ASan reports heap-buffer-overflow.
Test: m SANITIZE_HOST=address
out/soong/.intermediates/frameworks/base/tools/aapt2/aapt2_tests/linux_glibc_x86_64_asan/aapt2_tests \
LD_LIBRARY_PATH=out/soong/.intermediates/external/libcxx/libc++/linux_glibc_x86_64_shared
out/soong/.intermediates/frameworks/base/tools/aapt2/aapt2_tests/linux_glibc_x86_64_asan/aapt2_tests
Change-Id: I9a1956d815729de23c7038fb0d498240eb917070
chen xu [Thu, 20 Sep 2018 23:46:36 +0000 (16:46 -0700)]
new System API for preferred network mode
1. new System API for getPreferredNetworkType
2. new System API for preferred network mode
Bug:
115894190
Test: unit test
Change-Id: I34b060d3f915f2c74b2b9412d03f849e9d037c0b
Merged-in: Ic108c484905f80783982a22e8152609257d684b5
Calin Juravle [Wed, 26 Sep 2018 21:09:44 +0000 (14:09 -0700)]
Fix trial run in AppLaunch test
If the app does not exist log an error but do not fail the test.
Test: atest google/test/performance/app-install-startup -v
(cherry-picked from commit
55db8ff9a6fa383134142f65d0b1d0da9957411d)
Merged-In: Idb6f1d0ba3c5bfb6c7985cd84f5aa4e0599c6b59
Change-Id: Idb6f1d0ba3c5bfb6c7985cd84f5aa4e0599c6b59
Chen Xu [Wed, 26 Sep 2018 21:03:26 +0000 (21:03 +0000)]
Merge "expose getAidForApptype to system API"
Jordan Liu [Wed, 26 Sep 2018 19:49:11 +0000 (12:49 -0700)]
Dismiss SIM lock page after correct SIM
Previously the criteria was to dismiss if:
1. There is no pin/password/pattern set AND
2. the lockscreen is disabled.
This behaved incorrectly in the case where the lockscreen is enabled
but there is no pin/password/pattern set.
We fix the condition so that now we dismiss the SIM lock if:
1. There is no pin/password/pattern set OR
2. the lockscreen is disabled.
Fixes:
115780994
Test: manual
Change-Id: I88da896add635126934eb0ed22e617ac2607f15a
Shuo Qian [Wed, 26 Sep 2018 18:19:52 +0000 (18:19 +0000)]
Merge "Make SubscriptionManager.isActiveSubId public"
Jeff Sharkey [Wed, 26 Sep 2018 16:27:24 +0000 (16:27 +0000)]
Merge "Fix ExternalStorageProvider always throw exception when rename"
Neil Fuller [Wed, 26 Sep 2018 08:12:46 +0000 (08:12 +0000)]
Merge "Make ext.jar only dependent on public SDK APIs"
Tyler Gunn [Wed, 26 Sep 2018 04:18:35 +0000 (04:18 +0000)]
Merge "Mark event-based handover constants as deprecated."
Tony Huang [Tue, 11 Sep 2018 09:09:12 +0000 (17:09 +0800)]
Fix ExternalStorageProvider always throw exception when rename
ExternalStorageProvider always throw exception when renameDocument
because it will check file exist when getFileForDocId. However,
beforeVisibleFile is not exist after rename, it will throw
exception. Fix it by put getting beforeVisibleFile before rename.
Test: manual test rename in DocumentsUI
Test: atest RenameActualProviderUiTest
Fix:
113302685
Fix:
115304092
Change-Id: I45d60d2f940e3dbc2b121f7cd28acc3c2d085ec4
Merged-In: I45d60d2f940e3dbc2b121f7cd28acc3c2d085ec4
Leon Liao [Tue, 25 Sep 2018 23:06:20 +0000 (23:06 +0000)]
Merge "Rename method isConnectable()"
Hall Liu [Tue, 25 Sep 2018 22:45:39 +0000 (22:45 +0000)]
Merge "Add intdef for Telephony network type constants"
vnori [Tue, 25 Sep 2018 22:35:58 +0000 (22:35 +0000)]
Merge "Add hidden API to return "Uploading" bit value from SDP record's MapSupportedFeatures."
Youming Ye [Tue, 25 Sep 2018 22:29:39 +0000 (22:29 +0000)]
Merge "Show "Call Blocking disabled" notification always when emergency call"
Chen Xu [Tue, 25 Sep 2018 22:14:34 +0000 (22:14 +0000)]
Merge "expose getIsimDomain to systemAPI"
Calin Juravle [Tue, 25 Sep 2018 22:00:00 +0000 (22:00 +0000)]
Merge "Update the reference profile from .dm files only during installs"