OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "hidl getService throw correct exceptions." am: 5d5ace5e11 am: 197b62d3fa
Steven Moreland [Fri, 30 Jun 2017 20:55:12 +0000 (20:55 +0000)]
Merge "hidl getService throw correct exceptions." am: 5d5ace5e11 am: 197b62d3fa
am: d89566cb7d  -s ours

Change-Id: If34c8af2d4927705d500ea6df5e74ad0c89c149e

7 years agoMerge "hidl getService throw correct exceptions." am: 5d5ace5e11
Steven Moreland [Fri, 30 Jun 2017 20:49:57 +0000 (20:49 +0000)]
Merge "hidl getService throw correct exceptions." am: 5d5ace5e11
am: 197b62d3fa

Change-Id: I720e34630733e27734f050d6546be4df1a1948ab

7 years agoMerge "hidl getService throw correct exceptions."
Steven Moreland [Fri, 30 Jun 2017 20:44:10 +0000 (20:44 +0000)]
Merge "hidl getService throw correct exceptions."
am: 5d5ace5e11

Change-Id: I16bcf1b32914ef42bbe788a8b67e92f6fe9d04a2

7 years agoMerge "hidl getService throw correct exceptions."
Treehugger Robot [Fri, 30 Jun 2017 20:36:36 +0000 (20:36 +0000)]
Merge "hidl getService throw correct exceptions."

7 years agoMerge "Fix use-after-free" into oc-dr1-dev
John Reck [Fri, 30 Jun 2017 19:50:44 +0000 (19:50 +0000)]
Merge "Fix use-after-free" into oc-dr1-dev
am: 8626cd184b

Change-Id: Ib4666da39710948b86d942136c1fdee4b1b3cfa4

7 years agoMerge "Modify docs to clarify EXTRA_LOG_SELF_MANAGED_CALLS behavior." into oc-dr1-dev
Brad Ebinger [Fri, 30 Jun 2017 19:49:06 +0000 (19:49 +0000)]
Merge "Modify docs to clarify EXTRA_LOG_SELF_MANAGED_CALLS behavior." into oc-dr1-dev
am: 814a53c939

Change-Id: I64d274e2bf5a9e40456c54806007e3b17eda5b70

7 years agoMerge changes from topic 'HideMultiUser' into oc-dr1-dev
Jason Monk [Fri, 30 Jun 2017 19:42:50 +0000 (19:42 +0000)]
Merge changes from topic 'HideMultiUser' into oc-dr1-dev
am: 3024de2536

Change-Id: I65d4d1f6cf04624188c30673013ece9bb61c94ec

7 years agoMerge "Fix use-after-free" into oc-dr1-dev
TreeHugger Robot [Fri, 30 Jun 2017 19:41:46 +0000 (19:41 +0000)]
Merge "Fix use-after-free" into oc-dr1-dev

7 years agoMerge "Dedupes ranked apps in sharing windows, and reuses computed scores in sorting...
Kang Li [Fri, 30 Jun 2017 19:41:14 +0000 (19:41 +0000)]
Merge "Dedupes ranked apps in sharing windows, and reuses computed scores in sorting for ResolverActivity." into oc-dr1-dev
am: d967ee3492

Change-Id: I9573bc8878123fbad308d27adb2977811814ffcd

7 years agoMerge "Modify docs to clarify EXTRA_LOG_SELF_MANAGED_CALLS behavior." into oc-dr1-dev
TreeHugger Robot [Fri, 30 Jun 2017 19:36:52 +0000 (19:36 +0000)]
Merge "Modify docs to clarify EXTRA_LOG_SELF_MANAGED_CALLS behavior." into oc-dr1-dev

7 years agoMerge changes from topic 'HideMultiUser' into oc-dr1-dev
TreeHugger Robot [Fri, 30 Jun 2017 19:35:05 +0000 (19:35 +0000)]
Merge changes from topic 'HideMultiUser' into oc-dr1-dev

* changes:
  Don't show multi-user in QS unless it has been activated before
  QS: Move auto-add state to settings provider

7 years agoMerge "Move starting window dim layers behind the activity window layers" into oc...
Winson Chung [Fri, 30 Jun 2017 19:32:40 +0000 (19:32 +0000)]
Merge "Move starting window dim layers behind the activity window layers" into oc-dr1-dev
am: 262359fd29

Change-Id: I372546aa819df8d26af782e1e12ec0097d6c0837

7 years agoMerge "Dedupes ranked apps in sharing windows, and reuses computed scores in sorting...
TreeHugger Robot [Fri, 30 Jun 2017 19:28:31 +0000 (19:28 +0000)]
Merge "Dedupes ranked apps in sharing windows, and reuses computed scores in sorting for ResolverActivity." into oc-dr1-dev

