385735 Commits

Author SHA1 Message Date
Lorenzo Colitti
2bba8e7b60 Merge "Always prompt for limited connectivity." 2019-06-06 04:28:53 +00:00
Lorenzo Colitti
ec2c7ec18d Always prompt for limited connectivity.
Bug: 130766237
Test: See subsequent CL in same patch series.
Change-Id: I45b4a7ba2e21c0be868939d8c7bb78891d69c48b
2019-06-06 11:59:49 +09:00
Treehugger Robot
fe283df7ab Merge "Match src paths with aidl package name" 2019-06-06 01:42:18 +00:00
Treehugger Robot
9f56d51018 Merge "Clarify license terms for Romain Guy's artwork." 2019-06-06 01:13:08 +00:00
Bob Badour
9d53a5e9b7 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.

'wallpaper_goldengate.jpg' and 'wallpaper_goldengate_scale.jpg' were
altered using the exiftool:

exiftool -WebStatement=http://www.apache.org/licenses/LICENSE-2.0

Each of the other images was altered using the exiftool:

exiftool -URL=http://www.apache.org/licenses/LICENSE-2.0 \
    -WebStatement=http://www.apache.org/licenses/LICENSE-2.0 \
    -UsageTerms='Apache License Version 2.0'

Change-Id: I52a032fc6aa6373d2fb0ea941e041ea72764268c
2019-06-05 23:30:57 +00:00
Dan Willemsen
4a49850930 Match src paths with aidl package name
In order for the build system to track updates to the header files
during incremental builds, always specify the src files using the same
path as the package for C++ compilations.

Bug: 112114177
Test: treehugger
Change-Id: I97493c90c888678ce6c5fb56c9c83516b7e2fb2f
2019-06-05 15:51:24 -07:00
Shuo Qian
0e576fe639 Merge "Add "+" in EmergencyNumber API" 2019-06-05 20:19:52 +00:00
sqian
b46b589fc8 Add "+" in EmergencyNumber API
Bug: 133244926
Test: Treehugger
Change-Id: I09b0127ce929ec51fbb5c387c383e76dcde5f0b5
Merged-In: I09b0127ce929ec51fbb5c387c383e76dcde5f0b5
(cherry picked from commit 82cfdba17a123c70d331e5a129497d7df831380d)
2019-06-05 12:12:54 -07:00
Treehugger Robot
9d519d808f Merge "Frameworks: Slightly refactor Parcel code" 2019-06-05 18:13:36 +00:00
Lorenzo Colitti
79e58ad901 Merge "Allow passing in acceptUnvalidated without explicitlySelected" 2019-06-05 05:00:14 +00:00
Lorenzo Colitti
091de3f0a6 Allow passing in acceptUnvalidated without explicitlySelected
This will allow wifi to tell ConnectivityService that partial
connectivity is acceptable even if the network is not explicitly
selected.

This is needed when the user selects a partial connectivity
network and tells the system to connect to the network, and never
to ask again. In such cases, the system must switch to the
network even if it is not explicitly selected.

Bug: 130766237
Test: atest FrameworksNetTests
Test: unit tests in an upcoming CL
Change-Id: I13465090b7b1c0bf5dc83362387a5428d77b7e1d
Merged-In: I13465090b7b1c0bf5dc83362387a5428d77b7e1d
(cherry picked from commit 0e33bd116782f92dc77f65104ec6706e46548742)
2019-06-05 11:12:18 +09:00
Brad Ebinger
a8abb52707 Merge "Make getSimCallManager msim aware" 2019-06-04 20:40:42 +00:00
Tyler Gunn
4a8a8696b6 Merge "Add silence support to CallScreeningService/Call API" 2019-06-04 19:31:12 +00:00
Chen Xu
4a864b8d96 Merge "skip permission check for TelephonyManager API getMmsUserAgent" 2019-06-04 19:07:06 +00:00
Treehugger Robot
f089867d9b Merge "Update NEW_OUTGOING_CALL broadcast deprecation docs." 2019-06-04 18:37:48 +00:00
chen xu
459e51e5ba skip permission check for TelephonyManager API getMmsUserAgent
Bug: 133637995
Test: Manual test
Change-Id: Ib9f211120c34e9b48c02f990088c32fb307a64f2
(cherry picked from commit 48781653654ff06b5db51ab312fd1f01111d65de)
Merged-in: Ib9f211120c34e9b48c02f990088c32fb307a64f2
2019-06-04 18:13:32 +00:00
Usman Abdullah
b0dc29a875 Add silence support to CallScreeningService/Call API
Test: CTS
Test: Unit Tests
Test: Manual
Bug: 126590377
Bug: 122671585

