OSDN Git Service
Hall Liu [Tue, 12 Mar 2019 21:05:33 +0000 (14:05 -0700)]
Merge "Change summary text of Wi-Fi calling"
am:
68fdc5b7be
Change-Id: Ia52d09817e260ad144d37937b5caa48d4ba054e5
Hall Liu [Tue, 12 Mar 2019 20:49:21 +0000 (20:49 +0000)]
Merge "Change summary text of Wi-Fi calling"
Jordan Liu [Tue, 12 Mar 2019 20:13:35 +0000 (13:13 -0700)]
Merge "Add carrier's option to cancel CS reject cause notification"
am:
46f5897ae8
Change-Id: I5f95b337c6fca60d8ef66308b606081c5d9451d0
Jordan Liu [Tue, 12 Mar 2019 19:57:35 +0000 (19:57 +0000)]
Merge "Add carrier's option to cancel CS reject cause notification"
Seongho Kim [Tue, 13 Nov 2018 06:08:34 +0000 (15:08 +0900)]
Add carrier's option to cancel CS reject cause notification
Some carrier still want to cancel CS reject notification automatically
when it gets service. So, we need a way to set carrier's option for it.
Bug:
79889307
Test: Manual
Change-Id: If4c696e8116094d0cb555fe87c92243af1f34cec
Merged-In: If4c696e8116094d0cb555fe87c92243af1f34cec
Chalard Jean [Tue, 12 Mar 2019 12:25:48 +0000 (05:25 -0700)]
Merge "[CS] Support "instant failure" from factories"
am:
eb3e7b3f64
Change-Id: I0c5f2823763857edfc5095686345c764d9be12e1
Chalard Jean [Tue, 12 Mar 2019 12:04:46 +0000 (12:04 +0000)]
Merge "[CS] Support "instant failure" from factories"
Kiyoung Kim [Tue, 12 Mar 2019 09:05:13 +0000 (02:05 -0700)]
Merge "Add product apk support from libnativeloader"
am:
307df45b5f
Change-Id: I1f9c9e63c1cf7477436b8bc38e5e62e075183c64
Kiyoung Kim [Tue, 12 Mar 2019 08:48:46 +0000 (08:48 +0000)]
Merge "Add product apk support from libnativeloader"
Lucas Lin [Tue, 12 Mar 2019 08:28:50 +0000 (01:28 -0700)]
Merge "Check if network has partial connectivity"
am:
174ae05817
Change-Id: I3e94029fe067a1a22acc640a0df6a87720572b94
Lucas Lin [Tue, 12 Mar 2019 08:11:14 +0000 (08:11 +0000)]
Merge "Check if network has partial connectivity"
lucaslin [Tue, 12 Mar 2019 05:08:03 +0000 (13:08 +0800)]
Check if network has partial connectivity
In some networks, network validation may only get success
result for http probe but fail result for https probe.
For this kind of network, it may still work at some websites
or apps, but user didn't know about that. In order to fix this
issue, we will check if network has partial connectivity and
notify user to make a choice if they want to use this partial
connectivity or not.
Bug:
113450764
Test: 1. Build pass.
2. Fake partial connectivity case for testing.
3. atest FrameworksNetTests
4. atest NetworkStackTests
Change-Id: I69ed00ac4850904ff708c9fef22e148879a10e92
Daniel Huang [Tue, 12 Mar 2019 06:16:53 +0000 (23:16 -0700)]
Merge "Modify API return type and add callback."
am:
f96cc08066
Change-Id: I8d8ff3efd4666c4548dfe8a142ae0ad3f0b34b2c
Daniel Huang [Tue, 12 Mar 2019 06:02:04 +0000 (06:02 +0000)]
Merge "Modify API return type and add callback."
Remi NGUYEN VAN [Tue, 12 Mar 2019 05:37:29 +0000 (22:37 -0700)]
Merge "Move NetworkStack start to AM.systemReady"
am:
f9cca7dcc2
Change-Id: I80776bcaf5888b7244f83a467bc7c67267ccfee0
Tony Huang [Tue, 12 Mar 2019 05:29:24 +0000 (22:29 -0700)]
Merge "Update nullability of api"
am:
47890345d0
Change-Id: Ie8ed183155b16c87a98c19f11f69fe869e797880
Remi NGUYEN VAN [Tue, 12 Mar 2019 05:27:33 +0000 (05:27 +0000)]
Merge "Move NetworkStack start to AM.systemReady"
Tony Huang [Tue, 12 Mar 2019 05:22:28 +0000 (05:22 +0000)]
Merge "Update nullability of api"
Junyu Lai [Tue, 12 Mar 2019 05:21:27 +0000 (22:21 -0700)]
Merge "Improve keepalive offload documentation and error handling"
am:
cc3a190b07
Change-Id: Ia87def27904309d405c39607326a77133632461d
Junyu Lai [Tue, 12 Mar 2019 05:11:50 +0000 (05:11 +0000)]
Merge "Improve keepalive offload documentation and error handling"
Remi NGUYEN VAN [Tue, 12 Mar 2019 02:50:22 +0000 (11:50 +0900)]
Move NetworkStack start to AM.systemReady
In practice the NetworkStack was not started after
ActivityManager#systemReady, since ActivityManager was only scheduling
the start (mPendingStarts).
Requesting the start too early causes issues for the PackageManager to
install updates/rollbacks.
Test: flashed AOSP and internal builds, WiFi working
Bug:
128331883
Change-Id: I93315ad31925bd436e21d1eabb21d5967e6aae60
Remi NGUYEN VAN [Tue, 12 Mar 2019 01:53:23 +0000 (18:53 -0700)]
Merge "Use an in-process APK for in-process NetworkStack"
am:
b8f2ab9362
Change-Id: I4437757ba95f39d62a3418214d780f36daaada6e
Kazuki Iwami [Thu, 1 Nov 2018 10:02:34 +0000 (19:02 +0900)]
Change summary text of Wi-Fi calling
According to the wording change of the settings app, also change the
FWK resource for Wi-Fi calling.
Test: manual
Bug:
34793636
Change-Id: I75b970ed2094c4efcb5a8cf8b89cf3d8c78bb5db
Merged-In: I75b970ed2094c4efcb5a8cf8b89cf3d8c78bb5db
Remi NGUYEN VAN [Tue, 12 Mar 2019 01:37:26 +0000 (01:37 +0000)]
Merge "Use an in-process APK for in-process NetworkStack"
Ian Kasprzak [Mon, 11 Mar 2019 23:51:41 +0000 (16:51 -0700)]
Merge "Remove android-support-test lib from testutils."
am:
bc18cc9b19
Change-Id: I6931a899078460e8879b6c0f5b3dcb1f8d55b884
Etan Cohen [Tue, 8 Jan 2019 20:09:18 +0000 (12:09 -0800)]
[CS] Support "instant failure" from factories
Add a mechanism by which a factory can declare "instant failure" for
a request - which would result in it getting an OnUnavailable()
(even without a timeout).
Factories may only do this iff:
1. They know they are the only factory which may fulfill this
request (common for transport-specific requests).
2. The know that the request can definitely not be
fulfilled at any point in the future.
Bug:
31382922
Test: atest ConnectivityServiceTest
Merged-In: I9bce0f4d85fa8cad7f8a9998819f945b778c5ac5
Change-Id: I9bce0f4d85fa8cad7f8a9998819f945b778c5ac5
Treehugger Robot [Mon, 11 Mar 2019 22:57:58 +0000 (22:57 +0000)]
Merge "Remove android-support-test lib from testutils."
Chen Xu [Mon, 11 Mar 2019 21:54:34 +0000 (14:54 -0700)]
Merge "rename precise carrier id to specific carrier id"
am:
118354f77c
Change-Id: I2ef97c1013e3e77b7ec4ec311eaa437503a758e8
Chen Xu [Mon, 11 Mar 2019 21:34:30 +0000 (21:34 +0000)]
Merge "rename precise carrier id to specific carrier id"
Ian Kasprzak [Sat, 9 Mar 2019 02:49:31 +0000 (18:49 -0800)]
Remove android-support-test lib from testutils.
Fixed dependencies as needed.
Fixes apct/net/networking_framework_unit_test broken
in aosp/919393.
Test: m tests, checkbuild and Forrest (via gerritt) testing
Bug:
127910239
Change-Id: Ida0ca8012ede9227d204935b11002ddfa2f134ff
Merged-In: Ia825e0926b46855f9056739441cb21a065692076
(Manual partial cherry-pick of
ec6bcbceee8fed0f99d1d5d1760b74eead98668a)
Nathan Harold [Mon, 11 Mar 2019 18:19:00 +0000 (11:19 -0700)]
Merge "Add Missing getRssi to CellSignalStrengthGsm"
am:
e17575c03e
Change-Id: I882f00ce55571c66a1c9b50a839d848af950d68d
Nathan Harold [Mon, 11 Mar 2019 17:53:40 +0000 (17:53 +0000)]
Merge "Add Missing getRssi to CellSignalStrengthGsm"
Chalard Jean [Mon, 11 Mar 2019 17:26:28 +0000 (10:26 -0700)]
Merge "Add tethering event callback API"
am:
5227285ad7
Change-Id: Ie38a521abf09e0eb530173508b14aa2acdb9267c
Chalard Jean [Mon, 11 Mar 2019 17:04:57 +0000 (17:04 +0000)]
Merge "Add tethering event callback API"
Xin Li [Mon, 11 Mar 2019 16:09:43 +0000 (16:09 +0000)]
Merge "DO NOT MERGE - Merge PPRL.190305.001 into stage-aosp-master" into stage-aosp-master
Chalard Jean [Mon, 11 Mar 2019 15:04:48 +0000 (08:04 -0700)]
Merge "Add a static to get the Ip Memory Store"
am:
bee0cbe5df
Change-Id: I8cf868ca1801f30a772fea7716e0b9fd322a80de
Treehugger Robot [Mon, 11 Mar 2019 14:56:34 +0000 (14:56 +0000)]
Merge "Add a static to get the Ip Memory Store"
danielwbhuang [Mon, 11 Mar 2019 03:52:10 +0000 (11:52 +0800)]
Modify API return type and add callback.
1. Modify the type from boolean to void for updateAvailableNetworks().
2. Adding callback for updateAvailableNetworks().
3. Define error codes for update available networks results.
Test: build pass
Bug:
124616182
Merged-In: I32fe1407deabe36485227ec75931bec334d85abe
Change-Id: I32fe1407deabe36485227ec75931bec334d85abe
Chalard Jean [Mon, 11 Mar 2019 11:44:24 +0000 (20:44 +0900)]
Add a static to get the Ip Memory Store
This is so that there is some AOSP stable API while the
memory store is moved to the network.
Test: atest FrameworksNetTests
Change-Id: Ib51dbee77fcb0d14a5c85240ac711b3b1aa71286
Chalard Jean [Mon, 11 Mar 2019 11:21:36 +0000 (04:21 -0700)]
Merge "[PT17.5] Revert to booleans for send/not send broadcast constants."
am:
af5acad9f1
Change-Id: Ib8b991ce89fb94d7f0f8b865a1909f73b0b5be0d
Treehugger Robot [Mon, 11 Mar 2019 11:07:21 +0000 (11:07 +0000)]
Merge "[PT17.5] Revert to booleans for send/not send broadcast constants."
Chalard Jean [Mon, 15 Oct 2018 05:27:15 +0000 (14:27 +0900)]
[PT17.5] Revert to booleans for send/not send broadcast constants.
In PT17, for security of the patch these two constants have been
switched from boolean to enum values. While this is nice for making
sure a patch is correct, it's also pretty wasteful. Now that it's
certain that the values of these fields don't matter, they can be
set to logical values (as opposed to reversed as it was the case
before PT17.
Test: runtest
Change-Id: I93a0780e23c2f658687be066dc16f27529baaa86
Chalard Jean [Mon, 11 Mar 2019 04:19:42 +0000 (21:19 -0700)]
Merge "Make ParseException less useless."
am:
8e8ed1dfc2
Change-Id: If582e61ca92e5414edea351934053fa0ab6b04bf
Treehugger Robot [Mon, 11 Mar 2019 04:06:48 +0000 (04:06 +0000)]
Merge "Make ParseException less useless."
Kiyoung Kim [Wed, 20 Feb 2019 09:07:41 +0000 (18:07 +0900)]
Add product apk support from libnativeloader
Currently libnativeloader appends vendor lib path if apk is from vendor
partition. Similar to this we should add product lib path if apk if from product partition.
Bug:
124705551
Test: m -j && tested from crosshatch with product apps (such as Wallpaper)
Change-Id: Ic85b16e8e4484a35c659c16e067f1e7c7285d05e
Merged-In: Iaa8d0ea61b1b9ab8a1da676a492f75c6a5d71d5d
Remi NGUYEN VAN [Mon, 11 Mar 2019 02:22:45 +0000 (19:22 -0700)]
Merge changes I9dbbf904,Iebc174ed
am:
06d8067975
Change-Id: I30176a7bd0992d3a038458c0ccbe3a7ba9ecc9f7
Remi NGUYEN VAN [Mon, 11 Mar 2019 02:06:27 +0000 (02:06 +0000)]
Merge changes I9dbbf904,Iebc174ed
* changes:
Move NetworkStackTests to presubmit
Remove NetworkStack test dependency on testutils
chen xu [Wed, 6 Mar 2019 22:43:40 +0000 (14:43 -0800)]
rename precise carrier id to specific carrier id
Bug:
126727010
Test: atest CtsTelephonyTestCases
Change-Id: I4561ae8c15c429912695e0753b2ab3137a4e1e44
(cherry picked from commit
45f662139190df65f15d57a6e415c9559b580efe)
Merged-in: I4561ae8c15c429912695e0753b2ab3137a4e1e44
The Android Open Source Project [Fri, 8 Mar 2019 23:56:58 +0000 (15:56 -0800)]
DO NOT MERGE - Merge PPRL.190305.001 into stage-aosp-master
Bug:
127812889
Change-Id: I104af105cc225ae76eb176f227e9dd198f74e4b7
Nicolas Geoffray [Fri, 8 Mar 2019 23:27:04 +0000 (15:27 -0800)]
Merge "Update current API after adding nullable annotations."
am:
c06c54662b
Change-Id: If2c150f68b79f990edc046cce6ccc0d5bd85b5bf
Sasha Smundak [Fri, 8 Mar 2019 23:20:09 +0000 (15:20 -0800)]
Merge "Convert tests/**/Android.mk files to Android.bp"
am:
40ff4f7d83
Change-Id: If96014624542d6c99f7d0841347806954dbd4a42
Nicolas Geoffray [Fri, 8 Mar 2019 23:15:03 +0000 (23:15 +0000)]
Merge "Update current API after adding nullable annotations."
Treehugger Robot [Fri, 8 Mar 2019 22:54:11 +0000 (22:54 +0000)]
Merge "Convert tests/**/Android.mk files to Android.bp"
Nazanin Bakhshi [Fri, 8 Mar 2019 22:31:03 +0000 (14:31 -0800)]
Merge "update getStaticPhoneCapability to use HAL instead of default value"
am:
9e6f5d1521
Change-Id: Ib146ba3b8a7db7ed151ea721ceb57b21e4b44ac3
Nazanin Bakhshi [Fri, 8 Mar 2019 22:21:29 +0000 (14:21 -0800)]
Merge "make onActiveDataSubId in PhoneStateListener public API"
am:
dfe984c3fe
Change-Id: Ic385f5372535220bbeda6351974b22081a2e8b30
Irina Dumitrescu [Fri, 8 Mar 2019 22:16:35 +0000 (14:16 -0800)]
Merge "Add Keystore get option that supresses caught exceptions warnings."
am:
f070b51670
Change-Id: I5f229fc9d08e445c32ea8cf4e971129d79019cef
Treehugger Robot [Fri, 8 Mar 2019 22:05:59 +0000 (22:05 +0000)]
Merge "update getStaticPhoneCapability to use HAL instead of default value"
Nazanin Bakhshi [Fri, 8 Mar 2019 22:00:33 +0000 (22:00 +0000)]
Merge "make onActiveDataSubId in PhoneStateListener public API"
Treehugger Robot [Fri, 8 Mar 2019 21:58:46 +0000 (21:58 +0000)]
Merge "Add Keystore get option that supresses caught exceptions warnings."
Nazanin Bakhshi [Wed, 6 Mar 2019 23:31:45 +0000 (15:31 -0800)]
update getStaticPhoneCapability to use HAL instead of default value
Bug:
123359867
Test: build
Change-Id: Ic40921679ade1f9be42f2bc3d5170ba201dbab5a
Merged-In: Ic40921679ade1f9be42f2bc3d5170ba201dbab5a
(cherry picked from commit
1772247b044795cdad1fa22069040df0bf657f42)
Nathan Harold [Fri, 8 Mar 2019 19:39:33 +0000 (11:39 -0800)]
Merge "Add TimeStamp Constructor for HAL 1.4 Support"
am:
f899e26857
Change-Id: I9f96a8846bfb137bdcae8d8495188229637fac2c
Nazanin Bakhshi [Fri, 1 Mar 2019 18:10:22 +0000 (10:10 -0800)]
make onActiveDataSubId in PhoneStateListener public API
Bug:
124260187
Test: CTS
Change-Id: I6e5a5c8273348d822b8f552599784b8e986850bf
Merged-In: I6e5a5c8273348d822b8f552599784b8e986850bf
(cherry picked from commit
026c42d7521c390b171f2b42a9b961fdc325b44a)
Nathan Harold [Fri, 8 Mar 2019 19:03:47 +0000 (19:03 +0000)]
Merge "Add TimeStamp Constructor for HAL 1.4 Support"
android-build-team Robot [Fri, 8 Mar 2019 18:47:45 +0000 (18:47 +0000)]
Snap for
5240760 from
988624eda2c566551f75b48231cdeff2b0142d93 to pi-platform-release
Change-Id: I81cc0472fa90130ff2002a2e96240b41f4cf5f61
Nazanin Bakhshi [Fri, 8 Mar 2019 18:45:20 +0000 (10:45 -0800)]
Merge "Rename PREFERRED_DATA_SUBID_CHANGE to ACTIVE_DATA_SUB_CHANGE"
am:
016409b3d5
Change-Id: I2ced5079661da96b12c3359b6dc89412b585993a
Nazanin Bakhshi [Fri, 8 Mar 2019 18:25:59 +0000 (18:25 +0000)]
Merge "Rename PREFERRED_DATA_SUBID_CHANGE to ACTIVE_DATA_SUB_CHANGE"
Max Bires [Fri, 8 Mar 2019 18:22:53 +0000 (10:22 -0800)]
Merge "Adding KEY_PERMANENTLY_INVALIDATED int"
am:
18e0781d3d
Change-Id: I9a31a0b3c9abc72a619c06c2ffc092d5ef557213
Tyler Gunn [Fri, 8 Mar 2019 18:17:24 +0000 (10:17 -0800)]
Merge "Add carrier config key for TTY support."
am:
16f6deae44
Change-Id: Icd9d8ee8be9a4dafcca5ae6808b167c49e2e9e9f
David Anderson [Fri, 8 Mar 2019 17:55:40 +0000 (09:55 -0800)]
Merge "Update DynamicAndroidService for IGsiService AIDL changes."
am:
1451b2f3a5
Change-Id: I09b53ae751ffdff9e7fa31a8e5ee347bf42a347c
Max Bires [Fri, 8 Mar 2019 17:53:05 +0000 (17:53 +0000)]
Merge "Adding KEY_PERMANENTLY_INVALIDATED int"
Tyler Gunn [Fri, 8 Mar 2019 17:52:52 +0000 (17:52 +0000)]
Merge "Add carrier config key for TTY support."
David Anderson [Fri, 8 Mar 2019 17:39:44 +0000 (17:39 +0000)]
Merge "Update DynamicAndroidService for IGsiService AIDL changes."
Nicolas Geoffray [Fri, 8 Mar 2019 17:12:18 +0000 (17:12 +0000)]
Update current API after adding nullable annotations.
Test: m
Bug:
126703375
Change-Id: I355d911f07385fd835cb7c74a2dc9da689cda4be
Andrei-Valentin Onea [Fri, 8 Mar 2019 16:43:07 +0000 (08:43 -0800)]
Merge "Add extra hidden api related tags"
am:
cfd72b9386
Change-Id: I547a0596de397469e02d88a524610c546c59f5f7
Chalard Jean [Fri, 8 Mar 2019 16:38:35 +0000 (08:38 -0800)]
Merge "Give Telephony the permissions to access the network stack."
am:
a6f3476476
Change-Id: I4ae09aac25226904e34d77edb7333da0aabe86f9
markchien [Wed, 27 Feb 2019 06:56:11 +0000 (14:56 +0800)]
Add tethering event callback API
Provide OnTetheringEventCallback for system app to know
tethering's upstream.
Bug:
125583822
Test: -build, flash, boot
-atest FrameworksNetTests
Change-Id: I7ca81b27c9b805cc01884509f5b20d9d0a24cd36
Merged-in: I7ca81b27c9b805cc01884509f5b20d9d0a24cd36
Andrei-Valentin Onea [Fri, 8 Mar 2019 16:22:11 +0000 (16:22 +0000)]
Merge "Add extra hidden api related tags"
Treehugger Robot [Fri, 8 Mar 2019 15:55:53 +0000 (15:55 +0000)]
Merge "Give Telephony the permissions to access the network stack."
Bernie Innocenti [Fri, 8 Mar 2019 15:50:29 +0000 (07:50 -0800)]
Merge "Add junyulai@ as owner of the core networking dirs"
am:
e5e3ac639b
Change-Id: I06cca33e638baf671b891eb0c20b4c8f439eda2e
Jimmy Chen [Fri, 8 Mar 2019 15:38:41 +0000 (07:38 -0800)]
Merge "IPv6: enable IPv6 link local routing for local network"
am:
f635f12666
Change-Id: I3f5ecbd047d9205c9430610c7d6fa9400ab587d4
Bernie Innocenti [Fri, 8 Mar 2019 15:21:01 +0000 (15:21 +0000)]
Merge "Add junyulai@ as owner of the core networking dirs"
Jimmy Chen [Fri, 8 Mar 2019 15:08:07 +0000 (15:08 +0000)]
Merge "IPv6: enable IPv6 link local routing for local network"
Ugo Yu [Fri, 8 Mar 2019 15:01:55 +0000 (07:01 -0800)]
Merge "Change BluetoothCodecStatus.sameCapabilities() to public"
am:
27a6501a19
Change-Id: Ib061fe25ba0ec460b601c893f0a1396626e00331
Chiachang Wang [Fri, 8 Mar 2019 14:57:24 +0000 (06:57 -0800)]
Merge "Not to use any() to verify DataStallDetectionStats"
am:
18e931ba12
Change-Id: I7510070bc3f68386d9b222fc14342e08fc6e9b22
Luke Huang [Fri, 8 Mar 2019 14:51:48 +0000 (06:51 -0800)]
Merge "Minor changes to the async DNS query JAVA API"
am:
c8dfb72891
Change-Id: I96e9325c7dd5396f48b25919a104be55fb9b6346
Hall Liu [Fri, 8 Mar 2019 14:46:46 +0000 (06:46 -0800)]
Merge "Add more nullability annotations"
am:
3f2d69dc62
Change-Id: I9b815b25cd48a5e24506f3f50fc6370bac1af552
Chalard Jean [Fri, 8 Mar 2019 14:42:23 +0000 (06:42 -0800)]
Merge "Support VPN Proxy(1/2)"
am:
65087f4705
Change-Id: I51a716d1ee6b85bef347164061d1c12183612f50
cnx421 [Fri, 8 Mar 2019 14:38:44 +0000 (06:38 -0800)]
Merge "fix 'int android.view.View.getHeight()' on a null object reference"
am:
4add708b91
Change-Id: I3aa9c2da09a1447f79edb6a228f88cdc731bd605
Benedict Wong [Fri, 8 Mar 2019 14:35:04 +0000 (06:35 -0800)]
Merge changes Ie66ba631,Ic42c09a3
am:
cbc409986d
Change-Id: I5c8a3364f0244c5945be2bbe919aac2dcc4eba66
David Brazdil [Fri, 8 Mar 2019 14:29:15 +0000 (06:29 -0800)]
Merge "Move Camera.EventHandler constructor to greylist"
am:
b31032b3b0
Change-Id: If785b7e4f01db0a0e9b1e8d4e42258375de57dbc
Stanley Tng [Fri, 8 Mar 2019 14:25:47 +0000 (06:25 -0800)]
Merge "Add @NonNull annotations to Hearing Aids Profile APIs"
am:
6fa52c9b25
Change-Id: If06dc28087ad2fe14636e0147077b35af7947216
Xiangyu/Malcolm Chen [Fri, 8 Mar 2019 14:19:31 +0000 (06:19 -0800)]
Merge "Adding callback for setPreferredDataSubscriptionId."
am:
442084c722
Change-Id: Ic66db8504d02a22d8da38159e6d2fcf6decd1878
Brad Ebinger [Fri, 8 Mar 2019 14:16:02 +0000 (06:16 -0800)]
Merge "Fix NPE in SmsManager and keep existing behavior"
am:
8b95375a4a
Change-Id: I6b4d126b8b0a6a48bb91752dde2edd6af79b98b7
Brad Ebinger [Fri, 8 Mar 2019 14:12:38 +0000 (06:12 -0800)]
Merge "Add nullability annotations in accordance with the council"
am:
049c43f088
Change-Id: If13a487f14c6382aad010a3776dec76f7bf46738
Brad Ebinger [Fri, 8 Mar 2019 14:07:34 +0000 (06:07 -0800)]
Merge "Add CarrierConfig to use WFC home network mode in roaming network"
am:
98868a718a
Change-Id: Iabc46376d3b23d6462234c1eb9d1e9e389ac51dc
Ruchi Kandoi [Fri, 8 Mar 2019 14:03:45 +0000 (06:03 -0800)]
Merge "Add @NonNull annotations to (un)setOffHostForService()"
am:
78366e46b2
Change-Id: Ic96cc8e5d438d5083d5ad40e13367d7921f30af3
Andrei-Valentin Onea [Fri, 8 Mar 2019 14:00:20 +0000 (06:00 -0800)]
Merge "Add @UnsupportedAppUsage annotations"
am:
10c573ff85
Change-Id: I394e53a553e4c054c52fb3e991b4f81f3c152a94
Andrei-Valentin Onea [Fri, 8 Mar 2019 13:56:53 +0000 (05:56 -0800)]
Merge "Add @UnsupportedAppUsage annotations"
am:
5d256870aa
Change-Id: I2ff775d4b5f9417f8f68274b05829457fb00fe7a
Siarhei Vishniakou [Fri, 8 Mar 2019 13:53:28 +0000 (05:53 -0800)]
Merge "Add a null check for getWindow()"
am:
3c69948e6a
Change-Id: Ibeffcb78acdb9744993d3aec810acd27416ba455
Andrei Onea [Fri, 8 Mar 2019 12:34:28 +0000 (12:34 +0000)]
resolve merge conflicts of
04e04516b46a6e435282391f8cc4a7f50fe665b7 to stage-aosp-master
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Merged-In: If18cf25dbfb1b00d7bd39fd1e1032fd783fea792
Change-Id: I21e7d91ec2f6226c3f4b396eb00640021103006e