Commit Graph

385926 Commits

Author SHA1 Message Date
Chalard Jean
a1f7931360 Simplification of code to prevent a Log.wtf in expected cases.
This mostly serves to unindent code to make it locally more
readable. It is a functional no-op.

Bug: 135043192
Test: atest FrameworksNetTests
Change-Id: Iad0e9a28670e96a3c953518a0d0ccd77e2f2fa80
2019-06-17 18:01:35 +09:00
Nicolas Geoffray
cf8db35738 Merge "Print the fd that isn't whitelisted." 2019-06-14 13:26:42 +00:00
Nicolas Geoffray
983f8a5d9c Print the fd that isn't whitelisted.
Helps diagnosing issues.

Test: boots

(cherry picked from commit a83cad6ac5)

Change-Id: I85eb5ea0e29a101ad0d4227e782778f51f614ea0
Merged-In: I6fb4d40b28233a07e679dda91978a4bdec6c2a24
2019-06-14 13:38:01 +01:00
Nicolas Geoffray
c9bcf869db Merge "Pass to the runtime the primary zygote option." 2019-06-14 08:14:24 +00:00
Treehugger Robot
8fdfd917d1 Merge "Declare STATE_AUDIO_CONNECTED in right place" 2019-06-14 07:12:26 +00:00
Treehugger Robot
3b056773f1 Merge "Change factoryReset to succeed for Settings" 2019-06-14 07:02:17 +00:00
Treehugger Robot
94deb1ca38 Merge "Assume successful delivery if no Message Status" 2019-06-13 23:32:09 +00:00
Amit Mahajan
cb7c0be8fb Merge changes I44dc66f9,I72ee7af9
* changes:
  Avoid UnsupportedOperationException from getDefaultSmsSubscriptionId()
  Fix the default sub id returned by SmsManager.
2019-06-13 22:47:13 +00:00
Amit Mahajan
15fbc62662 Avoid UnsupportedOperationException from getDefaultSmsSubscriptionId()
This is basically reverting to earlier behavior.

Test: basic sanity
Bug: 134375393
Merged-in: I44dc66f9f3d5d4dfcab95220d7a6a6be0ed5a825
Change-Id: I44dc66f9f3d5d4dfcab95220d7a6a6be0ed5a825
(cherry picked from commit 900aad9924)
2019-06-13 14:31:19 -07:00
Amit Mahajan
2bc637ecb9 Fix the default sub id returned by SmsManager.
SmsManager.getDefaultSmsSubscriptionId() did not handle the case
of no default set with a single SIM present. This CL adds the
handling for that.

Test: manual SMS sanity on single sim and DSDS devices
Bug: 132259056
Merged-in: I72ee7af9f0b2662e1ac26b7d3db60c667d06c471
Change-Id: I72ee7af9f0b2662e1ac26b7d3db60c667d06c471
(cherry picked from commit 1c0a7a16c1)
2019-06-13 14:30:40 -07:00
Brad Ebinger
781ac9ef8e Merge changes from topic "cp_sms_trampoline_intent"
* changes:
  Trampoline SMS disambig dialog to Telephony
  No longer show disambig when calling SmsManager#getSubId
2019-06-13 20:17:19 +00:00
Brad Ebinger
05f4ff0a95 Trampoline SMS disambig dialog to Telephony
SmsManager used to display a "select default SMS
subscription" dialog every time SmsManager was used
and no default SMS subscription was set. This change
fixes the following issues:
1_ getSubscriptionId no longer pops up a disambig
dialog.
2) The disambig dialog no longer sets the
default, rather it waits for the response from the
user and performs the operation when it receives
a response.
2a) Dialogs can no longer be created from background
services, so we now have a restriction that if
the disambig dialog is shown via a background service,
we will use phone 0 as default (backwards compat for
apps targeting <Q) or fail (on apps targeting Q+).
3) If there is only one active subscription, use that
to perform the operation on MSIM devices instead of
asking and only displaying the one active subscription.
4) Certain non "user-facing" APIs that are used by
carrier apps no longer will pop up a UI.

Bug: 131713446
Bug: 130853716
Bug: 129141025

Test: run SmsManagerTestApp; atest TelephonyFrameworksTests

