OSDN Git Service
Hugo Benichi [Fri, 17 Feb 2017 00:18:35 +0000 (00:18 +0000)]
Merge "IP connectivity metrics: delete obsolete logger service" am:
37e3f22c2e am:
c54962a4bd
am:
9c2b6afa2f
Change-Id: I5f8cd508812d9532778c2f1f019308a4b8d8ee33
Hugo Benichi [Fri, 17 Feb 2017 00:09:11 +0000 (00:09 +0000)]
Merge "IP connectivity metrics: delete obsolete logger service" am:
37e3f22c2e
am:
c54962a4bd
Change-Id: Iccc3ee97bd2ac267b312c6c7d9269ac02a2bd68e
Hugo Benichi [Fri, 17 Feb 2017 00:00:14 +0000 (00:00 +0000)]
Merge "IP connectivity metrics: delete obsolete logger service"
am:
37e3f22c2e
Change-Id: Ib335bc5e19c2c703d23267bf2835fc89fcf5a957
Hugo Benichi [Thu, 16 Feb 2017 23:52:12 +0000 (23:52 +0000)]
Merge "IP connectivity metrics: delete obsolete logger service"
Leonard Mosescu [Thu, 16 Feb 2017 23:37:48 +0000 (23:37 +0000)]
Merge "Adding "attach-agent" to ActivityManagerShellCommand" am:
05dfd10254 am:
db0803b4e8
am:
7bf598cbd9
Change-Id: If7b73860cc8249b997d5e9a7a4d149732b08449b
Leonard Mosescu [Thu, 16 Feb 2017 23:29:16 +0000 (23:29 +0000)]
Merge "Adding "attach-agent" to ActivityManagerShellCommand" am:
05dfd10254
am:
db0803b4e8
Change-Id: I4493e6b3bd2cf8447e8c3043878ad0f531c0e677
Leonard Mosescu [Thu, 16 Feb 2017 23:24:32 +0000 (23:24 +0000)]
Merge "Adding "attach-agent" to ActivityManagerShellCommand"
am:
05dfd10254
Change-Id: I3623f617319f03bad87f65b61959ec2ce822ac7e
Leonard Mosescu [Thu, 16 Feb 2017 23:12:26 +0000 (23:12 +0000)]
Merge "Adding "attach-agent" to ActivityManagerShellCommand"
Meng Wang [Thu, 16 Feb 2017 22:22:39 +0000 (22:22 +0000)]
Merge "Add carrierconfig KEY_CARRIER_VOLTE_OVERRIDE_WFC_PROVISIONING_BOOL" into nyc-mr2-dev
am:
cd923a6910
Change-Id: I7c0432d62803b299de1777dd27c83fdca440d306
Meng Wang [Thu, 16 Feb 2017 22:14:35 +0000 (22:14 +0000)]
Merge "Add carrierconfig KEY_CARRIER_VOLTE_OVERRIDE_WFC_PROVISIONING_BOOL" into nyc-mr2-dev
Eino-Ville Talvala [Thu, 16 Feb 2017 21:53:23 +0000 (21:53 +0000)]
Merge "camera case fail for testSceneModes" am:
b59cd66e93 am:
a22c40839e
am:
a494d7287f
Change-Id: I8e7c31b71e1ccfb77d5cb46949e438c2f1e1ef4c
Eino-Ville Talvala [Thu, 16 Feb 2017 21:48:53 +0000 (21:48 +0000)]
Merge "camera case fail for testSceneModes" am:
b59cd66e93
am:
a22c40839e
Change-Id: I52fca667fcd8b8ff501bb145ee49934ba47f92a3
Eino-Ville Talvala [Thu, 16 Feb 2017 21:44:56 +0000 (21:44 +0000)]
Merge "camera case fail for testSceneModes"
am:
b59cd66e93
Change-Id: I509c87e5b69e4bd26dc97e86063f7a24860e8b3b
Eino-Ville Talvala [Thu, 16 Feb 2017 21:35:35 +0000 (21:35 +0000)]
Merge "camera case fail for testSceneModes"
Leonard Mosescu [Fri, 7 Oct 2016 00:32:05 +0000 (17:32 -0700)]
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
Xiaohui Chen [Thu, 16 Feb 2017 19:29:18 +0000 (19:29 +0000)]
Merge "ReolverActivity: try auto launching single choice" into nyc-mr2-dev
am:
daacf547ac
Change-Id: I06ca33714f6227f8cf86ecce29e1b87df80add6b
TreeHugger Robot [Thu, 16 Feb 2017 19:22:00 +0000 (19:22 +0000)]
Merge "ReolverActivity: try auto launching single choice" into nyc-mr2-dev
Narayan Kamath [Thu, 16 Feb 2017 17:31:41 +0000 (17:31 +0000)]
Merge "Track libcore change
d7d594236d66c4d595f7622a264fd51." am:
97ebc29e9c am:
b872486722
am:
26e655f397
Change-Id: I85b862ddf9f0e1b5dc48197075616bebdabf8c1a
Narayan Kamath [Thu, 16 Feb 2017 17:24:40 +0000 (17:24 +0000)]
Merge "Track libcore change
d7d594236d66c4d595f7622a264fd51." am:
97ebc29e9c
am:
b872486722
Change-Id: Ia7111f2be312494fbdb816efae9a7b465ce6b1a4
Narayan Kamath [Thu, 16 Feb 2017 17:20:26 +0000 (17:20 +0000)]
Merge "Track libcore change
d7d594236d66c4d595f7622a264fd51."
am:
97ebc29e9c
Change-Id: Ied575c14661753a56241f0cea62391b057ab4316
Narayan Kamath [Thu, 16 Feb 2017 17:12:48 +0000 (17:12 +0000)]
Neil Fuller [Thu, 16 Feb 2017 16:14:00 +0000 (16:14 +0000)]
Merge "TimeZoneBundleInstaller -> TimeZoneDistroInstaller" am:
eb82e3de87 am:
c1867dedfa
am:
4f5f211f72
Change-Id: If08545341c1bdcd79b7b16ed1da0f16b924cdea0
Neil Fuller [Thu, 16 Feb 2017 16:09:10 +0000 (16:09 +0000)]
Merge "TimeZoneBundleInstaller -> TimeZoneDistroInstaller" am:
eb82e3de87
am:
c1867dedfa
Change-Id: If2f639d07a44861b96b4497cc3dc02364dc85c51
Neil Fuller [Thu, 16 Feb 2017 16:02:33 +0000 (16:02 +0000)]
Merge "TimeZoneBundleInstaller -> TimeZoneDistroInstaller"
am:
eb82e3de87
Change-Id: I7666ae9c9472f11cafe0df5a2f259df1c499d44b
Neil Fuller [Thu, 16 Feb 2017 15:51:26 +0000 (15:51 +0000)]
Merge "TimeZoneBundleInstaller -> TimeZoneDistroInstaller"
Bill Yi [Thu, 16 Feb 2017 15:46:11 +0000 (15:46 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
d663b483d1 -s ours
Change-Id: I2ca0a1321763042be06e780dd89902810769ee3e
Bill Yi [Thu, 16 Feb 2017 15:38:04 +0000 (15:38 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
c527941449 -s ours
Change-Id: Icf5989d2e0cd7dc95fab6507067520a961b08be7
TreeHugger Robot [Thu, 16 Feb 2017 15:37:11 +0000 (15:37 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Bill Yi [Thu, 16 Feb 2017 15:36:59 +0000 (15:36 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
aeab162647 -s ours
Change-Id: Idb3a2c8387b8faac48c0d63d1f6c2fa84b1fb73e
Bill Yi [Thu, 16 Feb 2017 15:33:36 +0000 (15:33 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
495542837c -s ours
Change-Id: I35a3f583390c5a03682680921cc593e48fb77f88
Bill Yi [Thu, 16 Feb 2017 15:32:32 +0000 (15:32 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
ea62e92c27 -s ours
Change-Id: I0cde2e97d2d4ed8659b06ecae96c57a32f501e09
Bill Yi [Thu, 16 Feb 2017 15:31:22 +0000 (15:31 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
0860f41afc -s ours
Change-Id: I6df27fbf95cc22ef8988730a1d7f244949fa838c
TreeHugger Robot [Thu, 16 Feb 2017 15:29:35 +0000 (15:29 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Thu, 16 Feb 2017 15:29:05 +0000 (15:29 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Thu, 16 Feb 2017 15:25:29 +0000 (15:25 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Thu, 16 Feb 2017 15:24:59 +0000 (15:24 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Thu, 16 Feb 2017 15:24:27 +0000 (15:24 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Etan Cohen [Thu, 16 Feb 2017 14:38:28 +0000 (14:38 +0000)]
Merge changes from topic 'cm_request_to' am:
6fb97e8fd8 am:
ede9f94e32
am:
c3f0f5f3de
Change-Id: Ief32189b0f6f2c70d7e4097f70dbdf8195bd8713
Narayan Kamath [Thu, 16 Feb 2017 14:37:39 +0000 (14:37 +0000)]
Track libcore change
d7d594236d66c4d595f7622a264fd51.
Test: make update-api docs
Change-Id: Icfe470034b53afff60469d5bcfd58d959cea2488
Etan Cohen [Thu, 16 Feb 2017 14:37:26 +0000 (14:37 +0000)]
[CM] Remove non-functional timeout from request network am:
e9aea9d397 am:
a6be89aa40
am:
aae1411a93
Change-Id: I31fbce5bab0d03b9b468f4fc5e819a59027aca7b
Etan Cohen [Thu, 16 Feb 2017 14:29:29 +0000 (14:29 +0000)]
Merge changes from topic 'cm_request_to' am:
6fb97e8fd8
am:
ede9f94e32
Change-Id: I2720e64e4af88df9d3a7b6209e9fcef4a0340986
Etan Cohen [Thu, 16 Feb 2017 14:28:29 +0000 (14:28 +0000)]
[CM] Remove non-functional timeout from request network am:
e9aea9d397
am:
a6be89aa40
Change-Id: Ie00ac8dee9302fafc0cdad95ec08d376ad908ab9
Etan Cohen [Thu, 16 Feb 2017 14:23:18 +0000 (14:23 +0000)]
Merge changes from topic 'cm_request_to'
am:
6fb97e8fd8
Change-Id: I9ca18c0570be831ab37cdf200c28b0778117198d
Etan Cohen [Thu, 16 Feb 2017 14:21:44 +0000 (14:21 +0000)]
[CM] Remove non-functional timeout from request network
am:
e9aea9d397
Change-Id: Ica347b2c2181fe04a7efb2769d7498a31c888e5a
Etan Cohen [Thu, 16 Feb 2017 14:15:43 +0000 (14:15 +0000)]
Merge changes from topic 'cm_request_to'
* changes:
[CM] Remove maximum timeout value for request network
[CM] Remove non-functional timeout from request network
Etan Cohen [Sun, 5 Feb 2017 18:42:27 +0000 (10:42 -0800)]
[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
Hemant Gupta [Thu, 16 Feb 2017 13:18:22 +0000 (13:18 +0000)]
Merge "OBEX: Set Min maxPacketLength negotiated in CONNECT Operation." am:
3ac3170a4b am:
1112046506
am:
ff3f4e72af
Change-Id: Ic5965ea14b7b1b68b261b554063f5aae473a117d
Hemant Gupta [Thu, 16 Feb 2017 13:14:22 +0000 (13:14 +0000)]
Merge "OBEX: Set Min maxPacketLength negotiated in CONNECT Operation." am:
3ac3170a4b
am:
1112046506
Change-Id: Ib406bdcd0f388c7fe1f226da2ae17a2c588739c9
Shigeki Yokomichi [Thu, 16 Feb 2017 13:14:19 +0000 (13:14 +0000)]
Merge "Fix the "Alarm volume" icon is displayed incorrectly" am:
e0ba81110a am:
657abc315d
am:
4b06345751
Change-Id: I2b4719d6f50533f62af22d55fb870802ead7c554
Hemant Gupta [Thu, 16 Feb 2017 13:10:19 +0000 (13:10 +0000)]
Merge "OBEX: Set Min maxPacketLength negotiated in CONNECT Operation."
am:
3ac3170a4b
Change-Id: I477f407d94a43a14083fa68a7b271f5d4fe8445d
Shigeki Yokomichi [Thu, 16 Feb 2017 13:06:27 +0000 (13:06 +0000)]
Merge "Fix the "Alarm volume" icon is displayed incorrectly" am:
e0ba81110a
am:
657abc315d
Change-Id: I295d50e9513775dddb2aea3686275264d7e0f12c
Treehugger Robot [Thu, 16 Feb 2017 12:59:15 +0000 (12:59 +0000)]
Merge "OBEX: Set Min maxPacketLength negotiated in CONNECT Operation."
Shigeki Yokomichi [Thu, 16 Feb 2017 12:58:17 +0000 (12:58 +0000)]
Merge "Fix the "Alarm volume" icon is displayed incorrectly"
am:
e0ba81110a
Change-Id: Id7996cd16fea9eccbdcd389206e77d7390cd25a2
Bill Yi [Thu, 16 Feb 2017 12:54:38 +0000 (04:54 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3ee5f071cb664f57f316b70a4036973aba9312bd
Auto-generated-cl: translation import
Treehugger Robot [Thu, 16 Feb 2017 12:47:41 +0000 (12:47 +0000)]
Merge "Fix the "Alarm volume" icon is displayed incorrectly"
Bill Yi [Thu, 16 Feb 2017 11:29:57 +0000 (03:29 -0800)]
Import translations. DO NOT MERGE
Change-Id: If44132000703aba49ea891bd59b3006c7cc8dc31
Auto-generated-cl: translation import
Bill Yi [Thu, 16 Feb 2017 10:52:18 +0000 (02:52 -0800)]
Import translations. DO NOT MERGE
Change-Id: I10af9bcccabc29f816d9602bc0a371aef8fb3e77
Auto-generated-cl: translation import
Bill Yi [Thu, 16 Feb 2017 10:48:51 +0000 (02:48 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3ee247ad24da92edcf93e0edadcddcce8bda17b5
Auto-generated-cl: translation import
Bill Yi [Thu, 16 Feb 2017 10:31:50 +0000 (02:31 -0800)]
Import translations. DO NOT MERGE
Change-Id: I95db0b4941fbfbd4ad6bf625de876ffdc07210e6
Auto-generated-cl: translation import
Bill Yi [Thu, 16 Feb 2017 10:16:44 +0000 (02:16 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5987eba5f40b632fd475e57fb8c8ff1343b2d6bc
Auto-generated-cl: translation import
Hugo Benichi [Thu, 16 Feb 2017 07:12:55 +0000 (07:12 +0000)]
Merge "Captive portal: better detect empty responses" am:
c217f7a9f3 am:
af8e749820
am:
7973ff4c13
Change-Id: I63a3bf9f2983bdb68df7ef48b334930a089648eb
Hugo Benichi [Thu, 16 Feb 2017 07:08:27 +0000 (07:08 +0000)]
Merge "Captive portal: better detect empty responses" am:
c217f7a9f3
am:
af8e749820
Change-Id: I0b2cd45fb92e2f8accb53ef4e050d2b6e7f7fd1c
Hugo Benichi [Thu, 16 Feb 2017 07:04:25 +0000 (07:04 +0000)]
Merge "Captive portal: better detect empty responses"
am:
c217f7a9f3
Change-Id: If6229a3a5c0ccc3575d44d11ed9f486cab35eac3
Hugo Benichi [Thu, 16 Feb 2017 06:54:46 +0000 (06:54 +0000)]
Merge "Captive portal: better detect empty responses"
Hugo Benichi [Wed, 11 Jan 2017 07:23:26 +0000 (16:23 +0900)]
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
Manu Cornet [Thu, 16 Feb 2017 03:13:14 +0000 (03:13 +0000)]
Merge "DO NOT MERGE - Ensuring that there are per-user last stack active times." into nyc-mr2-dev
am:
e0e08f3f41
Change-Id: Iaeee64f2a6954be8560412f60f838e2483be01f0
TreeHugger Robot [Thu, 16 Feb 2017 03:02:14 +0000 (03:02 +0000)]
Merge "DO NOT MERGE - Ensuring that there are per-user last stack active times." into nyc-mr2-dev
Hall Liu [Thu, 16 Feb 2017 01:31:54 +0000 (01:31 +0000)]
Merge "Add extra key for app-specified outgoing call timeout" into nyc-mr2-dev
am:
4d3435637f -s ours
Change-Id: I2ed7250a9fb8c5026b209ad5b3384a401b1d4d16
Chris Tate [Thu, 16 Feb 2017 01:25:04 +0000 (01:25 +0000)]
Merge "Harden against jobscheduler client app misbehavior" into nyc-mr2-dev
am:
38f1b6dbc9
Change-Id: I44d16150abee9dd0ec7961d1ce847d9793937354
Hall Liu [Thu, 16 Feb 2017 01:09:34 +0000 (01:09 +0000)]
Merge "Add extra key for app-specified outgoing call timeout" into nyc-mr2-dev
Chris Tate [Thu, 16 Feb 2017 00:50:56 +0000 (00:50 +0000)]
Merge "Harden against jobscheduler client app misbehavior" into nyc-mr2-dev
Manu Cornet [Thu, 16 Feb 2017 00:37:16 +0000 (16:37 -0800)]
DO NOT MERGE - Ensuring that there are per-user last stack active times.
- This fixes an issue where the last stack active time would be clobbered
when switching between users. With the policy in the phone/stack
recents, this is fine, but with the grid recents, it no longer only
applies when out of the historical window, so it is always wrong (it
would normally be wrong if switching back from another user after the
historical time of six hours).
This CL will migrate the last stack active time to a per-user secure
setting, which will be used going forward.
[This is a manual merge of change
1913535]
Bug:
35375206
Test: On the Ryu, launch some tasks, switch users, launch more tasks, and
return to the original user
Change-Id: Idc72920240093d15f822f5d9e3ee11b12a56edae
Meng Wang [Wed, 15 Feb 2017 05:55:09 +0000 (21:55 -0800)]
Add carrierconfig KEY_CARRIER_VOLTE_OVERRIDE_WFC_PROVISIONING_BOOL
Bug:
28709116
Change-Id: I19673ef092ebbd655e3d687fc8d92bd9f67c5645
Hall Liu [Wed, 15 Feb 2017 02:11:11 +0000 (18:11 -0800)]
Add extra key for app-specified outgoing call timeout
Bug:
34474757
Test: manual
Merged-In: I6e7e67c946205b28440a4daeeab3a002f8d6bccc
Change-Id: Ia93d68d6a01308b0b93b88977daf983a0ed3a22c
Hall Liu [Wed, 15 Feb 2017 22:35:52 +0000 (22:35 +0000)]
Merge "Add extra key for app-specified outgoing call timeout" am:
decc6c9d56 am:
2bc24e252e
am:
38f5001c10
Change-Id: I6e7e67c946205b28440a4daeeab3a002f8d6bccc
Hall Liu [Wed, 15 Feb 2017 22:30:44 +0000 (22:30 +0000)]
Merge "Add extra key for app-specified outgoing call timeout" am:
decc6c9d56
am:
2bc24e252e
Change-Id: I1912bfa8856e78f375587d94bf589ef2fd25bee8
Hall Liu [Wed, 15 Feb 2017 22:24:23 +0000 (22:24 +0000)]
Merge "Add extra key for app-specified outgoing call timeout"
am:
decc6c9d56
Change-Id: I58a70b265f4b5af735e93c9004616bd44d5c51de
Hall Liu [Wed, 15 Feb 2017 21:41:21 +0000 (21:41 +0000)]
Merge "Add extra key for app-specified outgoing call timeout"
Badhri Jagan Sridharan [Wed, 15 Feb 2017 20:27:18 +0000 (20:27 +0000)]
Merge changes from topic 'dual_role_chargers' am:
37b939a180 am:
0a3efc2622
am:
d4a847495e
Change-Id: Icadc77cb7630e61166ab3c9608f60736c24e52c1
Badhri Jagan Sridharan [Wed, 15 Feb 2017 20:20:15 +0000 (20:20 +0000)]
Merge changes from topic 'dual_role_chargers' am:
37b939a180
am:
0a3efc2622
Change-Id: I2c0ba36c46674ff7f9a0b963543e271eec93858c
Badhri Jagan Sridharan [Wed, 15 Feb 2017 20:13:53 +0000 (20:13 +0000)]
Merge changes from topic 'dual_role_chargers'
am:
37b939a180
Change-Id: I2b9eda605ae85347eb2e3e4202a6c7ec176778af
Badhri Jagan Sridharan [Wed, 15 Feb 2017 20:00:24 +0000 (20:00 +0000)]
Merge changes from topic 'dual_role_chargers'
* changes:
Introduce debounce to filter rapidly toggling type-c ports
Fix handling usb dialog for wall chargers.
Badhri Jagan Sridharan [Fri, 10 Feb 2017 03:45:21 +0000 (19:45 -0800)]
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
Badhri Jagan Sridharan [Mon, 13 Feb 2017 21:14:40 +0000 (13:14 -0800)]
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
Xiaohui Chen [Tue, 14 Feb 2017 22:55:07 +0000 (14:55 -0800)]
ReolverActivity: try auto launching single choice
We already does this on start. Now we also do the same when
the list of options changes.
Test: locally on device
Bug:
34470067
Change-Id: Ib184d67b532c5afd584fb9cd52daac69a7c50d0a
Hugo Benichi [Fri, 10 Feb 2017 17:15:04 +0000 (02:15 +0900)]
IP connectivity metrics: delete obsolete logger service
Test: - runtest frameworks-net
- manually verified $ adb shell dumpsys connmetrics
Bug:
32648597
Change-Id: I69f7dee5871508398d7f7209658a00c768e2d18e
Hall Liu [Wed, 15 Feb 2017 02:11:11 +0000 (18:11 -0800)]
Add extra key for app-specified outgoing call timeout
Bug:
34474757
Test: manual
Change-Id: Ia93d68d6a01308b0b93b88977daf983a0ed3a22c
Hugo Benichi [Wed, 15 Feb 2017 01:24:29 +0000 (01:24 +0000)]
Merge "ConnectivityManager: fix potential NPE" am:
b688dd18ab am:
ab453cd565
am:
7c9cc1f9e5
Change-Id: I6f487ce9da656610c939ddc78e834ac8ef5f8135
Hugo Benichi [Wed, 15 Feb 2017 01:09:58 +0000 (01:09 +0000)]
Merge "ConnectivityManager: fix potential NPE" am:
b688dd18ab
am:
ab453cd565
Change-Id: I72e114037ce6a0ec53863749b8ffa34513c9fdce
Hugo Benichi [Wed, 15 Feb 2017 01:05:24 +0000 (01:05 +0000)]
Merge "ConnectivityManager: fix potential NPE"
am:
b688dd18ab
Change-Id: If562fc6a921569ad9d3141cac72b6f395a30da9e
Erik Kline [Wed, 15 Feb 2017 01:04:44 +0000 (01:04 +0000)]
Merge "Split chooseUpstreamType() into two separate functions" am:
7a42d3ad83 am:
f6d55d7e9e
am:
8eb1fbf1bc
Change-Id: Ia8fd663404f1d0a70243ab9c9bd853ac6d51d68f
Erik Kline [Wed, 15 Feb 2017 01:03:49 +0000 (01:03 +0000)]
Merge "Slightly simplify mTryCell and requestUpstreamMobileConnection() usage" am:
63445824d6 am:
4650762557
am:
23d077318c
Change-Id: I19f92ac6160702233832a190aeeaeff06391ce9e
Erik Kline [Wed, 15 Feb 2017 00:54:07 +0000 (00:54 +0000)]
Merge "Split chooseUpstreamType() into two separate functions" am:
7a42d3ad83
am:
f6d55d7e9e
Change-Id: Ibd6b1fae52ec31ae488484be727b5261820e6ecb
Hugo Benichi [Wed, 15 Feb 2017 00:53:44 +0000 (00:53 +0000)]
Merge "ConnectivityManager: fix potential NPE"
Erik Kline [Wed, 15 Feb 2017 00:52:57 +0000 (00:52 +0000)]
Merge "Slightly simplify mTryCell and requestUpstreamMobileConnection() usage" am:
63445824d6
am:
4650762557
Change-Id: Ie004da6fe1252ddec90204637ff17c3ed73f2923
Erik Kline [Wed, 15 Feb 2017 00:49:20 +0000 (00:49 +0000)]
Merge "Split chooseUpstreamType() into two separate functions"
am:
7a42d3ad83
Change-Id: I77649e11e74140ec985dcdadab226e3e73e67642
Erik Kline [Wed, 15 Feb 2017 00:48:24 +0000 (00:48 +0000)]
Merge "Slightly simplify mTryCell and requestUpstreamMobileConnection() usage"
am:
63445824d6
Change-Id: Ie921ee1a2f1dbdd338c9f0700b24808e1cb6435e
Erik Kline [Wed, 15 Feb 2017 00:38:50 +0000 (00:38 +0000)]
Merge "Split chooseUpstreamType() into two separate functions"
Erik Kline [Wed, 15 Feb 2017 00:38:31 +0000 (00:38 +0000)]
Merge "Slightly simplify mTryCell and requestUpstreamMobileConnection() usage"
Michael Peck [Wed, 15 Feb 2017 00:00:11 +0000 (00:00 +0000)]
Merge "Pass targetSdkVersion specifier for SELinux labeling" am:
4516240b47 am:
f8cefed995
am:
5493749d64
Change-Id: I731220c719cf29d94e11698906dfb7f049a90a55
OSDN Git Service
