OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "Merge "Adding "attach-agent" to ActivityManagerShellCommand" am: bd2688f4c3...
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

7 years agoMerge "Adding "attach-agent" to ActivityManagerShellCommand"
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

7 years agoMerge "Adding "attach-agent" to ActivityManagerShellCommand"
Leonard Mosescu [Thu, 27 Oct 2016 17:04:57 +0000 (17:04 +0000)]
Merge "Adding "attach-agent" to ActivityManagerShellCommand"

7 years agoAdding "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

7 years agoExtending DNS event reporting
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)

7 years agoMerge changes from topic 'netd_aosp'
Lorenzo Colitti [Thu, 27 Oct 2016 13:20:34 +0000 (13:20 +0000)]
Merge changes from topic 'netd_aosp'
am: d19524f4f2

Change-Id: Ia2b67e53de3b4b734e157b95908b9e4c94360c70

7 years agoAdd connect event reporting
Michal Karpinski [Thu, 27 Oct 2016 13:13:56 +0000 (13:13 +0000)]
Add connect event reporting
am: 265494a0f8

Change-Id: I258d348355ac182cdd0c0698d5dbbb66668dcdd8

7 years agoExtending DNS event reporting
Michal Karpinski [Thu, 27 Oct 2016 13:12:29 +0000 (13:12 +0000)]
Extending DNS event reporting
am: f82d1596ce

Change-Id: I2e39caad0074be519640b561201f75d6685c01ef

7 years agoMerge changes from topic 'netd_aosp'
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

7 years agoAdd connect 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

7 years agoExtending DNS event reporting
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

7 years agoMerge "wifi: hotspot2: omadm: add parsing support for PPS MO tree"
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

7 years agoMerge changes I69c1931b,I6b08f52d
Peter Qiu [Wed, 26 Oct 2016 22:29:01 +0000 (22:29 +0000)]
Merge changes I69c1931b,I6b08f52d
am: 1a5da2b533

Change-Id: I43b0ddd456cfd9d3988c504266e868a637bb43c4

7 years agowifi: hotspot2: omadm: add XML parser for parsing OMA-DM XML string
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

7 years agowifi: hotspot2: initial implementation of PasspointConfiguration
Peter Qiu [Wed, 26 Oct 2016 22:27:56 +0000 (22:27 +0000)]
wifi: hotspot2: initial implementation of PasspointConfiguration
am: e557c35d95

Change-Id: I0ece2aef3408de46c2c92b311c78e711c09c99b9

7 years agoMerge "wifi: hotspot2: omadm: add parsing support for PPS MO tree"
Treehugger Robot [Wed, 26 Oct 2016 22:14:15 +0000 (22:14 +0000)]
Merge "wifi: hotspot2: omadm: add parsing support for PPS MO tree"

7 years agoMerge changes I69c1931b,I6b08f52d
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

7 years agoMerge "Always call into native loader when load a native library"
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

7 years agoAlways call into native loader when load a native library
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

7 years agoresolve merge conflicts of ab00546 to stage-aosp-master
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

7 years agowifi: hotspot2: omadm: add parsing support for PPS MO tree
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

7 years agowifi: hotspot2: omadm: add XML parser for parsing OMA-DM XML string
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

7 years agoMerge "Always call into native loader when load a native library"
Dimitry Ivanov [Wed, 26 Oct 2016 18:27:37 +0000 (18:27 +0000)]
Merge "Always call into native loader when load a native library"

7 years agoMerge "Add key to CarrierConfigManager"
Jordan Liu [Wed, 26 Oct 2016 17:50:44 +0000 (17:50 +0000)]
Merge "Add key to CarrierConfigManager"

7 years agoMerge "Fix animation sequence for upload tasks"
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

7 years agoMerge "Fix animation sequence for upload tasks"
Jorim Jaggi [Wed, 26 Oct 2016 17:25:02 +0000 (17:25 +0000)]
Merge "Fix animation sequence for upload tasks"

