375019 Commits

Author SHA1 Message Date
Treehugger Robot
4593c78168 Merge "statsd: Add missing AIDs to UidMap" 2018-10-05 16:52:11 +00:00
Treehugger Robot
85666351d7 Merge "DO NOT MERGE Synchronize ZenModeControllerImpl callbacks" 2018-10-05 15:38:39 +00:00
Chalard Jean
79822ffb6f Merge "[PT10] Move loadGlobalProxy into ProxyTracker." 2018-10-05 09:07:12 +00:00
Neil Fuller
b2a8384164 Merge "Swap libcore annotations for framework versions" 2018-10-05 08:09:13 +00:00
Chalard Jean
655ad15890 [PT10] Move loadGlobalProxy into ProxyTracker.
Test: runtest
Change-Id: Id1c57ebb575c8742310be4822ec6e3fa03f487c3
2018-10-05 16:37:38 +09:00
Neil Fuller
b255cdcc0d Swap libcore annotations for framework versions
Swap libcore nullability annotations for android.annotation
equivalents.

Bug: 113148576
Test: build
Change-Id: Ie571062779e9bdf3890f6fcbd99be905aaf1adf9
2018-10-04 22:37:18 +01:00
Igor Murashkin
a1980ae12a statsd: Add missing AIDs to UidMap
Change-Id: I29f52727d344755a0c465105eb3a2c81b2bec700
2018-10-04 14:30:48 -07:00
Cassie Han
56dedc8fe8 Merge "Clean cherry-pick 'Fix getApnTypesBitmaskFromString in ApnSetting'" 2018-10-04 20:35:07 +00:00
Cassie
5d2b861509 Clean cherry-pick 'Fix getApnTypesBitmaskFromString in ApnSetting'
Bug: 116363528
Test: Maunal test
Change-Id: Ie2fda3fe4e2519f652e0a04dde058be748208bd5
Merged-In: Ie2fda3fe4e2519f652e0a04dde058be748208bd5
2018-10-04 20:31:05 +00:00
Shuo Qian
8f08ba793e Merge "New Permission for Call Redirection service" 2018-10-04 19:03:13 +00:00
Treehugger Robot
4ddd969fb9 Merge "startop: Add iorapd binder integration test" 2018-10-04 17:46:47 +00:00
Ian Kasprzak
3379469950 Merge "Add AndroidTest file for ExtServices" 2018-10-04 15:38:01 +00:00
Tyler Gunn
440158df4f Merge "Rename EXTRA_E_CALL to EXTRA_EMERGENCY_CALL." 2018-10-04 15:21:51 +00:00
Treehugger Robot
afffa37248 Merge "Delay global alerts by 1s for high thresholds" 2018-10-04 08:17:11 +00:00
Chalard Jean
d7c6e12bae Delay global alerts by 1s for high thresholds
By skipping updates if an alert is already scheduled, this avoids firing
the global alert too often on devices with high transfer speeds and high
quota.

