284413 Commits

Author SHA1 Message Date
Jakub Pawlowski
81cef3aeb8 Merge "Bluetooth API spelling fixes ("wether" -> "whether")" 2017-03-28 20:01:31 +00:00
Tianjie Xu
1cd3a93288 Merge "improve the format of locale argument when calling recovery"
am: 032c7a0a18

Change-Id: I54389601ac5234b872701762e928a3ea7ff2f307
2017-03-28 19:53:45 +00:00
Tianjie Xu
032c7a0a18 Merge "improve the format of locale argument when calling recovery" 2017-03-28 19:42:54 +00:00
Jerry Zhang
cb6beee2af Merge "Just broadcast intent to bring up MTP/PTP as soon as switching function"
am: a0360e38ab

Change-Id: I862f38f52cef8b2b90125953593774263b862306
2017-03-28 18:57:16 +00:00
Jerry Zhang
a0360e38ab Merge "Just broadcast intent to bring up MTP/PTP as soon as switching function" 2017-03-28 18:41:59 +00:00
Andreas Gampe
62be34e32e ActivityManager: Allow DiskRead for wrap.sh determination
Avoid killing debuggable apps which at the same time have a strict-mode
policy installed.

Bug: 33668201
Test: m
Change-Id: Ic3c56b01fe42a473e28c1d6280526afdc85793df
2017-03-28 11:36:01 -07:00
Sanket Padawe
86a70456a6 Merge commit '999a6d00244c4b0c2163597ee783739ce7699c5b' into manual_merge_999a6d00244c
Change-Id: Ic55532c0d8962288346d2c9b067794d7f5c157f3
2017-03-28 11:30:44 -07:00
Etan Cohen
2cbaf22bba [AWARE] Remove Publish/Subscribe Count configuration
Simplify API: semantics of publish/subscribe count restrictions
aren't clear at the app level. They depend on DW configuration as
well as discovery session type - number of packets transmitted over
the air.

There's already an app-facing discovery session lifetime configuration -
the TTL. That has clearer semantics and is sufficient (for now).

Bug: 36446307
Test: unit tests and integration (sl4a) tests.
Change-Id: I9129975bd2e1a61b3d23a4b6acaae703b42216c7
2017-03-28 11:25:21 -07:00
Jakub Pawlowski
08ed924d89 Bluetooth API spelling fixes ("wether" -> "whether")
Bug: 30622771
Test: manual
Change-Id: I01c8b18d0057f2fd6e477ce2ca0b779321b6c0e6
2017-03-28 18:09:50 +00:00
Etan Cohen
afddcc3c98 [AWARE] Fix unit tests
Update to reflect new mockito semantics.

No functional change, no change to test semantics!

Bug: 36680830
Test: unit tests now passing
Change-Id: Ic210f20ce47ab19da25bd0835ae2ee5ae0f73011
2017-03-28 10:50:41 -07:00
Sanket Padawe
999a6d0024 Merge "String changes for Voice/Data/Emergency service blocked." 2017-03-28 17:45:37 +00:00
Ying Xu
b2558c4ec1 Merge "Add a carrier option to hide the option of "Enhanced 4G LTE Mode""
am: 23393da165

Change-Id: Iaeae098f1185b045483334ff100e47a9be608c64
2017-03-28 17:04:04 +00:00
Ying Xu
23393da165 Merge "Add a carrier option to hide the option of "Enhanced 4G LTE Mode"" 2017-03-28 16:55:10 +00:00
Robert Greenwalt
79bde60db2 Merge "Correct ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS"
am: 07be9a0ef9

Change-Id: I3158ce88ca76a3ad4e8894f514030b31ae40f1fb
2017-03-28 16:20:57 +00:00
Robert Greenwalt
07be9a0ef9 Merge "Correct ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS" 2017-03-28 16:12:16 +00:00
Sanket Padawe
802b4fe400 String changes for Voice/Data/Emergency service blocked.
Bug: 31490566
Change-Id: Iaae2c5ef2a856ae265d4e4ea933d714491744e49
Merged-in: Iaae2c5ef2a856ae265d4e4ea933d714491744e49
2017-03-28 16:04:12 +00:00
Lorenzo Colitti
0a34afb48d Merge changes If94102c7,I8d51e8e0
am: 22b829c049

Change-Id: I8aa529a05fc40241ec9664775ca0ebd8960098a8
2017-03-28 12:33:28 +00:00
Lorenzo Colitti
22b829c049 Merge changes If94102c7,I8d51e8e0
* changes:
  Make ConnectivityServiceTest pass on wifi-only devices.
  Restore the net.dnsX system properties.
2017-03-28 12:22:43 +00:00
Roshan Pius
673de5b39d Merge "WifiManager(aidl): Remove pingSupplicant binder call"
am: 3777874320

Change-Id: Ia12b132ecb8bb8d7effe7b6fa98461c5cbfddf30
2017-03-28 05:34:27 +00:00
Roshan Pius
3777874320 Merge "WifiManager(aidl): Remove pingSupplicant binder call" 2017-03-28 05:25:25 +00:00
fen wang
40dca362a0 Merge "Add Bluetooth LDAC ABR UI to the Developer Options"
am: 5c64adef5f