7 years agoMerge "AOD: Ensure dark amount is set after reinflating" into oc-dr1-dev
Adrian Roos [Fri, 30 Jun 2017 19:24:56 +0000 (19:24 +0000)]
Merge "AOD: Ensure dark amount is set after reinflating" into oc-dr1-dev
am: 70c4a61033

Change-Id: I28bbd1ece0d83a190a38d39ddf8c113ba092454d

7 years agoMerge "Move starting window dim layers behind the activity window layers" into oc...
Winson Chung [Fri, 30 Jun 2017 19:20:22 +0000 (19:20 +0000)]
Merge "Move starting window dim layers behind the activity window layers" into oc-dr1-dev

7 years agoMerge "AOD: Ensure dark amount is set after reinflating" into oc-dr1-dev
TreeHugger Robot [Fri, 30 Jun 2017 19:15:04 +0000 (19:15 +0000)]
Merge "AOD: Ensure dark amount is set after reinflating" into oc-dr1-dev

7 years agoMerge "Do not extract colors of live wallpapers." into oc-dr1-dev
Lucas Dupin [Fri, 30 Jun 2017 18:36:13 +0000 (18:36 +0000)]
Merge "Do not extract colors of live wallpapers." into oc-dr1-dev
am: 68b8d34e94

Change-Id: Ib62c0fafc328e862f9051b9164c7c199bb1d2c90

7 years agoMerge "Do not extract colors of live wallpapers." into oc-dr1-dev
TreeHugger Robot [Fri, 30 Jun 2017 18:27:48 +0000 (18:27 +0000)]
Merge "Do not extract colors of live wallpapers." into oc-dr1-dev

7 years agoMerge "Update Landscape <-> Autorotate QS animations" into oc-dr1-dev
Evan Laird [Fri, 30 Jun 2017 18:02:02 +0000 (18:02 +0000)]
Merge "Update Landscape <-> Autorotate QS animations" into oc-dr1-dev
am: d2d4282e5e

Change-Id: I9efb0a5204f655c139c44d880e9182f53793291d

7 years agoMerge "Update Landscape <-> Autorotate QS animations" into oc-dr1-dev
TreeHugger Robot [Fri, 30 Jun 2017 17:50:55 +0000 (17:50 +0000)]
Merge "Update Landscape <-> Autorotate QS animations" into oc-dr1-dev

7 years agoMerge "Merge "Always run Virtual Display when in a BootsToVR device." into oc-dr1...
Android Build Merger (Role) [Fri, 30 Jun 2017 17:28:29 +0000 (17:28 +0000)]
Merge "Merge "Always run Virtual Display when in a BootsToVR device." into oc-dr1-dev am: b8a17cde7e" into oc-dr1-dev-plus-aosp

7 years agoMerge "Always run Virtual Display when in a BootsToVR device." into oc-dr1-dev
Santos Cordon [Fri, 30 Jun 2017 17:27:25 +0000 (17:27 +0000)]
Merge "Always run Virtual Display when in a BootsToVR device." into oc-dr1-dev
am: b8a17cde7e

Change-Id: Ic0fe241ee3bea23816baea9523f89e4845626c68

7 years agoMerge "Always run Virtual Display when in a BootsToVR device." into oc-dr1-dev
Santos Cordon [Fri, 30 Jun 2017 17:18:54 +0000 (17:18 +0000)]
Merge "Always run Virtual Display when in a BootsToVR device." into oc-dr1-dev
am: b8a17cde7e

Change-Id: Ic21bfaafead58f0c3ce7f0d206de235890636039

7 years agoMerge "Always run Virtual Display when in a BootsToVR device." into oc-dr1-dev
Santos Cordon [Fri, 30 Jun 2017 17:09:09 +0000 (17:09 +0000)]
Merge "Always run Virtual Display when in a BootsToVR device." into oc-dr1-dev

7 years agoMerge "AOD: Use keyguard screen rotation when dozing" into oc-dr1-dev
Adrian Roos [Fri, 30 Jun 2017 17:02:32 +0000 (17:02 +0000)]
Merge "AOD: Use keyguard screen rotation when dozing" into oc-dr1-dev
am: c8c4056756

Change-Id: I265c53deeb8c756c1480d45d50e0dcb98aa0c250

7 years agoMerge "AOD: Hide SIM PIN entry while dozing" into oc-dr1-dev
Adrian Roos [Fri, 30 Jun 2017 17:01:01 +0000 (17:01 +0000)]
Merge "AOD: Hide SIM PIN entry while dozing" into oc-dr1-dev
am: 4a51e275db

Change-Id: Ibf1bc449bf63e24ffec1fffc3634d4a4c5e281b8

7 years agoMerge "AOD: Use keyguard screen rotation when dozing" into oc-dr1-dev
TreeHugger Robot [Fri, 30 Jun 2017 16:55:16 +0000 (16:55 +0000)]
Merge "AOD: Use keyguard screen rotation when dozing" into oc-dr1-dev