Test: with tethering watching videos. Also runtest frameworks-net
Bug: 117243748
Change-Id: Idce6059832db7a0e4a7117bbb3e424ec62ae3b21
2018-10-04 01:30:43 +00:00
Treehugger Robot
7b532b7370 Merge "startop: Add iorap parcelables for AIDL interfaces" 2018-10-04 01:13:47 +00:00
Remi NGUYEN VAN
3b12359e4c Merge "Send hostname and MTU options in DHCP ACK/OFFER" 2018-10-04 01:08:19 +00:00
Treehugger Robot
5f7129b925 Merge "MTP: Add OWNERS for MTP functionality" 2018-10-04 00:48:39 +00:00
Clown SHEN
1bab71e0c4 Merge "New carrier config enhanced_4g_lte_title_variant_int" 2018-10-04 00:07:19 +00:00
Julia Reynolds
93d878f49e Add AndroidTest file for ExtServices
Test: make
Bug: 111475013, 117228643
Change-Id: Id649a1ed2109dee87bb8c61c3a161efe99c5e457
Merged-In: Id649a1ed2109dee87bb8c61c3a161efe99c5e457
(cherry picked from commit cfd2692a94503753bf9abcffdb40ed2de682dd41)
2018-10-03 16:43:09 -07:00
Jack Yu
2966539634 Merge "Renamed get network registration states API" 2018-10-03 21:35:57 +00:00
Youming Ye
4fb756984d Merge "Fix ImsManager callback called once registered" 2018-10-03 20:15:35 +00:00
Treehugger Robot
fce8595437 Merge "Add SapProfile to LocalBluetoothProfileManager (1/2)" 2018-10-03 18:04:28 +00:00
Beverly
503ae21287 DO NOT MERGE Synchronize ZenModeControllerImpl callbacks
Test: manual
Bug: 115688927
Change-Id: Ib47913c7b5522c40405fadd97d570d5f197f71dc
2018-10-03 12:36:04 -04:00
Nandana Dutt
7eaa2cbf51 Merge "Disable the buginfo dialog on AndroidTV" 2018-10-03 15:39:22 +00:00
Nandana Dutt
99c685b0e8 Merge "Bugreport: Fix SystemUI service from being dumped twice 1/2" 2018-10-03 15:35:56 +00:00
Neil Fuller
32fb670a0a Merge "Remove unnecessary dependency on bouncycastle" 2018-10-03 13:36:02 +00:00
Treehugger Robot
7fe2b3ec69 Merge "Remove an unused dependency on conscrypt" 2018-10-03 12:41:57 +00:00
Chienyuan
2be42b972c Add SapProfile to LocalBluetoothProfileManager (1/2)
* add SapProfile and related logic to LocalBluetoothProfileManager
* simplify logic for connect and disconnect in SapProfile
* connect: remove connected device check logic. SapService will
  return false directly.
* disconnect: remove connected device check logic. SapService will
  check it.
* getConnectionStatus: remove connected device check logic.
  SapService will check it.
* remove member variable V and related checks.
* wrap if/else statement in curly brackets.
* add robotest for SapProfile.

Bug: 116281023
Test: make -j42 RunSettingsLibRoboTests ROBOTEST_FILTER=SapProfileTest
Change-Id: I2efc1beb7a12e1ec412baf54f895d2ebe930e8f1
Merged-In: I2efc1beb7a12e1ec412baf54f895d2ebe930e8f1
2018-10-03 11:05:31 +00:00
Nandana Dutt
702587e787 Merge "Warn about sensitive bugreport contents." 2018-10-03 09:51:59 +00:00
Nandana Dutt
729ae07a36 Merge "Synchronize access to sNotificationBundle." 2018-10-03 08:55:01 +00:00
Jack Yu
aa5cb71764 Merge changes from topic "fcc_2019"
* changes:
  Added new cell broadcast channels
  Use locale language instead of harcoded langauge
2018-10-03 04:02:24 +00:00
Nathan Harold
d264669c7c Merge "Use SDK Constant for NeighboringCellInfo Docstring" 2018-10-03 01:21:17 +00:00
Igor Murashkin
292a9347f7 startop: Add iorapd binder integration test
Connects to the binder 'iorapd' service as a client
and tests round-trip callback functionality.

Also adds mockito-inline to the test build, allowing us to mock
any class/methods, even if it's static or final.

Note: selinux is currently not supported, need to use
 $> adb shell setenforce 0

Prior to running any tests relying on binder connectivity.

Bug: 72170747
Test: atest libiorap-java-tests
Change-Id: Id5ba579845105e331d764838c357924810a64c6c
2018-10-02 17:51:38 -07:00
Igor Murashkin
ca4fee198a startop: Add iorap parcelables for AIDL interfaces
Bug: 72170747
Test: atest frameworks/base/startop/iorap
Change-Id: Icd3feebcd2342e66b63fbb0c0e8f08bade618c76
2018-10-02 17:51:34 -07:00
Jack Yu
37a1fc31b5 Renamed get network registration states API
Using the term "for" is more appropriate than "from".

Test: Build
Bug: 73659459
Change-Id: I9e06a35979b887a14822862f290798a7f75a54f8
2018-10-02 17:01:51 -07:00
Jack Yu
f2e9856f49 Merge "Reworked getNetworkRegistrationStates API" 2018-10-02 23:34:15 +00:00
Nathan Harold
3d850a7fd7 Use SDK Constant for NeighboringCellInfo Docstring
As per API council feedback, when documenting
SDK-level-specific behavior and recommendations, the
document should use and link to the SDK constant rather
than its value. Update the docstring accordingly, and
also some minor verbiage tweaks.

