Commit Graph

283634 Commits

Author SHA1 Message Date
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
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
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
Isaac Chen
d95aa50b18 Merge "Turned ENABLE_CPUSETS into runtime decision." 2017-02-21 02:05:24 +00:00
Paul Duffin
3fbcd8cf38 Merge "Use Utils.assertTrue() in code that used junit.framework.Assert.assertTrue()"
am: 372b6b2c45

Change-Id: Iafa345df241f4f713451aa42a7169eddb57eb1ea
2017-02-20 15:59:06 +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
e4add524e9 Merge "Avoid using JUnit code in production WallpaperCropper"
am: 9598c98db0

Change-Id: I15b0bbe22d18feca699ecaf4146dc9e2c279e5b5
2017-02-20 12:48:55 +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
Tetsutoki Shiozawa
add56f7b66 Merge "Apply RTL layout to the title of ResolverActivity"
am: 2122e42e9b

Change-Id: Ibf9e9d7a0a397e314588322b5c8228cf5fa23957
2017-02-18 00:07:27 +00:00
Colin Cross
11436455cf Merge "WallpaperCropper has no tests, it doesn't need junit"
am: a34472b7e6

Change-Id: I1a2c5018f2f85bb21fccdccd3c736fdc844dcf92
2017-02-17 23:57:56 +00:00
Treehugger Robot
2122e42e9b Merge "Apply RTL layout to the title of ResolverActivity" 2017-02-17 23:57:25 +00:00
Colin Cross
a34472b7e6 Merge "WallpaperCropper has no tests, it doesn't need junit" 2017-02-17 23:49:03 +00:00
Pulkit Bhuwalka
806ac5e1dd Merge "Remove outdated emulator check which causes BT to not start"
am: ad7fb62d4f

Change-Id: Ia6f9417e6b21ec7911036b8875b9603f8b36152e
2017-02-17 23:28:09 +00:00
Treehugger Robot
ad7fb62d4f Merge "Remove outdated emulator check which causes BT to not start" 2017-02-17 23:20:25 +00:00
Brad Ebinger
e63b35d0b2 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
2017-02-17 14:50:48 -08:00
Colin Cross
3c2c2764d4 Merge changes I82aa8140,Ib62a5dd6,I2c4d64e2
am: 313e645801

Change-Id: Ia10d20ea4ebabc2cc84524950dec7570104b185f
2017-02-17 22:25:53 +00:00
Yuxin Chang
4896a04013 Merge "Show connection error reason for Passpoint AP"
am: 855889b086

Change-Id: I164f575dfc5dd69912f433e46b1d70b1fd11b1e6
2017-02-17 22:22:05 +00:00
Etan Cohen
8e32c1b718 Merge "[AWARE] Remove enableUsage/disableUsage API"
am: 647f2e1493

Change-Id: Ic48804f3e2ecac6a817d261f9f9cbfc505b01716
2017-02-17 22:18:32 +00:00
Etan Cohen
f8637d5c04 Merge "[AWARE] Add discovery window period configuration"
am: 17532ec02e

Change-Id: I62ba5123aafb236d756a4cafe7829717e8e542f9
2017-02-17 22:15:29 +00:00
Pulkit Bhuwalka
d98a4e5021 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.
2017-02-17 13:44:33 -08:00
Colin Cross
313e645801 Merge changes I82aa8140,Ib62a5dd6,I2c4d64e2
* changes:
  Enable multidex for SystemUITests
  Add missing transitive dependencies
  Revert "Remove support of disabling Jack."
2017-02-17 21:44:21 +00:00
Treehugger Robot
855889b086 Merge "Show connection error reason for Passpoint AP" 2017-02-17 21:34:35 +00:00
Etan Cohen
647f2e1493 Merge "[AWARE] Remove enableUsage/disableUsage API" 2017-02-17 21:33:40 +00:00
Etan Cohen
17532ec02e Merge "[AWARE] Add discovery window period configuration" 2017-02-17 21:26:04 +00:00
Leonard Mosescu
5d2af16008 Merge "Add missing break statement." am: 7a4b88de49
am: 080456edd6

Change-Id: I2acd644f0bb5916f9c90a1103b023544a7eebddb
2017-02-17 20:34:48 +00:00
Leonard Mosescu
080456edd6 Merge "Add missing break statement."
am: 7a4b88de49

Change-Id: I3323063130b71f831d7c6356d0657161f84c9e38
2017-02-17 20:31:15 +00:00
Hiroaki Kuriyama
2ab70d213b Merge "PrintSpooler: Remove recommendation if Play Store is not installed" am: 57b966eee1
am: 7cd04745f4

Change-Id: I04a0d5afbaedbef3a1d7b005dba124888fd213ca
2017-02-17 20:30:36 +00:00
Brad Ebinger
c9c8b590c5 Merge "Adds @hide ImsService APIs" am: 2b879016d3
am: f46aa6f9ee

Change-Id: I12e10d796a7b2d56cacf8e9b53bb5e228b79ecc3
2017-02-17 20:29:13 +00:00
Leonard Mosescu
7a4b88de49 Merge "Add missing break statement." 2017-02-17 20:22:07 +00:00
Hiroaki Kuriyama
7cd04745f4 Merge "PrintSpooler: Remove recommendation if Play Store is not installed"
am: 57b966eee1

Change-Id: I48c070c4b3e1cf3d1d6ff71612c7ad6d44e6cb1f
2017-02-17 19:52:32 +00:00