7 years agoMerge "AOD: Hide SIM PIN entry while dozing" into oc-dr1-dev
TreeHugger Robot [Fri, 30 Jun 2017 16:54:32 +0000 (16:54 +0000)]
Merge "AOD: Hide SIM PIN entry while dozing" into oc-dr1-dev

7 years agoMerge "Always send configuration to client from resize and relayout." into oc-dr1-dev
Bryce Lee [Fri, 30 Jun 2017 16:33:30 +0000 (16:33 +0000)]
Merge "Always send configuration to client from resize and relayout." into oc-dr1-dev
am: 392ac74f37

Change-Id: I9105966db42cf5cc9f0748ddd9121806529a3dd3

7 years agoMerge "Add rotation to configuration." into oc-dr1-dev
Bryce Lee [Fri, 30 Jun 2017 16:32:22 +0000 (16:32 +0000)]
Merge "Add rotation to configuration." into oc-dr1-dev
am: 2050dc66e2

Change-Id: I585507c98972c7b8a2ad07e21bf56c13552d20a4

7 years agoFix use-after-free
John Reck [Thu, 29 Jun 2017 17:26:44 +0000 (10:26 -0700)]
Fix use-after-free

Change-Id: I8ac1ede5b29f718aa145e18cf1cc057722b62f2b
Fixes: 62810849
Test: Builds
(cherry picked from commit 3c1820e0104b8e48f55cab491f82e84bf0a6081f)

7 years agoMerge "Turn off camera lift logging" into oc-dr1-dev
Jonathan Solnit [Fri, 30 Jun 2017 16:25:20 +0000 (16:25 +0000)]
Merge "Turn off camera lift logging" into oc-dr1-dev
am: 61dd3b8970

Change-Id: Ic55ecd06cf6c713bbcadc3fd9646f880274a6473

7 years agoMerge "Always send configuration to client from resize and relayout." into oc-dr1-dev
Bryce Lee [Fri, 30 Jun 2017 16:17:34 +0000 (16:17 +0000)]
Merge "Always send configuration to client from resize and relayout." into oc-dr1-dev

7 years agoMerge "Add rotation to configuration." into oc-dr1-dev
Bryce Lee [Fri, 30 Jun 2017 16:17:34 +0000 (16:17 +0000)]
Merge "Add rotation to configuration." into oc-dr1-dev

7 years agoMerge "Turn off camera lift logging" into oc-dr1-dev
Jonathan Solnit [Fri, 30 Jun 2017 16:11:22 +0000 (16:11 +0000)]
Merge "Turn off camera lift logging" into oc-dr1-dev

7 years agoAlways run Virtual Display when in a BootsToVR device.
Santos Cordon [Wed, 21 Jun 2017 23:03:49 +0000 (16:03 -0700)]
Always run Virtual Display when in a BootsToVR device.

This CL:
1) Moved initialization of the virtual display adapter to happen along
side the default display.  On standalone VR devices, a virtual display
is used as the main display for 2D UI so it is necessary that the virtual
display system is ready after PHASE_WAIT_FOR_DEFAULT_DISPLAY.
2) Add knowledge of bootsToVr in Vr2dDisplay, indicating that the device
is a standalone device that boots into VR. This forces Vr2dDisplay to
create the virtualDisplay at PHASE_SYSTEM_SERVICES_READY and never
destroy it (so that the activity stack doesn't go away).
3) Add tests to ensure default display and virtual display startup
sequence doesn't change.

Change-Id: Ie748771abd0b115db3c65a66a4b7a98dd1b28f2e
Bug:62842592
Test: Start a polaris device for first time, ensure SUW runs with
Virtual display dimentions.
Test: DisplayManagerServiceTest.java

7 years agoDon't show multi-user in QS unless it has been activated before
Jason Monk [Fri, 30 Jun 2017 15:31:03 +0000 (11:31 -0400)]
Don't show multi-user in QS unless it has been activated before

Like adding another user or activating a guest at some point.

Test: manual
Bug: 37152893
Change-Id: Ifeadeb8e7f021c4854aa74b71ffb6bed116c9c0f

7 years agoQS: Move auto-add state to settings provider
Jason Monk [Fri, 30 Jun 2017 14:28:18 +0000 (10:28 -0400)]
QS: Move auto-add state to settings provider

And back it up.

Test: runtest systemui
Change-Id: I880909ce63ab32a5c11f31f449c1aa10221085d3
Fixes: 62667758

7 years agoMerge "Fix test failure" into oc-dr1-dev
Jason Monk [Fri, 30 Jun 2017 15:23:52 +0000 (15:23 +0000)]
Merge "Fix test failure" into oc-dr1-dev
am: a9c3d283df

Change-Id: Ibbec4701dca82d9c271e8ff25d25cbe2df8da816

