Commit Graph

283669 Commits

Author SHA1 Message Date
Rebecca Silberstein
e1dd7de75e Merge "wifi.proto: add SoftApReturnCode enum"
am: 84374678e0

Change-Id: I22d8aca86a5a5c28c393db372b4399e5ddd99f46
2017-02-23 21:46:51 +00:00
Rebecca Silberstein
84374678e0 Merge "wifi.proto: add SoftApReturnCode enum" 2017-02-23 21:29:02 +00:00
Paul Lawrence
82c92f94bf Merge "Use bionic's autogenerated whitelist policy"
am: dcd14de5f6

Change-Id: Idf1ab0f6a2028a1e41c52f6269ec05a9f1e87ec5
2017-02-23 20:41:33 +00:00
Amin Shaikh
b858ffbe42 Merge changes from topic 'disabled-reason'
am: d0fc3f1383

Change-Id: I09e7dff673a56fb3c51cde827ae783da32407a70
2017-02-23 20:35:10 +00:00
Amin Shaikh
df6f7b9388 Add a disabled reason for recommendation providers
am: a70bc57ef9

Change-Id: Ie91764892f6bd8fc20990f5a172c020a670875ff
2017-02-23 20:33:59 +00:00
Treehugger Robot
dcd14de5f6 Merge "Use bionic's autogenerated whitelist policy" 2017-02-23 20:27:45 +00:00
Treehugger Robot
d0fc3f1383 Merge changes from topic 'disabled-reason'
* changes:
  Fix failing WifiConfigManagerTest test.
  Add a disabled reason for recommendation providers
2017-02-23 20:22:07 +00:00
Brad Ebinger
fe8d588dad Merge "reates base implementation of ImsService AIDLs"
am: b60869db12

Change-Id: I6edf280213bee0756aad65148daafe3300849baa
2017-02-23 20:10:34 +00:00
Treehugger Robot
b60869db12 Merge "reates base implementation of ImsService AIDLs" 2017-02-23 20:03:43 +00:00
Rebecca Silberstein
28d9de269c wifi.proto: add SoftApReturnCode enum
SoftAp startup returns a failure mode if it does not start.  This
additional information is useful in determining where we need to add
logging and retry logic to make SoftAp mode more reliable.  The
combination of Failure + failure reason is mapped to an enum defined for
wifi metrics.

Bug: 30899122
Test: checked WifiMetricsProto.java for the enum
Test: frameworks/base/wifi/tests/runtests.sh
Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Change-Id: I944e3e249d3be5738352b26a1d12139fdd50bf80
2017-02-23 10:42:05 -08:00
Amin Shaikh
d6a62ed405 Fix failing WifiConfigManagerTest test.
Bug: 35671673
Test: runtest frameworks-core frameworks-wifi
Change-Id: I55ff41464cabfb97d03a0758d73145df808ec2c8
Merged-In: I55ff41464cabfb97d03a0758d73145df808ec2c8
2017-02-23 10:29:10 -08:00
Paul Duffin
fd61eb1e39 Merge "Deprecate TestSuiteBuilder and related classes."
am: a26000b8f5

Change-Id: Ia9d491bd72f2a9f08838e298aaf4de5de28c7d4f
2017-02-23 13:44:24 +00:00
Paul Duffin
5da6f4fbd1 Merge "Fix build failure when using javac toolchain"
am: c098bea921

Change-Id: I56e965336c537295efc4c0c778f5c236f955bf10
2017-02-23 13:43:07 +00:00
Paul Duffin
a26000b8f5 Merge "Deprecate TestSuiteBuilder and related classes." 2017-02-23 13:36:30 +00:00
Paul Duffin
c098bea921 Merge "Fix build failure when using javac toolchain" 2017-02-23 13:34:39 +00:00
Chen Xu
979e4690ec Merge "renaming telephony internal hidden intents"
am: 09c663a84c

Change-Id: Ic20ae9e6816d629c979859a7d18f1827bafcc034
2017-02-23 02:03:00 +00:00
Chen Xu
09c663a84c Merge "renaming telephony internal hidden intents" 2017-02-23 01:55:25 +00:00
Brad Ebinger
21013dcf1b reates base implementation of ImsService AIDLs
This change introduces "base classes" of the AIDL interfaces that are
implemented in vendor provided ImsServices. This allows for new APIs
to be added to the AIDL files, along with stub implementation of those
AIDLs in the base classes. By extending from the base class, older
implementations of the AIDL interfaces will not need to be updated
when the interface changes.

This change also moves some of the com.android.ims classes from
frameworks/opt/net/ims to frameworks/base. Any class that will be
used in the new unbundled ImsService system will need to be in
the framework, as opposed to the optional library that they are
in now.