Change-Id: I4e7c67784198678eef1926759ec1d8afb98438f4
Merged-In: I4e7c67784198678eef1926759ec1d8afb98438f4
2019-06-04 15:38:07 +00:00
Treehugger Robot
c5bc106d53 Merge "Fix cannot create Nat-T keepalive on mobile data" 2019-06-04 12:09:00 +00:00
junyulai
02abbfde57 Fix cannot create Nat-T keepalive on mobile data
Currently phone process fail to unparcel NattKeepalivePacketData
since it is not in framework. Moves NattKeepalivePacketData to
framework to make it can be utilized by telephony.

This change also removes the error feedback triggered by calling
add keepalive packet filter to an unsupported network agent. This
is misinterpreted by KeepaliveTracker that start keepalive is
failing.

Bug: 134048171
Test: 1. atest android.net.cts.ConnectivityManagerTest#testSocketKeepaliveLimitTelephony
      2. atest android.net.cts.ConnectivityManagerTest
      3. atest FrameworksNetTests
      4. atest FrameworksTelephonyTests
Change-Id: If630d5b339aa722717258c721daa8ead8c431e2d
2019-06-04 18:22:15 +08:00
Chen Xu
cdbb700fa3 Merge "Get the resources associated with subid to support MSIM" 2019-06-04 06:34:16 +00:00
calvinpan
6f51e9624f Get the resources associated with subid to support MSIM
To avoid AP get the incorrect mms_user_agent and mms_user_agent_profile_url
in the MSIM device, so get the resource with subscription.

Bug: 131296413
Test: Build pass
Merged-In: Ib00cfe3640b59db5f971c32741eed999131e67c0
Change-Id: Ib00cfe3640b59db5f971c32741eed999131e67c0
(cherry picked from commit ea6d2b1e1e0f63f5a9ada0c884ac68e66009cd6d)
2019-06-03 19:51:21 -07:00
Svetoslav Ganov
83ea055e8e Merge "Add OWNERS for DeviceConfig" 2019-06-03 23:43:59 +00:00
Brad Ebinger
541f01b1bc Merge "Fix parcelling issue for certain fields." 2019-06-03 22:54:35 +00:00
Svet Ganov
6f0209aaee Add OWNERS for DeviceConfig
Test: N/A

Change-Id: Ia1b10287a0d056fd9d242936e90d8f91d847fe59
2019-06-03 14:27:39 -07:00
Youming Ye
93931ccb81 Merge "Add carrier config for conference participants data support" 2019-06-03 21:09:49 +00:00
Treehugger Robot
0a45ac2928 Merge "Export some api files for use by cts/tests/signature tests" 2019-06-03 14:52:00 +00:00
Lorenzo Colitti
a5496669e8 Merge "Re-notify if the network goes to PARTIAL." 2019-06-03 12:50:11 +00:00
Chiachang Wang
aedf0479d3 Re-notify if the network goes to PARTIAL.
If NetworkMonitor detects partial connectivity before
EVENT_PROMPT_UNVALIDATED arrives, show the partial
connectivity notification immediately. Re-notify
partial connectivity silently if no internet
notification already there.

Bug: 130683832
Bug: 130766237
Test: atest com.android.server.ConnectivityServiceTest
Change-Id: I7d4eddc643ec795c3961097dc1bdd314d168f6c7
2019-06-03 12:49:53 +00:00
Paul Duffin
cd35de3507 Export some api files for use by cts/tests/signature tests
Creates a filegroup for each of these files:
* api/current.txt
* api/system-current.txt
* api/system-removed.txt
* test-base/api/current.txt
* test-mock/api/current.txt
* test-runner/api/current.txt

Bug: 122332514
Test: atest -p cts/tests/signature
Change-Id: Ib031dcc39d3c1cca6dcdf977c0277d5e4875591e
2019-06-03 11:56:35 +01:00
Baligh Uddin
95ae9c0b37 Merge "Remove these subdirectories per b/133225687" 2019-06-02 15:58:12 +00:00
Baligh Uddin
1474c7bf34 Remove these subdirectories per b/133225687
Bug: 133225687
Test: Local compile/test.
Change-Id: I94f962e4e15c5addb193d6a54a6776614ed02657
2019-06-01 23:35:01 -07:00
Jack Yu
d40f7dc42e Merge "Considered network preference when simulating legacy data RAT" 2019-06-02 00:11:16 +00:00
Jack Yu
89ccc66963 Considered network preference when simulating legacy data RAT
Correctly supported the legacy data RAT when both cellular
and IWLAN are in service. In this case only report
RAT as IWLAN when any type of APN is preferred on IWLAN.
Otherwise still use the RAT reported by cellular network
service.

Bug: 133516945
Test: Manual

