OSDN Git Service
Treehugger Robot [Wed, 1 Mar 2017 10:55:34 +0000 (10:55 +0000)]
Merge "Also test for additional NetworkCallback calls"
Erik Kline [Tue, 28 Feb 2017 07:20:20 +0000 (16:20 +0900)]
Also test for additional NetworkCallback calls
Specifcally:
- onCapabilitiesChanged
- onLinkPropertiesChanged
- onNetworkSuspended
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest frameworks-net passes
Bug:
32163131
Change-Id: Ie0f7c8ac21313b11980bb335c89ecde6fd8e311c
Treehugger Robot [Wed, 1 Mar 2017 01:45:51 +0000 (01:45 +0000)]
Merge "Fix memory-leak warnings from the static analyzer"
Hall Liu [Wed, 1 Mar 2017 00:51:37 +0000 (00:51 +0000)]
Merge "Add @hide to RttAudioMode IntDef"
George Burgess IV [Wed, 25 Jan 2017 00:30:22 +0000 (16:30 -0800)]
Fix memory-leak warnings from the static analyzer
Warnings:
frameworks/base/core/jni/android_view_InputChannel.cpp:145:5: warning:
Potential memory leak
jobject serverChannelObj =
android_view_InputChannel_createInputChannel(env,
^~~~~~~~~~~~~~~~~~~~~~~~
frameworks/base/core/jni/android_view_InputChannel.cpp:151:5: warning:
Potential memory leak
jobject clientChannelObj =
android_view_InputChannel_createInputChannel(env,
^~~~~~~~~~~~~~~~~~~~~~~~
The warnings were complaining about that we might leak
nativeInputChannel, in android_view_InputChannel_createInputChannel,
since we're allocating it as an arg and not always putting it somewhere.
Bug: None
Test: Builds without warnings
Change-Id: I62163adee5d420ad78c8d4c74aafefc8a58f765b
Hall Liu [Tue, 28 Feb 2017 23:17:44 +0000 (15:17 -0800)]
Add @hide to RttAudioMode IntDef
IntDefs apparently require an @hide annotation to avoid breaking CTS
tests. Adding it here.
Change-Id: Ifd748b55e68091132571df7e74fdb797bd6a83fc
Test: CTS
Fix:
35808951
Brad Ebinger [Tue, 28 Feb 2017 22:44:54 +0000 (22:44 +0000)]
Merge "Send the IMS_SERVICE_UP intent when it is STATE_READY"
Andre Eisenbach [Tue, 28 Feb 2017 19:04:13 +0000 (19:04 +0000)]
Merge "Bluetooth: fix enable log: display 24h time"
Marie Janssen [Fri, 24 Feb 2017 19:06:33 +0000 (11:06 -0800)]
Bluetooth: fix enable log: display 24h time
Test: adb bugreport at 1pm, observe 13:xx:yy instead of 01:xx:yy
Change-Id: I172dcc63f0f43563ec692349a9434f63c55eac25
Brad Ebinger [Mon, 27 Feb 2017 21:38:53 +0000 (13:38 -0800)]
Send the IMS_SERVICE_UP intent when it is STATE_READY
The ImsService must send the IMS_SERVICE_UP intent when it
signals that it is in the STATE_READY state and
IMS_SERVICE_DOWN when it is STATE_INITIALIZING or
STATE_NOT_AVAILABLE.
Also, add READ_PRIVILEGED_PHONE_STATE check
Bug:
35736451
Test: Unit tests added in frameworks/opt/telephony
Change-Id: I03d4398cf7008cf8c51b78d99eb029aa99c63f62
Treehugger Robot [Tue, 28 Feb 2017 17:05:43 +0000 (17:05 +0000)]
Merge "Setting for RecommendedNetworkEvaluator cache TTL"
Treehugger Robot [Tue, 28 Feb 2017 15:36:07 +0000 (15:36 +0000)]
Merge "Move seccomp policy logic to bionic"
Amin Shaikh [Tue, 7 Feb 2017 00:22:42 +0000 (16:22 -0800)]
Setting for RecommendedNetworkEvaluator cache TTL
Bug:
19948759
Bug:
33694078
Test: runtest frameworks-core
Change-Id: Ic1820dc3d70170e6b7c740696abf87d284c6e2ea
Merged-In: Ic1820dc3d70170e6b7c740696abf87d284c6e2ea
Brad Ebinger [Mon, 27 Feb 2017 21:19:16 +0000 (21:19 +0000)]
Merge "Adds read/modify permission checks to ImsService"
Etan Cohen [Mon, 27 Feb 2017 18:33:34 +0000 (18:33 +0000)]
Merge "[AWARE] Remove (hide) sendMessage with retryCount API"
Paul Lawrence [Thu, 16 Feb 2017 17:25:12 +0000 (09:25 -0800)]
Move seccomp policy logic to bionic
Test: Make sure builds, runs, seccomp policy still applied
Bug:
35720753
Change-Id: Ieb09dd88cf070d4b4f1277d1a88d0ce250bb05b4
Paul Lawrence [Mon, 27 Feb 2017 16:39:11 +0000 (16:39 +0000)]
Merge "Revert "Move seccomp policy logic to bionic""
Paul Lawrence [Mon, 27 Feb 2017 16:32:10 +0000 (16:32 +0000)]
Revert "Move seccomp policy logic to bionic"
This reverts commit
48c30ef529543c9bbd1b55f9e05c666b3ffeb7c6.
Reverting build-breaking change
Change-Id: Iad6270e51cb1ead0efbd52c2dfcc6d2118931e4e
Paul Lawrence [Mon, 27 Feb 2017 16:09:39 +0000 (16:09 +0000)]
Merge "Move seccomp policy logic to bionic"
Tyler Gunn [Mon, 27 Feb 2017 02:55:24 +0000 (02:55 +0000)]
Merge "Fix videoStateToString for audio/paused state."
Tyler Gunn [Mon, 27 Feb 2017 02:48:10 +0000 (02:48 +0000)]
Merge "Format Japanese numbers using national format when in Japan."
Treehugger Robot [Sat, 25 Feb 2017 01:13:28 +0000 (01:13 +0000)]
Merge "Added a settings for CMAS message broadcast"
Chen Xu [Sat, 25 Feb 2017 01:05:30 +0000 (01:05 +0000)]
Merge "move ACTION_CARRIER_SETUP intent to public api"
Etan Cohen [Fri, 24 Feb 2017 20:43:16 +0000 (12:43 -0800)]
[AWARE] Remove (hide) sendMessage with retryCount API
Remove the sendMessage(..., retryCount) API (the version
without retryCount) remains. Baseline API already retries
transmissions (at the PHY/MAC layers) - no reason to add
framework-layer retries.
Bug:
35755823
Test: unit tests and integration (sl4a) tests
Change-Id: I49d8bd1e836c09d56f3a9343313f5647eac5c32d
Treehugger Robot [Fri, 24 Feb 2017 20:40:22 +0000 (20:40 +0000)]
Merge "Mark oemhook related APIs @Deprecated."
Josh Gao [Fri, 24 Feb 2017 20:17:22 +0000 (20:17 +0000)]
Merge "Open /data/anr/traces.txt with O_APPEND."
Josh Gao [Fri, 24 Feb 2017 02:46:49 +0000 (18:46 -0800)]
Open /data/anr/traces.txt with O_APPEND.
Should fix selinux denial:
audit(0.0:7893): avc: denied { write } for path="/data/anr/traces.txt" dev="sda35" ino=679938 scontext=u:r:crash_dump:s0 tcontext=u:object_r:anr_data_file:s0 tclass=file permissive=0
Bug:
35727090
Test: none
Change-Id: I5c131ca1ee48ed00934a9aa7c611ee35fc4f9f2a
Eric Laurent [Fri, 24 Feb 2017 19:36:28 +0000 (19:36 +0000)]
Merge "Load hyphenation patterns for Bulgarian and Church Slavonic"
Mukesh Agrawal [Fri, 24 Feb 2017 19:26:47 +0000 (19:26 +0000)]
Merge "StateMachine: add getLogRecMaxSize()"
Roozbeh Pournader [Thu, 23 Feb 2017 02:53:39 +0000 (18:53 -0800)]
Load hyphenation patterns for Bulgarian and Church Slavonic
Patterns for Bulgarian (bg) and Church Slavonic (cu) are now loaded
too.
Also make changes to fontchain_lint.py, so it knows the script for Bulgarian
and Church Slavonic is Cyrillic.
Test: make -j works and creates .hyb files for bg and cu
Change-Id: I0586f6c49380279ef88fe952b5cfd2d3594c5524
fionaxu [Sat, 18 Feb 2017 01:20:46 +0000 (17:20 -0800)]
move ACTION_CARRIER_SETUP intent to public api
As per CDD: 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.)
ACTION_CARRIER_SETUP intent is generally useful for carrier privileged
apps which is unbundled carrier apps, thus move to public APIs
Bug:
33679956
Test: Manual
Change-Id: I202398f868d35e7e9046e7cc41330a3c26dca0b0
Merged-in: Ie2b5d072406513f04676210d08c43d91623c3cd2
Treehugger Robot [Fri, 24 Feb 2017 18:32:21 +0000 (18:32 +0000)]
Merge "Update api for InMemoryDexClassLoader"
Alex Light [Fri, 24 Feb 2017 16:22:13 +0000 (08:22 -0800)]
Update api for InMemoryDexClassLoader
We changed the base class for InMemoryDexClassLoader to be
BaseDexClassLoader.
Test: m -j40 droid
Change-Id: Ibf9f8996a8b9a2feebbd42ec864fd1b08027a6ab
Jason Monk [Fri, 24 Feb 2017 14:13:59 +0000 (14:13 +0000)]
Merge "Data activity icon in statusbar"
Erik Kline [Fri, 24 Feb 2017 08:06:16 +0000 (08:06 +0000)]
Merge "Update UpstreamNetworkMonitor to use custom Handlers"
Miao Wang [Fri, 24 Feb 2017 05:39:14 +0000 (05:39 +0000)]
Merge "Update RenderScript JNI code for Treble"
Jack Yu [Thu, 23 Feb 2017 17:49:25 +0000 (09:49 -0800)]
Added a settings for CMAS message broadcast
This is for sl4a automation to receive CMAS messages
broadcasdt. The automation should inject the settings
through 'adb settings'.
Test: manual
bug:
34393649
Merged-In: Ic29be11b641f185219146d7fbb05561f5907ea76
Change-Id: Ic29be11b641f185219146d7fbb05561f5907ea76
Erik Kline [Wed, 22 Feb 2017 03:58:24 +0000 (12:58 +0900)]
Update UpstreamNetworkMonitor to use custom Handlers
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest frameworks-net passes
Bug:
32130437
Bug:
32163131
Change-Id: I2bc3f87cdf7fa6392b4750eb8adb4ea33c6a3f43
Miao Wang [Wed, 25 Jan 2017 02:58:17 +0000 (18:58 -0800)]
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
Chen Xu [Fri, 24 Feb 2017 02:24:42 +0000 (02:24 +0000)]
Merge "renaming telephony internal hidden intents"
fionaxu [Fri, 24 Feb 2017 02:06:52 +0000 (18:06 -0800)]
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
mukesh agrawal [Fri, 24 Feb 2017 01:13:29 +0000 (17:13 -0800)]
StateMachine: add getLogRecMaxSize()
Add the getLogRecMaxSize() method, so that
WifiStateMachine tests can verify the log
record buffer size, without having to fill
the buffer.
Bug:
35399013
Test: compile
Change-Id: Ib1bd8d670b7b39e9f740a4dd92ea67463b179ce2
Amit Mahajan [Thu, 23 Feb 2017 20:07:46 +0000 (12:07 -0800)]
Mark oemhook related APIs @Deprecated.
Test: none
Bug:
34344851
Change-Id: I5358d94b3f4cce015effdb3a7517980f369a1224
Treehugger Robot [Thu, 23 Feb 2017 23:21:09 +0000 (23:21 +0000)]
Merge "Add isBundled argument to LoadedApk.makePaths call"
Paul Lawrence [Thu, 16 Feb 2017 17:25:12 +0000 (09:25 -0800)]
Move seccomp policy logic to bionic
Test: Make sure builds, runs, seccomp policy still applied
Bug:
35720753
Change-Id: I2d3a4ac9284a733010d74cb509237e35df17588f
Brad Ebinger [Thu, 23 Feb 2017 21:14:04 +0000 (13:14 -0800)]
Adds read/modify permission checks to ImsService
This change adds READ/MODIFY_PHONE_STATE permission checks
to the ImsService to ensure that processes without those
permissions do not access this service illegally.
Test: Manual
Change-Id: I7740a9a6b6a12d3f9162aa5d055e7770b05fdff1
Dimitry Ivanov [Wed, 22 Feb 2017 23:39:42 +0000 (15:39 -0800)]
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
638d81009918eae44eec3261e235b78eae44331d)
Treehugger Robot [Thu, 23 Feb 2017 22:14:20 +0000 (22:14 +0000)]
Merge "Add a new ImsReasonInfo code"
Rebecca Silberstein [Thu, 23 Feb 2017 21:29:02 +0000 (21:29 +0000)]
Merge "wifi.proto: add SoftApReturnCode enum"
Treehugger Robot [Thu, 23 Feb 2017 20:27:45 +0000 (20:27 +0000)]
Merge "Use bionic's autogenerated whitelist policy"
Treehugger Robot [Thu, 23 Feb 2017 20:22:06 +0000 (20:22 +0000)]
Merge changes from topic 'disabled-reason'
* changes:
Fix failing WifiConfigManagerTest test.
Add a disabled reason for recommendation providers
Treehugger Robot [Thu, 23 Feb 2017 20:03:43 +0000 (20:03 +0000)]
Merge "reates base implementation of ImsService AIDLs"
Rebecca Silberstein [Tue, 24 Jan 2017 18:42:59 +0000 (10:42 -0800)]
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
Amin Shaikh [Thu, 23 Feb 2017 18:08:10 +0000 (10:08 -0800)]
Fix failing WifiConfigManagerTest test.
Bug:
35671673
Test: runtest frameworks-core frameworks-wifi
Change-Id: I55ff41464cabfb97d03a0758d73145df808ec2c8
Merged-In: I55ff41464cabfb97d03a0758d73145df808ec2c8
Paul Duffin [Thu, 23 Feb 2017 13:36:30 +0000 (13:36 +0000)]
Merge "Deprecate TestSuiteBuilder and related classes."
Paul Duffin [Thu, 23 Feb 2017 13:34:38 +0000 (13:34 +0000)]
Merge "Fix build failure when using javac toolchain"
Kenneth Westin [Thu, 28 Nov 2013 15:29:40 +0000 (16:29 +0100)]
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
Abhishek Adappa [Wed, 11 Jan 2017 01:36:06 +0000 (17:36 -0800)]
Add a new ImsReasonInfo code
For IKEv2 authentication failure during ePDG tunnel establishment.
Test: make
Change-Id: I1d10efac806abfaa80d9875b908385f7732f293a
Chen Xu [Thu, 23 Feb 2017 01:55:24 +0000 (01:55 +0000)]
Merge "renaming telephony internal hidden intents"
Brad Ebinger [Fri, 3 Feb 2017 00:21:22 +0000 (16:21 -0800)]
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
Brad Ebinger [Wed, 22 Feb 2017 23:22:06 +0000 (23:22 +0000)]
Merge "Add UI prompt for MMI code failure on 3gpp"
Amin Shaikh [Fri, 3 Feb 2017 01:50:12 +0000 (17:50 -0800)]
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
Hall Liu [Wed, 22 Feb 2017 18:48:52 +0000 (18:48 +0000)]
Merge "Introduce APIs for RTT calls (part 1)"
Paul Duffin [Mon, 20 Feb 2017 16:26:09 +0000 (16:26 +0000)]
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
Treehugger Robot [Wed, 22 Feb 2017 15:15:33 +0000 (15:15 +0000)]
Merge "Remove conflicting package information for junit.runner and junit.textui"
Paul Duffin [Wed, 22 Feb 2017 11:42:46 +0000 (11:42 +0000)]
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
Paul Duffin [Wed, 22 Feb 2017 12:43:57 +0000 (12:43 +0000)]
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
Hugo Benichi [Wed, 22 Feb 2017 03:42:14 +0000 (03:42 +0000)]
Merge "ConnectivityManager: allow custom Handlers"
Tyler Gunn [Tue, 21 Feb 2017 23:19:43 +0000 (15:19 -0800)]
Fix videoStateToString for audio/paused state.
The videoStateToString method erroneously assumed that if the videostate
was Audio - Paused, that it was audio-only. Simple logic error to fix.
Test: Added new unit tests.
Bug:
35645334
Change-Id: Ia5ae4d05284b70ad4ba86b8e5d2c53ee8e68a1fa
Treehugger Robot [Wed, 22 Feb 2017 02:45:17 +0000 (02:45 +0000)]
Merge "Added telephony manager set sim power state API"
Jack Yu [Thu, 16 Feb 2017 23:31:59 +0000 (15:31 -0800)]
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
Hugo Benichi [Thu, 2 Feb 2017 08:02:36 +0000 (17:02 +0900)]
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
Hall Liu [Thu, 26 Jan 2017 01:12:49 +0000 (17:12 -0800)]
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
Colin Cross [Tue, 21 Feb 2017 23:25:05 +0000 (23:25 +0000)]
Merge "Revert "Remove outdated emulator check which causes BT to not start""
Treehugger Robot [Tue, 21 Feb 2017 20:19:19 +0000 (20:19 +0000)]
Merge "Remove Session ID from ImsService APIs that do not need it."
Treehugger Robot [Tue, 21 Feb 2017 18:22:38 +0000 (18:22 +0000)]
Merge "SettingsLib: wifi: Fixed AccessPoint tracking for Passpoint networks"
Glen Kuhne [Tue, 21 Feb 2017 17:27:03 +0000 (17:27 +0000)]
Merge "Move wifi.proto to shared service .jar"
Peter Qiu [Wed, 1 Feb 2017 19:49:15 +0000 (11:49 -0800)]
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
Treehugger Robot [Tue, 21 Feb 2017 13:23:40 +0000 (13:23 +0000)]
Merge "Reinstate USER_PRESENT for ConnectivityService"
Erik Kline [Tue, 21 Feb 2017 09:54:04 +0000 (09:54 +0000)]
Merge "Don't request information on unregistered callbacks"
Erik Kline [Tue, 21 Feb 2017 07:21:46 +0000 (16:21 +0900)]
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
Isaac Chen [Tue, 21 Feb 2017 02:05:22 +0000 (02:05 +0000)]
Merge "Turned ENABLE_CPUSETS into runtime decision."
Treehugger Robot [Mon, 20 Feb 2017 15:47:53 +0000 (15:47 +0000)]
Merge "Use Utils.assertTrue() in code that used junit.framework.Assert.assertTrue()"
Paul Duffin [Mon, 20 Feb 2017 13:27:38 +0000 (13:27 +0000)]
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
Paul Duffin [Mon, 20 Feb 2017 12:40:17 +0000 (12:40 +0000)]
Merge "Avoid using JUnit code in production WallpaperCropper"
Paul Duffin [Mon, 20 Feb 2017 12:33:42 +0000 (12:33 +0000)]
Avoid using JUnit code in production WallpaperCropper
Bug:
30188076
Test: make checkbuild
Change-Id: Ib6fe445a246d15dbabb8b86f9251b0059ed216b5
Colin Cross [Sat, 18 Feb 2017 20:05:47 +0000 (20:05 +0000)]
Revert "Remove outdated emulator check which causes BT to not start"
This reverts commit
d98a4e502165d76d05e095608da3c795bd56eafd.
Merged-In: Ibd1596584928f2aa2c799501536abc9b384d1cda
Change-Id: Ibd1596584928f2aa2c799501536abc9b384d1cda
Isaac Chen [Thu, 16 Feb 2017 03:51:08 +0000 (11:51 +0800)]
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
Glen Kuhne [Tue, 25 Oct 2016 19:40:35 +0000 (12:40 -0700)]
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
Treehugger Robot [Fri, 17 Feb 2017 23:57:24 +0000 (23:57 +0000)]
Merge "Apply RTL layout to the title of ResolverActivity"
Colin Cross [Fri, 17 Feb 2017 23:49:03 +0000 (23:49 +0000)]
Merge "WallpaperCropper has no tests, it doesn't need junit"
Treehugger Robot [Fri, 17 Feb 2017 23:20:23 +0000 (23:20 +0000)]
Merge "Remove outdated emulator check which causes BT to not start"
Brad Ebinger [Fri, 17 Feb 2017 22:50:48 +0000 (14:50 -0800)]
Remove Session ID from ImsService APIs that do not need it.
Traditionally, to initiate a new call with the ImsService APIs,
you have to "open()" the interface, which returns a session ID.
This is not needed for querying other information, such as the
provisioning status of the ImsService slot.
Test: Manual
Change-Id: I155b291a49b9aa5ed9599f5a78b1e8d7ff9f8e1c
Pulkit Bhuwalka [Wed, 15 Feb 2017 00:27:10 +0000 (16:27 -0800)]
Remove outdated emulator check which causes BT to not start
ro.kernel.qemu based check to determine whether Bluetooth should be
started or not was an old hack used when "features" was not available to
determine hardware availability. This was later fixed with the
hasSystemFeature check. However, the old check was not removed.
The presence of the old check causes Bluetooth to not start on Android
Things devices which have ro.kernel.qemu set for graphics usage. It's
also preferable to depend on the system API rather than on build
configs. Related CLs modify the emulator builds to correct the config in
builds.
Bug:
35361545
Change-Id: I219ce5e14709c76dcba43af4693093e985269d43
Test: Verified by launching bluetooth on local devices after removing
the old check. Also verified by booting up the emulator and verifying
that Bluetooth Services do not start.
Colin Cross [Fri, 17 Feb 2017 21:44:21 +0000 (21:44 +0000)]
Merge changes I82aa8140,Ib62a5dd6,I2c4d64e2
* changes:
Enable multidex for SystemUITests
Add missing transitive dependencies
Revert "Remove support of disabling Jack."
Treehugger Robot [Fri, 17 Feb 2017 21:34:34 +0000 (21:34 +0000)]
Merge "Show connection error reason for Passpoint AP"
Etan Cohen [Fri, 17 Feb 2017 21:33:39 +0000 (21:33 +0000)]
Merge "[AWARE] Remove enableUsage/disableUsage API"
Etan Cohen [Fri, 17 Feb 2017 21:26:03 +0000 (21:26 +0000)]
Merge "[AWARE] Add discovery window period configuration"
Leonard Mosescu [Fri, 17 Feb 2017 20:22:06 +0000 (20:22 +0000)]
Merge "Add missing break statement."
Treehugger Robot [Fri, 17 Feb 2017 19:45:05 +0000 (19:45 +0000)]
Merge "PrintSpooler: Remove recommendation if Play Store is not installed"