7 years agowifi: hotspot2: initial implementation of PasspointConfiguration
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

7 years agoMerge "Add support for starting external Sessions"
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

7 years agoMerge "Add support for starting external Sessions"
Brad Ebinger [Wed, 26 Oct 2016 16:34:31 +0000 (16:34 +0000)]
Merge "Add support for starting external Sessions"

7 years agoMerge "Adds support for specifying the version of a service to register/lookup."
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

7 years agoMerge "Adds support for specifying the version of a service to register/lookup."
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."

7 years agoFix animation sequence for upload tasks
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

7 years agoMerge "Add script to expedite running passing tests"
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

7 years agoMerge "Add script to expedite running passing tests"
Treehugger Robot [Tue, 25 Oct 2016 22:58:55 +0000 (22:58 +0000)]
Merge "Add script to expedite running passing tests"

7 years agoMerge "Add helper method to convert Bluetooth UUID to bytes"
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

7 years agoMerge "Add helper method to convert Bluetooth UUID to bytes"
Jakub Pawlowski [Tue, 25 Oct 2016 21:36:38 +0000 (21:36 +0000)]
Merge "Add helper method to convert Bluetooth UUID to bytes"

7 years agoAdd support for starting external Sessions
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

7 years agoAdd script to expedite running passing tests
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

7 years agoAdds support for specifying the version of a service to register/lookup.
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

7 years agoAdd helper method to convert Bluetooth UUID to bytes
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

7 years agoMerge "Add unit tests for Tethering.isTetherProvisioningRequired"
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

7 years agoMerge "Add unit tests for Tethering.isTetherProvisioningRequired"
Treehugger Robot [Tue, 25 Oct 2016 18:12:42 +0000 (18:12 +0000)]
Merge "Add unit tests for Tethering.isTetherProvisioningRequired"

7 years agoMerge "Update the docstring on getAllCellInfo() for unreported values"
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

7 years agoMerge "Update the docstring on getAllCellInfo() for unreported values"
nharold [Tue, 25 Oct 2016 00:48:40 +0000 (00:48 +0000)]
Merge "Update the docstring on getAllCellInfo() for unreported values"

7 years agoAdd unit tests for Tethering.isTetherProvisioningRequired
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

7 years agoUpdate the docstring on getAllCellInfo() for unreported values
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

7 years agoMerge "Allow operator/manufacturer setting to use priority"
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

7 years agoMerge "Allow operator/manufacturer setting to use priority"
Treehugger Robot [Mon, 24 Oct 2016 18:21:06 +0000 (18:21 +0000)]
Merge "Allow operator/manufacturer setting to use priority"

7 years agoMerge "PdfEditor: define LOG_TAG"
Mark Salyzyn [Mon, 24 Oct 2016 15:53:30 +0000 (15:53 +0000)]
Merge "PdfEditor: define LOG_TAG"
am: a3bb8e3cc7

Change-Id: Ide63ebe4228d7b7af05e20202baafdebf9699150

7 years agoMerge "PdfEditor: define LOG_TAG"
Treehugger Robot [Mon, 24 Oct 2016 15:47:32 +0000 (15:47 +0000)]
Merge "PdfEditor: define LOG_TAG"

7 years agoMerge "Avoid NPE around mReusedTask of ActivityStarter"
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

7 years agoMerge "Avoid NPE around mReusedTask of ActivityStarter"
Treehugger Robot [Mon, 24 Oct 2016 14:09:35 +0000 (14:09 +0000)]
Merge "Avoid NPE around mReusedTask of ActivityStarter"

7 years agoAvoid 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

7 years agoMerge "Create the WebViewZygote and implement WebViewZygoteInit."
Robert Sesek [Sat, 22 Oct 2016 03:12:18 +0000 (03:12 +0000)]
Merge "Create the WebViewZygote and implement WebViewZygoteInit."
am: 8be2850546