Merged-In: Ifdddad1d5ee95f4576d5002a1b66caafc172cb58
Change-Id: Ifdddad1d5ee95f4576d5002a1b66caafc172cb58
(cherry picked from commit a74f2d8c34fa8bf22a2b6430d79c3fc34f615617)
2019-06-01 00:13:03 -07:00
Evan Tyra
c6e5a7197e Merge "Catch NPE in getServiceStateForSubscriber" 2019-06-01 02:50:10 +00:00
Evan Tyra
9bd937a0f6 Catch NPE in getServiceStateForSubscriber
ITelephony can enter a bad state with an incorrect SubId and throw an
NPE as shown in the attached bug. This is not an expected error, so a
bugreport will be triggered on userdebug builds on catch.

Test: Local
Bug: 134067547
2019-06-01 00:02:42 +00:00
Baligh Uddin
bc76317347 Merge "Add OWNERS file prior to migration." 2019-05-31 22:30:25 +00:00
Baligh Uddin
379969282d Add OWNERS file prior to migration.
Bug: 133225687
2019-05-31 15:28:57 -07:00
Treehugger Robot
1b817b81fd Merge "Stop USB Debugging authorization window dismissing on tap outside." 2019-05-31 18:13:20 +00:00
David Sehr
b1ec00b5ea Merge "Add system option to disable lock profiling" 2019-05-31 14:23:12 +00:00
Lorenzo Colitti
55d1b0500a Merge "Don't crash ConnectivityService if the network stack crashes." 2019-05-31 13:58:00 +00:00
Lorenzo Colitti
878a3dd49d Merge "Add a wrapper for INetworkMonitor." 2019-05-31 13:25:36 +00:00
Lorenzo Colitti
ac955b3171 Don't crash ConnectivityService if the network stack crashes.
When the network stack crashes, the system will rebind to it.
Existing references are no longer useful (they just throw
RemoteException) but if the system is still up, then the user
can at least recover the situation by taking actions such as
going into airplane mode, toggling wifi, etc.

This CL stops ConnectivityService from crashing the system when
it cannot talk to NetworkMonitor. This is arguably better than
crashing the system, because crashing the system is disruptive
and carries the serious risk of a bootloop from which it is not
possible to recover.

NetworkStackClient already contains code to crash the system
when the network stack crashes. This change help ensure that
if a crash occurs, it is the result of an explicit decision by
that code instead of an unchecked exception in one of the callers
of the network stack.

Bug: 133725814
Test: builds, boots
Test: atest FrameworksNetTests NetworkStackTests
Change-Id: Ib9a15fececd8579fc5b139fe0341275a45512e0f
2019-05-31 19:30:36 +09:00
Lorenzo Colitti
836f6a4a05 Add a wrapper for INetworkMonitor.
Generated using:
./wrap_aidl.sh frameworks/base/services/net/aidl/networkstack/3/android/net/INetworkMonitor.aidl > frameworks/base/services/net/java/android/net/NetworkMonitorManager.java

Bug: 133725814
Test: builds, boots
Test: atest FrameworksNetTests
Change-Id: I9f3f2588d498a05e2405129cf58bfcdd30f45e3b
2019-05-31 19:22:32 +09:00
Colin Cross
9a2d64872b Merge "Make test_options.timeout an int64" 2019-05-31 03:11:21 +00:00
David Sehr
26a6427c44 Add system option to disable lock profiling
Disable lock profiling to test for overhead.

Bug: 133257467
Test: build
Change-Id: Ida5f83e626c82266de69b13dc2def0477cc87b0f
2019-05-30 18:04:16 -07:00
Andreas Gampe
4c0df5c727 Frameworks: Slightly refactor Parcel code
Decrease the amount of code covered by a lock in Parcel. This allows
fetching multiple classes in parallel, with the slight downside that
these classes might be the same.

Reduces contention samples for this method in profiling by two thirds.

Test: m
Test: manual profiling
Change-Id: I96415659f6625df25800c60dd3bee1094255fcc3
2019-05-30 14:42:10 -07:00
Youming Ye
37ca693d78 Add carrier config for conference participants data support
Bug: 132312382
Test: Manual
Change-Id: I88edd5a590f46b961c986ef0bf24585b3c2cf4a1
2019-05-30 14:13:44 -07:00
Colin Cross
d0de38b222 Merge "Convert SettingsLib tests to Android.bp" 2019-05-30 21:08:52 +00:00
Varun Anand
b50e778fa7 Merge changes from topic "vpn_data_accn_tests"
* changes:
  Add one more test for VPN usage stats.
  Addressing comments for http://ag/7700679.
2019-05-30 19:34:28 +00:00
Colin Cross
c3378677a6 Make test_options.timeout an int64
Test: m RunSettingsLibRoboTests

Change-Id: I87e185a54474c43a0c5e77a657c28d3403354876
2019-05-30 11:39:13 -07:00