Commit Graph

277612 Commits

Author SHA1 Message Date
Jason Monk
1723bc14eb Merge "Data activity icon in statusbar" 2017-02-24 14:14:00 +00:00
Erik Kline
35c89886c2 Merge "Update UpstreamNetworkMonitor to use custom Handlers" 2017-02-24 08:06:17 +00:00
Miao Wang
9017b25631 Merge "Update RenderScript JNI code for Treble" 2017-02-24 05:39:16 +00:00
Erik Kline
b583b03675 Update UpstreamNetworkMonitor to use custom Handlers
Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 32130437
Bug: 32163131

Change-Id: I2bc3f87cdf7fa6392b4750eb8adb4ea33c6a3f43
2017-02-24 13:06:51 +09:00
Miao Wang
cbb0206cb4 Update RenderScript JNI code for Treble
- Include rsApiStubs.h instead of rs.h, and remove unused
  dependencies for rs.h in Android.mk.
  - Remove libRSDriver.so from LOCAL_REQUIRED_MODULE, since it is not
  required nor directly used by librs_jni.so.
  - Fix the discrepancy in ElementGetNativeData and
  ElementGetSubElements, respective to NDK APIs exposed in libRS.so.

  rsApiStubs.h contains all public RenderScript APIs exposed in libRS.so.
  It fixes the mismatch of the declarations and definitions of the two
  functions mentioned above. And it does not rely on the auto generated
  header (rsgApiFuncDecl.h) anymore.

Bug: 34396220
Test: mm
Merged-In: Iedb1b976cfa9033dccefe78cbe80c8022f990e53
Change-Id: Iedb1b976cfa9033dccefe78cbe80c8022f990e53
2017-02-23 19:39:43 -08:00
Chen Xu
6d198966fe Merge "renaming telephony internal hidden intents" 2017-02-24 02:24:43 +00:00
fionaxu
abeba60e8f renaming telephony internal hidden intents
The "android.*" namespace for intent constants is reserved for public
Android API in AOSP. (Whether public to the full SDK, @SystemApi or
defined in AOSP support libraries.) Implementation details of AOSP
components (subject to change by OEMs at will) should use the
"com.android.internal.*" as per CDD

Bug: 33679454
Test: manual
Change-Id: I7183493e2794a82e023bc4993aee328f24b2e7cb
2017-02-23 18:23:34 -08:00
Treehugger Robot
0743d56e2b Merge "Add isBundled argument to LoadedApk.makePaths call" 2017-02-23 23:21:10 +00:00
Dimitry Ivanov
484fbe9273 Add isBundled argument to LoadedApk.makePaths call
There is a disconnect between the way webview created
classloader and the way makePaths decides if paths are
intended for bundled app.

This change moves decision making out of makePaths method
which allows WebViewZygote to pass correct argument and
have makePath omit java.library.path for libPaths

Bug: http://b/35426785
Test: manual
Change-Id: Iab5a18c0091d0193dafa750498eb00f378411ba0
(cherry picked from commit 638d810099)
2017-02-23 14:16:45 -08:00
Treehugger Robot
b4234e6af8 Merge "Add a new ImsReasonInfo code" 2017-02-23 22:14:21 +00:00
Rebecca Silberstein
84374678e0 Merge "wifi.proto: add SoftApReturnCode enum" 2017-02-23 21:29:02 +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
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
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
Kenneth Westin
5c88ffb507 Data activity icon in statusbar
Display data activity icon for Wi-Fi and mobile data
respectively in statusbar

Bug: 30849089
Test: manual - go to Settings > Developer options > Demo mode and then
               enable both "Enable demo mode" and "Show demo mode"

Change-Id: I16e880ffb97666a6c6507b9cc8c99bf580972207
2017-02-23 13:08:16 +09:00
Abhishek Adappa
2134e14bda Add a new ImsReasonInfo code
For IKEv2 authentication failure during ePDG tunnel establishment.

Test: make
Change-Id: I1d10efac806abfaa80d9875b908385f7732f293a
2017-02-22 19:16:58 -08: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
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
27ad05169e Merge "Introduce APIs for RTT calls (part 1)" 2017-02-22 18:48:53 +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
ef69246260 Merge "ConnectivityManager: allow custom Handlers" 2017-02-22 03:42:15 +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
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
Treehugger Robot
975be6c065 Merge "Remove Session ID from ImsService APIs that do not need it." 2017-02-21 20:19:22 +00:00
Treehugger Robot
b13de64a11 Merge "SettingsLib: wifi: Fixed AccessPoint tracking for Passpoint networks" 2017-02-21 18:22:39 +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
Isaac Chen
d95aa50b18 Merge "Turned ENABLE_CPUSETS into runtime decision." 2017-02-21 02:05:24 +00:00
Treehugger Robot
372b6b2c45 Merge "Use Utils.assertTrue() in code that used junit.framework.Assert.assertTrue()" 2017-02-20 15:47:53 +00:00
Paul Duffin
0589d8287e Use Utils.assertTrue() in code that used junit.framework.Assert.assertTrue()
The previous changes to these files, which inlined the behavior
of Assert.assertTrue() were done in a hurry to fix the build.
This change makes use of the existing Utils.assertTrue() method
that was created for this purpose.

Bug: 30188076
Test: make checkbuild
Change-Id: Iacd505f8c3f7cefe6de94d30b56e39600bb9b0af
2017-02-20 13:27:38 +00:00
Paul Duffin
9598c98db0 Merge "Avoid using JUnit code in production WallpaperCropper" 2017-02-20 12:40:18 +00:00
Paul Duffin
c36ff4cf4f Avoid using JUnit code in production WallpaperCropper
Bug: 30188076
Test: make checkbuild
Change-Id: Ib6fe445a246d15dbabb8b86f9251b0059ed216b5
2017-02-20 12:37:35 +00:00
Colin Cross
a3b2212eda Revert "Remove outdated emulator check which causes BT to not start"
This reverts commit d98a4e5021.

Merged-In: Ibd1596584928f2aa2c799501536abc9b384d1cda
Change-Id: Ibd1596584928f2aa2c799501536abc9b384d1cda
2017-02-19 03:28:17 +00:00
Isaac Chen
d34fac541a Turned ENABLE_CPUSETS into runtime decision.
ENABLE_CPUSETS is usually set in BoardConfig.mk to use CONFIG_CPUSETS
feature of Linux kernel.

This change turns the build time variable into runtime decision by
checking if a special file, "tasks", can be found under the mount
point, /dev/cpuset, for cpusets.

Bug: 34726944

Test: Tested on Sailfish
          without cpuset mounted
	  with cpuset mounted, but without schedtune mounted
	  with cpuset mounted and with schedtune mounted

Change-Id: I1c044c3c9d4d15360a1605e7022da84d94df4014
2017-02-18 16:42:54 +08:00
Glen Kuhne
173c3b3e89 Move wifi.proto to shared service .jar
Changes to ART are causing nano-proto's generated java base classes
to conflict with their duplicates in other projects, leading to a
NullPointerException.

Moving wifi.proto to the same build as other framework service protos in order
for them to share and not generate a duplicate CodedOutputByteBufferNano
classes.

wifi.proto previously lived at:
frameworks/opt/net/wifi/service/proto/wifi.proto

Merged-In: Ia30391453e8d6614edc7f4397e9c17cfe95cf63e
Bug: 32261442
Test: Builds, and existing Unit tests pass
Change-Id: Ia30391453e8d6614edc7f4397e9c17cfe95cf63e
2017-02-17 16:43:41 -08:00