OSDN Git Service
Yuxin Chang [Fri, 17 Feb 2017 22:22:05 +0000 (22:22 +0000)]
Merge "Show connection error reason for Passpoint AP"
am:
855889b086
Change-Id: I164f575dfc5dd69912f433e46b1d70b1fd11b1e6
Etan Cohen [Fri, 17 Feb 2017 22:18:32 +0000 (22:18 +0000)]
Merge "[AWARE] Remove enableUsage/disableUsage API"
am:
647f2e1493
Change-Id: Ic48804f3e2ecac6a817d261f9f9cbfc505b01716
Etan Cohen [Fri, 17 Feb 2017 22:15:29 +0000 (22:15 +0000)]
Merge "[AWARE] Add discovery window period configuration"
am:
17532ec02e
Change-Id: I62ba5123aafb236d756a4cafe7829717e8e542f9
Treehugger Robot [Fri, 17 Feb 2017 21:34:34 +0000 (21:34 +0000)]
Merge "Show connection error reason for Passpoint AP"
Etan Cohen [Fri, 17 Feb 2017 21:33:39 +0000 (21:33 +0000)]
Merge "[AWARE] Remove enableUsage/disableUsage API"
Etan Cohen [Fri, 17 Feb 2017 21:26:03 +0000 (21:26 +0000)]
Merge "[AWARE] Add discovery window period configuration"
Leonard Mosescu [Fri, 17 Feb 2017 20:34:48 +0000 (20:34 +0000)]
Merge "Add missing break statement." am:
7a4b88de49
am:
080456edd6
Change-Id: I2acd644f0bb5916f9c90a1103b023544a7eebddb
Leonard Mosescu [Fri, 17 Feb 2017 20:31:15 +0000 (20:31 +0000)]
Merge "Add missing break statement."
am:
7a4b88de49
Change-Id: I3323063130b71f831d7c6356d0657161f84c9e38
Hiroaki Kuriyama [Fri, 17 Feb 2017 20:30:36 +0000 (20:30 +0000)]
Merge "PrintSpooler: Remove recommendation if Play Store is not installed" am:
57b966eee1
am:
7cd04745f4
Change-Id: I04a0d5afbaedbef3a1d7b005dba124888fd213ca
Brad Ebinger [Fri, 17 Feb 2017 20:29:13 +0000 (20:29 +0000)]
Merge "Adds @hide ImsService APIs" am:
2b879016d3
am:
f46aa6f9ee
Change-Id: I12e10d796a7b2d56cacf8e9b53bb5e228b79ecc3
Leonard Mosescu [Fri, 17 Feb 2017 20:22:06 +0000 (20:22 +0000)]
Merge "Add missing break statement."
Hiroaki Kuriyama [Fri, 17 Feb 2017 19:52:32 +0000 (19:52 +0000)]
Merge "PrintSpooler: Remove recommendation if Play Store is not installed"
am:
57b966eee1
Change-Id: I48c070c4b3e1cf3d1d6ff71612c7ad6d44e6cb1f
Treehugger Robot [Fri, 17 Feb 2017 19:45:05 +0000 (19:45 +0000)]
Merge "PrintSpooler: Remove recommendation if Play Store is not installed"
Brad Ebinger [Fri, 17 Feb 2017 19:33:02 +0000 (19:33 +0000)]
Merge "Adds @hide ImsService APIs"
am:
2b879016d3
Change-Id: Ia8b557ee006d3ffdbbe420934b97b0e7feb2ca80
Treehugger Robot [Fri, 17 Feb 2017 19:21:45 +0000 (19:21 +0000)]
Merge "Adds @hide ImsService APIs"
Orion Hodson [Fri, 17 Feb 2017 18:33:21 +0000 (18:33 +0000)]
Merge "Update dalvik.bytecode package" am:
3f827b5e33 am:
fd63280dd2
am:
2e6a473f20
Change-Id: I22a1e489d2597bfe0ed4b1f93a39128b29a08be5
Orion Hodson [Fri, 17 Feb 2017 18:27:29 +0000 (18:27 +0000)]
Merge "Update dalvik.bytecode package" am:
3f827b5e33
am:
fd63280dd2
Change-Id: If0728a4f838a275860e32f078822554815e31f22
Orion Hodson [Fri, 17 Feb 2017 18:20:18 +0000 (18:20 +0000)]
Merge "Update dalvik.bytecode package"
am:
3f827b5e33
Change-Id: I94a28f57f36af1528e04f1af9eb9239cee8eeee6
Treehugger Robot [Fri, 17 Feb 2017 18:13:40 +0000 (18:13 +0000)]
Merge "Update dalvik.bytecode package"
Leonard Mosescu [Fri, 17 Feb 2017 18:10:45 +0000 (10:10 -0800)]
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
Orion Hodson [Fri, 17 Feb 2017 14:55:25 +0000 (14:55 +0000)]
Update dalvik.bytecode package
BUG:
33191717
Test: m checkapi
Change-Id: I6af2b36573f698ae091e9d7e3f01c156549834c1
sj.cha [Fri, 17 Feb 2017 13:27:04 +0000 (13:27 +0000)]
Merge "Infinite reboot when OS upgrade from M to N with set Always-on VPN" am:
1a69570fe8 am:
3b92631a69
am:
10957727f5
Change-Id: I5e0faee7a0b1c6bdfafe77560a91e999f40edc4a
sj.cha [Fri, 17 Feb 2017 13:21:34 +0000 (13:21 +0000)]
Merge "Infinite reboot when OS upgrade from M to N with set Always-on VPN" am:
1a69570fe8
am:
3b92631a69
Change-Id: I82c297e654af6690c6a3be216a0da08a3aff5b9d
sj.cha [Fri, 17 Feb 2017 13:17:00 +0000 (13:17 +0000)]
Merge "Infinite reboot when OS upgrade from M to N with set Always-on VPN"
am:
1a69570fe8
Change-Id: I21a69eb02b13b20f66996836d54b8aadadfa80ec
Treehugger Robot [Fri, 17 Feb 2017 13:07:20 +0000 (13:07 +0000)]
Merge "Infinite reboot when OS upgrade from M to N with set Always-on VPN"
Bill Yi [Fri, 17 Feb 2017 10:24:43 +0000 (10:24 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
d4177b8610 -s ours
Change-Id: I73ba26823b2c27cf1f492558bf6b7c176c296282
TreeHugger Robot [Fri, 17 Feb 2017 10:16:38 +0000 (10:16 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Bill Yi [Fri, 17 Feb 2017 09:19:10 +0000 (09:19 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
d74b5f551d -s ours
Change-Id: Iffab34c61046aeeca37a906107f4183952156654
TreeHugger Robot [Fri, 17 Feb 2017 09:10:37 +0000 (09:10 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Bill Yi [Fri, 17 Feb 2017 05:18:39 +0000 (21:18 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia854a721fe3df7212deb75df8ab7c4adb5b531c1
Auto-generated-cl: translation import
Bill Yi [Fri, 17 Feb 2017 05:09:53 +0000 (21:09 -0800)]
Import translations. DO NOT MERGE
Change-Id: I80580cf6ece02cc20f4cda744f2b3599ec3985cd
Auto-generated-cl: translation import
Etan Cohen [Wed, 15 Feb 2017 16:40:10 +0000 (08:40 -0800)]
[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
Jerry Zhang [Fri, 17 Feb 2017 02:24:44 +0000 (02:24 +0000)]
Merge changes from topic 'svcusb' am:
5e2a2ee39e am:
6f44072d03
am:
35f8d6cfd0
Change-Id: I10c0be37b583f1670cb98e926aefb9dc8b986843
Jerry Zhang [Fri, 17 Feb 2017 02:16:11 +0000 (02:16 +0000)]
Merge changes from topic 'svcusb' am:
5e2a2ee39e
am:
6f44072d03
Change-Id: Ic30bca41e088c2d077dc5aa09e373a02acb60be6
Jerry Zhang [Fri, 17 Feb 2017 02:11:45 +0000 (02:11 +0000)]
Merge changes from topic 'svcusb'
am:
5e2a2ee39e
Change-Id: I4b628b80e348e25377d0855301374e71cb8f2c64
Treehugger Robot [Fri, 17 Feb 2017 02:01:54 +0000 (02:01 +0000)]
Merge changes from topic 'svcusb'
* changes:
Add data unlock argument to set function command.
Allow the shell to set USB functions.
Jack Yu [Fri, 17 Feb 2017 01:40:51 +0000 (01:40 +0000)]
Merge "Added the new RIL request to set SIM power state" am:
2f21f71da4 am:
bf21df3306
am:
8c89daceaf
Change-Id: I7dd15375a56a9243bf0c24c87def9949596093e0
Jack Yu [Fri, 17 Feb 2017 01:31:49 +0000 (01:31 +0000)]
Merge "Added the new RIL request to set SIM power state" am:
2f21f71da4
am:
bf21df3306
Change-Id: I7d11f132ca483272963f12363496d70651076f0b
Jack Yu [Fri, 17 Feb 2017 01:22:22 +0000 (01:22 +0000)]
Merge "Added the new RIL request to set SIM power state"
am:
2f21f71da4
Change-Id: I75402ea985f81fd4f420cf7bfb4b07680a11ef2f
Treehugger Robot [Fri, 17 Feb 2017 01:13:25 +0000 (01:13 +0000)]
Merge "Added the new RIL request to set SIM power state"
Bill Yi [Fri, 17 Feb 2017 00:36:17 +0000 (00:36 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
f54038169c -s ours
Change-Id: I1524a1cd097f8394cf067f61880efc55f7e48627
TreeHugger Robot [Fri, 17 Feb 2017 00:25:22 +0000 (00:25 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
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
Etan Cohen [Thu, 16 Feb 2017 22:13:42 +0000 (14:13 -0800)]
[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
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
Bill Yi [Thu, 16 Feb 2017 21:19:07 +0000 (13:19 -0800)]
Import translations. DO NOT MERGE
Change-Id: I80276c9711e32dc743172b380161807f6d2d8ff6
Auto-generated-cl: translation import
Jerry Zhang [Wed, 15 Feb 2017 22:15:30 +0000 (14:15 -0800)]
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
Philip P. Moltmann [Tue, 29 Nov 2016 22:25:59 +0000 (14:25 -0800)]
Allow the shell to set USB functions.
Bug:
25596495
Test: Issed a shell command and saw it handled correctly
Change-Id: I4472464a1c7ed100cb257dbad83d1d8cfef88fc6
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
Brad Ebinger [Wed, 25 Jan 2017 22:26:41 +0000 (14:26 -0800)]
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
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
OSDN Git Service
