Commit Graph

277547 Commits

Author SHA1 Message Date
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
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
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
Hugo Benichi
e3aae40d07 Captive portal: better detect empty responses
The captive portal detection logic treats empty http responses with a
Content-Length of 0 as not coming from a portal.

However when the Content-Length is missing from the response header, the
empty response is not detected as such and is classified as a captive
portal answer.

When this happens for the http probe, the portal detection logic will
short circuit the detection and wrongly report a portal. The system
validates the network in such conditions only if the https probe
returns a successful connection faster than the http probe.

This patch attempts to better detect empty responses by trying to read
the first byte from the response body when the Content-Length is missing
for 200 responses.

Test: build, flashed + manual tests.
Bug: 33498325

(cherry picked from commit cb4aa4d412)

Change-Id: Ibb9914cba72a4dab3ae76746d8889bbf083be812
2017-02-16 12:31:30 +09:00
Hall Liu
decc6c9d56 Merge "Add extra key for app-specified outgoing call timeout" 2017-02-15 21:41:23 +00:00
Badhri Jagan Sridharan
37b939a180 Merge changes from topic 'dual_role_chargers'
* changes:
  Introduce debounce to filter rapidly toggling type-c ports
  Fix handling usb dialog for wall chargers.
2017-02-15 20:00:25 +00:00
Badhri Jagan Sridharan
c584d77b93 Introduce debounce to filter rapidly toggling type-c ports
Type-c ports can quickly toggle between connected/disconnected
states. Introduce debounce to prevent sending spurious notifications.

Bug: 34972898
Test: notification should not be queued for a pixel-c charger not connected
to the power outlet.
Change-Id: I4aa19f9f864fe5b77e65f6a07a3184d8aba1f5fc
2017-02-15 10:21:19 -08:00
Badhri Jagan Sridharan
1b8e847a87 Fix handling usb dialog for wall chargers.
UsbPort.POWER_ROLE_SINK is orthogonal to the type of the charger
attached. POWER_ROLE_SINK would be the case for AC charging and
USB charging. Therefore query BatteryManager for the charger
type.

Bug: 34972898
Test: Charging notification should not show for pixel-c chargers.
Change-Id: I8dddcd7727b6af973bd173d2c6e325aa4be2ca3a
2017-02-15 10:21:02 -08:00
Hugo Benichi
d22edc28f5 IP connectivity metrics: delete obsolete logger service
Test: - runtest frameworks-net
      - manually verified $ adb shell dumpsys connmetrics
Bug: 32648597

Change-Id: I69f7dee5871508398d7f7209658a00c768e2d18e
2017-02-15 17:12:58 +09:00
Hall Liu
8f613fb4d6 Add extra key for app-specified outgoing call timeout
Bug: 34474757
Test: manual
Change-Id: Ia93d68d6a01308b0b93b88977daf983a0ed3a22c
2017-02-14 18:11:11 -08:00
Hugo Benichi
b688dd18ab Merge "ConnectivityManager: fix potential NPE" 2017-02-15 00:53:44 +00:00
Erik Kline
7a42d3ad83 Merge "Split chooseUpstreamType() into two separate functions" 2017-02-15 00:38:50 +00:00
Erik Kline
63445824d6 Merge "Slightly simplify mTryCell and requestUpstreamMobileConnection() usage" 2017-02-15 00:38:32 +00:00
Treehugger Robot
4516240b47 Merge "Pass targetSdkVersion specifier for SELinux labeling" 2017-02-14 23:42:59 +00:00
Etan Cohen
e9aea9d397 [CM] Remove non-functional timeout from request network
Until now the request network with timeout was non-functional
(see b/31402633). Any caller which was using the timeout getting
the request network without a timeout.

While the timeout version has now been implemented, a max
timeout value is being removed since the large number used
(100 minutes) had no rationale for existing.

Updating the code to reflect the functionality which was
actually used - without a timeout.

Bug: 31399536
Bug: 35354391
Test: unit tests and CTS of ConnectivityManager
Change-Id: I0ebf0917a4478036a5ae532dd1e0784479057eb8
2017-02-14 21:11:20 +00:00
Colin Cross
6b32770d6d Merge "Use asm-5.2 prebuilt" 2017-02-14 19:03:46 +00:00
Michael Peck
7c4787b4df Pass targetSdkVersion specifier for SELinux labeling
Motivation:
Provide the ability to phase in new security policies by
applying them to apps with a minimum targetSdkVersion

Test: Marlin builds and boots. Apps targeting targetSdkVersion<=25
run in untrusted_app_25 domain. Apps targeting the current development
build >=26 run in the untrusted_app domain with fewer permissions. No
new denials observed during testing.
Bug: 34115651
Change-Id: Ib9f6ded9bd2f426861a6d843861b4074084253b0
2017-02-14 09:07:04 -08:00
Orion Hodson
3023906b1b Merge "Import CallSite classes and BootstrapMethodError class from ojdk8u60" 2017-02-14 16:02:33 +00:00
Treehugger Robot
d530d1bf18 Merge "[NotificationManagerService]: Fixes the thread-safe issue." 2017-02-14 14:23:19 +00:00
Hiroaki Kuriyama
36bebe8420 PrintSpooler: Remove recommendation if Play Store is not installed
Sympton:
If Play Store (com.android.vending) is not installed, printer
recommendation function which guides a user to Play Store is useless.

Root-cause:
Even if Play Store is not installed,
PrintSpooler tries to start an activity for market:// with package
names in Play Store.

Solution:
Hide printer recommendation UI and show "No print services enabled"
if there is no printer service.

Change-Id: I0b2eabbd57bc47c6382f53e610e33252ea359390
2017-02-14 21:21:16 +09:00
Erik Kline
14f7faf78e Split chooseUpstreamType() into two separate functions
Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 32163131
Change-Id: If892864ff59a6f38340791597c2d9e5b4022bbfa
2017-02-14 19:03:16 +09:00
Erik Kline
fb41343c8c Slightly simplify mTryCell and requestUpstreamMobileConnection() usage
Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 32163131

Change-Id: I46fbd176a71e61552d7d92660c1debe6487a1edf
2017-02-14 18:50:21 +09:00
Treehugger Robot
3d57eb0bdc Merge "Verify duplicate upstream notifications are ignored" 2017-02-14 09:32:56 +00:00