OSDN Git Service
Amin Shaikh [Thu, 23 Feb 2017 20:39:57 +0000 (20:39 +0000)]
Add a disabled reason for recommendation providers am:
a70bc57ef9
am:
df6f7b9388
Change-Id: Id69eccbba15a0eb20c48680204007ed5354bd734
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
Makoto Onuki [Thu, 23 Feb 2017 20:18:04 +0000 (20:18 +0000)]
DO NOT MERGE Relax isUserRunning check and allow in-profile calls am:
a08c6a1cfb am:
7c6b2f4d8b am:
f171c39e53 am:
89bb32fb0d
am:
3fe290622f
Change-Id: Ia96b9c9c7997c726da5ae0221bb4d2d41869deb2
Brad Ebinger [Thu, 23 Feb 2017 20:14:58 +0000 (20:14 +0000)]
Merge "reates base implementation of ImsService AIDLs" am:
b60869db12
am:
fe8d588dad
Change-Id: I3425819c9ca83577ea4946dae072d9816626d5e5
Makoto Onuki [Thu, 23 Feb 2017 20:12:53 +0000 (20:12 +0000)]
DO NOT MERGE Relax isUserRunning check and allow in-profile calls am:
a08c6a1cfb am:
7c6b2f4d8b am:
f171c39e53
am:
89bb32fb0d
Change-Id: I264cdae7f5db5e9b9ecb7ef93d60f977157e1512
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
Makoto Onuki [Thu, 23 Feb 2017 20:07:27 +0000 (20:07 +0000)]
DO NOT MERGE Relax isUserRunning check and allow in-profile calls am:
a08c6a1cfb am:
7c6b2f4d8b
am:
f171c39e53
Change-Id: I69a9ece7da697e2a2fb979febad1af352713ccbe
Makoto Onuki [Thu, 23 Feb 2017 20:03:59 +0000 (20:03 +0000)]
DO NOT MERGE Relax isUserRunning check and allow in-profile calls am:
a08c6a1cfb
am:
7c6b2f4d8b
Change-Id: I18c2b795270260a02a117351fe5ca3ce5a5c0467
Treehugger Robot [Thu, 23 Feb 2017 20:03:43 +0000 (20:03 +0000)]
Merge "reates base implementation of ImsService AIDLs"
Makoto Onuki [Thu, 23 Feb 2017 20:00:01 +0000 (20:00 +0000)]
DO NOT MERGE Relax isUserRunning check and allow in-profile calls
am:
a08c6a1cfb
Change-Id: I07ce253853c1b3066c81af4f52a4ff6968437ef4
Paul Duffin [Thu, 23 Feb 2017 13:50:05 +0000 (13:50 +0000)]
Merge "Deprecate TestSuiteBuilder and related classes." am:
a26000b8f5
am:
fd61eb1e39
Change-Id: I23f137865997ca9ce4aa229c9329d8ea9fbcb6ee
Paul Duffin [Thu, 23 Feb 2017 13:49:07 +0000 (13:49 +0000)]
Merge "Fix build failure when using javac toolchain" am:
c098bea921
am:
5da6f4fbd1
Change-Id: I65623ab75b0cc7b828fe67544074549fc21206ca
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"
Makoto Onuki [Thu, 28 Jul 2016 20:10:42 +0000 (13:10 -0700)]
DO NOT MERGE Relax isUserRunning check and allow in-profile calls
Bug
30475753
Bug
35667752
Change-Id: I739ee7e259f041f5e133edf048b6b54cb7a770db
(cherry picked from commit
8198deacb52eb082ae9f0a5658d594dc9b689882)
Chen Xu [Thu, 23 Feb 2017 02:08:33 +0000 (02:08 +0000)]
Merge "renaming telephony internal hidden intents" am:
09c663a84c
am:
979e4690ec
Change-Id: I8cce065cc9ce6a87fa0ce9753a5e9170da77da59
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:57:23 +0000 (00:57 +0000)]
resolve merge conflicts of
ac9b2c4fab42 to stage-aosp-master
am:
4fb8988854
Change-Id: Ic679f452ad245cbe58ea8069c34c15e50ee9e5c2
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
Calvin On [Wed, 22 Feb 2017 22:48:23 +0000 (22:48 +0000)]
Replace WearWifi/Cell services with WearConnectivityService am:
5555bccc70
am:
abfd5bccb9
Change-Id: If051c765d3ea81cce2bedc2dfa02d64744088054
Calvin On [Wed, 22 Feb 2017 22:41:41 +0000 (22:41 +0000)]
Replace WearWifi/Cell services with WearConnectivityService
am:
5555bccc70
Change-Id: I5d8c97b8d5c394aeae99b7ddbe0dfdd5706a4293
Hall Liu [Wed, 22 Feb 2017 19:00:55 +0000 (19:00 +0000)]
Merge "Introduce APIs for RTT calls (part 1)" am:
27ad05169e
am:
d83b06cd31
Change-Id: Id3608cf918d829ed785d7b75dffa6b6ce6990f34
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:27:51 +0000 (15:27 +0000)]
Merge "Remove conflicting package information for junit.runner and junit.textui" am:
f3f4775a35
am:
9b5522f8c4
Change-Id: I4925285c1ea3027d46ac396b8ea29ac44c075e0d
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
Daniel Nishi [Wed, 22 Feb 2017 04:04:38 +0000 (04:04 +0000)]
Don't crash when primary volume is null in AppCollector.
am:
d54f3a487b
Change-Id: I77e27f4a7e901e98995039bcfd68453bec83a6cd
Hugo Benichi [Wed, 22 Feb 2017 03:51:08 +0000 (03:51 +0000)]
Merge "ConnectivityManager: allow custom Handlers" am:
ef69246260
am:
cb47118af1
Change-Id: I04171173890b161c053c41a2a5c7e1602e510b8c
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"
Jack Yu [Wed, 22 Feb 2017 02:56:44 +0000 (02:56 +0000)]
Merge "Added telephony manager set sim power state API" am:
cbffe38631
am:
d1f5b4245f
Change-Id: I0db1ff82aa80b3719efa9c0bdc2ca0a6f39347a5
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
Daniel Nishi [Wed, 22 Feb 2017 00:04:20 +0000 (16:04 -0800)]
Don't crash when primary volume is null in AppCollector.
getPrimaryStorageCurrentVolume() may return a null value. I did
not plan for this case in the AppCollector. This case occurs when
the primary storage is not mounted when the function is called.
By adding in a null check after getPrimaryStorageCurrentVolume()
and adding in preconditions to verify the non-nullness of the
volume as it propagates through the AppCollector, we ensure that
there should be no more NPE crashes for this reason.
Bug:
35636901
Test: FrameworkServicesTests
Change-Id: I4009e55502f71b8f14dd917ddd00caef3551aafd
Calvin On [Wed, 22 Feb 2017 00:41:43 +0000 (16:41 -0800)]
Replace WearWifi/Cell services with WearConnectivityService
go/wear-connectivity-service
Change-Id: I2a8214e2965ad63a23dc8c174db256a263102a6f
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:37:01 +0000 (23:37 +0000)]
Merge "Revert "Remove outdated emulator check which causes BT to not start"" am:
375ea2ae71
am:
ebc05de919
Change-Id: Id61ee53f3147d90d8fbca053633e3115b69d3065
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:28:09 +0000 (20:28 +0000)]
Merge "Remove Session ID from ImsService APIs that do not need it." am:
975be6c065
am:
50bc658e20
Change-Id: I2b2e4b0cbfcee5dd19f6d79ce5a949ca61140ffb
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."
Svetoslav Ganov [Tue, 21 Feb 2017 19:54:06 +0000 (19:54 +0000)]
Merge "[DO NOT MERGE] The system can post notifications for any package" into nyc-mr2-dev
am:
1ddddee33f
Change-Id: Iaf9aacd39ea328f3a22f26987eb65df682ddccc5
TreeHugger Robot [Tue, 21 Feb 2017 19:46:50 +0000 (19:46 +0000)]
Merge "[DO NOT MERGE] The system can post notifications for any package" into nyc-mr2-dev
Peter Qiu [Tue, 21 Feb 2017 18:43:11 +0000 (18:43 +0000)]
Merge "SettingsLib: wifi: Fixed AccessPoint tracking for Passpoint networks" am:
b13de64a11
am:
bedf92ed24
Change-Id: Ibcbc93be7e0294e6a06976a6222adc8fe95582e7
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 18:06:31 +0000 (18:06 +0000)]
Merge "Move wifi.proto to shared service .jar" am:
9ca5ddff4c
am:
d0dcf559c5
Change-Id: I7c0095922c87073732f29b623aee2d99608511cf
Robin Lee [Tue, 21 Feb 2017 18:05:37 +0000 (18:05 +0000)]
Merge "Reinstate USER_PRESENT for ConnectivityService" am:
2c8229456a
am:
433631edfe
Change-Id: I2c5b9061435e17d8319a3109e28fa2a1b6f75154
Erik Kline [Tue, 21 Feb 2017 18:04:38 +0000 (18:04 +0000)]
Merge "Don't request information on unregistered callbacks" am:
14e3db3de5
am:
042be0bd84
Change-Id: Idd102961c422be5c94e4bf92c3aaae7f660f4313
Isaac Chen [Tue, 21 Feb 2017 18:02:59 +0000 (18:02 +0000)]
Merge "Turned ENABLE_CPUSETS into runtime decision." am:
d95aa50b18
am:
7eca8f7073
Change-Id: I96e38dc38e372a27990b9cd1bda9f04676f13eb8
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 16:06:03 +0000 (16:06 +0000)]
Merge "Use Utils.assertTrue() in code that used junit.framework.Assert.assertTrue()" am:
372b6b2c45
am:
3fbcd8cf38
Change-Id: Ie2bb70bea07f8642804cd6dc2e987e95e69ef633
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:56:22 +0000 (12:56 +0000)]
Merge "Avoid using JUnit code in production WallpaperCropper" am:
9598c98db0
am:
e4add524e9
Change-Id: I8c22e84feff3fa597403a7de6300528f823268d7
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"
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
Svetoslav Ganov [Fri, 17 Feb 2017 03:47:25 +0000 (19:47 -0800)]
[DO NOT MERGE] The system can post notifications for any package
The platform is able to post notifications on behalf of
any app and muting the notifications for this app should
properly work by attributing the notification not to the
system but to the app on whose behalf the notication is
posted.
Test: manual
bug:
34966823
Change-Id: I4ebb2f5da1540557a8e7203b054a90ff967237f2
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
Tetsutoki Shiozawa [Sat, 18 Feb 2017 00:11:27 +0000 (00:11 +0000)]
Merge "Apply RTL layout to the title of ResolverActivity" am:
2122e42e9b
am:
add56f7b66
Change-Id: I00cd1ae9bd14043f6ad893076d4adebb59d4cde5
Tetsutoki Shiozawa [Sat, 18 Feb 2017 00:07:27 +0000 (00:07 +0000)]
Merge "Apply RTL layout to the title of ResolverActivity"
am:
2122e42e9b
Change-Id: Ibf9e9d7a0a397e314588322b5c8228cf5fa23957
Colin Cross [Sat, 18 Feb 2017 00:01:24 +0000 (00:01 +0000)]
Merge "WallpaperCropper has no tests, it doesn't need junit" am:
a34472b7e6
am:
11436455cf
Change-Id: I5c15471c8e98a1a45df669c2d7a6a2956c9227b8
Colin Cross [Fri, 17 Feb 2017 23:57:56 +0000 (23:57 +0000)]
Merge "WallpaperCropper has no tests, it doesn't need junit"
am:
a34472b7e6
Change-Id: I1a2c5018f2f85bb21fccdccd3c736fdc844dcf92
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"
Pulkit Bhuwalka [Fri, 17 Feb 2017 23:32:37 +0000 (23:32 +0000)]
Merge "Remove outdated emulator check which causes BT to not start" am:
ad7fb62d4f
am:
806ac5e1dd
Change-Id: I05b90b0f77fa74268f2f92bfa2e4decec3af5745
Pulkit Bhuwalka [Fri, 17 Feb 2017 23:28:09 +0000 (23:28 +0000)]
Merge "Remove outdated emulator check which causes BT to not start"
am:
ad7fb62d4f
Change-Id: Ia6f9417e6b21ec7911036b8875b9603f8b36152e
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
Colin Cross [Fri, 17 Feb 2017 22:31:08 +0000 (22:31 +0000)]
Merge changes I82aa8140,Ib62a5dd6,I2c4d64e2 am:
313e645801
am:
3c2c2764d4
Change-Id: I14e60ae916b81d5193d2bc08daa63282d426a49f
Yuxin Chang [Fri, 17 Feb 2017 22:30:16 +0000 (22:30 +0000)]
Merge "Show connection error reason for Passpoint AP" am:
855889b086
am:
4896a04013
Change-Id: I14f9205148adbb1819ed3c40b6536d1c72cd6536
Etan Cohen [Fri, 17 Feb 2017 22:26:51 +0000 (22:26 +0000)]
Merge "[AWARE] Remove enableUsage/disableUsage API" am:
647f2e1493
am:
8e32c1b718
Change-Id: I52340c790fe638c0baf8d48e5880b1e8ac8e408f
Colin Cross [Fri, 17 Feb 2017 22:25:53 +0000 (22:25 +0000)]
Merge changes I82aa8140,Ib62a5dd6,I2c4d64e2
am:
313e645801
Change-Id: Ia10d20ea4ebabc2cc84524950dec7570104b185f
Etan Cohen [Fri, 17 Feb 2017 22:24:04 +0000 (22:24 +0000)]
Merge "[AWARE] Add discovery window period configuration" am:
17532ec02e
am:
f8637d5c04
Change-Id: Ife1cfc7e027b858844a1a251843e0669d0ce3720