Change-Id: I608ea53be52cb91f0e8cf73998de4578b39e099a

7 years agoMerge "Create the WebViewZygote and implement WebViewZygoteInit."
Treehugger Robot [Sat, 22 Oct 2016 03:03:10 +0000 (03:03 +0000)]
Merge "Create the WebViewZygote and implement WebViewZygoteInit."

7 years agoMerge "Camera2 Legacy: catch more surface abandoned error"
Yin-Chia Yeh [Fri, 21 Oct 2016 21:07:44 +0000 (21:07 +0000)]
Merge "Camera2 Legacy: catch more surface abandoned error"
am: 03f14bef41

Change-Id: If2e05eeb8c7fe24f97fc0c5e20bfe03a6c8c9e23

7 years agoMerge "Camera2 Legacy: catch more surface abandoned error"
Treehugger Robot [Fri, 21 Oct 2016 20:36:29 +0000 (20:36 +0000)]
Merge "Camera2 Legacy: catch more surface abandoned error"

7 years agoPdfEditor: define LOG_TAG
Mark Salyzyn [Fri, 7 Oct 2016 19:13:43 +0000 (12:13 -0700)]
PdfEditor: define LOG_TAG

general cleanup of logging

Test: compile
Bug: 31992412
Change-Id: Ie2ec5a223bbb92e902bf6914100281b6d84500e3

7 years agoCamera2 Legacy: catch more surface abandoned error
Yin-Chia Yeh [Wed, 19 Oct 2016 20:53:33 +0000 (13:53 -0700)]
Camera2 Legacy: catch more surface abandoned error

Bug: 30140107
Change-Id: Ia293bdbb85c8078e17def55db9c599cfe70458db

7 years agoMerge "Fix accounting for .vdex in dumpsys meminfo"
Mathieu Chartier [Fri, 21 Oct 2016 17:20:27 +0000 (17:20 +0000)]
Merge "Fix accounting for .vdex in dumpsys meminfo"
am: 4a5789b9b1

Change-Id: I3e50c0e6a80bc221228dd8293ec8209ecf323123

7 years agoMerge "Fix accounting for .vdex in dumpsys meminfo"
Mathieu Chartier [Fri, 21 Oct 2016 17:07:37 +0000 (17:07 +0000)]
Merge "Fix accounting for .vdex in dumpsys meminfo"

7 years agoMerge "fix mistaken check of mScreenBrightnessDarkConfig"
liulvping [Fri, 21 Oct 2016 04:38:38 +0000 (04:38 +0000)]
Merge "fix mistaken check of mScreenBrightnessDarkConfig"
am: e6fe836938

Change-Id: I4eda1d6aed52fa4d8cbcd1ade29e96f14e58bab7

7 years agoMerge "Switch on android.telecom.Log in Telecom"
Brad Ebinger [Fri, 21 Oct 2016 04:37:28 +0000 (04:37 +0000)]
Merge "Switch on android.telecom.Log in Telecom"
am: 37521b9ba5  -s ours

Change-Id: I1a624721f577be6b1cf684208cdeb4e0471e51f2

7 years agoMerge "fix mistaken check of mScreenBrightnessDarkConfig"
Treehugger Robot [Fri, 21 Oct 2016 03:50:15 +0000 (03:50 +0000)]
Merge "fix mistaken check of mScreenBrightnessDarkConfig"

7 years agofix mistaken check of mScreenBrightnessDarkConfig
liulvping [Thu, 20 Oct 2016 11:51:38 +0000 (19:51 +0800)]
fix mistaken check of mScreenBrightnessDarkConfig

Change-Id: Ibd1234a5a69422f3124e72cd561d4f3624a82faf
Signed-off-by: liulvping <liulvping@xiaomi.com>
7 years agoSwitch on android.telecom.Log in Telecom
Brad Ebinger [Wed, 5 Oct 2016 22:47:28 +0000 (15:47 -0700)]
Switch on android.telecom.Log in Telecom