Merged-In: Ibbc07c961f1bdc19e1015885487e9f7b6a14fa83
Change-Id: I6be1c6d7bf6b6ee614b6a7d0369147e3b1890588
2019-06-13 18:30:14 +00:00
Brad Ebinger
26b242f75e No longer show disambig when calling SmsManager#getSubId
SmsManager#getSubId used to show a disambig dialog to
pick a default SMS subscription when
SmsManager#getSubscriptionId was called. Since it was used
internally as well, it would cause many of these dialogs
to pop up over and over again.

Do not display the dialog anymore and instead move the
dialog pop up to the methods that actually require the use
of the dialog, such as sending a text.

Bug: 130853716
Test: Manual, Default SMS app
Merged-In: Ibbc07c961f1bdc19e1015885487e9f7b6a14fa83
Change-Id: I71ad38f76750c750b149e4cdcb6fcf99ed89212e
2019-06-13 18:29:59 +00:00
Heemin Seog
29ddbd5b68 Change factoryReset to succeed for Settings
Wrap a part of factoryReset with Binder.withCleanCallingIdentity() so
that it doesn't crash thinking that a different uid connected to the
network stack.

Test: build, manual
Change-Id: Iea246a4c1939a4e7e35434137051835ece81d92f
2019-06-13 09:30:19 -07:00
Nicolas Geoffray
ce4f5c44dd Pass to the runtime the primary zygote option.
Will be used to customize when methods get JITted in jitzygote mode.

Test: boots
Bug: 119800099
Change-Id: Ib6c70cccfd1be6c867319cf78b5b2e4aec00bc80
2019-06-13 16:06:13 +01:00
Chiachang Wang
bca9bceffb Merge "Suppress the wtf log for notifications that are expected" 2019-06-13 09:15:09 +00:00
Chiachang Wang
1e087ac4a8 Suppress the wtf log for notifications that are expected
PARTIAL and NO_INTERNET may happen in the real world for
those transport types that provide internet. These two
notification types should be reasonable notificaitons, not a
terrible failure as the log. For Q, it may be too risky to
display more notifications with other information instead of
SSID. Thus, suppress the wtf log for these two notifications.

Bug: 135043192
Test: atest FrameworksNetTests
Change-Id: I35f3718fa93b403858587d918f0bc596f6c92f3e
2019-06-13 07:55:07 +00:00
Treehugger Robot
6b6b3322fc Merge "Update Secure NFC API definitions" 2019-06-13 04:07:54 +00:00
Taesu Lee
f018547425 Assume successful delivery if no Message Status
It assumes ERROR_CLASS is ERROR_NONE and MSG_STATUS_CODE is
STATUS_DELIVERED if there is no Message Status subparameter in Delivery
Acknowledgment.

Test: Manual

Change-Id: If5660235ce2a6af84d03ec1367a8be5daee672d2
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
2019-06-13 12:53:13 +09:00
Treehugger Robot
11d96c6de8 Merge "Clarify license terms for Romain Guy's artwork." 2019-06-12 22:24:56 +00:00
Ruchi Kandoi
6cc1ebe1e6 Update Secure NFC API definitions
Bug: 124767797
Test: None
Merged-In: If78d90fdc0a24d5f44bbb582f388a9c60b12786c
Change-Id: If78d90fdc0a24d5f44bbb582f388a9c60b12786c
2019-06-12 11:16:08 +00:00
Mark Chien
56dbf7cc45 Merge "Fix NullPointerException in ConnectivityService" 2019-06-12 06:24:41 +00:00
Bob Badour
fe0cecf534 Clarify license terms for Romain Guy's artwork.
As discussed with Romain Guy in the email thread, the Apache 2.0
license applies to the affected .jpg files now and retroactively from
the time of import.

The exiftool did not remove the old CreativeCommons metadata.

The images were altered using the bless hex editor to manually
overwrite the metadata.

$ exiftool -URL -WebStatement -UsageTerms tests/CanvasCompare/res/drawable/sunset1.jpg
URL                             : http://www.apache.org/licenses/LICENSE-2.0
Web Statement                   : http://www.apache.org/licenses/LICENSE-2.0
Usage Terms                     : Apache License Version 2.0