7 years agoMerge "Fix test failure" into oc-dr1-dev
TreeHugger Robot [Fri, 30 Jun 2017 15:15:40 +0000 (15:15 +0000)]
Merge "Fix test failure" into oc-dr1-dev

7 years agoMerge "AOD: avoid flicker when turning off screen" into oc-dr1-dev
Adrian Roos [Fri, 30 Jun 2017 14:38:14 +0000 (14:38 +0000)]
Merge "AOD: avoid flicker when turning off screen" into oc-dr1-dev
am: b4fe9ce703

Change-Id: Iedeab3f2342729224fe79f17665ef6e9f2a65f76

7 years agoMerge "AOD: avoid flicker when turning off screen" into oc-dr1-dev
TreeHugger Robot [Fri, 30 Jun 2017 14:31:33 +0000 (14:31 +0000)]
Merge "AOD: avoid flicker when turning off screen" into oc-dr1-dev

7 years agoUpdate Landscape <-> Autorotate QS animations
Evan Laird [Fri, 30 Jun 2017 14:18:34 +0000 (10:18 -0400)]
Update Landscape <-> Autorotate QS animations

Now with rounded edges!

Test: visual
Bug: 62386498
Change-Id: If66764c3f9723fcb89629e668d48b06ab8329808

7 years agoAOD: Ensure dark amount is set after reinflating
Adrian Roos [Fri, 30 Jun 2017 13:49:57 +0000 (15:49 +0200)]
AOD: Ensure dark amount is set after reinflating

Change-Id: I04437fb282db4bbbe81a3bf5267d081f19b49cae
Fixes: 62970437
Test: change wallpaper while device is on AOD, ensure date is not visible

7 years agoAlways send configuration to client from resize and relayout.
Bryce Lee [Thu, 29 Jun 2017 21:03:33 +0000 (14:03 -0700)]
Always send configuration to client from resize and relayout.

Previously, the server side would omit reporting new configurations
during resize and relayout if the current configuration matched the
last reported. However, if the last reported came through a resize,
the client side handling would be enqueued as a Handler message. This
leads to the possibility of the client getting a new window frame but
not a new configuration where this is synchronously handled, such as
ViewRootImpl::performTraversals.

To address this issue, we now always send the current configuration
from the server to the client. The client then identifies changes
against its own record of last reported configuration and updates as
appropriate.

This changelist also adds a call to force window relayout during
updateConfiguration, as it's possible this is called after
performTraversals is called or resize is handled, leading to a stale
window frame.

Bug: 24671393
Test: go/wm-smoke
Test: Open Camera while rotating phone to landscape. Added
      temporary logs to detect inconsistencies between measurements
      and reported rotation on draw.

Change-Id: I0d5143dfe80400f6a43ce710750f9fc9d4b93f74

7 years agoFix test failure
Jason Monk [Fri, 30 Jun 2017 13:10:01 +0000 (09:10 -0400)]
Fix test failure

Was the result of 2 CLs merging at the same time that affect the
test.

Test: runtest systemui
Change-Id: I622a9f7163aa5f9830ef9acb90f1bfb3e5f3df5f
Fixes: 63098063

7 years agoMerge "Track move of distro installer code" am: 8558d93db8 am: 50a15e7f6e
Neil Fuller [Fri, 30 Jun 2017 12:52:21 +0000 (12:52 +0000)]
Merge "Track move of distro installer code" am: 8558d93db8 am: 50a15e7f6e
am: fb46f6a0b8

Change-Id: I398b9b48447835bc86816187ed5bab4233dcf6e1

7 years agoMerge "Track move of distro installer code" am: 8558d93db8
Neil Fuller [Fri, 30 Jun 2017 12:45:16 +0000 (12:45 +0000)]
Merge "Track move of distro installer code" am: 8558d93db8
am: 50a15e7f6e

Change-Id: I5295f6e63ac9aafbebaa9870776e0502bf5129d7

7 years agoMerge "Track move of distro installer code"
Neil Fuller [Fri, 30 Jun 2017 12:38:05 +0000 (12:38 +0000)]
Merge "Track move of distro installer code"
am: 8558d93db8

Change-Id: I2d27a58c21b7b8931b1d058d6a6bc88eeb8f7709

7 years agoMerge "Track move of distro installer code"
Neil Fuller [Fri, 30 Jun 2017 12:28:23 +0000 (12:28 +0000)]
Merge "Track move of distro installer code"

7 years agoSupport battery level reporting via Apple VSC (1/2)
Jack He [Fri, 30 Jun 2017 10:50:54 +0000 (10:50 +0000)]
Support battery level reporting via Apple VSC (1/2)
am: 266499d9d8  -s ours

Change-Id: Iba054f707eaf71f952ba1185cd9c206453f73831

