285085 Commits

Author SHA1 Message Date
Rebecca Silberstein
2dda9f5d66 Merge "WifiManager: add new methods to start softap" am: be2653d41e
am: 334fe54661

Change-Id: I3e0455020c5b0c1896c1994a821832e0e45ae4e6
2017-04-17 17:30:08 +00:00
Rebecca Silberstein
334fe54661 Merge "WifiManager: add new methods to start softap"
am: be2653d41e

Change-Id: Ic73c0b8f52c86f00a6d03687b37b4c02f41d4fcc
2017-04-17 17:20:42 +00:00
Rebecca Silberstein
be2653d41e Merge "WifiManager: add new methods to start softap" 2017-04-17 17:10:39 +00:00
Tyler Gunn
d046aa9103 Merge "Expose phone account register/unregister intents." am: 24299f5b06
am: b993a44272

Change-Id: Ic3f8044b7df278b33208fae671abef21ae8f55d2
2017-04-15 06:17:18 +00:00
Tyler Gunn
b993a44272 Merge "Expose phone account register/unregister intents."
am: 24299f5b06

Change-Id: Ifbc60e3221bee3813e2c854305144af901067b13
2017-04-15 06:13:21 +00:00
Treehugger Robot
24299f5b06 Merge "Expose phone account register/unregister intents." 2017-04-15 06:07:27 +00:00
Tyler Gunn
27a83fe547 Expose phone account register/unregister intents.
These were previously @SystemApi.  Retaining the existing SystemAPI
behavior which sends the intents to those with a private permission.
Extending to ALSO send these intents to the default dialer app as well
using an explicit intent.

Test: Manual
Bug: 37106957
Merged-In: Ifb72870105be5ba024af196a8c3165a9afb397ab
Change-Id: Ifb72870105be5ba024af196a8c3165a9afb397ab
2017-04-15 04:57:47 +00:00
Nathan Harold
661278432d Merge "Update doc string for getForbiddenPlmns() to READ_PHONE_STATE" am: 02278a5a02
am: d50a325553

Change-Id: I6d55820dc1710035fcab839f6cae809fa44f16da
2017-04-15 01:59:13 +00:00
Nathan Harold
d50a325553 Merge "Update doc string for getForbiddenPlmns() to READ_PHONE_STATE"
am: 02278a5a02

Change-Id: I473f438a0336b8c5183f385f062493abb53966fe
2017-04-15 01:52:24 +00:00
Treehugger Robot
02278a5a02 Merge "Update doc string for getForbiddenPlmns() to READ_PHONE_STATE" 2017-04-15 01:43:00 +00:00
Nathan Harold
04908fcd17 Update doc string for getForbiddenPlmns() to READ_PHONE_STATE
For whatever reason when I chose the permission for this API I
chose the internal READ_PRIVILEGED_PHONE_STATE. Updating this to
use the equivalent public permission (since this is a public API)
requires me to use READ_PHONE_STATE

Bug: 35261110
Test: docstring only change. Compilation
Change-Id: I3647271798b33040751905c13b20da727eacfd9b
2017-04-14 13:13:11 -07:00
Andrew Zeng
45bd03914c Merge "DO NOT MERGE Notify keyguard of when power button is pressed." into cw-f-dev am: 2c42db20e4 -s ours
am: 812594f573

Change-Id: Ifb03ad1b13aa59e18ff658f6a0a5779d42d1d226
2017-04-14 20:02:57 +00:00
Andrew Zeng
812594f573 Merge "DO NOT MERGE Notify keyguard of when power button is pressed." into cw-f-dev
am: 2c42db20e4  -s ours

Change-Id: I1c4ddbf044df414cffa282d9e9aba4261b23a975
2017-04-14 19:52:58 +00:00
Andrew Zeng
2c42db20e4 Merge "DO NOT MERGE Notify keyguard of when power button is pressed." into cw-f-dev 2017-04-14 19:40:57 +00:00
Hall Liu
00cf4637d2 Merge "Helper method in VideoCallImpl for testing" am: 14d27fccad
am: 8fa1c9c899

Change-Id: I148108bcf8636d553852201b0a70e9cfc97d7d44
2017-04-14 18:43:19 +00:00
Hall Liu
8fa1c9c899 Merge "Helper method in VideoCallImpl for testing"
am: 14d27fccad

Change-Id: I5e298b40a83041d759e9e5c59d51be0ec5450d11
2017-04-14 18:39:18 +00:00
Hall Liu
14d27fccad Merge "Helper method in VideoCallImpl for testing" 2017-04-14 18:30:26 +00:00
Tsukasa Hashimoto
5dbe26f0f1 Merge "Add PID info into ANR crash log header" am: 2fe972c822
am: 5d57502c89

Change-Id: I5fc92088c55fed713716ea516a3b22e7cf00fcb0
2017-04-14 18:13:50 +00:00
Tsukasa Hashimoto
5d57502c89 Merge "Add PID info into ANR crash log header"
am: 2fe972c822