$ exiftool -URL -WebStatement -UsageTerms tests/HwAccelerationTest/res/drawable-hdpi/sunset1.jpg
URL                             : http://www.apache.org/licenses/LICENSE-2.0
Web Statement                   : http://www.apache.org/licenses/LICENSE-2.0
Usage Terms                     : Apache License Version 2.0

$ exiftool -URL -WebStatement -UsageTerms tests/HwAccelerationTest/res/drawable/sunset1.jpg
URL                             : http://www.apache.org/licenses/LICENSE-2.0
Web Statement                   : http://www.apache.org/licenses/LICENSE-2.0
Usage Terms                     : Apache License Version 2.0

Change-Id: Icbd8c8c65ca521751d63a213377e3ababff0b7da
2019-06-12 03:29:33 +00:00
Varun Anand
8af90ce15b Merge changes from topic "vpn_data_accnt_revert"
* changes:
  Revert "Take all VPN underlying networks into account when migrating traffic for"
  Revert "NetworkStatsService: Fix getDetailedUidStats to take VPNs into account."
  Revert "Addressing comments for http://ag/7700679."
  Revert "Add one more test for VPN usage stats."
2019-06-12 01:05:01 +00:00
Luke Huang
3f2aa4190d Merge "Fix race condition caused by fd reused for DnsResolver" 2019-06-11 15:32:17 +00:00
Luke Huang
5b31126c9d Fix race condition caused by fd reused for DnsResolver
There might be a gap between fd close and fd event listener unregister.
If fd is reused for another query during that gap, it might cause the
query failed with no response since addOnFileDescriptorEventListener
method failed. To fix this problem, we must ensure that fd event
listener is unregistered before fd closing.

Bug: 134310704
Test: atest DnsResolverTest
Change-Id: Ifb6bd34dc54dcf1c61fe8b87785124df4bc0f410
2019-06-11 15:18:28 +08:00
Treehugger Robot
882558700b Merge "Add FrameworksNetDeflakeTest" 2019-06-11 05:40:44 +00:00
Treehugger Robot
8402337237 Merge "Add workaround for b/124210145" 2019-06-11 03:25:45 +00:00
Varun Anand
d8220c2050 Revert "Take all VPN underlying networks into account when migrating traffic for"
This reverts commit 95aa6d446f.

Reason for revert: This change has been implicated in 4-way deadlocks as seen in b/134244752.

Bug: 134244752
Change-Id: I2f1839d7776a613ca571af8a542755ddc5fc8760
Merged-In: Ibdaad3a4cbf0d8ef1ed53cfab1e454b9b878bae9
2019-06-10 16:00:48 -07:00
Varun Anand
6a04d49ff2 Revert "NetworkStatsService: Fix getDetailedUidStats to take VPNs into account."
This reverts commit 29d2ef2fe1.

Reason for revert: This change has been implicated in 4-way deadlocks as seen in b/134244752.

Bug: 134244752
Change-Id: I37f75c2b243ea548a88ef1dae88287405c6ef55f
Merged-In: I0c00e8f0e30cee987b71b561079a97bf09d4dae4
2019-06-10 16:00:38 -07:00
Varun Anand
4f16107e3c Revert "Addressing comments for http://ag/7700679."
This reverts commit e4bfdccb57.

Reason for revert: This change has been implicated in 4-way deadlocks as seen in b/134244752.

Bug: 134244752
Change-Id: I12ab724e2ef8a5c1b42078330ba74713ff86fdd1
Merged-In: I5fbb3443a39a21fc9d96442726cd10d20e8d61cd
2019-06-10 16:00:28 -07:00
Varun Anand
eaa7294889 Revert "Add one more test for VPN usage stats."
This reverts commit 4e4efe42a1.

Reason for revert: This change has been implicated in 4-way deadlocks as seen in b/134244752.

