OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Mon, 21 Nov 2016 01:31:58 +0000 (01:31 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

7 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Mon, 21 Nov 2016 01:31:36 +0000 (01:31 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

7 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Mon, 21 Nov 2016 01:31:09 +0000 (01:31 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

7 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Mon, 21 Nov 2016 01:30:39 +0000 (01:30 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

7 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Mon, 21 Nov 2016 01:30:03 +0000 (01:30 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

7 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Mon, 21 Nov 2016 01:29:44 +0000 (01:29 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

7 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Mon, 21 Nov 2016 01:29:13 +0000 (01:29 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

7 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Mon, 21 Nov 2016 01:28:40 +0000 (01:28 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

7 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Mon, 21 Nov 2016 01:28:21 +0000 (01:28 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

7 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Mon, 21 Nov 2016 01:27:55 +0000 (01:27 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

7 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Mon, 21 Nov 2016 01:27:22 +0000 (01:27 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

7 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Mon, 21 Nov 2016 01:26:51 +0000 (01:26 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

7 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Mon, 21 Nov 2016 01:26:05 +0000 (01:26 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

7 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Mon, 21 Nov 2016 01:23:55 +0000 (01:23 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 20 Nov 2016 23:49:28 +0000 (15:49 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 32177112
Change-Id: Ia328721b05af6cfe32f4494e89f6ee1645cb1deb

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 20 Nov 2016 23:43:22 +0000 (15:43 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 32177112
Change-Id: I102b129ace5c7d97a6874aad995930b2f3cbdae6

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 20 Nov 2016 22:46:30 +0000 (14:46 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 32177112
Change-Id: I8f62ab1cb184f32e850831414c8ff3e7740d783f

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 20 Nov 2016 22:43:23 +0000 (14:43 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 32177112
Change-Id: Ic5781e21dceb885251e8ed7696a309e1844d9bd6

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 20 Nov 2016 22:18:34 +0000 (14:18 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 32177112
Change-Id: Iad7637d1a9f10f5641f089db9542734be4da0d2e

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 20 Nov 2016 22:15:31 +0000 (14:15 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 32177112
Change-Id: Ia301c54a58d496c9608939c12e18491d3c4df1f6

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 20 Nov 2016 22:12:16 +0000 (14:12 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 32177112
Change-Id: Ic71ef1faaf60206410b376e09daa2ad98c91d259

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 20 Nov 2016 22:09:05 +0000 (14:09 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 32177112
Change-Id: I3a874ee9fdb4b34f2db64447c6e5d74e25c06634

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 20 Nov 2016 22:01:26 +0000 (14:01 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 32177112
Change-Id: Ie0dcafdd0f6a197f33c9422e16fb1a03137b73b3

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 20 Nov 2016 21:56:06 +0000 (13:56 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 32177112
Change-Id: I781d238740edaed134108cb65f5a5e2a2bd9d3a0

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 20 Nov 2016 21:52:54 +0000 (13:52 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 32177112
Change-Id: Ia40da4b009f43aa51b2b7d3acdccc7552e2b35d0

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 20 Nov 2016 21:47:25 +0000 (13:47 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 32177112
Change-Id: I2ded2e0fc6589e569e2de2f4d042f68c1cd0b63e

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 20 Nov 2016 21:44:23 +0000 (13:44 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 32177112
Change-Id: Ied6fea4f1ce0e9b49dbaf9fedbf038c0bbafa0da

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 20 Nov 2016 21:41:21 +0000 (13:41 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 32177112
Change-Id: I51ff5d1408af5f07b9e9016d25b83996c2b5e369

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 20 Nov 2016 21:38:07 +0000 (13:38 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 32177112
Change-Id: I7f9e8278bdcb7f5f9041a9fff6456ab610e7c928

7 years agoMerge "Split libhidl into base and transport."
Yifan Hong [Fri, 18 Nov 2016 23:23:08 +0000 (23:23 +0000)]
Merge "Split libhidl into base and transport."
am: c6c005ef5b

Change-Id: Ia0017e01d650383a709952c86012dc958d93b794

7 years agoSplit libhidl into base and transport.
Yifan Hong [Fri, 18 Nov 2016 23:14:27 +0000 (23:14 +0000)]
Split libhidl into base and transport.
am: c46d1b44eb

Change-Id: I0bcf04338d71386249de46c015b0e577c47c6e79

7 years agoMerge "Split libhidl into base and transport."
Treehugger Robot [Fri, 18 Nov 2016 23:08:55 +0000 (23:08 +0000)]
Merge "Split libhidl into base and transport."

7 years agoMerge "Fix incorrect calculation of sizeof package structure"
Wan He [Fri, 18 Nov 2016 22:39:43 +0000 (22:39 +0000)]
Merge "Fix incorrect calculation of sizeof package structure"
am: 757e286cc8

Change-Id: Ia16ee8f4efaee3e43c656f753c878b13b4a4706c

7 years agoMerge "Fix incorrect calculation of sizeof package structure"
Treehugger Robot [Fri, 18 Nov 2016 22:30:41 +0000 (22:30 +0000)]
Merge "Fix incorrect calculation of sizeof package structure"

7 years agoMerge "Customization of LTE Signal Bars"
Mats 2, Åkesson [Fri, 18 Nov 2016 20:50:20 +0000 (20:50 +0000)]
Merge "Customization of LTE Signal Bars"
am: 3cbf2c2657

Change-Id: I33c625ec49547fde582462687e6229ddf0269b15

7 years agoMerge "Customization of LTE Signal Bars"
Treehugger Robot [Fri, 18 Nov 2016 20:44:14 +0000 (20:44 +0000)]
Merge "Customization of LTE Signal Bars"

7 years agoMerge "Share one receiver for CurrentUserTracker"
Selim Cinek [Fri, 18 Nov 2016 19:51:23 +0000 (19:51 +0000)]
Merge "Share one receiver for CurrentUserTracker"
am: 06d619ccfa

Change-Id: I4b0dc5398b0be804663ebd633070a38cc51ec7de

7 years agoMerge "Brightness mirror - fix multi-touch issue"
Selim Cinek [Fri, 18 Nov 2016 19:50:27 +0000 (19:50 +0000)]
Merge "Brightness mirror - fix multi-touch issue"
am: 1bfab3de31

Change-Id: I5906d89a1c4e1343dbdbf99f328a5356b4f2be85

7 years agoMerge "Share one receiver for CurrentUserTracker"
Selim Cinek [Fri, 18 Nov 2016 19:39:30 +0000 (19:39 +0000)]
Merge "Share one receiver for CurrentUserTracker"

7 years agoMerge "Brightness mirror - fix multi-touch issue"
Selim Cinek [Fri, 18 Nov 2016 19:39:09 +0000 (19:39 +0000)]
Merge "Brightness mirror - fix multi-touch issue"

7 years agoMerge "wifi: hotspot2: add support for validating passpoint configuration"
Peter Qiu [Fri, 18 Nov 2016 08:54:11 +0000 (08:54 +0000)]
Merge "wifi: hotspot2: add support for validating passpoint configuration"
am: ebb722d04a

Change-Id: Ic20a77103961bd9ff61b6af90130c25ad19c451a

7 years agoMerge "wifi: hotspot2: add support for validating passpoint configuration"
Treehugger Robot [Fri, 18 Nov 2016 08:45:15 +0000 (08:45 +0000)]
Merge "wifi: hotspot2: add support for validating passpoint configuration"

7 years agoMerge "Schedule agentDisconnected() in handler thread"
Chris Tate [Fri, 18 Nov 2016 01:33:29 +0000 (01:33 +0000)]
Merge "Schedule  agentDisconnected() in handler thread"
am: c02a4a4613

Change-Id: I1e2da0be53678a791dd16be5d00caa5e712fa036

7 years agoMerge "Schedule agentDisconnected() in handler thread"
Chris Tate [Fri, 18 Nov 2016 01:23:31 +0000 (01:23 +0000)]
Merge "Schedule  agentDisconnected() in handler thread"

7 years agoMerge "Avoid starving RT anims"
John Reck [Fri, 18 Nov 2016 00:14:05 +0000 (00:14 +0000)]
Merge "Avoid starving RT anims"
am: f77c220aa9

Change-Id: I3d4ba24ae0e6de4683d47163fd8f3bf65b98bd17

7 years agoSplit libhidl into base and transport.
Yifan Hong [Wed, 16 Nov 2016 23:48:49 +0000 (15:48 -0800)]
Split libhidl into base and transport.

Bug: 32756130

Test: mma
Change-Id: I0df309a1096b663cc51ce8badacf05e2a47836a8

7 years agoMerge "Avoid starving RT anims"
Treehugger Robot [Thu, 17 Nov 2016 23:52:59 +0000 (23:52 +0000)]
Merge "Avoid starving RT anims"

7 years agoAvoid starving RT anims
John Reck [Tue, 15 Nov 2016 18:22:01 +0000 (10:22 -0800)]
Avoid starving RT anims

Test: Manual, usleep(16000) in DrawFrameTask and tap
on recents

Merged-In: I88bb30a2503bc908ec45650c7d36b6fb3cc750d0

Change-Id: I88bb30a2503bc908ec45650c7d36b6fb3cc750d0

7 years agoMerge "Readability improvements in Logging"
Brad Ebinger [Thu, 17 Nov 2016 19:29:17 +0000 (19:29 +0000)]
Merge "Readability improvements in Logging"
am: d51df736f6

Change-Id: If7bb6955d615b8369ac41d3bb8ba96aa0cc752d2

7 years agoMerge "Readability improvements in Logging"
Brad Ebinger [Thu, 17 Nov 2016 19:18:00 +0000 (19:18 +0000)]
Merge "Readability improvements in Logging"

7 years agoMerge "Fix coretests: Remove dependency on libnativehelper"
Dimitry Ivanov [Thu, 17 Nov 2016 18:50:29 +0000 (18:50 +0000)]
Merge "Fix coretests: Remove dependency on libnativehelper"
am: f68cb55cc1

Change-Id: I06e1b8acbe6772ea80bb9c6ab6704e6ce678c3cc

7 years agoMerge "Fix coretests: Remove dependency on libnativehelper"
Treehugger Robot [Thu, 17 Nov 2016 18:37:41 +0000 (18:37 +0000)]
Merge "Fix coretests: Remove dependency on libnativehelper"

7 years agoMerge "Track libcore change Ib691c81b158ec37419a903bfa4261a12139fbff7"
Przemyslaw Szczepaniak [Thu, 17 Nov 2016 15:41:57 +0000 (15:41 +0000)]
Merge "Track libcore change Ib691c81b158ec37419a903bfa4261a12139fbff7"
am: caa816451c

Change-Id: I43c66260714bb312e270bfbae1c74047e6ef01e4

7 years agoMerge "Track libcore change Ib691c81b158ec37419a903bfa4261a12139fbff7"
Przemyslaw Szczepaniak [Thu, 17 Nov 2016 15:28:52 +0000 (15:28 +0000)]
Merge "Track libcore change Ib691c81b158ec37419a903bfa4261a12139fbff7"

7 years agoFix incorrect calculation of sizeof package structure
Wan He [Thu, 17 Nov 2016 09:49:37 +0000 (17:49 +0800)]
Fix incorrect calculation of sizeof package structure

Argument "package" is a pointer, not the structure.

Signed-off-by: Wan He <xiaolin.gxl@alibaba-inc.com>
7 years agoMerge "Don't disconnect an A2DP device when connecting to same device"
Pavlin Radoslavov [Thu, 17 Nov 2016 07:07:20 +0000 (07:07 +0000)]
Merge "Don't disconnect an A2DP device when connecting to same device"
am: 3ebcf1218b

Change-Id: Ibbf94535642bbde6e35ee1dacbd27dd13f400f16

7 years agoMerge "Don't disconnect an A2DP device when connecting to same device"
Treehugger Robot [Thu, 17 Nov 2016 06:58:42 +0000 (06:58 +0000)]
Merge "Don't disconnect an A2DP device when connecting to same device"

7 years agoDon't disconnect an A2DP device when connecting to same device
Pavlin Radoslavov [Thu, 17 Nov 2016 04:51:06 +0000 (20:51 -0800)]
Don't disconnect an A2DP device when connecting to same device

When processing a connect request for an A2DP device, Settings
would trigger a disconnect request for all A2DP devices that
have state of CONNECTED, CONNECTING or DISCONNECTING, including
eventually the device we are connecting to.
This could create timing-related issues, and is not necessary.
Now we explicitly check to avoid disconnecting the device we are
connecting to.

Test: Manual A2DP testing with a phone and wireless headsets
Bug: 32688022
Change-Id: I572dd87c071829b734513c4b928a4d65fe539520

7 years agoFix coretests: Remove dependency on libnativehelper
Dimitry Ivanov [Thu, 17 Nov 2016 02:28:04 +0000 (18:28 -0800)]
Fix coretests: Remove dependency on libnativehelper

This dependency was never needed and it makes test app
depend on private platform libraries - which is no longer allowed.

This change fixes these problems by removing dependency and renaming
JNI method.

Test: Install the test and start it.
Change-Id: I9878627148917c1b5928b98f3c86f6e6097093d6

7 years agoMerge "wifi: add constant definition for EAP types"
Peter Qiu [Thu, 17 Nov 2016 02:21:41 +0000 (02:21 +0000)]
Merge "wifi: add constant definition for EAP types"
am: a908e65b66

Change-Id: I283fba81ca5246222bda07f7f109d2f359e5e395

7 years agoMerge "wifi: add constant definition for EAP types"
Treehugger Robot [Thu, 17 Nov 2016 02:10:23 +0000 (02:10 +0000)]
Merge "wifi: add constant definition for EAP types"

7 years agoShare one receiver for CurrentUserTracker
dooyoung.hwang [Fri, 11 Nov 2016 08:23:00 +0000 (17:23 +0900)]
Share one receiver for CurrentUserTracker

Each CurrentUserTracker has one receiver per one object.
This could cause unnecessary transaction as Tracker counts
increases. The idea of redcuing receiver is creating
one static receiver for CurrentUserTracker and share it
with all object.

Test: Check if Quicksetting order is changed properly
after switching user.

Change-Id: I8404829826391f8b315b42bbd0f50e77b783eeab

7 years agoMerge changes from topic 'usb_bugfixes-mirror-aosp-master'
Jerry Zhang [Thu, 17 Nov 2016 00:22:59 +0000 (00:22 +0000)]
Merge changes from topic 'usb_bugfixes-mirror-aosp-master'
am: b37d826204

Change-Id: Id5e28b59858b16c1cfde16104feb54f2a101e366

7 years agoRefactored setCurrentFunction and setUsbDataUnlocked into single method.
Jerry Zhang [Thu, 17 Nov 2016 00:12:50 +0000 (00:12 +0000)]
Refactored setCurrentFunction and setUsbDataUnlocked into single method.
am: 935372bfd6

Change-Id: I5436278e092f691c9179f7cc3709c4578b544e74

7 years agoClean up persistent usb state on boot.
Jerry Zhang [Thu, 17 Nov 2016 00:11:15 +0000 (00:11 +0000)]
Clean up persistent usb state on boot.
am: dfacad026d

Change-Id: I762306bc76e304c6491c8af18e82bf2e0c4b433e

7 years agoFixed handling of usb state during adb changes.
Jerry Zhang [Thu, 17 Nov 2016 00:10:25 +0000 (00:10 +0000)]
Fixed handling of usb state during adb changes.
am: 0269ebe0fe

Change-Id: I2fc3674c4d5cc63febe2ebf47576f3cf1bcd1da2

7 years agoMerge changes from topic 'usb_bugfixes-mirror-aosp-master'
Jerry Zhang [Wed, 16 Nov 2016 23:59:32 +0000 (23:59 +0000)]
Merge changes from topic 'usb_bugfixes-mirror-aosp-master'

* changes:
  Refactored setCurrentFunction and setUsbDataUnlocked into single method.
  Clean up persistent usb state on boot.
  Fixed handling of usb state during adb changes.

7 years agoMerge "Add security capabilities enums to ScanResult"
Ningyuan Wang [Wed, 16 Nov 2016 23:54:24 +0000 (23:54 +0000)]
Merge "Add security capabilities enums to ScanResult"
am: a3c0324824

Change-Id: Iad2aba87155d52343b372b2d7af3e037842c1ca4

7 years agoMerge "Add security capabilities enums to ScanResult"
Treehugger Robot [Wed, 16 Nov 2016 23:42:24 +0000 (23:42 +0000)]
Merge "Add security capabilities enums to ScanResult"

7 years agowifi: hotspot2: add support for validating passpoint configuration
Peter Qiu [Tue, 1 Nov 2016 21:50:59 +0000 (14:50 -0700)]
wifi: hotspot2: add support for validating passpoint configuration

Bug: 32572199
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: I8e649430af54d863dfa5492abc3dfd79c772c765

7 years agowifi: add constant definition for EAP types
Peter Qiu [Fri, 11 Nov 2016 17:18:26 +0000 (09:18 -0800)]
wifi: add constant definition for EAP types

Bug: 32810711
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: Ia62f2674e8cdf975d1380f733a8687bdb15ed197

7 years agoAdd security capabilities enums to ScanResult
Ningyuan Wang [Tue, 1 Nov 2016 22:36:10 +0000 (15:36 -0700)]
Add security capabilities enums to ScanResult

This adds enums of security parameters, including
protocol, key management, and cipher suites.

Bug: 32512793
Test: compile

Change-Id: Ibf784d79695ca5e261c6bfe623406bc693c5ac17

7 years agoMerge "Fix include after spliting HidlSupport.h"
Yifan Hong [Wed, 16 Nov 2016 19:10:20 +0000 (19:10 +0000)]
Merge "Fix include after spliting HidlSupport.h"
am: efd7b9f57d

Change-Id: I6b0b3482feb169ae89ffa6e20561ad64b42d12d1

7 years agoReadability improvements in Logging
Brad Ebinger [Tue, 1 Nov 2016 21:11:38 +0000 (14:11 -0700)]
Readability improvements in Logging

We now truncate Session method paths and IDs based on the Logging level
to improve Session Logging readability in logcat. If another external
session is started off of an existing external Session, the preceding
histories are replaced with "..." so that the Session information is not
overwhelming.

Bug: 26571395
Test: Unit Tests and manual tests pass
Change-Id: I9ffda3d64f1072fa6228a82a86116a5e47d18c96

7 years agoMerge "Fix include after spliting HidlSupport.h"
Yifan Hong [Wed, 16 Nov 2016 19:01:00 +0000 (19:01 +0000)]
Merge "Fix include after spliting HidlSupport.h"

7 years agoMerge "Preload2: Fix dependencies"
Andreas Gampe [Wed, 16 Nov 2016 18:25:37 +0000 (18:25 +0000)]
Merge "Preload2: Fix dependencies"
am: 3b379ee94e

Change-Id: If3ecad631e5f7deb9b2f348a26d9b41f8a00b4f5

7 years agoMerge "Preload2: Fix dependencies"
Treehugger Robot [Wed, 16 Nov 2016 18:15:05 +0000 (18:15 +0000)]
Merge "Preload2: Fix dependencies"

7 years agoMerge "Fix deprecated range_x calls."
Martijn Coenen [Wed, 16 Nov 2016 10:00:23 +0000 (10:00 +0000)]
Merge "Fix deprecated range_x calls."
am: 87cafe8f33

Change-Id: Idfbc4e3475cea7e56b3ac72afd61e1e981ef4e5d

7 years agoMerge "Fix deprecated range_x calls."
Martijn Coenen [Wed, 16 Nov 2016 09:48:30 +0000 (09:48 +0000)]
Merge "Fix deprecated range_x calls."

7 years agoMerge "CountDownTimer: not skip onTick()"
Hidenari Koshimae [Wed, 16 Nov 2016 08:10:54 +0000 (08:10 +0000)]
Merge "CountDownTimer: not skip onTick()"
am: 224d9e48fa

Change-Id: I7ade5d057e73f53867747c00fcfc5882a57a2f4c

7 years agoMerge "CountDownTimer: not skip onTick()"
Treehugger Robot [Wed, 16 Nov 2016 07:55:26 +0000 (07:55 +0000)]
Merge "CountDownTimer: not skip onTick()"

7 years agoMerge "Fixed the issue when some apps were gone and couldn't be installed successfull...
longhai [Wed, 16 Nov 2016 03:04:38 +0000 (03:04 +0000)]
Merge "Fixed the issue when some apps were gone and couldn't be installed successfully after updating from KK to M via OTA."
am: 1813ae0159

Change-Id: Iae1a0cd25495206d596aed7d68ce7936071f9c6e

7 years agoMerge "Fixed the issue when some apps were gone and couldn't be installed successfull...
Treehugger Robot [Wed, 16 Nov 2016 02:54:25 +0000 (02:54 +0000)]
Merge "Fixed the issue when some apps were gone and couldn't be installed successfully after updating from KK to M via OTA."

7 years agoMerge changes from topic 'HS2 API Cleanup'
Peter Qiu [Wed, 16 Nov 2016 00:04:44 +0000 (00:04 +0000)]
Merge changes from topic 'HS2 API Cleanup'
am: 41fd0f1faf

Change-Id: Ic53fa2cad082484ebbbc9198511b0539dad97382

7 years agoFix include after spliting HidlSupport.h
Yifan Hong [Wed, 16 Nov 2016 00:02:40 +0000 (16:02 -0800)]
Fix include after spliting HidlSupport.h

Test: mma

Bug: 32756130
Change-Id: Ia4fa02726d79681753fe9c8c7135a28fffb508b4

7 years agowifi: remove unused hidden Hotspot 2.0 Release 1 API
Peter Qiu [Wed, 16 Nov 2016 00:00:06 +0000 (00:00 +0000)]
wifi: remove unused hidden Hotspot 2.0 Release 1 API
am: 1c3054ea87

Change-Id: I5a13979aedb39ad347099fd25e7515b099b9ac19

7 years agoBrightness mirror - fix multi-touch issue
dooyoung.hwang [Tue, 15 Nov 2016 23:59:23 +0000 (08:59 +0900)]
Brightness mirror - fix multi-touch issue

The issue is that QSPanel get touch event while brightness mirros
is showing after density changes. This is because StatusBarWindowView
keeps the reference of detached brightness mirror view. We can refresh
it at onViewAdded function.

Test: manual(change device density > Check if can click QuickSettings
while dragging brightness slider.)

Change-Id: I646092abbc23b24bb91fc5c8525b12a143364b84

7 years agowifi: remove hidden unused Hotspot 2.0 Release 2 APIs
Peter Qiu [Tue, 15 Nov 2016 23:59:20 +0000 (23:59 +0000)]
wifi: remove hidden unused Hotspot 2.0 Release 2 APIs
am: a38558b539

Change-Id: I48766f0c259693496dc9b63ad0dd287b93185787

7 years agoMerge changes from topic 'HS2 API Cleanup'
Treehugger Robot [Tue, 15 Nov 2016 23:50:16 +0000 (23:50 +0000)]
Merge changes from topic 'HS2 API Cleanup'

* changes:
  wifi: remove unused hidden Hotspot 2.0 Release 1 API
  wifi: remove hidden unused Hotspot 2.0 Release 2 APIs

7 years agoRefactored setCurrentFunction and setUsbDataUnlocked into single method.
Jerry Zhang [Wed, 12 Oct 2016 22:49:32 +0000 (15:49 -0700)]
Refactored setCurrentFunction and setUsbDataUnlocked into single method.

This gets rid of an extraneous configuration change when going from
adb to adb + file transfer as previously the config would have been
reset once for functions and once for data unlocked.

It also simplifies some of the code.

Test: manually changing usb configurations
Change-Id: Ica10a195338b2189db13113f44657393db110bee
(cherry picked from commit 7a396be6d5ba8914933a54b5bfac25e118db0e9f)

7 years agoClean up persistent usb state on boot.
Jerry Zhang [Tue, 18 Oct 2016 00:37:13 +0000 (17:37 -0700)]
Clean up persistent usb state on boot.

b/31814300 was fixed, but mtp can still stick around in the
persistent config even after flashing. This block of code
will only run once, but will ensure that mtp is not in
the config after the update.

Bug: 31814300
Test: Manual
Change-Id: Icf02be38c9e1f769412ac963ed6afc14e6092bfb
(cherry-picked from commit a45dac0e83f4f907b6b42f453181a7d5c01f65f3)

7 years agoFixed handling of usb state during adb changes.
Jerry Zhang [Thu, 13 Oct 2016 01:04:03 +0000 (18:04 -0700)]
Fixed handling of usb state during adb changes.

When changing state to adb from mtp (charging), we want to disable
the old mtp function. Similarly when change to away from adb to
charging, enable the mtp function.

Also the mtp function should never be persisted.

Bug: 31818377
Bug: 31814300
Test: Manually verify that the correct usb configuration is displayed.
Test: Manually verify that logcat is not kicked during boot.
Change-Id: Idcb7f53be39ea38712d5de45b323d8daeb552129
(cherry-picked from commit 58018d01a3c384b954275d15bee7f9c52a1c7c0a)

7 years agoMerge "Correctly handle when the user has no explicit time_12_24 setting"
Neil Fuller [Tue, 15 Nov 2016 16:50:29 +0000 (16:50 +0000)]
Merge "Correctly handle when the user has no explicit time_12_24 setting"
am: 8631e19d38

Change-Id: I70533c5ff4ac8cdeef1b42337bb47b09c8bbf927

7 years agoMerge "Correctly handle when the user has no explicit time_12_24 setting"
Neil Fuller [Tue, 15 Nov 2016 16:39:42 +0000 (16:39 +0000)]
Merge "Correctly handle when the user has no explicit time_12_24 setting"

7 years agoFix deprecated range_x calls.
Martijn Coenen [Mon, 14 Nov 2016 13:56:03 +0000 (14:56 +0100)]
Fix deprecated range_x calls.

Test: builds
Change-Id: I98412e51a54ef9f9e26c72ecd810dcea77aefdbb

7 years agoMerge "osu: remove calls to deprecated APIs"
Peter Qiu [Tue, 15 Nov 2016 04:15:59 +0000 (04:15 +0000)]
Merge "osu: remove calls to deprecated APIs"
am: e9514808d7

Change-Id: If7c31b7d901ef8cc8561b7f0933d803498105e75

7 years agoMerge "osu: remove calls to deprecated APIs"
Treehugger Robot [Tue, 15 Nov 2016 03:59:57 +0000 (03:59 +0000)]
Merge "osu: remove calls to deprecated APIs"

7 years agoMerge "Add WiFi toggle prompts - framework" into stage-aosp-master
TreeHugger Robot [Tue, 15 Nov 2016 03:18:21 +0000 (03:18 +0000)]
Merge "Add WiFi toggle prompts - framework" into stage-aosp-master

7 years agoPreload2: Fix dependencies
Andreas Gampe [Tue, 15 Nov 2016 03:08:22 +0000 (19:08 -0800)]
Preload2: Fix dependencies

Also depend on and package tools-common.

Test: m
Test: preload-tool
Change-Id: I19a8844f87417f2292e50ffaaebb5fa24a2eca24

7 years agoMerge "Update for removing read/writeEmbeddedFrom/ToParcel methods."
Yifan Hong [Tue, 15 Nov 2016 03:06:44 +0000 (03:06 +0000)]
Merge "Update for removing read/writeEmbeddedFrom/ToParcel methods."
am: 8cc1343724

Change-Id: If003adc06673d8e6c6db6f8a5d858dcca7aed109