Change-Id: Ib7ec151a3a4b1759022a9a663836a73087ea85ec
2017-04-14 18:09:56 +00:00
Treehugger Robot
2fe972c822 Merge "Add PID info into ANR crash log header" 2017-04-14 18:03:12 +00:00
Hugo Benichi
e505b37ec5 Merge "ConnectivityManager: release all requests mapping to a callback." am: 1a8f04b1b2
am: 4d80366762

Change-Id: I8c5d3fba8aaa19e8ffd1146ddb68c4279140f921
2017-04-14 15:29:09 +00:00
Hugo Benichi
4d80366762 Merge "ConnectivityManager: release all requests mapping to a callback."
am: 1a8f04b1b2

Change-Id: I30d3790822430d250d6005cc165e7fa10f56649e
2017-04-14 15:22:39 +00:00
Treehugger Robot
1a8f04b1b2 Merge "ConnectivityManager: release all requests mapping to a callback." 2017-04-14 15:10:10 +00:00
Hugo Benichi
dafed3d008 ConnectivityManager: release all requests mapping to a callback.
This patch changes how callback unregistration works in order to be
consistent with undocumented use cases currently de-facto supported
by the API (although in a buggy way):
  - callback recycling: releasing then reregistering a callback again.
  - multiple request registrations with the same callback.

The second use case is not desirable but needs to be taken into account
for now for the purpose of correctly releasing NetworkRequests
registered in ConnectivityService.

In order to support request release in both use cases with minimal
amount of complexity for the time being the following changes are done:
  - request to callback unmapping is done synchronously at callback
    release time.
  - all requests associated to a callback are unmapped at callback
    release time.

This fixes the following issues:
  - a callback stops being triggered as soon as it is released.
    Otherwise when recycling the callback immediately, it is possible
    the previous request associated with it triggers it, confusing the
    app.
  - when a callback is registered multiple times, the requests are not
    leaked.
  - when a callback is registered multiple times and then released, the
    N-1 first registrations do not trigger the callback anymore.

In the future it would be desirable to enforce the intended 1:1 mapping
between callbacks and requests at registration time.

Bug: 35921499, 35955593, 20701525
Test: - added new tests in ConnectivityManagerTest to test releasing,
      recycling, and a disabled test for no multiple regristration.
      - new tests catch regression causing b/35921499, b/35955593.
Change-Id: Ia0917ac322fc049f76adb4743bc745989fed6d26
2017-04-14 22:17:21 +09:00
Hugo Benichi
4479901ff3 Merge "Captive portal: rotate fallback urls" am: 76b3537dfd
am: 605eafe0a5

Change-Id: I456d8a2af20dc2fa1553e0e27ec0280380ae6f38
2017-04-14 07:00:41 +00:00
Hugo Benichi
605eafe0a5 Merge "Captive portal: rotate fallback urls"
am: 76b3537dfd

Change-Id: I5583659f2f79cf5d42e7825dfbda875ce359ddb0
2017-04-14 06:54:10 +00:00
Treehugger Robot
76b3537dfd Merge "Captive portal: rotate fallback urls" 2017-04-14 06:41:08 +00:00
Rebecca Silberstein
2f7a169618 Merge "Add a default SSID prefix for local only hotspot" am: e98a2942a4
am: 6fc5051613

Change-Id: If99dc4527f2d85d803d7ef8eabfbb8601be11071
2017-04-14 04:19:02 +00:00
Rebecca Silberstein
6fc5051613 Merge "Add a default SSID prefix for local only hotspot"
am: e98a2942a4

Change-Id: I3981dbbaa2eee7e54e8c8fd2d9825a3c0866bdb2
2017-04-14 04:12:34 +00:00
Rebecca Silberstein
e98a2942a4 Merge "Add a default SSID prefix for local only hotspot" 2017-04-14 04:03:50 +00:00
Andrew Zeng
aa448d0290 DO NOT MERGE Notify keyguard of when power button is pressed.
This is done on wear power button doesn't turn off the screen,
when the device wakes from keyguard UI isn't visible yet, so
it needs to react to power press in some way.

Bug: 35147955
Change-Id: I22619ea446770d09b53370e9244215646b60a9db
2017-04-13 18:26:21 -07:00
Hugo Benichi
eef918a66c Captive portal: rotate fallback urls
This patch introduces a new settings value to specify more than one url
for the fallback http probe in addition to the existing settings value.
If more than one url exists, a network will rotate urls for the fallback
probe one by one everytime the fallback probe is sent.