7 years agoSupport battery level reporting via Plantronics XEVENT (1/2)
Jack He [Fri, 30 Jun 2017 10:49:07 +0000 (10:49 +0000)]
Support battery level reporting via Plantronics XEVENT (1/2)
am: fff37da08d  -s ours

Change-Id: I31254fdc92aa4d2c5a08822d680b8e7ff0d77134

7 years agoSupport battery level reporting via Apple VSC (1/2)
Jack He [Wed, 21 Jun 2017 00:09:47 +0000 (17:09 -0700)]
Support battery level reporting via Apple VSC (1/2)

* Add related constants to BluetoothHeadset

Bug: 35874078
Test: make, test with supporting headsets
Change-Id: I9f49ea28efdf6de0e751a377d879fe13a47655d5
Merged-In: I9f49ea28efdf6de0e751a377d879fe13a47655d5
(cherry picked from commit 679d0bc8f99145d70af0c8006d807b55110fe3b5)

7 years agoHFP: Modify comments for ACTION_HF_INDICATORS_VALUE_CHANGED (1/2)
Jack He [Fri, 30 Jun 2017 08:47:28 +0000 (08:47 +0000)]
HFP: Modify comments for ACTION_HF_INDICATORS_VALUE_CHANGED (1/2)
am: dfd8618b2d  -s ours

Change-Id: I971e1a1523d4716c1ae13bd498687d14d662d7dd

7 years agoSupport battery level reporting via Plantronics XEVENT (1/2)
Jack He [Wed, 21 Jun 2017 00:07:40 +0000 (17:07 -0700)]
Support battery level reporting via Plantronics XEVENT (1/2)

* Add related constants to BluetoothHeadset

Bug: 35874078
Test: make, test with supporting headsets
Change-Id: Ied089a065bf9caa0d03f681950fefa2ea990bb3e
Merged-In: Ied089a065bf9caa0d03f681950fefa2ea990bb3e
(cherry picked from commit 0fcbba25b7ac7fd59367c8c9ba3080a3e6ade934)

7 years agoMerge "Add APIs to get remote device's battery level (1/2)" into oc-dr1-dev
Jack He [Fri, 30 Jun 2017 06:34:20 +0000 (06:34 +0000)]
Merge "Add APIs to get remote device's battery level (1/2)" into oc-dr1-dev
am: 41760687fd  -s ours

Change-Id: If2ea7309bf4cf1d7df496657eb2e2452082fa04b

7 years agoAdd APIs to get remote device's battery level (1/2)
Jack He [Fri, 30 Jun 2017 06:27:03 +0000 (06:27 +0000)]
Add APIs to get remote device's battery level (1/2)
am: 2b07bbafa2  -s ours

Change-Id: I9741e078c85b65b160a8e7f2f64d89dd3824d709

7 years agoHFP: Modify comments for ACTION_HF_INDICATORS_VALUE_CHANGED (1/2)
Jack He [Thu, 22 Jun 2017 19:56:54 +0000 (12:56 -0700)]
HFP: Modify comments for ACTION_HF_INDICATORS_VALUE_CHANGED (1/2)

* Per HFP 1.7.1 spec page 102 of 144
  EXTRA_HF_INDICATORS_IND_ID should be int
  EXTRA_HF_INDICATORS_IND_VALUE should be int

Bug: 35874078
Test: make, PTS test, unit tests
runtest -c com.android.bluetooth.btservice.RemoteDevicesTest bluetooth
Change-Id: Idd316a82bab164b6ea1701bb261b1cc3dee196f1
Merged-In: Idd316a82bab164b6ea1701bb261b1cc3dee196f1
(cherry picked from commit 73795440a54a5407284331ac11f8c0f75acd98d6)

7 years agoMerge "Add APIs to get remote device's battery level (1/2)" into oc-dr1-dev
TreeHugger Robot [Fri, 30 Jun 2017 06:21:48 +0000 (06:21 +0000)]
Merge "Add APIs to get remote device's battery level (1/2)" into oc-dr1-dev

7 years agoAdd APIs to get remote device's battery level (1/2)
Jack He [Sat, 17 Jun 2017 02:43:58 +0000 (19:43 -0700)]
Add APIs to get remote device's battery level (1/2)

* Add BluetoothDevice.getBatteryLevel() API to retreive battery level
  information of remote device
* Add BluetoothDevice.ACTION_BATTERY_LEVEL_CHANGED intent to notify user
  that remote device's battery level has changed

Bug: 35874078
Test: make, pair with devices and use them
Change-Id: I41051ee25383f5f3a1e505aef6f8c526385f58bd
Merged-In: I41051ee25383f5f3a1e505aef6f8c526385f58bd
(cherry picked from commit 1d312bfa78c25e0e1d6ea25b2c027e2efdd5a418)

