278029 Commits

Author SHA1 Message Date
Jack Yu
bf21df3306 Merge "Added the new RIL request to set SIM power state"
am: 2f21f71da4

Change-Id: I75402ea985f81fd4f420cf7bfb4b07680a11ef2f
2017-02-17 01:22:22 +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
c54962a4bd Merge "IP connectivity metrics: delete obsolete logger service"
am: 37e3f22c2e

Change-Id: Ib335bc5e19c2c703d23267bf2835fc89fcf5a957
2017-02-17 00:00:14 +00:00
Hugo Benichi
37e3f22c2e Merge "IP connectivity metrics: delete obsolete logger service" 2017-02-16 23:52:13 +00:00
Leonard Mosescu
db0803b4e8 Merge "Adding "attach-agent" to ActivityManagerShellCommand"
am: 05dfd10254

Change-Id: I3623f617319f03bad87f65b61959ec2ce822ac7e
2017-02-16 23:24:32 +00:00
Leonard Mosescu
05dfd10254 Merge "Adding "attach-agent" to ActivityManagerShellCommand" 2017-02-16 23:12:26 +00:00
Eino-Ville Talvala
a22c40839e Merge "camera case fail for testSceneModes"
am: b59cd66e93

Change-Id: I509c87e5b69e4bd26dc97e86063f7a24860e8b3b
2017-02-16 21:44:56 +00: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
Narayan Kamath
b872486722 Merge "Track libcore change d7d594236d66c4d595f7622a264fd51."
am: 97ebc29e9c

Change-Id: Ied575c14661753a56241f0cea62391b057ab4316
2017-02-16 17:20:26 +00:00
Narayan Kamath
97ebc29e9c Merge "Track libcore change d7d594236d66c4d595f7622a264fd51." 2017-02-16 17:12:48 +00:00
Neil Fuller
c1867dedfa Merge "TimeZoneBundleInstaller -> TimeZoneDistroInstaller"
am: eb82e3de87

Change-Id: I7666ae9c9472f11cafe0df5a2f259df1c499d44b
2017-02-16 16:02:33 +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
ede9f94e32 Merge changes from topic 'cm_request_to'
am: 6fb97e8fd8

Change-Id: I9ca18c0570be831ab37cdf200c28b0778117198d
2017-02-16 14:23:18 +00:00
Etan Cohen
a6be89aa40 [CM] Remove non-functional timeout from request network
am: e9aea9d397

Change-Id: Ica347b2c2181fe04a7efb2769d7498a31c888e5a
2017-02-16 14:21:44 +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
Hemant Gupta
1112046506 Merge "OBEX: Set Min maxPacketLength negotiated in CONNECT Operation."
am: 3ac3170a4b

Change-Id: I477f407d94a43a14083fa68a7b271f5d4fe8445d
2017-02-16 13:10:19 +00:00
Treehugger Robot
3ac3170a4b Merge "OBEX: Set Min maxPacketLength negotiated in CONNECT Operation." 2017-02-16 12:59:16 +00:00
Shigeki Yokomichi
657abc315d Merge "Fix the "Alarm volume" icon is displayed incorrectly"
am: e0ba81110a

Change-Id: Id7996cd16fea9eccbdcd389206e77d7390cd25a2
2017-02-16 12:58:17 +00:00
Treehugger Robot
e0ba81110a Merge "Fix the "Alarm volume" icon is displayed incorrectly" 2017-02-16 12:47:43 +00:00
Hugo Benichi
af8e749820 Merge "Captive portal: better detect empty responses"
am: c217f7a9f3

Change-Id: If6229a3a5c0ccc3575d44d11ed9f486cab35eac3
2017-02-16 07:04:25 +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 cb4aa4d412c7940386df9b8dd681e0d2efebfd1d)

Change-Id: Ibb9914cba72a4dab3ae76746d8889bbf083be812
2017-02-16 12:31:30 +09:00
Hall Liu
2bc24e252e Merge "Add extra key for app-specified outgoing call timeout"
am: decc6c9d56

Change-Id: I58a70b265f4b5af735e93c9004616bd44d5c51de
2017-02-15 22:24:23 +00: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
0a3efc2622 Merge changes from topic 'dual_role_chargers'
am: 37b939a180

Change-Id: I2b9eda605ae85347eb2e3e4202a6c7ec176778af
2017-02-15 20:13:53 +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
ab453cd565 Merge "ConnectivityManager: fix potential NPE"
am: b688dd18ab

Change-Id: If562fc6a921569ad9d3141cac72b6f395a30da9e
2017-02-15 01:05:24 +00:00
Hugo Benichi
b688dd18ab Merge "ConnectivityManager: fix potential NPE" 2017-02-15 00:53:44 +00:00
Erik Kline
f6d55d7e9e Merge "Split chooseUpstreamType() into two separate functions"
am: 7a42d3ad83

Change-Id: I77649e11e74140ec985dcdadab226e3e73e67642
2017-02-15 00:49:20 +00:00
Erik Kline
4650762557 Merge "Slightly simplify mTryCell and requestUpstreamMobileConnection() usage"
am: 63445824d6

Change-Id: Ie921ee1a2f1dbdd338c9f0700b24808e1cb6435e
2017-02-15 00:48:24 +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
Michael Peck
f8cefed995 Merge "Pass targetSdkVersion specifier for SELinux labeling"
am: 4516240b47

Change-Id: Ic61c4dc30f075d01a85d8b60cfe4ae1de773aa09
2017-02-14 23:50:17 +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
6c1ac4dd80 Merge "Use asm-5.2 prebuilt"
am: 6b32770d6d

Change-Id: I7dc856be1a10ea7a65c7b3f889b37d9afaadbd5c
2017-02-14 19:10:18 +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
49e0cad3e1 Merge "Import CallSite classes and BootstrapMethodError class from ojdk8u60"
am: 3023906b1b

Change-Id: If332034df3b7afac1f7fdb92ca40adfb420ba768
2017-02-14 16:07:28 +00:00
Orion Hodson
3023906b1b Merge "Import CallSite classes and BootstrapMethodError class from ojdk8u60" 2017-02-14 16:02:33 +00:00
songjinshi
f69a73793d Merge "[NotificationManagerService]: Fixes the thread-safe issue."
am: d530d1bf18

Change-Id: I661207bb52d84b1928d7ff3ad262cfe89e71e60b
2017-02-14 14:29:36 +00:00
Treehugger Robot
d530d1bf18 Merge "[NotificationManagerService]: Fixes the thread-safe issue." 2017-02-14 14:23:19 +00:00