Bug: 30290416
Test: Manual
Change-Id: I4a186d8e910d6d4f711e983ec8d717fc5cbdefab
2017-02-22 16:58:50 -08:00
Brad Ebinger
4fb8988854 resolve merge conflicts of ac9b2c4fab to stage-aosp-master
Change-Id: I4a6094c41ab267f89a15c5e8caa25e6b683419d0
2017-02-22 16:04:39 -08:00
Brad Ebinger
ac9b2c4fab Merge "Add UI prompt for MMI code failure on 3gpp" 2017-02-22 23:22:07 +00:00
Amin Shaikh
a70bc57ef9 Add a disabled reason for recommendation providers
Display a message indicating that a saved networks has not been
automatically connecting due to low quality if
WifiConfiguration#mNotRecommended is set.

Bug: 34745259
Bug: 35671673
Test: m RunSettingsLibRoboTests && runtest frameworks-wifi
Change-Id: I275e2711da68715fb6d92bf954e9f58a3386b1f4
Merged-In: I275e2711da68715fb6d92bf954e9f58a3386b1f4
2017-02-22 15:18:28 -08:00
Hall Liu
d83b06cd31 Merge "Introduce APIs for RTT calls (part 1)"
am: 27ad05169e

Change-Id: I3fb3cb89b467e5df808967dcd478964a84e2e61f
2017-02-22 18:56:48 +00:00
Hall Liu
27ad05169e Merge "Introduce APIs for RTT calls (part 1)" 2017-02-22 18:48:53 +00:00
Paul Duffin
9b5522f8c4 Merge "Remove conflicting package information for junit.runner and junit.textui"
am: f3f4775a35

Change-Id: Ie0ca0b2b6b5f06e90f55996625f758521c9039cb
2017-02-22 15:24:27 +00:00
Paul Duffin
253ad40649 Deprecate TestSuiteBuilder and related classes.
Deprecates com.android.internal.util.Predicate in favour of
java.util.function.Predicate.

Deprecates TestMethod and TestSuiteBuilder in favour of
Android Test Support Library.

Bug: 35089332
Test: make checkbuild
Change-Id: Id8b2be55925d7ca09750fc9681817793517ceb5d
2017-02-22 15:18:19 +00:00
Treehugger Robot
f3f4775a35 Merge "Remove conflicting package information for junit.runner and junit.textui" 2017-02-22 15:15:34 +00:00
Paul Duffin
f1c59610bb Fix build failure when using javac toolchain
The legacy-performance-test-hostdex library was built using the
BUILD_HOST_DALVIK_JAVA_LIBRARY macro (which creates a non-static
library) but is used with LOCAL_STATIC_JAVA_LIBRARIES which
requires a static library. That works with Jack but fails with
the javac toolchain.

This change switched to build legacy-performance-test-hostdex
using the BUILD_HOST_DALVIK_STATIC_JAVA_LIBRARY macro.

Bug: 30188076
Test: make checkbuild
Change-Id: I8d42c669e4ded3417ecdcb7b0251bc6346debd5d
2017-02-22 14:42:46 +00:00
Paul Duffin
f845fec30c Remove conflicting package information for junit.runner and junit.textui
Removes package.html files and update package-info.java files to
use same wording as previous releases.

Bug: 35653948
Test: make docs
Change-Id: Idbede2eb4f57818f152834fad7e75dd181fe25d6
2017-02-22 12:43:57 +00:00
Hugo Benichi
cb47118af1 Merge "ConnectivityManager: allow custom Handlers"
am: ef69246260

Change-Id: I8da5540f6561cdef4adc91bbeeb9c21a91c08d49
2017-02-22 03:48:10 +00:00
Hugo Benichi
ef69246260 Merge "ConnectivityManager: allow custom Handlers" 2017-02-22 03:42:15 +00:00
Jack Yu
d1f5b4245f Merge "Added telephony manager set sim power state API"
am: cbffe38631

Change-Id: I9fbe161505905c3d3c1c431d1589248324fb3e4f
2017-02-22 02:50:29 +00:00
Treehugger Robot
cbffe38631 Merge "Added telephony manager set sim power state API" 2017-02-22 02:45:18 +00:00
Jack Yu
e25a4dfb6a Added telephony manager set sim power state API
The new API can be used to power up/down the SIM. This is equivalent
to inserting and removing the card.

Test: Telephony sanity tests
bug: 32224755

Change-Id: Ib82ab1eff613946e7c31c9b2131183a40d09af80
2017-02-21 17:36:45 -08:00
Hugo Benichi
2583ef0239 ConnectivityManager: allow custom Handlers
This patch adds overloaded version of registerDefaultNetworkCallback
registerNetworkCallback, and requestNetwork with an additional Handler
argument that is used for running the caller provided NetworkCallback.

