Chalard Jean
6997192f35
Merge "Fix a bug where Uri can't parse IPv6 literal addresses." am: 54677a86d4
...
am: 86ff3f4c7a
Change-Id: Iec4629bc84bb32185be7120a6f5dfc5e97a5dbff
2018-10-19 06:14:19 -07:00
Chalard Jean
86ff3f4c7a
Merge "Fix a bug where Uri can't parse IPv6 literal addresses."
...
am: 54677a86d4
Change-Id: Ibf681262344904990f77f9016f3ffc9efbce08ba
2018-10-19 05:10:55 -07:00
Treehugger Robot
54677a86d4
Merge "Fix a bug where Uri can't parse IPv6 literal addresses."
2018-10-19 11:04:29 +00:00
Ajay Panicker
9020cf9a48
Merge "Synchronize on a static final object to lock mDeviceBusy" am: 34f9a3e9e9
...
am: 56d37b7c43
Change-Id: Ic53518b0e62803bb68b60ed318d6a0825b192164
2018-10-18 23:34:44 -07:00
Ajay Panicker
56d37b7c43
Merge "Synchronize on a static final object to lock mDeviceBusy"
...
am: 34f9a3e9e9
Change-Id: I8547f2f6f7caed16887558416525fb7d40cda46a
2018-10-18 23:24:17 -07:00
Chalard Jean
1a1d52ebb4
Fix a bug where Uri can't parse IPv6 literal addresses.
...
Bug: 25540738
Test: added CTS in aosp change #793137 and ran them
Change-Id: Ibf870b7e87799090fae9ed456286c11990b01461
2018-10-19 11:25:27 +09:00
Treehugger Robot
34f9a3e9e9
Merge "Synchronize on a static final object to lock mDeviceBusy"
2018-10-18 22:00:49 +00:00
Ajay Panicker
6c96b70195
Synchronize on a static final object to lock mDeviceBusy
...
Synchronizing on a field doesn't lock the object in a predictable way.
Bug: 63389270
Test: Compile
Change-Id: Idd3111bc94d32bc4bb320a5c25da37fe68276337
2018-10-17 18:20:51 +00:00
Luke Huang
11454a2163
Merge "Network-related commands porting" am: 9b20115264
...
am: 923aa75d75
Change-Id: I957050b73afed3e6fde908883568b81198310622
2018-10-16 02:19:35 -07:00
Luke Huang
923aa75d75
Merge "Network-related commands porting"
...
am: 9b20115264
Change-Id: I96b2bb80cca6e9d80f3f0fe08f7b71ce31b67528
2018-10-16 01:09:30 -07:00
Luke Huang
9b20115264
Merge "Network-related commands porting"
2018-10-16 07:44:37 +00:00
Stanley Tng
2350e15f4b
Merge "Add Feature Flag for Hearing Aid Profile"
...
am: e4e653b8bf
Change-Id: I53ba5bf7547b66e29a0fbed7b5d596f010dd8a9b
2018-10-15 18:57:59 -07:00
Treehugger Robot
e4e653b8bf
Merge "Add Feature Flag for Hearing Aid Profile"
2018-10-15 23:10:41 +00:00
Lorenzo Colitti
3d23e905a9
Merge "Change permissions checks for setAirplaneMode." am: 3889ff53ed
...
am: 10c175041e
Change-Id: Ibe5bbd51adae83e1bfb5a4ab43d29eb2ccd02a8b
2018-10-15 08:29:00 -07:00
Lorenzo Colitti
10c175041e
Merge "Change permissions checks for setAirplaneMode."
...
am: 3889ff53ed
Change-Id: I578923c3f9012055f715e536f5d4d42ed669c5ee
2018-10-15 08:03:52 -07:00
Lorenzo Colitti
3889ff53ed
Merge "Change permissions checks for setAirplaneMode."
2018-10-15 13:36:45 +00:00
Stanley Tng
cbfcbd168b
Add Feature Flag for Hearing Aid Profile
...
Using the Settings App-Developer Options-Feature Flag, allow the user to
enable or disable the Hearing Aid Profile.
Bug: 116317072
Bug: 116044083
Test: Manual testing using Settings App
Change-Id: I58a9d339941e235242c443c85b6f4194b5a296c9
Merged-In: I58a9d339941e235242c443c85b6f4194b5a296c9
(cherry picked from commit fe8c8337ed )
2018-10-13 16:16:33 -07:00
Chen Xu
6169b04385
Merge "refactor data/voice roaming states" am: 6bd29ab2df
...
am: 652ec06948
Change-Id: I1f82195e5477401f3216db92bbdac388bbe16c7f
2018-10-12 11:32:19 -07:00
Chen Xu
652ec06948
Merge "refactor data/voice roaming states"
...
am: 6bd29ab2df
Change-Id: Iac8184fe2dfdb7ff4c3d93ecb7c0c9dd9a7a46a5
2018-10-12 11:20:18 -07:00
Jack He
94405bb133
Merge "Remove BluetoothDevice.ACTION_DISAPPEARED" am: 2ac8c8a3e2
...
am: 24591d2641
Change-Id: Idc687ad7ea25b793f5ef12612e161e197d87679d
2018-10-12 11:18:09 -07:00
Nandana Dutt
1d1184cf83
Merge "Add DumpstateOptions java implementation" am: 52502ef1a1
...
am: 8a9f23c8a1
Change-Id: I392c2c6bdb522efa708b82174debf3a18167c0bc
2018-10-12 11:07:59 -07:00
Jack He
24591d2641
Merge "Remove BluetoothDevice.ACTION_DISAPPEARED"
...
am: 2ac8c8a3e2
Change-Id: I8836294e7206c8e8c024f5b986c25b9cf2dd29d9
2018-10-12 11:06:44 -07:00
Chen Xu
6bd29ab2df
Merge "refactor data/voice roaming states"
2018-10-12 18:02:17 +00:00
Nandana Dutt
8a9f23c8a1
Merge "Add DumpstateOptions java implementation"
...
am: 52502ef1a1
Change-Id: I18d5d73028a5ebfdf0ac13d141e20cc5356b61e1
2018-10-12 10:58:16 -07:00
Treehugger Robot
2ac8c8a3e2
Merge "Remove BluetoothDevice.ACTION_DISAPPEARED"
2018-10-12 17:35:14 +00:00
Nandana Dutt
52502ef1a1
Merge "Add DumpstateOptions java implementation"
2018-10-12 17:31:39 +00:00
Lorenzo Colitti
f5845d14e1
Change permissions checks for setAirplaneMode.
...
Require NETWORK_SETTINGS (or NETWORK_SETUP_WIZARD) instead of the
legacy CONNECTIVITY_INTERNAL permission. The users are as follows:
- The system callers (Phone, Settings, SystemUI, VrSettings) all
have NETWORK_SETTINGS.
- SetupWizard has NETWORK_SETUP_WIZARD
- sl4a has NETWORK_STACK
Bug: 115302596
Test: builds, boots, airplane mode via SystemUI works
Change-Id: I8ca40182bd8b5e3fd9a82296c0cc28de30ed4baf
2018-10-12 16:35:46 +09:00
Android Build Merger (Role)
ff88bfdb68
Merge "Merge "Recover shady content:// paths." into pi-dev am: 7402d7611c" into pi-dev-plus-aosp
2018-10-12 04:22:50 +00:00
Jeff Sharkey
83e5229ab7
Merge "Recover shady content:// paths." into pi-dev
...
am: 7402d7611c
Change-Id: I499e0086df06d77d1fce3afaa86bb19a136b1ca2
2018-10-11 21:22:04 -07:00
Chalard Jean
d55d5c2126
Merge "Add log for debugging ConnectivityManager" am: 4b48dca2e8
...
am: e3c0f28a1e
Change-Id: I2d8604c172b26e474050afd45fba74dc6c2c18bc
2018-10-11 21:21:45 -07:00
Chalard Jean
e3c0f28a1e
Merge "Add log for debugging ConnectivityManager"
...
am: 4b48dca2e8
Change-Id: I666e534f42a930a2d0fee55032d7a9e4516349c0
2018-10-11 21:11:51 -07:00
TreeHugger Robot
7402d7611c
Merge "Recover shady content:// paths." into pi-dev
2018-10-12 03:59:38 +00:00
Chalard Jean
4b48dca2e8
Merge "Add log for debugging ConnectivityManager"
2018-10-12 03:14:48 +00:00
Nan Zhang
55581d99b5
Fix the incorrect javadoc links
...
A lot of unresolved link errors showing up after go/ag/5172152.
Test: m -j docs with -lerror enabled
Bug: b/116163454
Change-Id: I74d1f75e0f00015410a63e13103c28a9c84b4fe0
2018-10-11 17:54:36 -07:00
chen xu
0281169e6d
refactor data/voice roaming states
...
1. migrate set/get roamingType from ServiceState to
NetworkRegState.set/get roamingType
2. migrate set/get roamingStateFromRegstate from ServiceState
to NetworkRegState.regState
3. new System API for neworkRegistration.isRoaming().
Bug: 116127096
Test: ServiceStateTest, ServiceStateProviderTest
Change-Id: Ib89744089c98713819c8d313240d629ddb77d0bf
2018-10-11 15:10:32 -07:00
Shuzhen Wang
acca5faecf
Merge "Camera: Trivial doc update" am: e9f1e8c123
...
am: 9481340777
Change-Id: I5d9c7fc848eb154e27012f1101340da2195bc423
2018-10-11 14:34:05 -07:00
Shuzhen Wang
9481340777
Merge "Camera: Trivial doc update"
...
am: e9f1e8c123
Change-Id: Id1a9c504a460b9f82496fbfcabb49e1c7f583dba
2018-10-11 14:21:35 -07:00
Jack He
097a89513e
Remove BluetoothDevice.ACTION_DISAPPEARED
...
This intent was never sent by the Bluetooth stack
Fixes: 112115770
Test: make
Change-Id: Iaf71aeafa21f44ec9b59c1b766c936ab7dde39f1
2018-10-11 21:06:29 +00:00
Shuzhen Wang
2b11fddb22
Camera: Trivial doc update
...
Change-Id: I63198c6d2cb348380e718974dd356d48137ae376
2018-10-11 09:17:34 -07:00
Nandana Dutt
b3f7168136
Add DumpstateOptions java implementation
...
DumpstateOptions will be used to pass options to Dumpstate service
for specifying arguments for taking bugreports.
Test: m
Test: adb bugreport
Change-Id: I4dc9511f0be2f86239ea9094a3c527b6ce0d1d41
2018-10-11 17:05:35 +01:00
Lorenzo Colitti
6b2f6b1e05
Merge "Make setAirplaneMode @SystemApi for SetupWizard." am: 772b75c26d
...
am: aab9359c05
Change-Id: I8049e2484526104eba7fad92d2819eb94319fa84
2018-10-10 20:26:35 -07:00
Lorenzo Colitti
aab9359c05
Merge "Make setAirplaneMode @SystemApi for SetupWizard."
...
am: 772b75c26d
Change-Id: Ib418ca0a9f8d9be9c4bdc419c9d2ed05aa47a49d
2018-10-10 20:14:03 -07:00
Treehugger Robot
772b75c26d
Merge "Make setAirplaneMode @SystemApi for SetupWizard."
2018-10-11 02:44:21 +00:00
Tor Norbye
f2183961a9
Merge "Fix incorrect javadoc links" am: 0d954557a1
...
am: cd1c75ae4c
Change-Id: I6d8c44be9d156ac2b6a20d3d13972371ee4d741e
2018-10-10 17:20:42 -07:00
Tor Norbye
cd1c75ae4c
Merge "Fix incorrect javadoc links"
...
am: 0d954557a1
Change-Id: Id358aab44d8e77561a9b5cb27c363d2325a79086
2018-10-10 16:39:36 -07:00
Treehugger Robot
0d954557a1
Merge "Fix incorrect javadoc links"
2018-10-10 23:23:53 +00:00
Scott Kennedy
61f76551f1
Merge "Mark getInstallerPackageName @Nullable" am: c41a5d6bc0
...
am: cecccf6258
Change-Id: Ib27badf42d90932da0b7f2f0922b8903936feafd
2018-10-10 15:04:12 -07:00
Scott Kennedy
cecccf6258
Merge "Mark getInstallerPackageName @Nullable"
...
am: c41a5d6bc0
Change-Id: I9500bd37c872fac143074d9a79402d07b0c0419d
2018-10-10 14:57:22 -07:00
Lorenzo Colitti
85eca488e5
Make setAirplaneMode @SystemApi for SetupWizard.
...
Expose ConnectivityManager#setAirplaneMode and the
NETWORK_SETUP_WIZARD permission so that SetupWizard can call
setAirplaneMode.
Delete setAirplaneMode from the greylist because the permissions
checks on it, since at least 2013, have been for a privileged
permission (CONNECTIVITY_INTERNAL) that normal apps don't have.
Test: m
Bug: 115302596
Change-Id: I28f24d32c4b4b386407e9e0e3514ea9f8854f4a8
2018-10-10 17:50:05 +09:00
Soi, Yoshinari
dee2aa4e55
Add log for debugging ConnectivityManager
...
Add log to ConnectivityManager for better investigations of issue.
This patch adds StackTrace to the following APIs.
reportInetCondition()
reportBadNetwork()
reportNetworkConnectivity()
sendRequestForNetwork()
requestNetwork()
releaseNetworkRequest()
registerNetworkCallback()
unregisterNetworkCallback()
Bug: 116751720
Change-Id: I992292cd9d6f3d69c91ddbde5577591f9ec0f39b
2018-10-10 11:56:04 +09:00