7 years agoMerge "Add getCurrentImeTouchRegion to the WindowManager API" into oc-dr1-dev
Albert Chaulk [Fri, 30 Jun 2017 03:27:04 +0000 (03:27 +0000)]
Merge "Add getCurrentImeTouchRegion to the WindowManager API" into oc-dr1-dev
am: 4bf79089c4

Change-Id: I634f874a94e97aadc139e75d241efa4c9e13542a

7 years agoMerge "Add getCurrentImeTouchRegion to the WindowManager API" into oc-dr1-dev
TreeHugger Robot [Fri, 30 Jun 2017 03:22:45 +0000 (03:22 +0000)]
Merge "Add getCurrentImeTouchRegion to the WindowManager API" into oc-dr1-dev

7 years agoMerge "Add strings for battery level info of connected devices" into oc-dr1-dev
Jack He [Fri, 30 Jun 2017 02:29:10 +0000 (02:29 +0000)]
Merge "Add strings for battery level info of connected devices" into oc-dr1-dev
am: e269956acb

Change-Id: Iad81be953573a43e7ff5cffb06af5222f4e67322

7 years agoMerge "Add strings for battery level info of connected devices" into oc-dr1-dev
TreeHugger Robot [Fri, 30 Jun 2017 02:20:34 +0000 (02:20 +0000)]
Merge "Add strings for battery level info of connected devices" into oc-dr1-dev

7 years agoMerge "Remove IPC calls from synchronized block." into oc-dr1-dev
Sundeep Ghuman [Fri, 30 Jun 2017 01:58:35 +0000 (01:58 +0000)]
Merge "Remove IPC calls from synchronized block." into oc-dr1-dev
am: 6829db0cb6

Change-Id: I0de9ba563c2e84997c5ecb10efa973974191047f

7 years agoMerge "Remove IPC calls from synchronized block." into oc-dr1-dev
TreeHugger Robot [Fri, 30 Jun 2017 01:50:48 +0000 (01:50 +0000)]
Merge "Remove IPC calls from synchronized block." into oc-dr1-dev

7 years agoMerge "Merge "docs: Updated isAutofillSupported description." into oc-dev am: a89dfb5...
Android Build Merger (Role) [Fri, 30 Jun 2017 01:00:25 +0000 (01:00 +0000)]
Merge "Merge "docs: Updated isAutofillSupported description." into oc-dev am: a89dfb5439 am: a8bccb6674" into oc-dr1-dev-plus-aosp

7 years agoMerge "docs: Updated isAutofillSupported description." into oc-dev am: a89dfb5439
Ricardo Loo [Fri, 30 Jun 2017 00:59:23 +0000 (00:59 +0000)]
Merge "docs: Updated isAutofillSupported description." into oc-dev am: a89dfb5439
am: a8bccb6674

Change-Id: Ie60b3eb45178fd4f8a6dff3d860f1195ba3a847e

7 years agoMerge "docs: Updated isAutofillSupported description." into oc-dev am: a89dfb5439
Ricardo Loo [Fri, 30 Jun 2017 00:59:20 +0000 (00:59 +0000)]
Merge "docs: Updated isAutofillSupported description." into oc-dev am: a89dfb5439
am: 824b41d77a

Change-Id: Ie9593ce8239fc8c5f0e8dd40bc513c1edcb849a1

7 years agoMerge "docs: Updated isAutofillSupported description." into oc-dev
Ricardo Loo [Fri, 30 Jun 2017 00:51:57 +0000 (00:51 +0000)]
Merge "docs: Updated isAutofillSupported description." into oc-dev
am: a89dfb5439

Change-Id: Ibaa0fd7bcbb1fa4eb880a53894fbf94d857f334f

7 years agoMerge "docs: Updated isAutofillSupported description." into oc-dev
Ricardo Loo [Fri, 30 Jun 2017 00:51:55 +0000 (00:51 +0000)]
Merge "docs: Updated isAutofillSupported description." into oc-dev
am: a89dfb5439

Change-Id: Ie43f37efa9e268b04dbad09ad04795089de68adf

7 years agoMerge "docs: Updated isAutofillSupported description." into oc-dev
Ricardo Loo [Fri, 30 Jun 2017 00:44:50 +0000 (00:44 +0000)]
Merge "docs: Updated isAutofillSupported description." into oc-dev

7 years agoMerge "Merge "Add docs for new padding/margin attributes." into oc-dev am: 8cdbd6e184...
Android Build Merger (Role) [Fri, 30 Jun 2017 00:41:13 +0000 (00:41 +0000)]
Merge "Merge "Add docs for new padding/margin attributes." into oc-dev am: 8cdbd6e184 am: 1040b18dc3" into oc-dr1-dev-plus-aosp

7 years agoAdd rotation to configuration.
Bryce Lee [Thu, 22 Jun 2017 22:29:42 +0000 (15:29 -0700)]
Add rotation to configuration.

