Chen Xu
302b8e8cfe
Merge "Get the resources associated with subid to support MSIM"
...
am: cdbb700fa3
2019-06-04 00:07:17 -07: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 ea6d2b1e1e
2019-06-03 19:51:21 -07:00
Svetoslav Ganov
f42291962b
Merge "Add OWNERS for DeviceConfig"
...
am: 83ea055e8e
2019-06-03 16:55:39 -07:00
Svetoslav Ganov
83ea055e8e
Merge "Add OWNERS for DeviceConfig"
2019-06-03 23:43:59 +00:00
Brad Ebinger
07eec6e05d
Merge "Fix parcelling issue for certain fields."
...
am: 541f01b1bc
2019-06-03 16:10:40 -07:00
Brad Ebinger
541f01b1bc
Merge "Fix parcelling issue for certain fields."
2019-06-03 22:54:35 +00:00
Youming Ye
c575a96d53
Merge "Add carrier config for conference participants data support"
...
am: 93931ccb81
2019-06-03 14:32:15 -07: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
Paul Duffin
b5d6cc540c
Merge "Export some api files for use by cts/tests/signature tests"
...
am: 0a45ac2928
2019-06-03 08:10:42 -07: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
58d4e7304c
Merge "Re-notify if the network goes to PARTIAL."
...
am: a5496669e8
2019-06-03 06:04:00 -07: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
965240b262
Merge "Remove these subdirectories per b/133225687"
...
am: 95ae9c0b37
2019-06-02 09:17:53 -07: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
6581f25fec
Merge "Considered network preference when simulating legacy data RAT"
...
am: d40f7dc42e
2019-06-01 17:22:15 -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 a74f2d8c34
2019-06-01 00:13:03 -07:00
Evan Tyra
915b05da82
Merge "Catch NPE in getServiceStateForSubscriber"
...
am: c6e5a7197e
2019-05-31 21:15:52 -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
0d3ebfcf80
Merge "Add OWNERS file prior to migration."
...
am: bc76317347
2019-05-31 16:08:02 -07: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
Tobias Thierer
e9f31c6529
Merge "Stop USB Debugging authorization window dismissing on tap outside."
...
am: 1b817b81fd
2019-05-31 11:41:37 -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
f7da2c5812
Merge "Add system option to disable lock profiling"
...
am: b1ec00b5ea
2019-05-31 07:29:00 -07:00
David Sehr
b1ec00b5ea
Merge "Add system option to disable lock profiling"
2019-05-31 14:23:12 +00:00
Lorenzo Colitti
ac29a97d10
Merge "Don't crash ConnectivityService if the network stack crashes."
...
am: 55d1b0500a
2019-05-31 07:17:35 -07:00
Lorenzo Colitti
55d1b0500a
Merge "Don't crash ConnectivityService if the network stack crashes."
2019-05-31 13:58:00 +00:00
Lorenzo Colitti
3346abba4b
Merge "Add a wrapper for INetworkMonitor."
...
am: 878a3dd49d
2019-05-31 06:42:54 -07: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
9b4f268106
Merge "Make test_options.timeout an int64"
...
am: 9a2d64872b
2019-05-30 20:19:02 -07: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
Colin Cross
ec3a29c544
Merge "Convert SettingsLib tests to Android.bp"
...
am: d0de38b222
2019-05-30 14:14:23 -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
9561790069
Merge changes from topic "vpn_data_accn_tests"
...
am: b50e778fa7
2019-05-30 13:11:03 -07: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
Neil Fuller
364ed0b152
Merge "Switch to HexEncoding from ByteStringUtils"
...
am: a326166eba
2019-05-30 09:50:53 -07:00
Neil Fuller
a326166eba
Merge "Switch to HexEncoding from ByteStringUtils"
2019-05-30 16:31:09 +00:00
Neil Fuller
ae6fef3de7
Switch to HexEncoding from ByteStringUtils
...
Migration in preparation for deletion of ByteStringUtils.
DexLogger contains import ordering fixes to enable upload.
Bug: 124232146
Test: build only
Exempt-From-Owner-Approval: Already approved internally
Merged-In: I2cb09da5ec5296799e03bab812b7fb29452a623e
Change-Id: I2cb09da5ec5296799e03bab812b7fb29452a623e
2019-05-30 16:30:53 +00:00