(not like commit 0908daaaf00e6b56ebed0a0fce9c3e3fe183a06b, this patch
uses a comma to separate fallback urls, which works as expected with
Java's String.split())

Test: built, flashed, tested manually with various portal networks.
Bug: 36532213
Change-Id: I3c010bfee5b99db03a500776fbf47959a29d0578
2017-04-14 08:19:39 +09:00
Dave Friedman
27aeab9763 Docs: Fixes broken link in Javadoc. am: df0fd34d50 am: 506a8b39fb am: 4eff74f8cb am: 2d642f9e2d
am: f125662db1

Change-Id: I5220c1ef4ac51e876c3461b64e2a3dd54c9e2b48
2017-04-13 17:28:34 +00:00
Dave Friedman
f125662db1 Docs: Fixes broken link in Javadoc. am: df0fd34d50 am: 506a8b39fb am: 4eff74f8cb
am: 2d642f9e2d

Change-Id: I5257f51a37e6e45a928befea94b2ecdb0cf01f45
2017-04-13 17:19:36 +00:00
Dave Friedman
2d642f9e2d Docs: Fixes broken link in Javadoc. am: df0fd34d50 am: 506a8b39fb
am: 4eff74f8cb

Change-Id: Id237b5c6ead732111feb29e1dc0dcd8a444366ee
2017-04-13 17:06:11 +00:00
Dave Friedman
4eff74f8cb Docs: Fixes broken link in Javadoc. am: df0fd34d50
am: 506a8b39fb

Change-Id: If60b7db71fe92508daaec1255c637927432d7b55
2017-04-13 17:00:44 +00:00
Dave Friedman
506a8b39fb Docs: Fixes broken link in Javadoc.
am: df0fd34d50

Change-Id: I76ed5361426065d5e532c5a11c2d11f28ba8c2d7
2017-04-13 16:48:41 +00:00
Hugo Benichi
4d47a6a26b Merge "Revert "Captive portal: rotate fallback urls"" am: 9ea45b6106
am: 4d47eba86a

Change-Id: Ic2e927bec210f65a0de6face224ce0b8d227b0bc
2017-04-13 13:46:32 +00:00
Orion Hodson
2d5f14e578 Merge "Unhide MethodHandles.explicitCastArguments()" am: 891cab55d3
am: 0f7294af11

Change-Id: Ib22190f899dfe6c1440fd70725958f1a767674ae
2017-04-13 13:40:32 +00:00
Hugo Benichi
4d47eba86a Merge "Revert "Captive portal: rotate fallback urls""
am: 9ea45b6106

Change-Id: Iea6582b4c7f347c24ebccf815256dd7125ab29de
2017-04-13 13:40:04 +00:00
Orion Hodson
0f7294af11 Merge "Unhide MethodHandles.explicitCastArguments()"
am: 891cab55d3

Change-Id: I6406a01c50df40a59e3af5432c1f31309cdb43e5
2017-04-13 13:34:27 +00:00
Hugo Benichi
9ea45b6106 Merge "Revert "Captive portal: rotate fallback urls"" 2017-04-13 13:25:42 +00:00
Treehugger Robot
891cab55d3 Merge "Unhide MethodHandles.explicitCastArguments()" 2017-04-13 13:25:12 +00:00
Hugo Benichi
2e43e45e1e Revert "Captive portal: rotate fallback urls"
After discussion in the cl we agreed to use "|" as a separator. However  String.split() input arg is a regex and not a literal string, so that "|" will actually split the urls characters per characters.

Will revert and resubmit with a comma.

This reverts commit 0908daaaf00e6b56ebed0a0fce9c3e3fe183a06b.

Change-Id: Ifab25e41bec806fbc1d2c13ffd81d4ad91598c89
2017-04-13 12:43:49 +00:00
Hugo Benichi
b98eee1f78 Merge changes Ia15f77e2,Icaa1f95c am: c923752929
am: 8e5ebd9261

Change-Id: Idf1f5091144d93f88684df50fd38593400b0e23e
2017-04-13 09:40:19 +00:00
Hugo Benichi
8e5ebd9261 Merge changes Ia15f77e2,Icaa1f95c
am: c923752929

Change-Id: I98b29c91c68a63d6ddeffd03a690b7e841c2b5bc
2017-04-13 09:34:22 +00:00
Treehugger Robot
c923752929 Merge changes Ia15f77e2,Icaa1f95c
* changes:
  Captive portal: regroup hardcoded http response codes.
  Captive portal: rotate fallback urls
2017-04-13 09:24:33 +00:00
Erik Kline
270ab2fa7e Merge "Extract SimChangeListener to its own file" am: 0ef8df6d52
am: 85f5725fb5

Change-Id: I51f350937450542d8217da5e3d4a415de6cb7f30
2017-04-13 08:38:44 +00:00
Erik Kline
85f5725fb5 Merge "Extract SimChangeListener to its own file"
am: 0ef8df6d52

Change-Id: Ib83aa0acc1cf19c04ed94a198bb8333c7e3a60b8
2017-04-13 08:33:12 +00:00
Treehugger Robot
0ef8df6d52 Merge "Extract SimChangeListener to its own file" 2017-04-13 08:19:07 +00:00