Certain activities are dependent on the rotation of the device to
determine layout. In these cases, orientation does not provide enough
details.

This CL adds the field (hidden) to the configuration.

Change-Id: Idb3ba10cb4de8838737c25e92264e6cee224e264
Fixes: 32839232
Test: go/wm-smoke

7 years agoMerge "Add docs for new padding/margin attributes." into oc-dev am: 8cdbd6e184
Chet Haase [Fri, 30 Jun 2017 00:39:54 +0000 (00:39 +0000)]
Merge "Add docs for new padding/margin attributes." into oc-dev am: 8cdbd6e184
am: 1040b18dc3

Change-Id: I8add96e5d8817413500e7763afb77715be3ca703

7 years agoMerge "Add docs for new padding/margin attributes." into oc-dev am: 8cdbd6e184
Chet Haase [Fri, 30 Jun 2017 00:39:52 +0000 (00:39 +0000)]
Merge "Add docs for new padding/margin attributes." into oc-dev am: 8cdbd6e184
am: d73f6a985d

Change-Id: I3e9a5533093efe5ecdcc908432ec476f081548f5

7 years agoMerge "Add docs for new padding/margin attributes." into oc-dev
Chet Haase [Fri, 30 Jun 2017 00:32:27 +0000 (00:32 +0000)]
Merge "Add docs for new padding/margin attributes." into oc-dev
am: 8cdbd6e184

Change-Id: I0d82ace7d340af8f66a6233ce5b474d26595c38f

7 years agoMerge "Add docs for new padding/margin attributes." into oc-dev
Chet Haase [Fri, 30 Jun 2017 00:32:26 +0000 (00:32 +0000)]
Merge "Add docs for new padding/margin attributes." into oc-dev
am: 8cdbd6e184

Change-Id: Iacf5e069e0e6a2b38a1566f36f81ab8de693e634

7 years agoMerge "Add docs for new padding/margin attributes." into oc-dev
TreeHugger Robot [Fri, 30 Jun 2017 00:21:28 +0000 (00:21 +0000)]
Merge "Add docs for new padding/margin attributes." into oc-dev

7 years agoMerge "Add boot/shutdown timing to sync detailed logging" into oc-dr1-dev
Makoto Onuki [Fri, 30 Jun 2017 00:19:06 +0000 (00:19 +0000)]
Merge "Add boot/shutdown timing to sync detailed logging" into oc-dr1-dev
am: 09e1fae73f

Change-Id: If7c7fe80a450d0151efeb2ea26e7bfedd6a4a04f

7 years agoMerge "Add boot/shutdown timing to sync detailed logging" into oc-dr1-dev
TreeHugger Robot [Fri, 30 Jun 2017 00:08:52 +0000 (00:08 +0000)]
Merge "Add boot/shutdown timing to sync detailed logging" into oc-dr1-dev

7 years agoMerge "Move generatePreferenceKey to AccessPointPreference." into oc-dr1-dev
Sundeep Ghuman [Fri, 30 Jun 2017 00:05:43 +0000 (00:05 +0000)]
Merge "Move generatePreferenceKey to AccessPointPreference." into oc-dr1-dev
am: 635575d579

Change-Id: I2f962bc6b2c2c8eda54ed8d9578922bd67e441dc

7 years agoMerge "Move generatePreferenceKey to AccessPointPreference." into oc-dr1-dev
Sundeep Ghuman [Thu, 29 Jun 2017 23:56:55 +0000 (23:56 +0000)]
Merge "Move generatePreferenceKey to AccessPointPreference." into oc-dr1-dev

7 years agoAdd strings for battery level info of connected devices
Jack He [Wed, 28 Jun 2017 21:17:10 +0000 (14:17 -0700)]
Add strings for battery level info of connected devices

* SystemUI: quick_settings_connected_battery_level
* SettingsLib:
bluetooth_connected_battery_level
bluetooth_connected_no_headset_battery_level
bluetooth_connected_no_a2dp_battery_level
bluetooth_connected_no_headset_no_a2dp_battery_level

Bug: 63027849
Test: make, test using these strings
Change-Id: I9052dad87d2afd30d005d050c6b3bfc4813853df

7 years agoMerge "Update auto rotate / portrait QS icon" into oc-dr1-dev
Evan Laird [Thu, 29 Jun 2017 23:28:06 +0000 (23:28 +0000)]
Merge "Update auto rotate / portrait QS icon" into oc-dr1-dev
am: a8abb9d586

Change-Id: I7ae1b22a70a73d761dc4cea6c6892100261394af

7 years agoMerge "Update auto rotate / portrait QS icon" into oc-dr1-dev
TreeHugger Robot [Thu, 29 Jun 2017 23:19:58 +0000 (23:19 +0000)]
Merge "Update auto rotate / portrait QS icon" into oc-dr1-dev

