Commit Graph

277569 Commits

Author SHA1 Message Date
Glen Kuhne
9ca5ddff4c Merge "Move wifi.proto to shared service .jar" 2017-02-21 17:27:04 +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
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
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
Treehugger Robot
ad7fb62d4f Merge "Remove outdated emulator check which causes BT to not start" 2017-02-17 23:20:25 +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
7a4b88de49 Merge "Add missing break statement." 2017-02-17 20:22:07 +00:00
Treehugger Robot
57b966eee1 Merge "PrintSpooler: Remove recommendation if Play Store is not installed" 2017-02-17 19:45:06 +00:00
Treehugger Robot
2b879016d3 Merge "Adds @hide ImsService APIs" 2017-02-17 19:21:45 +00:00
Treehugger Robot
3f827b5e33 Merge "Update dalvik.bytecode package" 2017-02-17 18:13:42 +00:00
Leonard Mosescu
456d5fc159 Add missing break statement.
It was caught in the code review after the merge (thanks Narayan!).
This is already fixed and tested in the internal branch (see Merged-In)

Test: manual, CTS in internal

Change-Id: I9f6f72995e9ab633564b6bc22846fbe99eb65105
Merged-In: If14126e645b2d0a1307404e2f50088b3994abce2
2017-02-17 10:10:55 -08:00
Orion Hodson
7d1bdf8375 Update dalvik.bytecode package
BUG: 33191717
Test: m checkapi
Change-Id: I6af2b36573f698ae091e9d7e3f01c156549834c1
2017-02-17 14:55:25 +00:00
Treehugger Robot
1a69570fe8 Merge "Infinite reboot when OS upgrade from M to N with set Always-on VPN" 2017-02-17 13:07:21 +00:00
Etan Cohen
6bb624a532 [AWARE] Add discovery window period configuration
Discovery window period configuration modifies the duty cycle of
the Aware discovery session. Allowing trade-offs of discovery
latency vs. power.

Add the configuration.

Note: the whole ConfigRequest object is not public (at this point)
so by default so is the new configuration.

Bug: 33552536
Test: unit tests and integration (sl4a) tests.
Change-Id: I16f5c084dbc91431763a81de0a3adfe6f452e44c
2017-02-16 18:38:23 -08:00
Treehugger Robot
5e2a2ee39e Merge changes from topic 'svcusb'
* changes:
  Add data unlock argument to set function command.
  Allow the shell to set USB functions.
2017-02-17 02:01:55 +00:00
Colin Cross
5a252e6b4b WallpaperCropper has no tests, it doesn't need junit
Test: builds
Change-Id: I1e65b921120f061119e06efeea9fb22d043bf305
2017-02-16 17:34:45 -08:00
Colin Cross
254a418e97 Enable multidex for SystemUITests
Test: builds
Change-Id: I82aa81405f635165716c39191082836dae8ce819
2017-02-16 17:34:45 -08:00
Colin Cross
062d1d5b16 Add missing transitive dependencies
Add android-support-transition to DocumentsUI for
android-support-design, android-support-annotations to
ExternalStorageProvider for android-support-documents-archive, and
android support libraries to SettingsLib/common.mk.

Test: builds
Merged-In: Ib62a5dd6ee1cf39c99c9cce3a9310c35cf631fdf
Change-Id: Ib62a5dd6ee1cf39c99c9cce3a9310c35cf631fdf
2017-02-16 17:34:29 -08:00
Treehugger Robot
2f21f71da4 Merge "Added the new RIL request to set SIM power state" 2017-02-17 01:13:26 +00:00
Hugo Benichi
37e3f22c2e Merge "IP connectivity metrics: delete obsolete logger service" 2017-02-16 23:52:13 +00:00
Leonard Mosescu
05dfd10254 Merge "Adding "attach-agent" to ActivityManagerShellCommand" 2017-02-16 23:12:26 +00:00
Etan Cohen
416d6fba17 [AWARE] Remove enableUsage/disableUsage API
The APIs (never public) were provided for indirect access to enable
or disable Aware usage. No longer necessary.

Bug: 35435032
Test: unit tests and integration (sl4a) tests
Change-Id: Ia5c2b8aed8dd908f49b5e4f42a77feed3cda946c
2017-02-16 14:13:42 -08:00
Eino-Ville Talvala
b59cd66e93 Merge "camera case fail for testSceneModes" 2017-02-16 21:35:36 +00:00
Leonard Mosescu
02758a9a80 Adding "attach-agent" to ActivityManagerShellCommand
This new command is used to attach runtime agents to a running application:

attach-agent <PROCESS> <FILE>
   Attach an agent to the specified <PROCESS>,
   which may be either a process name or a PID.

Test: m test-art-host, manual testing:
    . invalid syntax, missing arguments
    . invalid syntax, extra arguments
    . invalid numeric PID
    . invalid process name
    . valid process, not debuggable
    . valid process, missing agent
    . valid process, valid agent