Move over the Runnable Class into android.telecom and turn on the
framework's usage in Telecom.
CP from: https://android-review.googlesource.com/#/c/287291/

Test: All Telecom unit tests pass. Manual Log testing has also been
confirmed to be working as it did before.
Bug: 26571395
Change-Id: If7e2036c746c5a953f3a77e2d625a423ce5bf8f3
(cherry picked from commit 9fbbd4052dee1dfa74b87502cec91cc51170d69d)

7 years agoMerge "Gradually increase the level of authentication on failed GATT operations."
Jacky Cheung [Thu, 20 Oct 2016 23:03:57 +0000 (23:03 +0000)]
Merge "Gradually increase the level of authentication on failed GATT operations."
am: 6071abdb92

Change-Id: If06babf4a23879acdfc358838cdc094d753c362b

7 years agoMerge "Switch on android.telecom.Log in Telecom"
Brad Ebinger [Thu, 20 Oct 2016 22:53:38 +0000 (22:53 +0000)]
Merge "Switch on android.telecom.Log in Telecom"

7 years agoMerge "Gradually increase the level of authentication on failed GATT operations."
Treehugger Robot [Thu, 20 Oct 2016 22:50:07 +0000 (22:50 +0000)]
Merge "Gradually increase the level of authentication on failed GATT operations."

7 years agoFix accounting for .vdex in dumpsys meminfo
Mathieu Chartier [Thu, 20 Oct 2016 22:38:55 +0000 (15:38 -0700)]
Fix accounting for .vdex in dumpsys meminfo

Before it was showing up in "Other mmap" instead. Now it is correctly
showing up in ".dex mmap".

Bug: 30937355
Test: N6P booting, dumpsys meminfo -d

Change-Id: I335dbb77414b395b14259aa7c68068f845a5eca1

7 years agoMerge "Adds registerSessionListener API to Log"
Brad Ebinger [Thu, 20 Oct 2016 22:09:30 +0000 (22:09 +0000)]
Merge "Adds registerSessionListener API to Log"
am: e3daed81eb

Change-Id: Ia42cba6a735170ce1aea653bd42b6f1182853819

7 years agoMerge "Adds registerSessionListener API to Log"
Brad Ebinger [Thu, 20 Oct 2016 21:51:53 +0000 (21:51 +0000)]
Merge "Adds registerSessionListener API to Log"

7 years agoGradually increase the level of authentication on failed GATT operations.
Jacky Cheung [Thu, 20 Oct 2016 20:55:21 +0000 (13:55 -0700)]
Gradually increase the level of authentication on failed GATT operations.

When lower layer returns insufficient authentication or insufficient
encryption on various GATT operations, gradually retry with increased
authentication level first to AUTHENTICATION_NO_MITM, then
AUTHENTICATION_MITM.

Test: ported from internal branch.

Change-Id: I6bcc4198ca493b7900ddd166a81d30cde896fa86

7 years agoMerge "Fix a static-analyzer warning."
George Burgess IV [Thu, 20 Oct 2016 19:19:15 +0000 (19:19 +0000)]
Merge "Fix a static-analyzer warning."
am: 63b4f6f5db

Change-Id: I85fd6d25733d59da76eb0bab381fdbd3b5a0430d

7 years agoMerge "Fix a static-analyzer warning."
Treehugger Robot [Thu, 20 Oct 2016 19:06:58 +0000 (19:06 +0000)]
Merge "Fix a static-analyzer warning."

7 years agoAdds registerSessionListener API to Log
Brad Ebinger [Tue, 18 Oct 2016 20:48:17 +0000 (13:48 -0700)]
Adds registerSessionListener API to Log

Adds the registerSessionListener API to android.telecom.Log to allow
callbacks to occur when a session has been fully completed.
CP from internal branch.

Test: Manual Testing
Bug: 26571395
Change-Id: I70ebd6f432768a5d7bd8f3a0997b8e0ef335bb35

