OSDN Git Service
Fan Zhang [Wed, 13 Feb 2019 18:00:16 +0000 (18:00 +0000)]
Revert "Enable static overlay for SettingsLib resources"
This reverts commit
6828b0f191e49859345d81694282e1dcda599462.
Fixes:
124370422
Reason for revert: b/
124370422
Error:
The following topic from AOSP:
https://android-review.googlesource.com/q/topic:%
22116821732%22+(status:open%20OR%20status:merged)
Has broken several builds (test_suites_x86_64, build_test, docs) with the following error:
FAILED:
build/make/core/aapt2.mk:33: error: overriding commands for target `out/target/common/obj/APPS/SetupWraith_intermediates/flat-res/frameworks/base/packages/SettingsLib/res/color_batterymeter_bolt_color.xml.flat', previously defined at build/make/core/aapt2.mk:33
05:05:47 ckati failed with: exit status 1
make: *** [run_soong_ui] Error 1
Return Code: 2
Change-Id: I9b980c512eb354f87470bcefe1df095fc5c9a807
Yanjia Li [Wed, 5 Jul 2017 08:20:48 +0000 (16:20 +0800)]
Enable static overlay for SettingsLib resources
SettingsLib is a static library, and its overlay resource cannot be
built into client apps. This CL enables static overlay of resources in
SettingsLib.
Bug:
116821732
Test: build & manual
Change-Id: I255feb12f96938053e9e00fc5d83ee2b29584dae
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
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"
Vasu Nori [Sat, 18 Aug 2018 00:25:28 +0000 (17:25 -0700)]
Add hidden API to return "Uploading" bit value from SDP record's MapSupportedFeatures.
Bug:
111614861
Test: tested w/ KitchenSink App
Change-Id: I43895183d7b315f57257e1d2045f17dedcb0cfcd
fionaxu [Mon, 17 Sep 2018 00:12:02 +0000 (17:12 -0700)]
expose getAidForApptype to system API
Bug:
115891723
Test: telephony unit test
Change-Id: Ica1d6facba229781806c2c205406c658ac5ad838
Hall Liu [Tue, 25 Sep 2018 20:38:23 +0000 (20:38 +0000)]
Merge "Add the EMBMS group call API"
Calin Juravle [Mon, 24 Sep 2018 21:07:16 +0000 (14:07 -0700)]
Update the reference profile from .dm files only during installs
In order to speed up first boot time we only create the current profile
and do not update the content of the reference profile. A system image
should already be configured with the right profile keys and the
profiles for the speed-profile prebuilds should already be copied (that's
done in #performDexOptUpgrade).
Test: manual (install apps and splits, take OTA)
Bug:
114046578
(cherry picked from commit
5c9a0085a3366b4c7f00586dba9691fac9016f22)
Merged-In: I99db76684430b929c52634c25b457e874648e205
Change-Id: I99db76684430b929c52634c25b457e874648e205
Hall Liu [Tue, 25 Sep 2018 18:12:21 +0000 (11:12 -0700)]
Add intdef for Telephony network type constants
Change-Id: Id212f5009ff2d57344dd747c1837ad9ff1546e31
Fixes:
116592397
Test: compiles
Neil Fuller [Tue, 25 Sep 2018 12:00:35 +0000 (13:00 +0100)]
Make ext.jar only dependent on public SDK APIs
ext.jar can be built using only public SDK APIs. This
makes that obvious.
Bug:
113148576
Test: make ext
Change-Id: I792b14924878623f832f3afbb1d3e23fba34d5bf
Treehugger Robot [Tue, 25 Sep 2018 11:55:51 +0000 (11:55 +0000)]
Merge "Reduce visibility on PackageDexUsage methods."
Treehugger Robot [Tue, 25 Sep 2018 11:37:23 +0000 (11:37 +0000)]
Merge "Fix minSdkVersion for test."
Alan Stokes [Tue, 25 Sep 2018 09:28:52 +0000 (10:28 +0100)]
Fix minSdkVersion for test.
P is 28 not 27, and the test requires P.
Test: atest DexLoggerIntegrationTests
Change-Id: Ib83ec92bf5d7e791bac90331b5dcc3c4b826a4fd
Alan Stokes [Fri, 21 Sep 2018 16:26:43 +0000 (17:26 +0100)]
Reduce visibility on PackageDexUsage methods.
Not a big win, but it makes it clearer that the data is never directly
changed by PackageManager etc. (We could extract the two nested
classes and then PackageDexUsage wouldn't need to be public at all.)
Test: Still builds.
Test: atest services/tests/servicestests/src/com/android/server/pm/dex
Change-Id: I0a5c0bff473a03178f730e354a2f60694729ba10
Adam Vartanian [Tue, 25 Sep 2018 08:43:59 +0000 (08:43 +0000)]
Merge "Inline two short methods from Conscrypt"
Kikkawa Shohei [Fri, 21 Sep 2018 08:06:07 +0000 (17:06 +0900)]
Show "Call Blocking disabled" notification always when emergency call
Currently "Call Blocking disabled" notification is shown only when any
setting of "Enhanced Blocked number" is enabled, and it's not shown even
if only "blocked number" is enabled.
This patch adds new CarrierConfig key to show "Call Blocking disabled"
notification always when "Enhanced Blocked number" is enabled and
making emergency call.
Test: manual - Verified behavior about Block numbers settings
Test: auto - Passed BlockedNumberProviderTest
Bug:
115697577
Change-Id: I2281c21992928037ea38227b7476adc76b6755e8
Nan Zhang [Tue, 25 Sep 2018 03:03:52 +0000 (03:03 +0000)]
Merge "Add comments for offline-sdk-referenceonly docs"
Hall Liu [Fri, 20 Apr 2018 00:57:58 +0000 (17:57 -0700)]
Add the EMBMS group call API
Add APIs for apps to access a LTE broadcast group call service provided
by a preinstalled middleware app, and add system APIs for the
preinstalled middleware app to communicate with frontend apps.
Bug:
112731375
Test: CTS
Change-Id: Ie6817cbc6c3b69de7a4d66c4cfc103b02e15ad6b
Tyler Gunn [Mon, 24 Sep 2018 22:50:50 +0000 (22:50 +0000)]
Merge "Add support for network identified emergency calls."
sqian [Tue, 11 Sep 2018 02:05:51 +0000 (19:05 -0700)]
Make SubscriptionManager.isActiveSubId public
Rename subId to subscriptionId
Bug:
113072551
Test: Treehugger
Change-Id: I6f7e0d06a2ad2367dad04723fea808cad8f9597a
Nan Zhang [Sat, 22 Sep 2018 00:16:49 +0000 (17:16 -0700)]
Add comments for offline-sdk-referenceonly docs
Add comment to provide some cautions in case of we make some changes on
the doc target names in the future.
Test: N/A
Bug: b/
116221385
Change-Id: Ibb21ca51c1eed990fe5dfceb6a8170821e70f8cf
Treehugger Robot [Mon, 24 Sep 2018 18:34:42 +0000 (18:34 +0000)]
Merge "Fix clang-tidy performance warnings in frameworks/base."
Tyler Gunn [Mon, 17 Sep 2018 16:20:34 +0000 (09:20 -0700)]
Cleanup deprecated or removed telephony methods.
Mark previously deprecated TelephonyManager APIs as @remove; some of these
have valid public APIs; for now just calling the public APIs to give more
time for API consumers to transition over to the new methods.
Remove ITelephony AIDL calls for removed methods.
Removed ITelephony light greylist for removed methods; see bug for details.
There are public alternatives for most of the remove AIDL methods; a couple
of the subscription specific ones are not available directly but the
non-subscription specific versions should suffice.
Test: Compile/build/manual
Bug:
115776310
Change-Id: Iff4bf99b34b8e14d5a4dc1d2f4e4926880b6434c
Chih-Hung Hsieh [Mon, 17 Sep 2018 22:12:02 +0000 (15:12 -0700)]
Fix clang-tidy performance warnings in frameworks/base.
* Use more efficient overloaded string methods.
Bug:
30411878
Test: build with WITH_TIDY=1
Change-Id: Ia387e61770e1e7211280ed028ef0eef6e632a1d2
Adam Vartanian [Thu, 20 Sep 2018 14:15:56 +0000 (15:15 +0100)]
Inline two short methods from Conscrypt
We're trying to reduce unnecessary direct dependencies on Conscrypt.
These two methods are simple and the implementations can't change, so
they're good candidates for inlining directly instead of depending on
the Conscrypt implementation.
Bug:
110404540
Test: atest NetworkSecurityConfigTests (same failures pre/post)
Change-Id: I303d955e3f49885326fe75f451c06a52af745053
Paul Duffin [Mon, 24 Sep 2018 11:02:43 +0000 (11:02 +0000)]
Merge "Add serialization methods to whitelist not light greylist"
vichang [Mon, 24 Sep 2018 09:56:32 +0000 (09:56 +0000)]
Merge "Expose android.icu.text.Bidi API"
Treehugger Robot [Mon, 24 Sep 2018 05:43:27 +0000 (05:43 +0000)]
Merge "Enable excluded-input-devices settings for vendor"
Treehugger Robot [Sat, 22 Sep 2018 00:29:38 +0000 (00:29 +0000)]
Merge "Frameworks: Remove AsyncTask from preloaded-classes"
Pengquan Meng [Fri, 21 Sep 2018 21:20:57 +0000 (21:20 +0000)]
Merge "Update network selection API"
Jeffrey Vander Stoep [Fri, 21 Sep 2018 21:04:20 +0000 (21:04 +0000)]
Merge "Add ConnectivityManager.getConnectionOwnerUid()"
Pengquan Meng [Thu, 20 Sep 2018 20:47:43 +0000 (13:47 -0700)]
Update network selection API
Change the manual network selection api in TelephonyManager to support
the OperatorInfo.
Bug:
115401728
Test: manual test
Merged-In: I43dee55ce117873b699cb98c6eb6d41f5dee24ea
Change-Id: I43dee55ce117873b699cb98c6eb6d41f5dee24ea
Andreas Gampe [Fri, 21 Sep 2018 17:05:43 +0000 (10:05 -0700)]
Frameworks: Remove AsyncTask from preloaded-classes
Bug:
113624968
Test: m
Change-Id: I77be78138f13fdc6d3a26aea3f59d01ef0e745e8
Tyler Gunn [Fri, 21 Sep 2018 16:37:07 +0000 (09:37 -0700)]
Add support for network identified emergency calls.
Add support for the IMS call profile to indicate that a call is an
emergency call.
Add supporting connection and call properties so that this can be
propagated to Telecom and ultimately the Dialer app.
Add System API to determine if the device is in a network IDed or dialed
emergency call (used in Telephony).
Test: Manual test using test intents and ecclist property.
Test: Added new telecom unit tests.
Bug:
77565333
Change-Id: I769e7b5000b10662c08fe53c91ef99edc685d2b1
Paul Duffin [Thu, 20 Sep 2018 10:03:40 +0000 (11:03 +0100)]
Add serialization methods to whitelist not light greylist
Checked the contents of the hiddenapi lists before and after the change
and the methods were definitely moved from light greylist to the
whitelist.
Flashed the device and checked the log and did not see anything out of
the ordinary.
Test: frameworks/base/tools/hiddenapi/generate_hiddenapi_lists_test.py
Change-Id: I9b4b2426251e99495f65ae02a3c2c32ce6966625
Takayuki Hoshi [Fri, 21 Sep 2018 06:24:21 +0000 (06:24 +0000)]
Merge "Allocate new native handle to store sidebandStream"
Jeff Vander Stoep [Mon, 23 Jul 2018 17:57:53 +0000 (10:57 -0700)]
Add ConnectivityManager.getConnectionOwnerUid()
Allow VPN apps to lookup the UID owner of a network connection.
Requires specifying the:
- IP address and port for both the source and destination of a TCP
connection.
- IP address and port for either source and destination or just
source for a UDP connection.
Only TCP and UDP protocols are supported. Only connections for UIDs
that apply to the calling VPN app will be resolved. This is intended
to replace direct app access to /proc/net/{tcp,tcp6,udp,udp6}.
The implementation uses netlink inet_diag sockets[1] to perform
the lookup on TCP sockets as well as UDP sockets when supported
(kernel has CONFIG_INET_UDP_DIAG=y).
[1] http://man7.org/linux/man-pages/man7/sock_diag.7.html
Bug:
9496886
Bug:
109758967
Test: atest HostsideVpnTests
Test: atest InetDiagSocketTest on Taimen with CONFIG_INET_UDP_DIAG
and on Sailfish without CONFIG_INET_UDP_DIAG.
Change-Id: I2bbc7072dd091e2e653dadf6dc05024c04180f34
Treehugger Robot [Fri, 21 Sep 2018 04:18:30 +0000 (04:18 +0000)]
Merge "DO NOT MERGE: Move AM/WM unit tests out of FrameworksServicesTests to WmTests"
Treehugger Robot [Fri, 21 Sep 2018 03:00:33 +0000 (03:00 +0000)]
Merge "Statsd atoms: restrict OEM fields 100000-199999"
Tadashi G. Takaoka [Wed, 19 Sep 2018 02:59:40 +0000 (11:59 +0900)]
DO NOT MERGE: Move AM/WM unit tests out of FrameworksServicesTests to WmTests
Test: All presubmit and non-flaky tests pass
129 com.android.server.am
176 com.android.server.wm
32 com.android.server.policy
$ tradefed.sh run commandAndExit WmTests \
--include-filter com.android.server.am. \
--include-annotation android.platform.test.annotations.Presubmit \
--exclude-annotation android.support.test.filters.FlakyTest
$ tradefed.sh run commandAndExit WmTests \
--include-filter com.android.server.wm. \
--include-annotation android.platform.test.annotations.Presubmit \
--exclude-annotation android.support.test.filters.FlakyTest
$ tradefed.sh run commandAndExit WmTests \
--include-filter com.android.server.policy. \
--include-annotation android.platform.test.annotations.Presubmit \
--exclude-annotation android.support.test.filters.FlakyTest
Test: No AM/WM unit test in FrameworksServicesTests
$ tradefed.sh run commandAndExit FrameworksServicesTests \
--include-filter com.android.server.am.
$ tradefed.sh run commandAndExit FrameworksServicesTests \
--include-filter com.android.server.wm.
$ tradefed.sh run commandAndExit FrameworksServicesTests \
--include-filter com.android.server.policy.
Bug:
113800711
Change-Id: I01ab256aabf7e1f1b513fe3b92140f6936c2d649
Hall Liu [Fri, 21 Sep 2018 00:10:36 +0000 (00:10 +0000)]
Merge "Add a new carrier config that supports no-reply timer of CFNRy"
Hall Liu [Thu, 20 Sep 2018 22:16:50 +0000 (22:16 +0000)]
Merge "Propagates voice call radio technology to connection"
fionaxu [Mon, 17 Sep 2018 02:01:25 +0000 (19:01 -0700)]
expose getIsimDomain to systemAPI
This is required for carrier apps to get Imsi domain name as part of
request URI.
Bug:
115884625
Test: telephony unit test
Change-Id: Iad405dc2b2f182039a828e4a4709d273579a8273
Treehugger Robot [Thu, 20 Sep 2018 20:16:36 +0000 (20:16 +0000)]
Merge "Revision of CallRedirectionService API Review"
Tianjie Xu [Thu, 20 Sep 2018 17:39:36 +0000 (17:39 +0000)]
Merge "Remove the metrics report in recovery system"
Victor Chang [Fri, 7 Sep 2018 15:26:05 +0000 (16:26 +0100)]
Expose android.icu.text.Bidi API
- All API methods has coverage by existing CTS
Bug:
110093760
Test: m api-stubs-docs-update-current-api droid cts docs
Change-Id: Ifcd1b8c2d93393dd21c5c9a6a2f2a58c76854975
manabu, shimoda [Mon, 25 Dec 2017 09:38:47 +0000 (18:38 +0900)]
Add a new carrier config that supports no-reply timer of CFNRy
Some carriers do not support no-reply timer of CFNRy.
So, if it is configured by carrier config, request CFNRy without
no-reply timer when a user sets CFNRy in settings UI.
Test: manual - Check that CFNRy is requested without no-reply timer
if it configured.
Bug:
110121791
Change-Id: If80cdd3c5eaa7b2b59cab9640d560f0b29b5eb5a
Chalard Jean [Thu, 20 Sep 2018 09:45:56 +0000 (09:45 +0000)]
Merge "Fix NullPointerException in CaptivePortalLogin"
Leon Liao [Tue, 18 Sep 2018 04:45:45 +0000 (12:45 +0800)]
Rename method isConnectable()
LocalBluetoothProfile.isConnectable() checks whether the user can initiate a connection
for a specific profile, not really whether the profile is connectable.
Change-Id: If6c6cd1554acf35db2460ea6ddb65148a7e86e45
Bug:
79982487
Test: build
Treehugger Robot [Thu, 20 Sep 2018 00:35:25 +0000 (00:35 +0000)]
Merge "Set InputMethoMananger#mCurRootView to null when window dismissed"
daqi [Wed, 19 Sep 2018 07:51:22 +0000 (15:51 +0800)]
Set InputMethoMananger#mCurRootView to null when window dismissed
InputMethodManager#sInstance is a long live static object so we have to
set its field with right value, otherwise any object referenced by it
cannot be gc including potential activity context.
Now InputMethodManager#mCurRootView is set to null in
InputMethodManager#onPreWindowFocus which is invoked when app's
ViewRootImpl received ViewRootImpl#W#windowfocusChanged from WMS.
However, in the ViewRootImpl#W#windowfocusChanged, mViewAncestor is a
weak reference which get() may returns null sometimes.
One scenario is the ViewRootImpl#W#windowfocusChanged is called after
ActivityThread#handleDestroyActivity. The activity is destroyed and its
ViewRootImpl get GC'd. Then InputMethodManager#onPreWindowFocus won't
get called and InputMethodManager#mCurRootView won't be set to null.
And it is a proper time to set InputMethodManager#mCurRootView to null
when the window it served dismissed.
Fix:
116078227
Test: Break at ActivityThread#handleDestroyActivity and ViewRootImpl#W#windowfocusChanged
Change-Id: I8fabb30f14bcb2cd7019e29b6642b4562d49d248
Signed-off-by: daqi <daqi@xiaomi.com>
Treehugger Robot [Wed, 19 Sep 2018 23:28:55 +0000 (23:28 +0000)]
Merge "Don't run comparisons on non-jank frames"
Treehugger Robot [Wed, 19 Sep 2018 22:31:44 +0000 (22:31 +0000)]
Merge "Added mapping files for DualShock3 and DualShock4"
Benedict Wong [Wed, 19 Sep 2018 21:46:05 +0000 (21:46 +0000)]
Merge "Re-enable checks for MANAGE_IPSEC_TUNNELS"
sqian [Thu, 9 Aug 2018 21:34:27 +0000 (14:34 -0700)]
Revision of CallRedirectionService API Review
- onBind should be final (I think also for onUnBind)
- Remove verbose logging
- Document redirectCall/placeCallUnmodified/cancelCall can only be
called from onPlaceCall
Bug:
112303670
Test: compile
Change-Id: I7d70a5ac3063a638d9383f69c99e4c1f822e8948
Merged-In: I7d70a5ac3063a638d9383f69c99e4c1f822e8948
(cherry picked from commit
4ec07dd68a84782e34858c16735732725d443f71)
Hall Liu [Wed, 19 Sep 2018 18:09:01 +0000 (18:09 +0000)]
Merge "Mark old APIs as @removed"
Nan Zhang [Wed, 19 Sep 2018 14:34:04 +0000 (14:34 +0000)]
Merge "Enable api-versions.xml generation for api-stubs"
Wei Huang [Wed, 30 May 2018 11:21:36 +0000 (19:21 +0800)]
Propagates voice call radio technology to connection
This patch mainly takes below changes:
1) Add new extra to indicates the call network technology.
2) Provides basic function to set/get call radio technology.
Bug:
67856372
Test: Manual
Change-Id: I1a12382fdb589ce823fe7af025832db4cdc152c2
David Brazdil [Wed, 19 Sep 2018 07:23:36 +0000 (07:23 +0000)]
Merge "Add entry to hidden API greylist"
Hisanobu, Watanabe [Mon, 20 Aug 2018 08:46:54 +0000 (17:46 +0900)]
Fix NullPointerException in CaptivePortalLogin
[Problem]
After reboot, the CaptivePortalLogin crashes when start the
CaptivePortalLogin from Recents Screen.
[Root Cause]
Although Network class is null, Network#getPrivateDnsBypassingCopy is
called at CaptivePortalLoginActivity
[Solution]
To check if NetworkCapabilities is null before
Network#getPrivateDnsBypassingCopy
Bug:
113303484
Test: built, boot and manual
Change-Id: Icff8446fefa9700dcbcd1f8f1e4edeaf4b0d3557
David Brazdil [Wed, 19 Sep 2018 04:09:17 +0000 (12:09 +0800)]
Add entry to hidden API greylist
Bug:
114488777
Test: m appcompat
Change-Id: I8207503ab2904eb61e0f49e1fa317602d9fa145d
Treehugger Robot [Wed, 19 Sep 2018 04:24:19 +0000 (04:24 +0000)]
Merge "Simplify logic for connect in PbapClientProfile"
Treehugger Robot [Wed, 19 Sep 2018 03:10:37 +0000 (03:10 +0000)]
Merge "Update boot image profile to include Object.wait()"
Treehugger Robot [Wed, 19 Sep 2018 03:02:19 +0000 (03:02 +0000)]
Merge "Enable jdiff for api-stubs-docs"
Treehugger Robot [Wed, 19 Sep 2018 02:08:33 +0000 (02:08 +0000)]
Merge "Simplify logic for getConnectionStatus in HidDeviceProfile"
Treehugger Robot [Wed, 19 Sep 2018 02:08:05 +0000 (02:08 +0000)]
Merge "Simplify logic for connect in MapClientProfile"
Nan Zhang [Tue, 18 Sep 2018 17:46:10 +0000 (10:46 -0700)]
Enable api-versions.xml generation for api-stubs
Test: m -j
out/target/common/obj/PACKAGING/api-stubs-docs_generated-api-versions.xml
Bug: b/
78245848
Change-Id: I2800f49e264473f5ec78e074cfd844c72342522f
Merged-In: I2800f49e264473f5ec78e074cfd844c72342522f
Treehugger Robot [Tue, 18 Sep 2018 23:03:47 +0000 (23:03 +0000)]
Merge changes from topic "ota_dexopt_no_ampersand"
* changes:
OTA Dexopt: Use protocol version 10
OTA Dexopt: Remove old '&' path
Andreas Gampe [Tue, 18 Sep 2018 21:21:11 +0000 (14:21 -0700)]
Update boot image profile to include Object.wait()
Bug:
116028959
Test: m
Test: inspect oatdump
Change-Id: I5aefa4e334d61cd24f110a35a0084d563a8aca63