Bug: 31682382

Change-Id: I61cc8bf20addb1702acc8e7aae65b2f9ed7c5ca0
Merged-In: Ife88dbf23991dde7945d9208e54cd014bb7ecdc6
2017-02-16 13:19:41 -08:00
Jerry Zhang
ca1663a093 Add data unlock argument to set function command.
This allows automated switches into file transfer mode,
which makes automated Mtp testing possible.

Test: adb shell svc setFunction mtp true
Bug: 25596495
Change-Id: I67be58853b002789dc22b75d82af9eb6cfb7a361
2017-02-16 13:14:50 -08:00
Philip P. Moltmann
30a2d638c0 Allow the shell to set USB functions.
Bug: 25596495
Test: Issed a shell command and saw it handled correctly
Change-Id: I4472464a1c7ed100cb257dbad83d1d8cfef88fc6
2017-02-16 13:14:50 -08:00
Colin Cross
be2d3307e2 Revert "Remove support of disabling Jack."
This reverts commit ba068f4872.

Test: builds
Change-Id: I2c4d64e26c2e4ceb710a39de2ee9749160d33a72
2017-02-16 11:41:42 -08:00
Brad Ebinger
1639c21be6 Adds @hide ImsService APIs
Adds @hide ImsService API implementations to be used for the new
dynamic ImsResolver.

1) ImsService - The main class that all vendor ImsServices will implement.
ImsServices that implement this method must return their implementations
of MMTelFeature when onCreateMMTelFeature is called. The base ImsService
class also relays all method calls through itself as a proxy. So, when
Telephony calls a method, the ImsService figures out which MMTelFeature
should be called (by slot) and then calls that feature's method
implementation.

2) MMTelFeature/RcsFeature - Implements the I*Feature interfaces, which
are used on both sides of the interface. The vendor implemented ImsService
must implement all methods provided in the I*Feature interface in their
implementation of *Feature that they return to the ImsService.

3) ImsServiceProxy[Compat] - The Proxy interface in telephony that will be
called in ImsManager. When a method in this class is called, it will call
the respective AIDL function: Telephony -> IImsServiceController AIDL ->
vendor ImsService -> vendor ImsFeature implementation.
ImsServiceProxyCompat is there to provide backwards compatibility with
older ImsServices that do not use the new ImsService implementations.
It implements all of the methods that are defined in the new I*Feature
interfaces and translates them to the old ImsService AIDL calls.

Test: Adds Unit Tests (see frameworks/opt/telephony)
Merged-In: Id3466c178384158c788ab1d708ab108bb95866fc
Change-Id: Id3466c178384158c788ab1d708ab108bb95866fc
2017-02-16 11:14:26 -08:00
Narayan Kamath
97ebc29e9c Merge "Track libcore change d7d594236d66c4d595f7622a264fd51." 2017-02-16 17:12:48 +00:00
Neil Fuller
eb82e3de87 Merge "TimeZoneBundleInstaller -> TimeZoneDistroInstaller" 2017-02-16 15:51:27 +00:00
Narayan Kamath
03d82b2ea3 Track libcore change d7d594236d66c4d595f7622a264fd51.
Test: make update-api docs
Change-Id: Icfe470034b53afff60469d5bcfd58d959cea2488
2017-02-16 14:37:39 +00:00
Etan Cohen
6fb97e8fd8 Merge changes from topic 'cm_request_to'
* changes:
  [CM] Remove maximum timeout value for request network
  [CM] Remove non-functional timeout from request network
2017-02-16 14:15:44 +00:00
Etan Cohen
ba07c8c4ec [CM] Remove maximum timeout value for request network
The request network with timeout was originally created with a
check of max timeout against a constant of 100 minutes. However,
the API was not public and did not implement a timeout. Any users
were internal and never got any onUnavailable() callback (since
timeout never triggered).

There is no reason to have a max timeout so the constant is
remove.

Bug: 31399536
Test: unit tests and CTS of ConnectivityManager
Change-Id: Icbedfb4299d75b6a7e3e43720111531f1faafd06
2017-02-16 14:15:16 +00:00
Treehugger Robot
3ac3170a4b Merge "OBEX: Set Min maxPacketLength negotiated in CONNECT Operation." 2017-02-16 12:59:16 +00:00
Treehugger Robot
e0ba81110a Merge "Fix the "Alarm volume" icon is displayed incorrectly" 2017-02-16 12:47:43 +00:00
Hugo Benichi
c217f7a9f3 Merge "Captive portal: better detect empty responses" 2017-02-16 06:54:48 +00:00
Jack Yu
866e9e3947 Added the new RIL request to set SIM power state
The new RIL request for powering up/down the SIM card.

Test: Telephony sanity tests
bug: 32224755
Merged-In: Ia20f824eb9a0bf6d5f63f782a8d42a22a0355938
Change-Id: Ia20f824eb9a0bf6d5f63f782a8d42a22a0355938
2017-02-16 05:11:41 +00:00