OSDN Git Service
Brad Ebinger [Fri, 28 Oct 2016 20:17:03 +0000 (20:17 +0000)]
Modify AIDLs to include Session.Info
am:
b32d4f8b5c
Change-Id: Ibbac4c74b5a0c4fcd5524c97acef5fc078d80cb7
Brad Ebinger [Mon, 24 Oct 2016 23:40:49 +0000 (16:40 -0700)]
Modify AIDLs to include Session.Info
Modifies the IConnectionService.aidl file to include Session.Info
information to pass from Telecom to Telephony, which is used to start
external Sessions in Telephony from Telecom.
Test: Manual testing and Unit Tests pass
Bug:
26571395
Change-Id: Ia09a0abfa13d5167542d4c67465ea9aa1930b58b
Igor Murashkin [Fri, 28 Oct 2016 17:55:12 +0000 (17:55 +0000)]
Merge "app_process: Forward -cp/-classpath to ART." am:
4a4a8f1555
am:
d0d99d8a3d
Change-Id: Ia7bea2370daeb77ab23a797546f8f7c437902516
Igor Murashkin [Fri, 28 Oct 2016 17:48:15 +0000 (17:48 +0000)]
Merge "app_process: Forward -cp/-classpath to ART."
am:
4a4a8f1555
Change-Id: If7773d6bae3f4f13aa7f0c883b1c20319d85c747
Treehugger Robot [Fri, 28 Oct 2016 17:34:46 +0000 (17:34 +0000)]
Merge "app_process: Forward -cp/-classpath to ART."
Przemyslaw Szczepaniak [Fri, 28 Oct 2016 12:15:19 +0000 (12:15 +0000)]
Merge "Track libcore change
16fa17012b56e990ced91cd023dee33f96deedf9" am:
ec3e884e88
am:
29d6af7fe7
Change-Id: I6693fe79836e88d022d393d2bee5d811cb2dcdfc
Przemyslaw Szczepaniak [Fri, 28 Oct 2016 12:05:56 +0000 (12:05 +0000)]
Merge "Track libcore change
16fa17012b56e990ced91cd023dee33f96deedf9"
am:
ec3e884e88
Change-Id: Ibf708f685bf8cb8e5f88423b48ed05986c223651
Przemyslaw Szczepaniak [Fri, 28 Oct 2016 11:57:07 +0000 (11:57 +0000)]
Mitchell Wills [Wed, 31 Aug 2016 23:15:37 +0000 (16:15 -0700)]
Revert "DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework""
This reverts commit
6a80a4b05acacd3fd07583a3bb6185e9770215eb.
Change-Id: I21fc6802fd3eeca42492e07437bb71d54f015593
(cherry picked from commit
b38028128bb9878971f8b5a85b90b3f303fec0ba)
Mitchell Wills [Fri, 28 Oct 2016 04:58:50 +0000 (04:58 +0000)]
Revert "DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework""
am:
77281bbaf4 -s ours
Change-Id: I85645a2301cba10b1612c5ec851412d4e1c6d947
Mitchell Wills [Wed, 31 Aug 2016 23:15:37 +0000 (16:15 -0700)]
Revert "DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework""
This reverts commit
6a80a4b05acacd3fd07583a3bb6185e9770215eb.
Change-Id: I21fc6802fd3eeca42492e07437bb71d54f015593
(cherry picked from commit
b38028128bb9878971f8b5a85b90b3f303fec0ba)
Jakub Pawlowski [Fri, 28 Oct 2016 02:56:54 +0000 (02:56 +0000)]
Merge "Separate LE scanner from GATT client (1/4)" am:
87c997ca21
am:
81d5ecb7a6
Change-Id: If7688706be45e72e3ab98a35d3712ddae9d508a6
Marie Janssen [Fri, 28 Oct 2016 02:52:00 +0000 (02:52 +0000)]
Merge "Add Bluetooth toggle prompts - framework" am:
a062ce698b -s ours
am:
98f664b903
Change-Id: I6dabd16f5334e78bc05e6b5ffb95a0177a3cd4d7
Jakub Pawlowski [Fri, 28 Oct 2016 02:50:54 +0000 (02:50 +0000)]
Merge "Separate LE scanner from GATT client (1/4)"
am:
87c997ca21
Change-Id: I8fdf97a457d7566b4e0048624d47a6cfea693f13
Marie Janssen [Fri, 28 Oct 2016 02:45:26 +0000 (02:45 +0000)]
Merge "Add Bluetooth toggle prompts - framework"
am:
a062ce698b -s ours
Change-Id: I426b2378c9153286557498fe80c2469caa6a4888
Jakub Pawlowski [Thu, 27 Oct 2016 23:18:53 +0000 (23:18 +0000)]
Merge "Separate LE scanner from GATT client (1/4)"
Jakub Pawlowski [Wed, 26 Oct 2016 20:05:30 +0000 (13:05 -0700)]
Separate LE scanner from GATT client (1/4)
Right now, LE scanning functionality is combined with the GATT client.
This is the source of various bugs, like scans suddenly stoppinging when
a GATT client is killed. It also increases memory consumption, because
we associate many structures with a GATT client, which are not necessary
when just scanning.
Test: sl4a BleScanApiTest ConcurrentBleScanTest
Change-Id: I0c25bd4a58bb430eb0ee4100d5f2bbab194f9621
Marie Janssen [Thu, 27 Oct 2016 23:07:31 +0000 (23:07 +0000)]
Merge "Add Bluetooth toggle prompts - framework"
Svetoslav Ganov [Thu, 30 Jun 2016 00:31:44 +0000 (17:31 -0700)]
Add Bluetooth toggle prompts - framework
If permission review is enabled toggling bluetoth on or off
results in a user prompt to collect consent. This applies
only to legacy apps, i.e. ones that don't support runtime
permissions as they target SDK 22.
Also added a configuration resource which controls whether
permission review mode is enabled. By default it is not and
an OEM can change this via an overlay. For now we also keep
the old mechanism to toggle review mode via a build property
which is still used and will be removed when clients have
transitioned.
bug:
28715749
Change-Id: I94c5828ad6c8aa6b363622a26ff9da4fc2e2fac7
(cherry picked from commit
ac69be543f89ea6e9a27204492e0a170d9b3450e)
Leonard Mosescu [Thu, 27 Oct 2016 17:29:24 +0000 (17:29 +0000)]
Merge "Merge "Adding "attach-agent" to ActivityManagerShellCommand" am:
bd2688f4c3 -s ours" into stage-aosp-master
am:
258790a2ea
Change-Id: I82e68dd1ad007b8962f8ee73de2429dbe3e23959
Leonard Mosescu [Thu, 27 Oct 2016 17:29:19 +0000 (17:29 +0000)]
Merge "Adding "attach-agent" to ActivityManagerShellCommand" am:
bd2688f4c3 -s ours
am:
d73688521c
Change-Id: I67fdb8dcceb791b5984bba37395a73c3be36a992
Michal Karpinski [Thu, 27 Oct 2016 17:28:15 +0000 (17:28 +0000)]
Extending DNS event reporting
am:
6e54239e50
Change-Id: I64e6a48fbbaa734447069b073c3499ef71af907c
Android Build Merger (Role) [Thu, 27 Oct 2016 17:24:53 +0000 (17:24 +0000)]
Merge "Merge "Adding "attach-agent" to ActivityManagerShellCommand" am:
bd2688f4c3 -s ours" into stage-aosp-master
Leonard Mosescu [Thu, 27 Oct 2016 17:24:17 +0000 (17:24 +0000)]
Merge "Adding "attach-agent" to ActivityManagerShellCommand"
am:
bd2688f4c3 -s ours
Change-Id: If1e48ecf5e75452c85e7a36f4be0d817234043c9
Leonard Mosescu [Thu, 27 Oct 2016 17:04:57 +0000 (17:04 +0000)]
Merge "Adding "attach-agent" to ActivityManagerShellCommand"
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: Ife88dbf23991dde7945d9208e54cd014bb7ecdc6
Merged-In: Ife88dbf23991dde7945d9208e54cd014bb7ecdc6
Michal Karpinski [Tue, 27 Sep 2016 16:13:57 +0000 (17:13 +0100)]
Extending DNS event reporting
This adds hostname, array of addresses, total count of IP addresses
and uid to the existing pipeline.
Currently ignores the new data it receives, further work will be
done in the subsequent CLs.
Test: for now just the benchmarking, in the future unit and CTS
Bug:
29748723
Change-Id: Ice7db208282934e74f0e1808ffbae96d476c4216
(cherry picked from commit
14c9d2d0df7fab2b0470c3c404f600d87d4f0f93)
Lorenzo Colitti [Thu, 27 Oct 2016 13:30:02 +0000 (13:30 +0000)]
Merge changes from topic 'netd_aosp' am:
d19524f4f2
am:
853427a30a
Change-Id: I91cce5b10d49573a37504b6664b3ef0d13ae0d77
Michal Karpinski [Thu, 27 Oct 2016 13:21:37 +0000 (13:21 +0000)]
Add connect event reporting am:
265494a0f8
am:
17be4d6c85
Change-Id: I042fdb187af2de08374864867dbd75d8c92c56c9
Lorenzo Colitti [Thu, 27 Oct 2016 13:20:34 +0000 (13:20 +0000)]
Merge changes from topic 'netd_aosp'
am:
d19524f4f2
Change-Id: Ia2b67e53de3b4b734e157b95908b9e4c94360c70
Michal Karpinski [Thu, 27 Oct 2016 13:20:31 +0000 (13:20 +0000)]
Extending DNS event reporting am:
f82d1596ce
am:
3156b53fbe
Change-Id: I14dfa7508c7115b0e60836b3788c421068b70946
Michal Karpinski [Thu, 27 Oct 2016 13:13:56 +0000 (13:13 +0000)]
Add connect event reporting
am:
265494a0f8
Change-Id: I258d348355ac182cdd0c0698d5dbbb66668dcdd8
Michal Karpinski [Thu, 27 Oct 2016 13:12:29 +0000 (13:12 +0000)]
Extending DNS event reporting
am:
f82d1596ce
Change-Id: I2e39caad0074be519640b561201f75d6685c01ef
Lorenzo Colitti [Thu, 27 Oct 2016 13:05:25 +0000 (13:05 +0000)]
Merge changes from topic 'netd_aosp'
* changes:
Add connect event reporting
Extending DNS event reporting
Michal Karpinski [Wed, 28 Sep 2016 15:06:16 +0000 (16:06 +0100)]
Add connect event reporting
Adds reporting of connect events including netId, destination IP address,
destination port, uid and connect latency.
Currently ignores the new data it receives, further work will be
done in the subsequent CLs.
Test: for now just the benchmarking, in the future CTS
Bug:
29748723
(cherry picked from commit
965894eeb90c13255b5559b925d13fd22528f8cb)
Change-Id: I0c563f26ac39a7e1870153f30d073fc7d0006abc
Michal Karpinski [Tue, 27 Sep 2016 16:13:57 +0000 (17:13 +0100)]
Extending DNS event reporting
This adds hostname, array of addresses, total count of IP addresses
and uid to the existing pipeline.
Currently ignores the new data it receives, further work will be
done in the subsequent CLs.
Test: for now just the benchmarking, in the future unit and CTS
(cherry picked from commit
14c9d2d0df7fab2b0470c3c404f600d87d4f0f93)
Bug:
29748723
Change-Id: Ice7db208282934e74f0e1808ffbae96d476c4216
Peter Qiu [Wed, 26 Oct 2016 22:44:44 +0000 (22:44 +0000)]
Merge "wifi: hotspot2: omadm: add parsing support for PPS MO tree" am:
ef0cc62058
am:
bb8f3a3bbf
Change-Id: I935c4b34c1f40e2bba1983161f7900ec9511f8da
Peter Qiu [Wed, 26 Oct 2016 22:43:23 +0000 (22:43 +0000)]
Merge changes I69c1931b,I6b08f52d am:
1a5da2b533
am:
fe4f473fb8
Change-Id: I54e73a4e4f336fc8d4fc5eae55d138a46aee9626
Peter Qiu [Wed, 26 Oct 2016 22:41:48 +0000 (22:41 +0000)]
wifi: hotspot2: omadm: add XML parser for parsing OMA-DM XML string am:
bae4becf69
am:
2fb7775d2a
Change-Id: Ie6cc6911d6ec49a55f467cfe5e59f218df18455b
Peter Qiu [Wed, 26 Oct 2016 22:40:43 +0000 (22:40 +0000)]
wifi: hotspot2: initial implementation of PasspointConfiguration am:
e557c35d95
am:
6f426e3b17
Change-Id: Icb7497670a7137810ed4def6e6b087c56f1c6de9
Peter Qiu [Wed, 26 Oct 2016 22:30:37 +0000 (22:30 +0000)]
Merge "wifi: hotspot2: omadm: add parsing support for PPS MO tree"
am:
ef0cc62058
Change-Id: Id5b7771a25905d8e8e074b62c6ef70363c459d08
Peter Qiu [Wed, 26 Oct 2016 22:29:01 +0000 (22:29 +0000)]
Merge changes I69c1931b,I6b08f52d
am:
1a5da2b533
Change-Id: I43b0ddd456cfd9d3988c504266e868a637bb43c4
Peter Qiu [Wed, 26 Oct 2016 22:28:55 +0000 (22:28 +0000)]
wifi: hotspot2: omadm: add XML parser for parsing OMA-DM XML string
am:
bae4becf69
Change-Id: I2b8510cc8dc6fad443f0507a86f960ce1ae9a0d6
Peter Qiu [Wed, 26 Oct 2016 22:27:56 +0000 (22:27 +0000)]
wifi: hotspot2: initial implementation of PasspointConfiguration
am:
e557c35d95
Change-Id: I0ece2aef3408de46c2c92b311c78e711c09c99b9
Treehugger Robot [Wed, 26 Oct 2016 22:14:15 +0000 (22:14 +0000)]
Merge "wifi: hotspot2: omadm: add parsing support for PPS MO tree"
Treehugger Robot [Wed, 26 Oct 2016 22:13:57 +0000 (22:13 +0000)]
Merge changes I69c1931b,I6b08f52d
* changes:
wifi: hotspot2: omadm: add XML parser for parsing OMA-DM XML string
wifi: hotspot2: initial implementation of PasspointConfiguration
Dimitry Ivanov [Wed, 26 Oct 2016 20:18:08 +0000 (20:18 +0000)]
Merge "Always call into native loader when load a native library" am:
e266c37559
am:
808bd1765f
Change-Id: I63495e45a1eafe2dd92c30f315289f5ca2d17070
Dimitry Ivanov [Wed, 26 Oct 2016 20:16:38 +0000 (20:16 +0000)]
Always call into native loader when load a native library am:
569834d861
am:
3512d092dd
Change-Id: I73a52349387cad474da6cb0d6c664cfb0879e2a6
Jordan Liu [Wed, 26 Oct 2016 20:12:56 +0000 (20:12 +0000)]
resolve merge conflicts of
ab00546 to stage-aosp-master
am:
bc2af49c21
Change-Id: I95cfcd3907105ef1969f02bf1229ba0c5eb9b8c7
Dimitry Ivanov [Wed, 26 Oct 2016 20:11:33 +0000 (20:11 +0000)]
Merge "Always call into native loader when load a native library"
am:
e266c37559
Change-Id: I4d220cde19ac85b16396070f493395227a85d82c
Dimitry Ivanov [Wed, 26 Oct 2016 20:11:01 +0000 (20:11 +0000)]
Always call into native loader when load a native library
am:
569834d861
Change-Id: I35ce58423aefceb541542e0ef9408e0b7ef9b104
Jordan Liu [Wed, 26 Oct 2016 18:24:54 +0000 (11:24 -0700)]
resolve merge conflicts of
ab00546 to stage-aosp-master
Change-Id: Ief51ceeeae7a11e26dd2c53411ce67e6d0e6bd49
Peter Qiu [Tue, 18 Oct 2016 19:04:23 +0000 (12:04 -0700)]
wifi: hotspot2: omadm: add parsing support for PPS MO tree
This parser will convert a PPS MO (PerProviderSubscription Management Object)
tree XML string to a PasspointConfiguration parcelable object.
Bug:
32129686
Change-Id: Ia80b6d73828436ded57a3817f5eca7b79c618de4
Test: frameworks/base/wifi/tests/runtests.sh
Peter Qiu [Fri, 14 Oct 2016 21:26:46 +0000 (14:26 -0700)]
wifi: hotspot2: omadm: add XML parser for parsing OMA-DM XML string
The XML parser will parse an XML string into a tree-like structure
represented by XMLNode, which will be used by an object specific parser
(e.g. PerProviderSubscription Management Object tree parser) for further
processing.
Bug:
32129686
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: I69c1931b2e8a6f3551e4eba5cffa3d2d0877872a
Dimitry Ivanov [Wed, 26 Oct 2016 18:27:37 +0000 (18:27 +0000)]
Merge "Always call into native loader when load a native library"
Jordan Liu [Wed, 26 Oct 2016 17:50:44 +0000 (17:50 +0000)]
Merge "Add key to CarrierConfigManager"
Jorim Jaggi [Wed, 26 Oct 2016 17:36:55 +0000 (17:36 +0000)]
Merge "Fix animation sequence for upload tasks" am:
7f2676a3d9
am:
b5fed003cc
Change-Id: I2b7e8e684aa449d317db9f1b85d8d768bbf8e7ec
Jorim Jaggi [Wed, 26 Oct 2016 17:32:54 +0000 (17:32 +0000)]
Merge "Fix animation sequence for upload tasks"
am:
7f2676a3d9
Change-Id: Id281265f87e4670ec322d33384422b02ca7fd50b
Jorim Jaggi [Wed, 26 Oct 2016 17:25:02 +0000 (17:25 +0000)]
Merge "Fix animation sequence for upload tasks"
Peter Qiu [Thu, 29 Sep 2016 17:44:15 +0000 (10:44 -0700)]
wifi: hotspot2: initial implementation of PasspointConfiguration
Only support nodes under HomeSP and Credential subtree that are used
by Hotspot 2.0 Release 1.
These classes are used for data exchanges between the app and the system
service (WifiService). All the business logics and validations will be
done on the service side (WifiService).
Bug:
31813706
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: I6b08f52dd7b1a7b337899ab80f11d062c8e2f532
Przemyslaw Szczepaniak [Wed, 26 Oct 2016 16:57:33 +0000 (17:57 +0100)]
Track libcore change
16fa17012b56e990ced91cd023dee33f96deedf9
Test: cts run of CtsLibcoreTestCases
Bug:
29935305
Change-Id: I01465dd11d8ef13d6d47f2dec73100af988edfa1
Brad Ebinger [Wed, 26 Oct 2016 16:48:54 +0000 (16:48 +0000)]
Merge "Add support for starting external Sessions" am:
4ce60695f9
am:
9bec1a5095
Change-Id: Ie0b4ca75d34f8489483bd274e7902d3de67703fa
Brad Ebinger [Wed, 26 Oct 2016 16:42:15 +0000 (16:42 +0000)]
Merge "Add support for starting external Sessions"
am:
4ce60695f9
Change-Id: I6957c8e2846d216f77f5f6337388e1fc296511de
Brad Ebinger [Wed, 26 Oct 2016 16:34:31 +0000 (16:34 +0000)]
Merge "Add support for starting external Sessions"
Andreas Huber [Wed, 26 Oct 2016 15:54:20 +0000 (15:54 +0000)]
Merge "Adds support for specifying the version of a service to register/lookup." am:
c3d8550cf3
am:
8bd63a39f3
Change-Id: I00c3d6441f15011a6ddbb281169bfcac71aff062
Andreas Huber [Wed, 26 Oct 2016 15:49:52 +0000 (15:49 +0000)]
Merge "Adds support for specifying the version of a service to register/lookup."
am:
c3d8550cf3
Change-Id: I6b12021c6100f33de7f4b4702bdb4bf1a48c0259
Andreas Huber [Wed, 26 Oct 2016 15:38:44 +0000 (15:38 +0000)]
Merge "Adds support for specifying the version of a service to register/lookup."
Zhao Wei Liew [Mon, 14 Sep 2015 13:41:57 +0000 (21:41 +0800)]
Fix animation sequence for upload tasks
stat_sys_upload_anim2 and stat_sys_upload_anim1 are reversed,
resulting in an animation that jumps from one frame to the
following frame and back again.
Change-Id: Ibb9c6c4ff992895dce26a283f1ee9a81f7cdee15
Christopher Wiley [Tue, 25 Oct 2016 23:10:49 +0000 (23:10 +0000)]
Merge "Add script to expedite running passing tests" am:
4d1c2922f0
am:
2bb707b1c1
Change-Id: I42f000895fcba0c12c5301578a791ce17668df3d
Christopher Wiley [Tue, 25 Oct 2016 23:06:51 +0000 (23:06 +0000)]
Merge "Add script to expedite running passing tests"
am:
4d1c2922f0
Change-Id: I1b85b8ffd3f6de26d3226f5b1e1475ad87e8def6
Treehugger Robot [Tue, 25 Oct 2016 22:58:55 +0000 (22:58 +0000)]
Merge "Add script to expedite running passing tests"
Jakub Pawlowski [Tue, 25 Oct 2016 21:54:44 +0000 (21:54 +0000)]
Merge "Add helper method to convert Bluetooth UUID to bytes" am:
8a0a58b218
am:
f169ecb76f
Change-Id: I035eb25c9a320b1760221bc5928919a148801488
Jakub Pawlowski [Tue, 25 Oct 2016 21:47:35 +0000 (21:47 +0000)]
Merge "Add helper method to convert Bluetooth UUID to bytes"
am:
8a0a58b218
Change-Id: I829135e559a9c3cf3c942258a16acee62c37c3ac
Jakub Pawlowski [Tue, 25 Oct 2016 21:36:38 +0000 (21:36 +0000)]
Merge "Add helper method to convert Bluetooth UUID to bytes"
Brad Ebinger [Fri, 21 Oct 2016 16:41:29 +0000 (09:41 -0700)]
Add support for starting external Sessions
This change adds support for parceling Session Information to be
transmitted over AIDLs and starting an external session in the external
process.
Test: Telecom Unit tests and new SessionManager Tests.
Bug:
26571395
Change-Id: Ie27ed88d4a8c344b34568025ddcf150fdcb38d62
Christopher Wiley [Thu, 20 Oct 2016 19:33:31 +0000 (12:33 -0700)]
Add script to expedite running passing tests
Developers can run this script from within a shell where they have
source'd build/envsetup.sh and lunched a target. It builds, installs,
and runs whitelisted test packages.
Bug: None
Test: This script is useful for iterating rapidly on unittests.
Change-Id: I44c32a0f75da1be2c69a8b1a67c0080a68def738
Andreas Huber [Tue, 25 Oct 2016 20:29:30 +0000 (13:29 -0700)]
Adds support for specifying the version of a service to register/lookup.
Bug:
32405011
Test: hidl_test_java
Change-Id: I91a31cafa68d570c67f9a1aa7efb9d3dcb35e591
Jakub Pawlowski [Mon, 24 Oct 2016 20:56:54 +0000 (13:56 -0700)]
Add helper method to convert Bluetooth UUID to bytes
Bug:
30622771
Test: sl4a ConcurrentBleAdvertisingTest
Change-Id: I7f646d1d357c51b82efc504a0e65d868ad363ddb
Christopher Wiley [Tue, 25 Oct 2016 18:31:02 +0000 (18:31 +0000)]
Merge "Add unit tests for Tethering.isTetherProvisioningRequired" am:
836ffa6e1c
am:
c29f2575f2
Change-Id: Ica704d0a64dde80ae0a9f1cef0250bfbdafcd49a
Christopher Wiley [Tue, 25 Oct 2016 18:23:02 +0000 (18:23 +0000)]
Merge "Add unit tests for Tethering.isTetherProvisioningRequired"
am:
836ffa6e1c
Change-Id: I1dab386e3891c01a2917c32847d2aecdbfa10102
Treehugger Robot [Tue, 25 Oct 2016 18:12:42 +0000 (18:12 +0000)]
Merge "Add unit tests for Tethering.isTetherProvisioningRequired"
nharold [Tue, 25 Oct 2016 01:06:07 +0000 (01:06 +0000)]
Merge "Update the docstring on getAllCellInfo() for unreported values" am:
88d0a95c74
am:
b7e5c6fa32
Change-Id: Ie5f6460962fac98bd63aa7b7d4e77e5bc84347e7
nharold [Tue, 25 Oct 2016 00:57:36 +0000 (00:57 +0000)]
Merge "Update the docstring on getAllCellInfo() for unreported values"
am:
88d0a95c74
Change-Id: Ib482a5398776473ccb97c4df96115fc3763c782f
nharold [Tue, 25 Oct 2016 00:48:40 +0000 (00:48 +0000)]
Merge "Update the docstring on getAllCellInfo() for unreported values"
Christopher Wiley [Tue, 11 Oct 2016 20:26:03 +0000 (13:26 -0700)]
Add unit tests for Tethering.isTetherProvisioningRequired
Check that we tolerate various dependencies not being available.
Bug:
31946071
Test: These are tests
Change-Id: Ic0a9cd6f255ba9ff4c774dee640df1a0bdf8dc39
Nathan Harold [Mon, 24 Oct 2016 18:24:16 +0000 (11:24 -0700)]
Update the docstring on getAllCellInfo() for unreported values
In the event that not all fields are available for a particular
cell information report, those values are set to
Integer.MAX_VALUE. In addition, this docstring clarifies the
minimum expectation for what will be reported in all cases.
Bug:
32364031
Test: none
Change-Id: Ic5df72f69e5917eb495d349a380ced53a80408fa
Yoshinori Hirano [Mon, 24 Oct 2016 18:39:22 +0000 (18:39 +0000)]
Merge "Allow operator/manufacturer setting to use priority" am:
aef1a557aa
am:
4244d53c3e
Change-Id: Ia6fcaa0550f2e1bb74f61d547fcd39de3b95fe90
Yoshinori Hirano [Mon, 24 Oct 2016 18:32:14 +0000 (18:32 +0000)]
Merge "Allow operator/manufacturer setting to use priority"
am:
aef1a557aa
Change-Id: I81ccdc0910ab5298d5b54f3b8e390262d02225ea
Treehugger Robot [Mon, 24 Oct 2016 18:21:06 +0000 (18:21 +0000)]
Merge "Allow operator/manufacturer setting to use priority"
Mark Salyzyn [Mon, 24 Oct 2016 15:59:34 +0000 (15:59 +0000)]
Merge "PdfEditor: define LOG_TAG" am:
a3bb8e3cc7
am:
9c0ea2d1cd
Change-Id: I61d351dd5b83e598fd59efbe9f414166a685fef7
Mark Salyzyn [Mon, 24 Oct 2016 15:53:30 +0000 (15:53 +0000)]
Merge "PdfEditor: define LOG_TAG"
am:
a3bb8e3cc7
Change-Id: Ide63ebe4228d7b7af05e20202baafdebf9699150
Treehugger Robot [Mon, 24 Oct 2016 15:47:32 +0000 (15:47 +0000)]
Merge "PdfEditor: define LOG_TAG"
Shigeki Yokomichi [Mon, 24 Oct 2016 14:28:23 +0000 (14:28 +0000)]
Merge "Avoid NPE around mReusedTask of ActivityStarter" am:
f741f88284
am:
e79cb5c81d
Change-Id: I45c03d29bec22b59decb7c95bc1464dd83094c90
Shigeki Yokomichi [Mon, 24 Oct 2016 14:21:25 +0000 (14:21 +0000)]
Merge "Avoid NPE around mReusedTask of ActivityStarter"
am:
f741f88284
Change-Id: I64701d06c2e15b0ad11018c233fce32dce1caa52
Treehugger Robot [Mon, 24 Oct 2016 14:09:35 +0000 (14:09 +0000)]
Merge "Avoid NPE around mReusedTask of ActivityStarter"
Shigeki Yokomichi [Wed, 12 Oct 2016 09:35:17 +0000 (18:35 +0900)]
Avoid NPE around mReusedTask of ActivityStarter
Symptom:
System crash by NPE is observed on ActivityStarter
during phone boot-up.
Detail and sample:
ActivityStarter has possibility to be called itself recursively
by calling TaskRecord$performClearTaskLocked().
Then class variable of mReusedTask is initialized to null
after the call, because the recursive call isn't guarded by
synchronized block.
Then NPE crash occurs on next statement.
Solutions:
Avoid to use the class variable on null possibility statement.
Bug:
32361138
Change-Id: Iaea3e066a6f7134fcae4338ff864bb236241194c
Pankaj Kanwar [Mon, 24 Oct 2016 02:20:20 +0000 (02:20 +0000)]
Merge "CaptivePortalLogin: set mixed content policy to compatibility." into nyc-mr1-dev am:
9cac4568e5
am:
0d75ccf006
Change-Id: I7c147cf575e1040a82a7fe05a97a45e06108b010
Lorenzo Colitti [Mon, 24 Oct 2016 02:19:19 +0000 (02:19 +0000)]
CaptivePortalLogin: set mixed content policy to compatibility. am:
625166377b
am:
c9f79b3d1e
Change-Id: I8430e6190e2c6170a00c6b8106416ca5801671db
Pankaj Kanwar [Mon, 24 Oct 2016 02:13:18 +0000 (02:13 +0000)]
Merge "CaptivePortalLogin: set mixed content policy to compatibility." into nyc-mr1-dev
am:
9cac4568e5
Change-Id: I6b1d09378a0a9a82c0ac397ed920ae633232f044
Lorenzo Colitti [Mon, 24 Oct 2016 02:13:15 +0000 (02:13 +0000)]
CaptivePortalLogin: set mixed content policy to compatibility.
am:
625166377b
Change-Id: I536b2f5a80d3ceaed0ffa86501f6d60e2a407641
OSDN Git Service