It also clarifies the documentation of the existing methods that
implicitly uses the internal singleton ConnectivityThread about which
internal Handler is used for running NetworkCallbacks.

Test: build, flashed, booted device
Bug: 32130437
Change-Id: Iae15f81e47e2dc0355baf2f2c1679b77e56af299
2017-02-22 09:24:01 +09:00
Colin Cross
ebc05de919 Merge "Revert "Remove outdated emulator check which causes BT to not start""
am: 375ea2ae71

Change-Id: I3d5abc52abf3f7c01ba4fbee47d7e487e99f5dda
2017-02-21 23:32:32 +00:00
Hall Liu
95d5587d0a Introduce APIs for RTT calls (part 1)
Add signaling methods and data pipes for handling real-time text during
a call.

Change-Id: I876827c448252c5f786d7a4919c47891acb03877
Test: manual, through telecom testapps
2017-02-21 15:27:25 -08:00
Colin Cross
375ea2ae71 Merge "Revert "Remove outdated emulator check which causes BT to not start"" 2017-02-21 23:25:07 +00:00
Brad Ebinger
50bc658e20 Merge "Remove Session ID from ImsService APIs that do not need it."
am: 975be6c065

Change-Id: I09469d99bc68133a4de594507854c269e905c40e
2017-02-21 20:24:21 +00:00
Treehugger Robot
975be6c065 Merge "Remove Session ID from ImsService APIs that do not need it." 2017-02-21 20:19:22 +00:00
Peter Qiu
bedf92ed24 Merge "SettingsLib: wifi: Fixed AccessPoint tracking for Passpoint networks"
am: b13de64a11

Change-Id: I0e45cb17f11e8991d0d2c58cf7630f1e33296d97
2017-02-21 18:39:01 +00:00
Treehugger Robot
b13de64a11 Merge "SettingsLib: wifi: Fixed AccessPoint tracking for Passpoint networks" 2017-02-21 18:22:39 +00:00
Glen Kuhne
d0dcf559c5 Merge "Move wifi.proto to shared service .jar"
am: 9ca5ddff4c

Change-Id: I3c10728fdbcd2882723a1bd519a47a63aeba0ac0
2017-02-21 17:56:13 +00:00
Robin Lee
433631edfe Merge "Reinstate USER_PRESENT for ConnectivityService"
am: 2c8229456a

Change-Id: If8b7239cdabdd79d9ea24baf99e95c6ec1a9acf3
2017-02-21 17:55:07 +00:00
Erik Kline
042be0bd84 Merge "Don't request information on unregistered callbacks"
am: 14e3db3de5

Change-Id: I99bf9b6a092318cf5183b18d25bda36f9977ce4e
2017-02-21 17:54:13 +00:00
Isaac Chen
7eca8f7073 Merge "Turned ENABLE_CPUSETS into runtime decision."
am: d95aa50b18

Change-Id: Ie31a736b2edd33c1cebbc08fbc39b555d501a349
2017-02-21 17:52:22 +00:00
Glen Kuhne
9ca5ddff4c Merge "Move wifi.proto to shared service .jar" 2017-02-21 17:27:04 +00:00
Peter Qiu
6ee49f2245 SettingsLib: wifi: Fixed AccessPoint tracking for Passpoint networks
Previously, we were using provider name as the "SSID" for
Passpoint networks, and use it to compare against real SSIDs,
which obvious doesn't match.  So fix it.

Also removed the Passpoint specific logics in WifiTracker for
tracking Passpoint networks, since there shouldn't any
difference in tracking Passpoint APs and normal APs.

Additional work is still needed for managing installed
Passpoint configurations in the "Saved networks" page,
and it is being tracked by b/34207710. The Passpoint configuration
is not an "Access Point" per se, it is a network profile.

Bug: 34455883
Test: Install a Globla Reach Passpoint profile on a bullhead,
      verify device auto connects to a Global Reach AP and UI
      (QS, QS+, and Settings) correctly reflects it.

Change-Id: I63e66f683f8cb96e664516b130f5e7bc02358a10
Merged-In: I63e66f683f8cb96e664516b130f5e7bc02358a10
2017-02-21 17:20:42 +00:00
Treehugger Robot
2c8229456a Merge "Reinstate USER_PRESENT for ConnectivityService" 2017-02-21 13:23:41 +00:00
Erik Kline
14e3db3de5 Merge "Don't request information on unregistered callbacks" 2017-02-21 09:54:05 +00:00
Erik Kline
32858e14ca Don't request information on unregistered callbacks
Test: as follows
    - build (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 32163131
Bug: 35608572
Change-Id: I489e510ac131a7a624a652b12165104202a49f85
2017-02-21 17:22:14 +09:00