7 years agoMerge "Don't synchronize inside getWallpaperColors()" into oc-dr1-dev
Christopher Tate [Thu, 29 Jun 2017 22:34:22 +0000 (22:34 +0000)]
Merge "Don't synchronize inside getWallpaperColors()" into oc-dr1-dev
am: 2de66f7be1

Change-Id: Id453b9477272c8d10738a06626411dfda58cea74

7 years agoMerge "Don't synchronize inside getWallpaperColors()" into oc-dr1-dev
TreeHugger Robot [Thu, 29 Jun 2017 22:26:34 +0000 (22:26 +0000)]
Merge "Don't synchronize inside getWallpaperColors()" into oc-dr1-dev

7 years agoMerge "Implement cancelDownload and remove appName" am: 9b43ffcf2f am: 4b1acf4421
Hall Liu [Thu, 29 Jun 2017 21:58:22 +0000 (21:58 +0000)]
Merge "Implement cancelDownload and remove appName" am: 9b43ffcf2f am: 4b1acf4421
am: 4c751c865a

Change-Id: I05814ffe8fb4ca2f334d6c0ecd772295bc2c7c63

7 years agoMerge "Implement cancelDownload and remove appName" am: 9b43ffcf2f
Hall Liu [Thu, 29 Jun 2017 21:51:13 +0000 (21:51 +0000)]
Merge "Implement cancelDownload and remove appName" am: 9b43ffcf2f
am: 4b1acf4421

Change-Id: Ic6d19500c335bc40e6d14d009d4d459bf02b06e1

7 years agoMerge "Implement cancelDownload and remove appName"
Hall Liu [Thu, 29 Jun 2017 21:45:47 +0000 (21:45 +0000)]
Merge "Implement cancelDownload and remove appName"
am: 9b43ffcf2f

Change-Id: I98914bf79ad6178e1ef8689acf5d0a18c78a7735

7 years agoMerge "Implement cancelDownload and remove appName"
Hall Liu [Thu, 29 Jun 2017 21:33:11 +0000 (21:33 +0000)]
Merge "Implement cancelDownload and remove appName"

7 years agoMerge "Add ability to turn off VR virtual display functionality." into oc-dr1-dev
Santos Cordon [Thu, 29 Jun 2017 21:31:53 +0000 (21:31 +0000)]
Merge "Add ability to turn off VR virtual display functionality." into oc-dr1-dev
am: 67143a8cfc

Change-Id: I9a65c8a9c33ffe4a982d090966654f4e93690c3b

7 years agoMerge "Add ability to turn off VR virtual display functionality." into oc-dr1-dev
Santos Cordon [Thu, 29 Jun 2017 21:21:42 +0000 (21:21 +0000)]
Merge "Add ability to turn off VR virtual display functionality." into oc-dr1-dev

7 years agoTurn off camera lift logging
Jonathan Solnit [Thu, 29 Jun 2017 20:05:13 +0000 (13:05 -0700)]
Turn off camera lift logging

Test: Triggered camera lift, confirmed no logging
Bug: 63141065
Change-Id: Ib93fd5885196a9a3055dabb8b956b23d6928cc49

7 years agoAdd boot/shutdown timing to sync detailed logging
Makoto Onuki [Thu, 29 Jun 2017 21:11:14 +0000 (14:11 -0700)]
Add boot/shutdown timing to sync detailed logging

Bug 63136907
Test: manual test

Change-Id: I141f32f90579e2676af616f21254774d64a37c31

7 years agoMerge "Fix issue for Preference.setSingleLineTitle() has no effect." into oc-dr1-dev
Doris Ling [Thu, 29 Jun 2017 20:49:39 +0000 (20:49 +0000)]
Merge "Fix issue for Preference.setSingleLineTitle() has no effect." into oc-dr1-dev
am: 18f3adc03a

Change-Id: I04b7160390a4c3cdee6f0355e3aeb0fdee0a4719

7 years agoMerge "Fix issue for Preference.setSingleLineTitle() has no effect." into oc-dr1-dev
TreeHugger Robot [Thu, 29 Jun 2017 20:41:47 +0000 (20:41 +0000)]
Merge "Fix issue for Preference.setSingleLineTitle() has no effect." into oc-dr1-dev

7 years agoMerge "Move TestAccessPointBuilder." into oc-dr1-dev
Sundeep Ghuman [Thu, 29 Jun 2017 20:37:53 +0000 (20:37 +0000)]
Merge "Move TestAccessPointBuilder." into oc-dr1-dev
am: 80139bfc4d

Change-Id: I6d1ad70e691c5ef0712afa79a9c96160b6559cd5

7 years agoMerge "Move TestAccessPointBuilder." into oc-dr1-dev
TreeHugger Robot [Thu, 29 Jun 2017 20:31:23 +0000 (20:31 +0000)]
Merge "Move TestAccessPointBuilder." into oc-dr1-dev