OSDN Git Service
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
TreeHugger Robot [Thu, 29 Jun 2017 22:26:34 +0000 (22:26 +0000)]
Merge "Don't synchronize inside getWallpaperColors()" into oc-dr1-dev
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
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
Hall Liu [Thu, 29 Jun 2017 21:45:47 +0000 (21:45 +0000)]
Merge "Implement cancelDownload and remove appName"
am:
9b43ffcf2f
Change-Id: I98914bf79ad6178e1ef8689acf5d0a18c78a7735
Hall Liu [Thu, 29 Jun 2017 21:33:11 +0000 (21:33 +0000)]
Merge "Implement cancelDownload and remove appName"
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
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
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
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
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
TreeHugger Robot [Thu, 29 Jun 2017 20:31:23 +0000 (20:31 +0000)]
Merge "Move TestAccessPointBuilder." into oc-dr1-dev
Paul McLean [Thu, 29 Jun 2017 19:33:36 +0000 (19:33 +0000)]
Merge "Adding USB Headset awareness." into oc-dr1-dev
am:
f56b57781e
Change-Id: I994d9d6f327a204916fe9145cc6ce9a2b511d307
Hyunyoung Song [Thu, 29 Jun 2017 19:27:30 +0000 (19:27 +0000)]
Merge "AdaptiveIconDrawable should not update layer bounds when bound is empty" into oc-dr1-dev
am:
e54ad58aea
Change-Id: I01b6fd2391e1296546291af5db5a4663e67fae01
TreeHugger Robot [Thu, 29 Jun 2017 19:25:09 +0000 (19:25 +0000)]
Merge "Adding USB Headset awareness." into oc-dr1-dev
TreeHugger Robot [Thu, 29 Jun 2017 19:18:52 +0000 (19:18 +0000)]
Merge "AdaptiveIconDrawable should not update layer bounds when bound is empty" into oc-dr1-dev
Android Build Merger (Role) [Thu, 29 Jun 2017 19:07:39 +0000 (19:07 +0000)]
Merge "Merge "Prevent unwanted keypress actions during TV Setup." into oc-dev am:
564d0bf1be am:
98b181b25f" into oc-dr1-dev-plus-aosp
Sujith Ramakrishnan [Thu, 29 Jun 2017 19:06:36 +0000 (19:06 +0000)]
Merge "Prevent unwanted keypress actions during TV Setup." into oc-dev am:
564d0bf1be
am:
98b181b25f
Change-Id: Ic87422062ac28fb51596af2a7665b228b446b98a
Sujith Ramakrishnan [Thu, 29 Jun 2017 19:06:33 +0000 (19:06 +0000)]
Merge "Prevent unwanted keypress actions during TV Setup." into oc-dev am:
564d0bf1be
am:
a1157b3aa1
Change-Id: I80fac516afe2c7b75fe775d80444a501585bd3b7
Santos Cordon [Tue, 13 Jun 2017 00:57:17 +0000 (17:57 -0700)]
Add ability to turn off VR virtual display functionality.
Add flag to enable/disable virtual displays via the existing
setDisplayProperties API. This makes it possible for the VR system
to turn off virtual displays if necessary after we ship.
Bug:
62546364
Test: Run 'adb shell vr enable-virtual-display [true|false] to toggle while 2d in 3d
runs.
Change-Id: Iae029be501d61189fced981dbc554e984fa7ed4b
Sujith Ramakrishnan [Thu, 29 Jun 2017 18:59:11 +0000 (18:59 +0000)]
Merge "Prevent unwanted keypress actions during TV Setup." into oc-dev
am:
564d0bf1be
Change-Id: I23deb9056dbd9967bfe07d3db30256794b30a778
Sujith Ramakrishnan [Thu, 29 Jun 2017 18:59:07 +0000 (18:59 +0000)]
Merge "Prevent unwanted keypress actions during TV Setup." into oc-dev
am:
564d0bf1be
Change-Id: I1cd59a2966f692a4857343e21bf1586719939490
TreeHugger Robot [Thu, 29 Jun 2017 18:50:08 +0000 (18:50 +0000)]
Merge "Prevent unwanted keypress actions during TV Setup." into oc-dev
Jack He [Thu, 29 Jun 2017 18:06:33 +0000 (18:06 +0000)]
Merge "Support battery level reporting via Apple VSC (1/2)" am:
874af710b7 am:
9fd5d0da1e
am:
8d9e7be8e4
Change-Id: I211c5bfda4b9a2e2139e2c516716f83ad726e944
Jack He [Thu, 29 Jun 2017 17:58:13 +0000 (17:58 +0000)]
Merge "Support battery level reporting via Apple VSC (1/2)" am:
874af710b7
am:
9fd5d0da1e
Change-Id: If22202112ad66a7b8d86438ca5d2947cf1842b8a
Jack He [Thu, 29 Jun 2017 17:53:10 +0000 (17:53 +0000)]
Merge "Support battery level reporting via Apple VSC (1/2)"
am:
874af710b7
Change-Id: Id65e6e11308c66893cb701af8909df9fee3a131f
Justin Klaassen [Thu, 29 Jun 2017 17:47:31 +0000 (17:47 +0000)]
Merge "Add @*android:bool/config_defaultRingtonePickerEnabled" into oc-dr1-dev
am:
13d5f05350
Change-Id: Ic0bbf06e495f67ce50955e8db8d853852b5b8f0e
Treehugger Robot [Thu, 29 Jun 2017 17:44:10 +0000 (17:44 +0000)]
Merge "Support 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
Jack He [Thu, 29 Jun 2017 17:40:30 +0000 (17:40 +0000)]
Merge "Support battery level reporting via Plantronics XEVENT (1/2)" am:
c79c4240ec am:
c286110c1a
am:
b01caeeb94
Change-Id: I0c35a8cd009940262e0055633b268a2da8fc11fc
TreeHugger Robot [Thu, 29 Jun 2017 17:38:13 +0000 (17:38 +0000)]
Merge "Add @*android:bool/config_defaultRingtonePickerEnabled" into oc-dr1-dev
Jack He [Thu, 29 Jun 2017 17:32:35 +0000 (17:32 +0000)]
Merge "Support battery level reporting via Plantronics XEVENT (1/2)" am:
c79c4240ec
am:
c286110c1a
Change-Id: I37cb48012b0f7170415693476d7e9f105798d814
Wyatt Riley [Thu, 29 Jun 2017 17:28:47 +0000 (17:28 +0000)]
Merge "Ensure complete GnssStatus construction" into oc-dr1-dev
am:
e327572e36
Change-Id: Idc1ca1c01f8b77cd4ba7e1780335b9e0dea2b656
Jack He [Thu, 29 Jun 2017 17:25:26 +0000 (17:25 +0000)]
Merge "Support battery level reporting via Plantronics XEVENT (1/2)"
am:
c79c4240ec
Change-Id: I6aa50e541763adfa9ebe738d98d86152cf0cd1d5
TreeHugger Robot [Thu, 29 Jun 2017 17:18:14 +0000 (17:18 +0000)]
Merge "Ensure complete GnssStatus construction" into oc-dr1-dev
Treehugger Robot [Thu, 29 Jun 2017 17:17:38 +0000 (17:17 +0000)]
Merge "Support 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
Chris Wren [Thu, 29 Jun 2017 16:58:45 +0000 (16:58 +0000)]
Merge "add an auto-merge guard to the metrics constants file" into oc-dr1-dev
am:
325706f143
Change-Id: I0a597ec06a40f97dea3edcd8a4807040c742b1d9
Selim Cinek [Thu, 29 Jun 2017 16:57:31 +0000 (16:57 +0000)]
Merge "Fixed an icon flickering when adding a notification" into oc-dr1-dev
am:
aa481d695d
Change-Id: I9b4fb988b6db2cd16a5e78a67ab53948746d6488
TreeHugger Robot [Thu, 29 Jun 2017 16:49:46 +0000 (16:49 +0000)]
Merge "add an auto-merge guard to the metrics constants file" into oc-dr1-dev
Sundeep Ghuman [Mon, 19 Jun 2017 23:56:41 +0000 (16:56 -0700)]
Move TestAccessPointBuilder.
This is necessary to make it accessible to other test packages, such as
WifiSettingsUiTest.java in packages/apps/Settings.
Bug:
37558394
Test: runtest --path
packages/apps/Settings/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java
Change-Id: Ic1e4185639b2947433d6371e74448097d6adb962
TreeHugger Robot [Thu, 29 Jun 2017 16:45:50 +0000 (16:45 +0000)]
Merge "Fixed an icon flickering when adding a notification" into oc-dr1-dev
Jason Monk [Thu, 29 Jun 2017 16:39:27 +0000 (16:39 +0000)]
Merge "Remove extraneous log message" into oc-dr1-dev
am:
7c726fb430
Change-Id: Iddd2fa8db9363cf2ad502d1435ca1b7ea5ebc368
TreeHugger Robot [Thu, 29 Jun 2017 16:33:00 +0000 (16:33 +0000)]
Merge "Remove extraneous log message" into oc-dr1-dev
Paul McLean [Wed, 7 Jun 2017 22:48:32 +0000 (16:48 -0600)]
Adding USB Headset awareness.
Bug:
36220140
Bug:
62043095
Test: Manual
Change-Id: Ic4636e3dc2dfce0154e6405848bea7752cf2d07b
Android Build Merger (Role) [Thu, 29 Jun 2017 16:29:50 +0000 (16:29 +0000)]
Merge "Merge "Merge "add links to Log class summary for methods and logcat doc" into oc-dev am:
ea6fea4d5d" into oc-dr1-dev am:
0bd1a7b461" into oc-dr1-dev-plus-aosp
Scott Main [Thu, 29 Jun 2017 16:28:51 +0000 (16:28 +0000)]
Merge "Merge "add links to Log class summary for methods and logcat doc" into oc-dev am:
ea6fea4d5d" into oc-dr1-dev
am:
0bd1a7b461
Change-Id: I5ebb6c9f860f8a9167ebb460041633db4ab2f160
Android Build Merger (Role) [Thu, 29 Jun 2017 16:28:32 +0000 (16:28 +0000)]
Merge "Merge "add links to Log class summary for methods and logcat doc" into oc-dev am:
ea6fea4d5d am:
afeb63d823" into oc-dr1-dev-plus-aosp
Scott Main [Thu, 29 Jun 2017 16:27:24 +0000 (16:27 +0000)]
Merge "add links to Log class summary for methods and logcat doc" into oc-dev am:
ea6fea4d5d
am:
afeb63d823
Change-Id: If161555970f40d9db0e15c20768a7ddb46527302
Sundeep Ghuman [Thu, 29 Jun 2017 16:27:23 +0000 (16:27 +0000)]
Merge "Update WifiConfiguration in AccessPoint." into oc-dr1-dev
am:
c93f7b215b
Change-Id: I8f9dfe61ec23118b5936a4e13428ebb6783718e5
Android Build Merger (Role) [Thu, 29 Jun 2017 16:20:48 +0000 (16:20 +0000)]
Merge "Merge "add links to Log class summary for methods and logcat doc" into oc-dev am:
ea6fea4d5d" into oc-dr1-dev
TreeHugger Robot [Thu, 29 Jun 2017 16:20:13 +0000 (16:20 +0000)]
Merge "Update WifiConfiguration in AccessPoint." into oc-dr1-dev
Scott Main [Thu, 29 Jun 2017 16:19:25 +0000 (16:19 +0000)]
Merge "add links to Log class summary for methods and logcat doc" into oc-dev
am:
ea6fea4d5d
Change-Id: I205254f618a3a405aab6f783f5d7de99c9a3a907
Scott Main [Thu, 29 Jun 2017 16:19:20 +0000 (16:19 +0000)]
Merge "add links to Log class summary for methods and logcat doc" into oc-dev
am:
ea6fea4d5d
Change-Id: I322405e6712ef9affb57d86e43b852e19cdc7f88
Scott Main [Thu, 29 Jun 2017 16:12:47 +0000 (16:12 +0000)]
Merge "add links to Log class summary for methods and logcat doc" into oc-dev
Justin Klaassen [Mon, 26 Jun 2017 14:55:08 +0000 (07:55 -0700)]
Add @*android:bool/config_defaultRingtonePickerEnabled
Bug:
62996582
Test: verify activity is enabled by default
Change-Id: I9503cd09066d1a61f670da2139758ef83b5edea3
Chris Wren [Thu, 29 Jun 2017 14:10:02 +0000 (10:10 -0400)]
add an auto-merge guard to the metrics constants file
Test: make
Bug:
63127271
Change-Id: Ib03a14d2a9e321d743a67f72f9be50259ced162a
Selim Cinek [Thu, 29 Jun 2017 13:44:57 +0000 (13:44 +0000)]
Merge "Be more lenient when processing group headers" into oc-dr1-dev
am:
693179307c
Change-Id: Iccf9df3cf1f15aefd88b8cb77568df1a00e52e21
TreeHugger Robot [Thu, 29 Jun 2017 13:38:24 +0000 (13:38 +0000)]
Merge "Be more lenient when processing group headers" into oc-dr1-dev
Jason Monk [Thu, 29 Jun 2017 13:34:26 +0000 (09:34 -0400)]
Remove extraneous log message
Test: make
Bug:
62620242
Change-Id: I5861f074e1db89cab44d6c86a32d2340b283f588
Erik Kline [Thu, 29 Jun 2017 12:43:17 +0000 (12:43 +0000)]
Merge "No need to explicitly list ethernet upstream type" am:
01017959fe am:
065e3a7786
am:
0cde0ab951
Change-Id: Ide54094d327d67af32ca84c287d9cb09133390a0
Erik Kline [Thu, 29 Jun 2017 12:35:15 +0000 (12:35 +0000)]
Merge "No need to explicitly list ethernet upstream type" am:
01017959fe
am:
065e3a7786
Change-Id: I5442a9298822af5f6cbfa2570906bc38018c07e4
Erik Kline [Thu, 29 Jun 2017 12:26:53 +0000 (12:26 +0000)]
Merge "No need to explicitly list ethernet upstream type"
am:
01017959fe
Change-Id: I93a74d80db134e832cef16d61abc057c88e86675
Treehugger Robot [Thu, 29 Jun 2017 12:18:35 +0000 (12:18 +0000)]
Merge "No need to explicitly list ethernet upstream type"
Neil Fuller [Thu, 29 Jun 2017 11:53:48 +0000 (11:53 +0000)]
Merge "Use sendBroadcastAsUser rather than sendBroadcast" am:
d129a14647 am:
93b232db41
am:
95eab26704
Change-Id: I3fee39d494d9ea041351218e72ebbe65bdb07637
Neil Fuller [Thu, 29 Jun 2017 11:45:04 +0000 (11:45 +0000)]
Merge "Use sendBroadcastAsUser rather than sendBroadcast" am:
d129a14647
am:
93b232db41
Change-Id: I749e98ea84dd8c3811d302848a14576c6aff8fb1
Neil Fuller [Thu, 29 Jun 2017 11:37:13 +0000 (11:37 +0000)]
Merge "Use sendBroadcastAsUser rather than sendBroadcast"
am:
d129a14647
Change-Id: I76324b2d983887dbdac4b26e518a68d8c4035a47
Treehugger Robot [Thu, 29 Jun 2017 11:29:37 +0000 (11:29 +0000)]
Merge "Use sendBroadcastAsUser rather than sendBroadcast"
Andre Eisenbach [Thu, 29 Jun 2017 08:53:03 +0000 (08:53 +0000)]
Merge "HFP: Modify comments for ACTION_HF_INDICATORS_VALUE_CHANGED (1/2)" am:
5790bae2f4 am:
df1831d2ee
am:
83e46cbacc
Change-Id: I43fb2e8c31de5dfff2eb517e59951ddf60575a9c
Andre Eisenbach [Thu, 29 Jun 2017 08:45:01 +0000 (08:45 +0000)]
Merge "HFP: Modify comments for ACTION_HF_INDICATORS_VALUE_CHANGED (1/2)" am:
5790bae2f4
am:
df1831d2ee
Change-Id: I33fb994d049b033d9e58bbc080fa6ce1efc8e240
Andre Eisenbach [Thu, 29 Jun 2017 08:39:40 +0000 (08:39 +0000)]
Merge "HFP: Modify comments for ACTION_HF_INDICATORS_VALUE_CHANGED (1/2)"
am:
5790bae2f4
Change-Id: I480ef38d5aa61aa153ee53d325e8b249c1eab222
Andre Eisenbach [Thu, 29 Jun 2017 08:30:50 +0000 (08:30 +0000)]
Merge "HFP: 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
Selim Cinek [Thu, 29 Jun 2017 08:28:17 +0000 (10:28 +0200)]
Be more lenient when processing group headers
We are now only looking at the contracted header instead of all
sorts of headers and if the current header is null, we don't
look any further but consider it to be equal.
Bug:
62378776
Test: add notification groups with multiple headers, observe correct icon / text behavior
Change-Id: I0b83b91caaace30df3bdcba7225e93bd0e195484
Erik Kline [Wed, 21 Jun 2017 14:27:55 +0000 (23:27 +0900)]
No need to explicitly list ethernet upstream type
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
32163131
Bug:
36076442
Change-Id: I743c20d5b969e33c6b10d0b47ac06e6b8c968acf
Sundeep Ghuman [Thu, 29 Jun 2017 05:59:19 +0000 (05:59 +0000)]
Merge "Clear AccessPoints in WifiTracker when Wifi is Off." into oc-dr1-dev
am:
e644b8cfa3
Change-Id: I003454ea1526b58d5ce52ad18b6a674c0c57dcea
TreeHugger Robot [Thu, 29 Jun 2017 05:51:39 +0000 (05:51 +0000)]
Merge "Clear AccessPoints in WifiTracker when Wifi is Off." into oc-dr1-dev
Sundeep Ghuman [Thu, 29 Jun 2017 05:46:48 +0000 (05:46 +0000)]
Merge "Change TRON counters to reflect cl/
159755374" into oc-dr1-dev
am:
f1febb57d8
Change-Id: I76ca207614a29a901aed937df484d06ed1470f05
TreeHugger Robot [Thu, 29 Jun 2017 05:38:33 +0000 (05:38 +0000)]
Merge "Change TRON counters to reflect cl/
159755374" into oc-dr1-dev
Sundeep Ghuman [Tue, 6 Jun 2017 02:47:36 +0000 (19:47 -0700)]
Update WifiConfiguration in AccessPoint.
Currently, calling AccessPoint.update(config, info, networkInfo) will
not store the new WifiConfiguration object if it has changed. This can
cause the summary statement to fall out of sync.
Bug: b/
38409294
Test: Open WifiNetworkDetails page with verbose logging. Stale state no
longer shown when config changes.
runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java
Change-Id: I86411527472621f86ab691ee772c0b3d2153d01f
Sundeep Ghuman [Thu, 29 Jun 2017 04:41:15 +0000 (04:41 +0000)]
Merge "Add case sensitive sort to AccessPoint compareTo." into oc-dr1-dev
am:
6a62328517
Change-Id: I01cd4dcc90090d82d93d9b92d446d4a2d97e7aa0
TreeHugger Robot [Thu, 29 Jun 2017 04:31:36 +0000 (04:31 +0000)]
Merge "Add case sensitive sort to AccessPoint compareTo." into oc-dr1-dev
Steven Moreland [Thu, 29 Jun 2017 02:40:48 +0000 (02:40 +0000)]
Merge "hidl getService throw correct exceptions." into oc-dr1-dev
am:
350328965b
Change-Id: I1546968a0ccba501e05027e8e1d3f878139d343c
Winson Chung [Thu, 29 Jun 2017 02:39:41 +0000 (02:39 +0000)]
Merge "Updating dismiss button icon to be rounded." into oc-dr1-dev
am:
fd71b51367
Change-Id: I56c77719fe60f9073bc8f770775a7b160f6de52b
Winson Chung [Thu, 29 Jun 2017 02:38:20 +0000 (02:38 +0000)]
Merge "Fixing black background when going back from assistant." into oc-dr1-dev
am:
4d6747bb0f
Change-Id: I93373af41ad59ce2a5f3e82e07027286138b8c10
Tri Vo [Thu, 29 Jun 2017 02:37:04 +0000 (02:37 +0000)]
Merge "Fwk vibrator server handles vibrator hal dying." into oc-dr1-dev
am:
d6d2c148fe
Change-Id: Ia09adb568136553f2bad7f7a1e07dee1c9912414
Android Build Merger (Role) [Thu, 29 Jun 2017 02:33:28 +0000 (02:33 +0000)]
Merge "Merge "Further restrict activity launch on virtual displays" into oc-dev am:
36dbd3d43f am:
6e086877e5" into oc-dr1-dev-plus-aosp
TreeHugger Robot [Thu, 29 Jun 2017 02:33:09 +0000 (02:33 +0000)]
Merge "hidl getService throw correct exceptions." into oc-dr1-dev
Winson Chung [Thu, 29 Jun 2017 02:32:55 +0000 (02:32 +0000)]
Merge "Updating dismiss button icon to be rounded." into oc-dr1-dev
Andrii Kulian [Thu, 29 Jun 2017 02:32:25 +0000 (02:32 +0000)]
Merge "Further restrict activity launch on virtual displays" into oc-dev am:
36dbd3d43f
am:
6e086877e5
Change-Id: Ie9737c79dfaad2385d380d1255a17ad903770c59
Android Build Merger (Role) [Thu, 29 Jun 2017 02:31:57 +0000 (02:31 +0000)]
Merge "Merge "Disable requestVisibleBehind." into oc-dev am:
e33c33e38a am:
da72cb368e" into oc-dr1-dev-plus-aosp
Winson Chung [Thu, 29 Jun 2017 02:31:54 +0000 (02:31 +0000)]
Merge "Fixing black background when going back from assistant." into oc-dr1-dev
Robert Carr [Thu, 29 Jun 2017 02:30:52 +0000 (02:30 +0000)]
Merge "Disable requestVisibleBehind." into oc-dev am:
e33c33e38a
am:
da72cb368e
Change-Id: Id5e228ae7414f2dc8c489990a48ecc1a118538e5
Android Build Merger (Role) [Thu, 29 Jun 2017 02:30:37 +0000 (02:30 +0000)]
Merge "Merge "Use Bundle for inter-process message" am:
db8e4efd5b am:
5311da134a am:
ebf9f098d5 -s ours" into oc-dr1-dev-plus-aosp
yinxu [Thu, 29 Jun 2017 02:29:25 +0000 (02:29 +0000)]
Merge "Use Bundle for inter-process message" am:
db8e4efd5b am:
5311da134a
am:
ebf9f098d5 -s ours
Change-Id: I7fbdde086630a10a4dc324da9aa336bb1f565d9d
Android Build Merger (Role) [Thu, 29 Jun 2017 02:26:29 +0000 (02:26 +0000)]
Merge "Merge "Further restrict activity launch on virtual displays" into oc-dev am:
36dbd3d43f am:
c8cccd7621" into oc-dr1-dev-plus-aosp
Tri Vo [Thu, 29 Jun 2017 02:26:14 +0000 (02:26 +0000)]
Merge "Fwk vibrator server handles vibrator hal dying." into oc-dr1-dev
Andrii Kulian [Thu, 29 Jun 2017 02:25:33 +0000 (02:25 +0000)]
Merge "Further restrict activity launch on virtual displays" into oc-dev am:
36dbd3d43f
am:
c8cccd7621
Change-Id: I8d67796f837783494188a841a5168b0672c1f225
Android Build Merger (Role) [Thu, 29 Jun 2017 02:25:10 +0000 (02:25 +0000)]
Merge "Merge "Disable requestVisibleBehind." into oc-dev am:
e33c33e38a am:
1c89591f94" into oc-dr1-dev-plus-aosp
Robert Carr [Thu, 29 Jun 2017 02:24:23 +0000 (02:24 +0000)]
Merge "Disable requestVisibleBehind." into oc-dev am:
e33c33e38a
am:
1c89591f94
Change-Id: Ife4908481549c956a23118ce5f8422161cc73d9e
OSDN Git Service