7 years agoMerge "HIDL Vectors are now exposed to Java as ArrayList<T>, the supporting APIs on"
Andreas Huber [Wed, 19 Oct 2016 19:39:03 +0000 (19:39 +0000)]
Merge "HIDL Vectors are now exposed to Java as ArrayList<T>, the supporting APIs on"
am: 2202b164d8

Change-Id: I43bec2c6d3e6e4201f7a50981f428ef00f384684

7 years agoMerge "Use this.isUp() inside InterfaceConfiguration"
Christopher Wiley [Wed, 19 Oct 2016 19:31:57 +0000 (19:31 +0000)]
Merge "Use this.isUp() inside InterfaceConfiguration"
am: 239df3cc5a

Change-Id: Id6f064d7a74e41d757de2499653671fc830d217b

7 years agoMerge "HIDL Vectors are now exposed to Java as ArrayList<T>, the supporting APIs on"
Andreas Huber [Wed, 19 Oct 2016 19:30:28 +0000 (19:30 +0000)]
Merge "HIDL Vectors are now exposed to Java as ArrayList<T>, the supporting APIs on"

7 years agoMerge "Use this.isUp() inside InterfaceConfiguration"
Treehugger Robot [Wed, 19 Oct 2016 19:15:30 +0000 (19:15 +0000)]
Merge "Use this.isUp() inside InterfaceConfiguration"

7 years agoMerge "Hide QS customizer correctly"
Jason Monk [Wed, 19 Oct 2016 15:15:43 +0000 (15:15 +0000)]
Merge "Hide QS customizer correctly"
am: 03e4eb32fe

Change-Id: I8c1998de76beee26b703781a6f883e9efd24bde3

7 years agoMerge "Hide QS customizer correctly"
Jason Monk [Wed, 19 Oct 2016 15:05:41 +0000 (15:05 +0000)]
Merge "Hide QS customizer correctly"

7 years agoMerge "Add support for new SessionManager and EventManager tests"
Brad Ebinger [Tue, 18 Oct 2016 21:30:57 +0000 (21:30 +0000)]
Merge "Add support for new SessionManager and EventManager tests"
am: 42598f4a96

Change-Id: I9c629074ca39dfb06bd6b16217ba5e59a9e0a004

7 years agoMerge "Add support for new SessionManager and EventManager tests"
Brad Ebinger [Tue, 18 Oct 2016 21:22:18 +0000 (21:22 +0000)]
Merge "Add support for new SessionManager and EventManager tests"

7 years agoHIDL Vectors are now exposed to Java as ArrayList<T>, the supporting APIs on
Andreas Huber [Tue, 18 Oct 2016 16:24:04 +0000 (09:24 -0700)]
HIDL Vectors are now exposed to Java as ArrayList<T>, the supporting APIs on

HwParcel now reflect this change.

Bug: 32237331
Test: hidl_test_java
Change-Id: Ia1ce5a4e3acedd8ebcff15107aea53ce28fde589

7 years agoHide QS customizer correctly
Yoshinori Hirano [Mon, 5 Sep 2016 07:11:59 +0000 (16:11 +0900)]
Hide QS customizer correctly

When users open and close QS customizer quickly, QSCustomizer#hide()
is not called because QSCustomizer#isCustomizing() returns false.
The isCustomizing() becomes true when the expand animation ends.
The hide() should be called even though the animation is ongoing.

Bug: 30545089
Test: manual - open and close QS customizer quickly

Change-Id: Ic483addfb6ae9da31c997fec7778e5acd718c353

7 years agoMerge "Fix static analyzer warnings."
George Burgess IV [Tue, 18 Oct 2016 01:43:24 +0000 (01:43 +0000)]
Merge "Fix static analyzer warnings."
am: ff5c3ad08b

Change-Id: I655fd765cfeae407c070261cfe07ce8b739b06fa