Bug: 134244752
Change-Id: I87ddc0af9ff6fbd9b7afd6d4d24985b9b7205416
Merged-In: I64b48d575f2e6ec4cb7d2d100a859a30af0501dc
2019-06-10 15:59:58 -07:00
Xin Li
3d478475d6 Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master" 2019-06-10 19:54:58 +00:00
Neil Fuller
1c5515c76a Merge "Switch to use tz data module tz files, not runtime module" 2019-06-10 17:21:51 +00:00
The Android Open Source Project
c0ff987df5 DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master
Bug: 134605042
Change-Id: Ifb8de28ea860cec31308c8472c26766a6461aa5d
2019-06-10 09:32:28 -07:00
Roland Levillain
244f224221 Merge "Use suffixes instead of stems in the definition of module app_process."
am: 9c2eef9841

Change-Id: I121b48ca7c657bc524bc9c4bcf250a675f027e3a
2019-06-10 05:13:29 -07:00
Roland Levillain
9c2eef9841 Merge "Use suffixes instead of stems in the definition of module app_process." 2019-06-10 11:51:27 +00:00
Neil Fuller
54db13fa62 Switch to use tz data module tz files, not runtime module
The time zone data module is now functionally mandatory so
we can reference the files there instead.

Bug:132168458
Test: build only
Change-Id: Ie246be6882a128beddd1d9d4ee1c9bc02a821755
2019-06-10 11:00:24 +00:00
SongFerngWang
ffe3ce0ce3 Merge "notifyUserMobileDataStateChangedForPhoneId does not set mUserMobileDataState."
am: 74cdfecc5d

Change-Id: I42a294404ae715f998f3b0db90e79602629ef9dc
2019-06-09 23:20:16 -07:00
Treehugger Robot
74cdfecc5d Merge "notifyUserMobileDataStateChangedForPhoneId does not set mUserMobileDataState." 2019-06-10 06:04:15 +00:00
SongFerngWang
dfa9a7464b notifyUserMobileDataStateChangedForPhoneId does not set mUserMobileDataState.
It is wrong array. The correct array is mUserMobileDataState.

Bug: 128510330
Test: build pass
Merged-In: I5db6329ce4699cca8d79a827c36f7f61a4fa8f92
Change-Id: I5db6329ce4699cca8d79a827c36f7f61a4fa8f92
2019-06-10 10:22:25 +08:00
Remi NGUYEN VAN
67e55b4b70 Merge changes I399d3e37,Ia3fdd80c,Iad90c7a4
am: 870c267b6c

Change-Id: I1df4d64ef2c56a1f8f7fb6b5dfd6de1eab2e157b
2019-06-09 18:33:16 -07:00
Remi NGUYEN VAN
870c267b6c Merge changes I399d3e37,Ia3fdd80c,Iad90c7a4
* changes:
  Remove DeviceConfig usage from NetworkStackClient
  Simplify crash conditions in NetworkStackClient
  Proper handling of NetworkStack crash
2019-06-10 01:19:24 +00:00
Xiao Ma
e15f92e37f Merge "Fix the potential NullPointerException."
am: 4b5c8e1076

Change-Id: If2b68e47eacb1faf9ce50161322ccbed9c8253c8
2019-06-08 04:37:27 -07:00
Xiao Ma
4b5c8e1076 Merge "Fix the potential NullPointerException." 2019-06-08 11:21:44 +00:00
Jack Yu
d348075221 Merge "Supported data enabled override for different scenarios"
am: 8959a121ce

Change-Id: Ic607bd5ad608c75002a71010f73fa3c672c5b51a
2019-06-07 17:18:34 -07:00
Jack Yu
8959a121ce Merge "Supported data enabled override for different scenarios" 2019-06-07 23:58:15 +00:00
Jack Yu
a726a48fcd Supported data enabled override for different scenarios
Added override rules support for always allowing mms and
internet data during voice call.

Test: Manual + unit tests
Bug: 132113695
Merged-In: I2266d7f428901ccbba6bf538a7c7696e6566b96c
Change-Id: I2266d7f428901ccbba6bf538a7c7696e6566b96c
(cherry picked from commit 0d26d718b3)
2019-06-07 14:47:13 -07:00
Al Sutton
377d3166e4 Merge "Update services/backup OWNERS to be current B&R team"
am: bdc8e00211

Change-Id: I278f27e80f466e7bd270af103a6a27ccbea94f86
2019-06-07 09:27:05 -07:00
Al Sutton
bdc8e00211 Merge "Update services/backup OWNERS to be current B&R team" 2019-06-07 16:04:55 +00:00