Bug: 117154674
Test: compilation; docstring-only change
Change-Id: I0ee56a4d76a311a8e0136766ef45aeda46cd12b4
2018-10-02 16:10:21 -07:00
Tyler Gunn
e35965e881 Merge "Add handleCallIntent method in TelecomManager." 2018-10-02 22:27:14 +00:00
Tyler Gunn
70f9063dde Rename EXTRA_E_CALL to EXTRA_EMERGENCY_CALL.
Test: Update API, verify code compiles.
Bug: 117145353
Change-Id: Ic5e2618144eaaa4c836d085fe4555eb5d9b2947f
2018-10-02 15:25:06 -07:00
Jack Yu
bb16b5509b Added new cell broadcast channels
Added new cell broadcast channels for public safety messages
and state/local test alert required by FCC of the United States.

Test: Build
Bug: 110754638, 71497689, 110896497
Merged-In: I05c57b66d85ea7f2b67d7fc421230442f5c7694f
Change-Id: I05c57b66d85ea7f2b67d7fc421230442f5c7694f
(cherry picked from commit 78921f09257d62236b19aee20bbafc00e0320fd8)
(cherry picked from commit 4353217a778c33f4831a8b74d9c12ea22cf442cd)
2018-10-02 15:16:54 -07:00
Jack Yu
7dafd0d7e9 Use locale language instead of harcoded langauge
Used the locale language instead of the hardcoded language since
ISO 639 is not a stable standard. Some language codes changed before.

This is part of the cell broadcast language filtering feature
added per U.S. FCC requirement.

Test: Manual
Bug: 110754638, 71497689, 110896497
Merged-In: I3cf42eb037cdbb40597c1053fedb36b478277fc9
Change-Id: I3cf42eb037cdbb40597c1053fedb36b478277fc9
(cherry picked from commit 28e9684705e63b5bb6c4a6d30fcf0809801b483f)
(cherry picked from commit 232b237b0fdc68cbe234d9d987161f8a7922995c)
2018-10-02 15:16:43 -07:00
Treehugger Robot
9073dc4839 Merge "Remove unused / invalid import" 2018-10-02 21:46:01 +00:00
Treehugger Robot
9b2c026f10 Merge "Dismiss Dialog in post instead of immediately" 2018-10-02 21:34:07 +00:00
Neil Fuller
35297c49f6 Remove unnecessary dependency on bouncycastle
Nothing in this target requires bouncycastle.
Bug: 113148576
Test: build

Change-Id: I6128fca1eca1c6cefe679721a4cf72729d27d6bb
2018-10-02 21:32:36 +01:00
Jayant Chowdhary
604b0eed1f Merge "Add libbinderthreadstate to LOCAL_JNI_SHARED_LIBS for some tests" 2018-10-02 20:14:37 +00:00
Jack Yu
b4ae477213 Reworked getNetworkRegistrationStates API
Added two new APIs for getting network registration states
from domain and transport type. Deprecated the old APIs.

Test: Manual
Bug: 73659459
Change-Id: I3143df320f2942213aa0f10fe3cca9851bd82bb8
2018-10-02 12:11:36 -07:00
Neil Fuller
85176a86a1 Remove an unused dependency on conscrypt
The dependency is not needed and will soon be
forbidden.

Bug: 113148576
Test: build
Change-Id: I87975f5be02bff94f60da3b5d53c4cda711fddb0
2018-10-02 18:46:49 +01:00
Treehugger Robot
54d34fe8a7 Merge "Allow wifi and ethenet connected at same time." 2018-10-02 17:09:16 +00:00
Felipe Leme
ed5e51dbb2 Synchronize access to sNotificationBundle.
Otherwise Shell can crash due to ConcurrentModificationException

Test: atest BugreportReceiverTest
Test: manual verification

Fixes:116280360

Change-Id: I138acd43b313d2a7a9d945fb44a9d63e1ad798eb
Merged-In: I138acd43b313d2a7a9d945fb44a9d63e1ad798eb
(cherry picked from commit ee72fa19a97f2b0677a130204e3527bc3233e4d9)
2018-10-02 11:39:42 +01:00