Change-Id: Iff2e13b8c8921c47176fc43e2a35ebd4cd284a96
2017-03-28 05:03:27 +00:00
Treehugger Robot
5c64adef5f Merge "Add Bluetooth LDAC ABR UI to the Developer Options" 2017-03-28 04:54:21 +00:00
fen wang
0716700f5d Add Bluetooth LDAC ABR UI to the Developer Options
Bug: 35381097
Change-Id: Idcc2fabe86acaf441f5a71f5d2bb66ad29252cdb
2017-03-28 04:53:57 +00:00
Lorenzo Colitti
42cdf57703 Make ConnectivityServiceTest pass on wifi-only devices.
Test: ConnectivityServiceTest passes on ryu on internal master
Test: ConnectivityServiceTest passes on bullhead
Change-Id: If94102c7df0257ea9e69e72b07a685ae3c2c4022
2017-03-28 12:53:06 +09:00
Erik Kline
c5bca697ba Merge "Add null check to IpManager.dump()"
am: 58406d1df2

Change-Id: I68f644a305d58e1396522d73c0983e1eb201cb1c
2017-03-28 02:30:18 +00:00
Treehugger Robot
58406d1df2 Merge "Add null check to IpManager.dump()" 2017-03-28 02:19:22 +00:00
Peter Qiu
61f58f0676 Merge "hotspot2: register Passpoint related intents as protected broadcast"
am: 97bdedf655

Change-Id: I06d54b99006d631c5792f823e9ae7da1703a201d
2017-03-27 23:54:37 +00:00
Treehugger Robot
97bdedf655 Merge "hotspot2: register Passpoint related intents as protected broadcast" 2017-03-27 23:44:43 +00:00
Wei Huang
a8ad152269 Add carrier config to hide merge button for IMS conference
There is the case that operator's network does not support IMS
conference call although it supports IMS normal call. It sometimes
happens when operator starts up IMS service. In such case, it is
necessary to hide merge button for IMS conference.

Bug: 29430010
Change-Id: Iab8afaab297cd401ddea8ef4bbd6a06edfbcfeb3
2017-03-28 08:31:21 +09:00
Robert Greenwalt
7811b34b36 Correct ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS
The name is not allowed for an internal, non-public
intent.  Changed to use com.android.internal.* namespace.

bug:35266833
Test: Ran cts.IntentTest.shouldNotFindUnexpectedIntents
Change-Id: Ifd7d7f0aa537bfbbc7d67aa3b73b0887acd6104a
2017-03-27 22:43:15 +00:00
Peter Qiu
cb9ad34e66 hotspot2: register Passpoint related intents as protected broadcast
These intents should only be broadcast by the System Service, so
register them as protected broadcast.

Bug: 36655814
Test: Build with go/aog/355397, verify in logcat that no non-protected
      broadcast error gets thrown when
      android.net.wifi.action.PASSPOINT_OSU_PROVIDERS_LIST intent
      is broadcasted

Change-Id: I57849d0decef407624cac380a0f12f5428e0f1de
2017-03-27 15:10:04 -07:00
Lorenzo Colitti
c02ac733d2 Restore the net.dnsX system properties.
In order to avoid app breakage, we are putting back the system
properties and using selinux to disallow access from apps
targeting the O SDK or above.

This CL is cherry-picked from internal commit
e3b85dfbc1dde8d229410f54c75c1efa4bb09fbe, but with a different
commit description.

Bug: 33308258
Bug: 33807046
Bug: 34028616
Bug: 34115651
Test: system properties are readable as root and shell
Change-Id: I8d51e8e0a620d581c4251fb2f3c1d0a813b929be
2017-03-28 06:55:01 +09:00
Peter Qiu
78eeb9b090 Merge "wifi: catch UnsupportedOperationException for getMatchingWifiConfig"
am: ae3bae715e

Change-Id: If47b5c5fae03ad2e6a68771da893acaad743fcbd
2017-03-27 21:29:53 +00:00
Jakub Pawlowski
cfe099b01d Merge "Bluetooth GATT callback naming fix "Ext" -> "" (1/2)"
am: beb8ceada8

Change-Id: Ie88e330a1d50adac8c6b83581079c6096c4d898a
2017-03-27 21:22:15 +00:00
Peter Qiu
ae3bae715e Merge "wifi: catch UnsupportedOperationException for getMatchingWifiConfig" 2017-03-27 21:21:42 +00:00
Jakub Pawlowski
beb8ceada8 Merge "Bluetooth GATT callback naming fix "Ext" -> "" (1/2)" 2017-03-27 21:15:22 +00:00
Peter Qiu
0ffb89d1d1 wifi: catch UnsupportedOperationException for getMatchingWifiConfig
On a device without Passpoint support, an UnsupportedOperationException
will be thrown when invoking WifiManager#getMatchingWifiConfig.
So catch it to avoid crash.

