OSDN Git Service
Tyler Gunn [Mon, 27 Feb 2017 03:01:08 +0000 (03:01 +0000)]
Merge "Fix videoStateToString for audio/paused state."
am:
89e7a888be
Change-Id: I04fe4d5b61c548f3b5f012af343c4e08334933e0
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:54:49 +0000 (02:54 +0000)]
Merge "Format Japanese numbers using national format when in Japan."
am:
050e5ddb4f
Change-Id: I996a79c2b3158e1fd6999330e0b0b21f8e4c8b4b
Tyler Gunn [Mon, 27 Feb 2017 02:48:10 +0000 (02:48 +0000)]
Merge "Format Japanese numbers using national format when in Japan."
Jack Yu [Sat, 25 Feb 2017 02:46:58 +0000 (18:46 -0800)]
resolve merge conflicts of
e091985bb5b5 to stage-aosp-master
Test: Manual
Change-Id: Icaf4663abd3ad233afa3e31ff1939dbb7c07a2a5
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:12:09 +0000 (01:12 +0000)]
Merge "move ACTION_CARRIER_SETUP intent to public api"
am:
fcb37ffc60
Change-Id: Iaa09a2c35a88d58a6c6df4122bf7f1f87bd7075e
Chen Xu [Sat, 25 Feb 2017 01:05:30 +0000 (01:05 +0000)]
Merge "move ACTION_CARRIER_SETUP intent to public api"
Amit Mahajan [Fri, 24 Feb 2017 20:48:10 +0000 (20:48 +0000)]
Merge "Mark oemhook related APIs @Deprecated."
am:
79faa72eee
Change-Id: Ia31c163fdd65f305095ca1749cbc457eea4b0ca8
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:28:00 +0000 (20:28 +0000)]
Merge "Open /data/anr/traces.txt with O_APPEND."
am:
5bf8540194
Change-Id: Ie73b2930348d946a6f4504df190bd3e819043487
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:45:28 +0000 (19:45 +0000)]
Merge "Load hyphenation patterns for Bulgarian and Church Slavonic"
am:
70bc4a8036
Change-Id: Iac325d28a09f4ddceb93ec85beba0eabfd393992
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:32:03 +0000 (19:32 +0000)]
Merge "StateMachine: add getLogRecMaxSize()"
am:
22e43471ed
Change-Id: Iaab7955c0721e240487e8c842e994c90141d6013
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
Alex Light [Fri, 24 Feb 2017 18:39:00 +0000 (18:39 +0000)]
Merge "Update api for InMemoryDexClassLoader"
am:
2f40b2b302
Change-Id: I4c28a97869d17862076521c7fc22a96f9946d6b0
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:34:42 +0000 (09:34 -0500)]
resolve merge conflicts of
1723bc14ebfd to stage-aosp-master
Change-Id: I11054806dbd263b2adaedb21458c33b7407bb7d6
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:15:19 +0000 (08:15 +0000)]
Merge "Update UpstreamNetworkMonitor to use custom Handlers"
am:
35c89886c2
Change-Id: I76433822a9b7c124e4b7cfcf2a20cb0e43a60199
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:47:35 +0000 (05:47 +0000)]
Merge "Update RenderScript JNI code for Treble"
am:
9017b25631
Change-Id: I0cc281a372ec83d3731a83b0af5cc3a02b259a67
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:33:53 +0000 (02:33 +0000)]
Merge "renaming telephony internal hidden intents"
am:
6d198966fe
Change-Id: If1db829fe5308bcbc1d8b778aef50368581850f4
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
Dimitry Ivanov [Thu, 23 Feb 2017 23:30:16 +0000 (23:30 +0000)]
Merge "Add isBundled argument to LoadedApk.makePaths call"
am:
0743d56e2b
Change-Id: I74deae8126109555bbbe57983ffd6a22ab50e303
Treehugger Robot [Thu, 23 Feb 2017 23:21:09 +0000 (23:21 +0000)]
Merge "Add isBundled argument to LoadedApk.makePaths call"
Abhishek Adappa [Thu, 23 Feb 2017 22:22:40 +0000 (22:22 +0000)]
Merge "Add a new ImsReasonInfo code"
am:
b4234e6af8
Change-Id: Ia5174fafbc08acf559e35a28538d2b112b5cdb19
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:46:51 +0000 (21:46 +0000)]
Merge "wifi.proto: add SoftApReturnCode enum"
am:
84374678e0
Change-Id: I22d8aca86a5a5c28c393db372b4399e5ddd99f46
Rebecca Silberstein [Thu, 23 Feb 2017 21:29:02 +0000 (21:29 +0000)]
Merge "wifi.proto: add SoftApReturnCode enum"
Paul Lawrence [Thu, 23 Feb 2017 20:41:33 +0000 (20:41 +0000)]
Merge "Use bionic's autogenerated whitelist policy"
am:
dcd14de5f6
Change-Id: Idf1ab0f6a2028a1e41c52f6269ec05a9f1e87ec5
Amin Shaikh [Thu, 23 Feb 2017 20:35:10 +0000 (20:35 +0000)]
Merge changes from topic 'disabled-reason'
am:
d0fc3f1383
Change-Id: I09e7dff673a56fb3c51cde827ae783da32407a70
Amin Shaikh [Thu, 23 Feb 2017 20:33:59 +0000 (20:33 +0000)]
Add a disabled reason for recommendation providers
am:
a70bc57ef9
Change-Id: Ie91764892f6bd8fc20990f5a172c020a670875ff
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
Brad Ebinger [Thu, 23 Feb 2017 20:10:34 +0000 (20:10 +0000)]
Merge "reates base implementation of ImsService AIDLs"
am:
b60869db12
Change-Id: I6edf280213bee0756aad65148daafe3300849baa
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:44:24 +0000 (13:44 +0000)]
Merge "Deprecate TestSuiteBuilder and related classes."
am:
a26000b8f5
Change-Id: Ia9d491bd72f2a9f08838e298aaf4de5de28c7d4f
Paul Duffin [Thu, 23 Feb 2017 13:43:07 +0000 (13:43 +0000)]
Merge "Fix build failure when using javac toolchain"
am:
c098bea921
Change-Id: I56e965336c537295efc4c0c778f5c236f955bf10
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 02:03:00 +0000 (02:03 +0000)]
Merge "renaming telephony internal hidden intents"
am:
09c663a84c
Change-Id: Ic20ae9e6816d629c979859a7d18f1827bafcc034
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 [Thu, 23 Feb 2017 00:03:47 +0000 (16:03 -0800)]
resolve merge conflicts of
ac9b2c4fab42 to stage-aosp-master
Change-Id: I4a6094c41ab267f89a15c5e8caa25e6b683419d0
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:56:48 +0000 (18:56 +0000)]
Merge "Introduce APIs for RTT calls (part 1)"
am:
27ad05169e
Change-Id: I3fb3cb89b467e5df808967dcd478964a84e2e61f
Hall Liu [Wed, 22 Feb 2017 18:48:52 +0000 (18:48 +0000)]
Merge "Introduce APIs for RTT calls (part 1)"
Paul Duffin [Wed, 22 Feb 2017 15:24:27 +0000 (15:24 +0000)]
Merge "Remove conflicting package information for junit.runner and junit.textui"
am:
f3f4775a35
Change-Id: Ie0ca0b2b6b5f06e90f55996625f758521c9039cb
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:48:10 +0000 (03:48 +0000)]
Merge "ConnectivityManager: allow custom Handlers"
am:
ef69246260
Change-Id: I8da5540f6561cdef4adc91bbeeb9c21a91c08d49
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
Jack Yu [Wed, 22 Feb 2017 02:50:29 +0000 (02:50 +0000)]
Merge "Added telephony manager set sim power state API"
am:
cbffe38631
Change-Id: I9fbe161505905c3d3c1c431d1589248324fb3e4f
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
Colin Cross [Tue, 21 Feb 2017 23:32:32 +0000 (23:32 +0000)]
Merge "Revert "Remove outdated emulator check which causes BT to not start""
am:
375ea2ae71
Change-Id: I3d5abc52abf3f7c01ba4fbee47d7e487e99f5dda
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""
Brad Ebinger [Tue, 21 Feb 2017 20:24:21 +0000 (20:24 +0000)]
Merge "Remove Session ID from ImsService APIs that do not need it."
am:
975be6c065
Change-Id: I09469d99bc68133a4de594507854c269e905c40e
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."
Peter Qiu [Tue, 21 Feb 2017 18:39:01 +0000 (18:39 +0000)]
Merge "SettingsLib: wifi: Fixed AccessPoint tracking for Passpoint networks"
am:
b13de64a11
Change-Id: I0e45cb17f11e8991d0d2c58cf7630f1e33296d97
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:56:13 +0000 (17:56 +0000)]
Merge "Move wifi.proto to shared service .jar"
am:
9ca5ddff4c
Change-Id: I3c10728fdbcd2882723a1bd519a47a63aeba0ac0
Robin Lee [Tue, 21 Feb 2017 17:55:07 +0000 (17:55 +0000)]
Merge "Reinstate USER_PRESENT for ConnectivityService"
am:
2c8229456a
Change-Id: If8b7239cdabdd79d9ea24baf99e95c6ec1a9acf3
Erik Kline [Tue, 21 Feb 2017 17:54:13 +0000 (17:54 +0000)]
Merge "Don't request information on unregistered callbacks"
am:
14e3db3de5
Change-Id: I99bf9b6a092318cf5183b18d25bda36f9977ce4e
Isaac Chen [Tue, 21 Feb 2017 17:52:22 +0000 (17:52 +0000)]
Merge "Turned ENABLE_CPUSETS into runtime decision."
am:
d95aa50b18
Change-Id: Ie31a736b2edd33c1cebbc08fbc39b555d501a349
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."
Paul Duffin [Mon, 20 Feb 2017 15:59:06 +0000 (15:59 +0000)]
Merge "Use Utils.assertTrue() in code that used junit.framework.Assert.assertTrue()"
am:
372b6b2c45
Change-Id: Iafa345df241f4f713451aa42a7169eddb57eb1ea
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:48:55 +0000 (12:48 +0000)]
Merge "Avoid using JUnit code in production WallpaperCropper"
am:
9598c98db0
Change-Id: I15b0bbe22d18feca699ecaf4146dc9e2c279e5b5
Paul Duffin [Mon, 20 Feb 2017 12:40:17 +0000 (12:40 +0000)]
Merge "Avoid using JUnit code in production WallpaperCropper"