7 years agoMerge "Fix static analyzer warnings."
Treehugger Robot [Tue, 18 Oct 2016 01:30:54 +0000 (01:30 +0000)]
Merge "Fix static analyzer warnings."

7 years agoMerge "Remove APIs that are not directly usable."
Sanket Agarwal [Mon, 17 Oct 2016 21:28:05 +0000 (21:28 +0000)]
Merge "Remove APIs that are not directly usable."
am: 9cff57312d

Change-Id: I1234db97ed82017ed3bca02e10818a53fdc33d3d

7 years agoMerge "missing includes"
Mark Salyzyn [Mon, 17 Oct 2016 21:25:59 +0000 (21:25 +0000)]
Merge "missing includes"
am: 78929f3ee0

Change-Id: I3e7a25ded484d516fab453abe434c2e53cf0f27e

7 years agoMerge "Remove APIs that are not directly usable."
Treehugger Robot [Mon, 17 Oct 2016 21:16:20 +0000 (21:16 +0000)]
Merge "Remove APIs that are not directly usable."

7 years agoMerge "missing includes"
Treehugger Robot [Mon, 17 Oct 2016 21:12:08 +0000 (21:12 +0000)]
Merge "missing includes"

7 years agoRemove APIs that are not directly usable.
Sanket Agarwal [Wed, 3 Aug 2016 19:57:34 +0000 (12:57 -0700)]
Remove APIs that are not directly usable.

The right way to expose this API is done via MediaBrowser.

Bug: b/28791287
Change-Id: I0a8a185934fd7aaa9f2b5eac7398955fa380060f
(cherry picked from commit b5fbb75aa26a6322b26b1289cc5d14a8c31acb34)

7 years agomissing includes
Mark Salyzyn [Mon, 17 Oct 2016 17:10:55 +0000 (10:10 -0700)]
missing includes

Assumptions are made about header side effects

Test: compile
Bug: 30465923
Change-Id: Icc9415aed5e54b2bc00b70aa0da6df4148f30654

7 years agoUse this.isUp() inside InterfaceConfiguration
Christopher Wiley [Mon, 17 Oct 2016 17:30:28 +0000 (10:30 -0700)]
Use this.isUp() inside InterfaceConfiguration

Bug: 31337216
Test: Compiles
Change-Id: I968a739f9ada47b1357932d2da76451eb26c3d5f

7 years agoMerge "Avoid automatically mirroring Drawable of CustomTile"
Yoshinori Hirano [Mon, 17 Oct 2016 17:00:44 +0000 (17:00 +0000)]
Merge "Avoid automatically mirroring Drawable of CustomTile"
am: 9a904d68c7

Change-Id: I337620f4a2514a00a6b49275cadde6087e11dddf

7 years agoMerge "Avoid automatically mirroring Drawable of CustomTile"
Treehugger Robot [Mon, 17 Oct 2016 16:42:17 +0000 (16:42 +0000)]
Merge "Avoid automatically mirroring Drawable of CustomTile"

7 years agoMerge "Add InterfaceConfiguration.isUp()"
Christopher Wiley [Mon, 17 Oct 2016 16:41:52 +0000 (16:41 +0000)]
Merge "Add InterfaceConfiguration.isUp()"
am: c7ea99a63c

Change-Id: Id0bc63c82f8ffd6ad411769ab012efd8bbdfa3ce

7 years agoMerge "Add InterfaceConfiguration.isUp()"
Treehugger Robot [Mon, 17 Oct 2016 16:30:43 +0000 (16:30 +0000)]
Merge "Add InterfaceConfiguration.isUp()"

7 years agoMerge "Update time_zones_by_country.xml / delete unused files"
Neil Fuller [Mon, 17 Oct 2016 16:30:06 +0000 (16:30 +0000)]
Merge "Update time_zones_by_country.xml / delete unused files"
am: 143d13ce59

Change-Id: I1a52ac448247c1ebe7dc19f566e87478131a95e0