Bug: 36649203
Test: manually set config_wifi_hotspot2_enabled to false and verify
      Settings app doesn't crash

Change-Id: I69f37897449033da9d21edda9953ad2738f7e314
2017-03-27 13:55:34 -07:00
Chen Xu
3f26682252 Merge "make carrier default app direct boot aware"
am: 98ded6c9ab

Change-Id: I6a8f45b2839a07a9bfae23ab41a9c6ebd1c0e5e1
2017-03-27 20:54:53 +00:00
Chen Xu
98ded6c9ab Merge "make carrier default app direct boot aware" 2017-03-27 20:45:14 +00:00
Erik Kline
0ea70fc38b Add null check to IpManager.dump()
Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 36650508
Change-Id: I2270bec20b966de487048f0ea0c97360e242cd9d
2017-03-28 05:30:41 +09:00
Jakub Pawlowski
d7116bea06 Bluetooth GATT callback naming fix "Ext" -> "" (1/2)
Gatt callback don't need the "Ext" postfix, as it was removed from new
API.

Test: manual
Bug: 30622771
Change-Id: I54596ffdcb818343cc313123266cfa16291c6236
2017-03-27 19:27:57 +00:00
Lorenzo Colitti
37afaac70d Merge "Make CONNECTIVITY_USE_RESTRICTED_NETWORKS @SystemApi."
am: a1e206a335

Change-Id: I71fabdff9deb0f7ba40a545090bd09ddc66994a8
2017-03-27 19:16:17 +00:00
Lorenzo Colitti
a1e206a335 Merge "Make CONNECTIVITY_USE_RESTRICTED_NETWORKS @SystemApi." 2017-03-27 19:08:25 +00:00
Neil Fuller
0f3235a167 Merge "Update settings to use latest IDs for zones"
am: c75dbe9d9c

Change-Id: If3708653ad78fb38e57508c4d8fac9dd5bffc2c1
2017-03-27 14:12:35 +00:00
Treehugger Robot
c75dbe9d9c Merge "Update settings to use latest IDs for zones" 2017-03-27 14:06:35 +00:00
Robin Lee
b8c2a2b850 Move some VPN logic out of ConnectivityService
This cleanup helps declutter ConnectivityService, and encapsulates the
always-on setting inside of Vpn instead of spreading it across two
classes.

In particular having the save code in one file and the load code in
another file was weird and I apologise for that.

Added a SystemServices wrapper for Settings.Secure and PendingIntent
calls to decouple some of the global state nastiness and make it
testable without forcing ConnectivityService to drive the load/save.

Test: runtest -x tests/net/java/com/android/server/ConnectivityServiceTest.java
Test: runtest -x tests/net/java/com/android/server/connectivity/VpnTest.java
Bug: 33159037
Change-Id: Ie2adb1c377adfcef0a5900dc866e6118f451b265
2017-03-27 13:40:51 +01:00
Neil Fuller
8bb9748442 Update settings to use latest IDs for zones
Various zones in timezones.xml were being identified by old
IDs. The settings picker and setup wizard uses the exact
ID when pre-selecting the user's current zone. Since the
autodetection uses the new IDs in places like Buenos
Aires users would not have the correct zone pre-selected
during setup.

Thanks to Marcio Ikeda of LG for the report.

Other legacy IDs found with:

for TZ in `grep 'id=' timezones.xml \
    | awk -F\" '{ print $2 }'`; do \
grep ${TZ} ~/Downloads/tzdata2016g/zone.tab > /dev/null; \
if (( $? != 0 )); then echo Bad: ${TZ}; fi; \
done

New IDs found using tzdata NEWS and "backward" file.

Test: Manual testing: selection of the zone in the settings
Bug: 36469833
(cherry picked from commit b4d003da66beb414e8e7fcec94a82a53027dbbfa)
Merged-In: I8c20494a48870cdc600854756061e86db730e14a
Change-Id: I829a70921eb13b763b5446820c87672615f2524d
2017-03-27 13:32:59 +01:00
Joel Scherpelz
84c2fb2070 Merge "Revert "Set accept_ra_rt_info_max_plen to 64 before enabling IPv6 interfaces""
am: 63d26caa38

Change-Id: I367506eee558dbd7abeeabf09716f7024c2e43d8
2017-03-27 05:24:09 +00:00
Joel Scherpelz
63d26caa38 Merge "Revert "Set accept_ra_rt_info_max_plen to 64 before enabling IPv6 interfaces"" 2017-03-27 05:17:22 +00:00
Joel Scherpelz
6a35f3c3e2 Revert "Set accept_ra_rt_info_max_plen to 64 before enabling IPv6 interfaces"
On second thought, let's set accept_ra_rt_info_m**_plen in 
Netd (InterfaceController::initializeAll())

This reverts commit 25870a2c9effd7a7d31c0678c34a6e952b2d56a1.

Change-Id: I22b000623bb852e375385d4aae789d007e84ba3d
2017-03-27 00:54:41 +00:00