OSDN Git Service
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
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 [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
Android Build Merger (Role) [Thu, 29 Jun 2017 02:24:02 +0000 (02:24 +0000)]
Merge "Merge "[Companion] Dont crash if started with bluetooth off" into oc-dev am:
c55f7d2180 am:
8e079af6ad" into oc-dr1-dev-plus-aosp
Eugene Susla [Thu, 29 Jun 2017 02:23:11 +0000 (02:23 +0000)]
Merge "[Companion] Dont crash if started with bluetooth off" into oc-dev am:
c55f7d2180
am:
8e079af6ad
Change-Id: I739f5aa80a75f34230593173f2536fe8d0e33bca
Android Build Merger (Role) [Thu, 29 Jun 2017 02:22:57 +0000 (02:22 +0000)]
Merge "Merge "[Companion] Dont crash if started with bluetooth off" into oc-dev am:
c55f7d2180 am:
a96ef94e0d" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 29 Jun 2017 02:22:45 +0000 (02:22 +0000)]
Merge "Merge "Selectively disable filtering if estimated safe" into oc-dev am:
38c97237e3 am:
14fe0b69c7" into oc-dr1-dev-plus-aosp
Eugene Susla [Thu, 29 Jun 2017 02:22:03 +0000 (02:22 +0000)]
Merge "[Companion] Dont crash if started with bluetooth off" into oc-dev am:
c55f7d2180
am:
a96ef94e0d
Change-Id: I0c9f433041911a4f908074b89df088ee1557796b
John Reck [Thu, 29 Jun 2017 02:21:44 +0000 (02:21 +0000)]
Merge "Selectively disable filtering if estimated safe" into oc-dev am:
38c97237e3
am:
14fe0b69c7
Change-Id: I9e75af1654188288d57653c754df56855eed5564
Android Build Merger (Role) [Thu, 29 Jun 2017 02:21:42 +0000 (02:21 +0000)]
Merge "Merge "Selectively disable filtering if estimated safe" into oc-dev am:
38c97237e3 am:
dfce81961d" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 29 Jun 2017 02:21:20 +0000 (02:21 +0000)]
Merge "Merge "Properly check for orientation mismatch" into oc-dev am:
a96d749140 am:
3bd6012cee" into oc-dr1-dev-plus-aosp
John Reck [Thu, 29 Jun 2017 02:20:55 +0000 (02:20 +0000)]
Merge "Selectively disable filtering if estimated safe" into oc-dev am:
38c97237e3
am:
dfce81961d
Change-Id: I8bf7663f2f5aecf22fc83304e09dc7d7f5cc1028
Android Build Merger (Role) [Thu, 29 Jun 2017 02:20:37 +0000 (02:20 +0000)]
Merge "Merge "Properly check for orientation mismatch" into oc-dev am:
a96d749140 am:
9d41ce8c4f" into oc-dr1-dev-plus-aosp
Jorim Jaggi [Thu, 29 Jun 2017 02:20:34 +0000 (02:20 +0000)]
Merge "Properly check for orientation mismatch" into oc-dev am:
a96d749140
am:
3bd6012cee
Change-Id: I3a148e593f5d1bf7f397567719244453adb3541c
Jorim Jaggi [Thu, 29 Jun 2017 02:19:49 +0000 (02:19 +0000)]
Merge "Properly check for orientation mismatch" into oc-dev am:
a96d749140
am:
9d41ce8c4f
Change-Id: I31e4258b225d3cd23409f0f901d8fe00fb1feecb
Evan Laird [Thu, 29 Jun 2017 02:19:21 +0000 (02:19 +0000)]
Merge "Fix empty signal line thickness / color in status bar" into oc-dev am:
91870d1587
am:
090807e840
Change-Id: I1a8d503b9d769b1535fe77b2fd5e6ef69fde7987
Andrii Kulian [Thu, 29 Jun 2017 02:16:43 +0000 (02:16 +0000)]
Merge "Further restrict activity launch on virtual displays" into oc-dev
am:
36dbd3d43f
Change-Id: Iea0afa18746c4b04d12433902140d65d4af50c8e
Robert Carr [Thu, 29 Jun 2017 02:15:32 +0000 (02:15 +0000)]
Merge "Disable requestVisibleBehind." into oc-dev
am:
e33c33e38a
Change-Id: I29e5507d716e19060d4c0578d4b4df3bcfa30069
Eugene Susla [Thu, 29 Jun 2017 02:14:22 +0000 (02:14 +0000)]
Merge "[Companion] Dont crash if started with bluetooth off" into oc-dev
am:
c55f7d2180
Change-Id: I024af9dfe70fb340b2dc481f8aad6b12351b56cb
John Reck [Thu, 29 Jun 2017 02:13:18 +0000 (02:13 +0000)]
Merge "Selectively disable filtering if estimated safe" into oc-dev
am:
38c97237e3
Change-Id: Ic3be7167429e8cd6a291ac0465e883522afcf9e3
yinxu [Thu, 29 Jun 2017 02:12:05 +0000 (02:12 +0000)]
Merge "Use Bundle for inter-process message" am:
db8e4efd5b
am:
5311da134a
Change-Id: I0b7d8ee5827c97fc761cb1fe102d4b89b364e9f7
Evan Laird [Thu, 29 Jun 2017 02:12:02 +0000 (02:12 +0000)]
Merge "resolve merge conflicts of
91870d158748 to oc-dr1-dev" into oc-dr1-dev
am:
423022e8ab
Change-Id: I5f81cfde196fc801c4141c35e708d8f27032c621
Jorim Jaggi [Thu, 29 Jun 2017 02:12:02 +0000 (02:12 +0000)]
Merge "Properly check for orientation mismatch" into oc-dev
am:
a96d749140
Change-Id: I5f11ef2c520e418242b44db32d087656c4eb3984
yinxu [Thu, 29 Jun 2017 02:05:53 +0000 (02:05 +0000)]
Merge "Use Bundle for inter-process message"
am:
db8e4efd5b
Change-Id: Ib93e91969063a5d2276c99b8b0fee4dd1a398771
TreeHugger Robot [Thu, 29 Jun 2017 02:00:51 +0000 (02:00 +0000)]
Merge "resolve merge conflicts of
91870d158748 to oc-dr1-dev" into oc-dr1-dev
Andrii Kulian [Thu, 29 Jun 2017 01:57:32 +0000 (01:57 +0000)]
Merge "Further restrict activity launch on virtual displays" into oc-dev
am:
36dbd3d43f
Change-Id: I30a4083e9c8467dd8698b50f0999b5ae20f2e01c
Lucas Dupin [Thu, 29 Jun 2017 01:53:04 +0000 (01:53 +0000)]
Merge changes from topic 'fix_broken_overlay' into oc-dr1-dev
am:
4b535d93f7
Change-Id: I74f15490d9a71386230fd6f326bd0a1866c7f7d3
Treehugger Robot [Thu, 29 Jun 2017 01:51:04 +0000 (01:51 +0000)]
Merge "Use Bundle for inter-process message"
Andrii Kulian [Thu, 29 Jun 2017 01:47:41 +0000 (01:47 +0000)]
Merge "Further restrict activity launch on virtual displays" into oc-dev
TreeHugger Robot [Thu, 29 Jun 2017 01:43:52 +0000 (01:43 +0000)]
Merge changes from topic 'fix_broken_overlay' into oc-dr1-dev
* changes:
Revert "Replaced overlay target package"
Revert "Support dark text on Recents"
Robert Carr [Thu, 29 Jun 2017 00:26:35 +0000 (00:26 +0000)]
Merge "Disable requestVisibleBehind." into oc-dev
am:
e33c33e38a
Change-Id: Ie0733cb79acbe34536c4c031f1234dac134841d3
TreeHugger Robot [Thu, 29 Jun 2017 00:17:19 +0000 (00:17 +0000)]
Merge "Disable requestVisibleBehind." into oc-dev
Matthew Ng [Thu, 29 Jun 2017 00:16:12 +0000 (00:16 +0000)]
Merge "Fixes getting the wrong app transition going home after minimized (1/2)" into oc-dr1-dev
am:
eb36d83901
Change-Id: I01f2882da4d75a127a872858b351130f6da6aa1e
TreeHugger Robot [Thu, 29 Jun 2017 00:09:25 +0000 (00:09 +0000)]
Merge "Fixes getting the wrong app transition going home after minimized (1/2)" into oc-dr1-dev
Eugene Susla [Thu, 29 Jun 2017 00:03:08 +0000 (00:03 +0000)]
Merge "[Companion] Dont crash if started with bluetooth off" into oc-dev
am:
c55f7d2180
Change-Id: I9386692da93413a6b9fec51045d003fba5284401
TreeHugger Robot [Wed, 28 Jun 2017 23:54:49 +0000 (23:54 +0000)]
Merge "[Companion] Dont crash if started with bluetooth off" into oc-dev
Mady Mellor [Wed, 28 Jun 2017 23:53:23 +0000 (23:53 +0000)]
Merge "Adjustments to PIP position while flinging" into oc-dr1-dev
am:
176f2533a1
Change-Id: Ic5d38c862c155ac025884e53d688826b57829529
TreeHugger Robot [Wed, 28 Jun 2017 23:45:37 +0000 (23:45 +0000)]
Merge "Adjustments to PIP position while flinging" into oc-dr1-dev
Andrii Kulian [Wed, 28 Jun 2017 23:21:07 +0000 (16:21 -0700)]
Further restrict activity launch on virtual displays
Only callers with INTERNAL_SYSTEM_WINDOW permission can launch
an activity to a virtual display.
Bug:
63094482
Test: android.server.cts.ActivityManagerDisplayTests
Change-Id: I3f618fcbf3c07e5085e2b43b0f038f240df0c9d3
Sundeep Ghuman [Thu, 22 Jun 2017 05:35:30 +0000 (22:35 -0700)]
Clear AccessPoints in WifiTracker when Wifi is Off.
When Wifi is not Enabled, we should clear existing access points. This
avoids showing stale data when wifi is turned back on. Since this method can
now invoke onAccessPointsChanged callbacks, add extra gating for
mStaleScanResults.
Improve test flakiness by waiting for Work and Main handlers to
finish processing messages before continuing.
Bug: b/
37832771
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java
Change-Id: I34faabec01a7188debe3c3b2fe6a0e02f49b320f
Lucas Dupin [Wed, 28 Jun 2017 23:00:39 +0000 (16:00 -0700)]
Revert "Replaced overlay target package"
This reverts commit
ae885416dddd684fab2369fde234dc9e48db5051.
Lucas Dupin [Wed, 28 Jun 2017 23:00:26 +0000 (16:00 -0700)]
Revert "Support dark text on Recents"
This reverts commit
512ce6c9b75ce7d3f4f70280a414ab8fb994e809.
John Reck [Wed, 28 Jun 2017 22:45:50 +0000 (22:45 +0000)]
Merge "Selectively disable filtering if estimated safe" into oc-dev
am:
38c97237e3
Change-Id: I3ef75aea36939b1dffa44500097709ef51787a1d
John Reck [Wed, 28 Jun 2017 22:39:46 +0000 (22:39 +0000)]
Merge "Selectively disable filtering if estimated safe" into oc-dev
Jorim Jaggi [Wed, 28 Jun 2017 22:05:47 +0000 (22:05 +0000)]
Merge "Properly check for orientation mismatch" into oc-dev
am:
a96d749140
Change-Id: I2476d7710bff82e3eeedc0f48f61b57e392efbe7
Evan Laird [Wed, 28 Jun 2017 22:00:02 +0000 (18:00 -0400)]
resolve merge conflicts of
91870d158748 to oc-dr1-dev
Test: mp sysuig; visual
Change-Id: Id329cd7f08667b29e8d430cff6576d8894cd9cf4
Jorim Jaggi [Wed, 28 Jun 2017 21:55:27 +0000 (21:55 +0000)]
Merge "Properly check for orientation mismatch" into oc-dev
Evan Laird [Wed, 28 Jun 2017 21:38:13 +0000 (21:38 +0000)]
Merge "Fix empty signal line thickness / color in status bar" into oc-dev
am:
91870d1587
Change-Id: Ie05d24e13dd2975d45acb59e594df0240d54c460
Charlie Wang [Wed, 28 Jun 2017 21:37:55 +0000 (21:37 +0000)]
Merge "Adding fields for time elapsed for headset device events." into oc-dr1-dev
am:
b5e79ad0d3
Change-Id: I717159a360b1aeb2f928c88b76ad060f4d8516c7
Alison Cichowlas [Wed, 28 Jun 2017 21:30:46 +0000 (21:30 +0000)]
Merge "This import got lost in the merge. Restore to fix build." into oc-dr1-dev
am:
29c70316df
Change-Id: Ia1864af61669029ac5596d3477b3d959e824422a
Evan Laird [Wed, 28 Jun 2017 21:30:15 +0000 (21:30 +0000)]
Merge "Fix empty signal line thickness / color in status bar" into oc-dev
Android Build Merger (Role) [Wed, 28 Jun 2017 21:26:45 +0000 (21:26 +0000)]
Merge "Merge "Don't break key event stream when enabling a11y" into oc-dev am:
bb8a7983ff am:
aec87eab5b" into oc-dr1-dev-plus-aosp
Charlie Wang [Wed, 28 Jun 2017 21:26:38 +0000 (21:26 +0000)]
Merge "Adding fields for time elapsed for headset device events." into oc-dr1-dev
Phil Weaver [Wed, 28 Jun 2017 21:25:36 +0000 (21:25 +0000)]
Merge "Don't break key event stream when enabling a11y" into oc-dev am:
bb8a7983ff
am:
aec87eab5b
Change-Id: I615ef6fb2fa5786895a385f721bc929df780906f
Phil Weaver [Wed, 28 Jun 2017 21:24:42 +0000 (21:24 +0000)]
Merge "Don't break key event stream when enabling a11y" into oc-dev am:
bb8a7983ff
am:
2bf63f4fde
Change-Id: I5a6fe8947017b7a8b3cfdf41c4b5583dc114bf44
Alison Cichowlas [Wed, 28 Jun 2017 21:23:49 +0000 (21:23 +0000)]
Merge "This import got lost in the merge. Restore to fix build." into oc-dr1-dev
Sundeep Ghuman [Wed, 21 Jun 2017 23:54:36 +0000 (16:54 -0700)]
Change TRON counters to reflect cl/
159755374
This updates to the newly defined TRON counters and futures proofs us
for new values. Prior to this change, introducing a new enum would throw
an IllegalArgumentException.
Bug: b/
35628911
Test: NA
Change-Id: I46662d53b31858396c9a5a6113b1166fba4dfc51
Jason Monk [Wed, 28 Jun 2017 21:19:19 +0000 (21:19 +0000)]
Merge "NavBar: Don't reorient as much, its a waste of work" into oc-dr1-dev
am:
587b673e5b
Change-Id: I0c7b9118cdf37f321772865caa835cdb76b79b97
Brad Ebinger [Wed, 28 Jun 2017 21:17:52 +0000 (21:17 +0000)]
Merge "IMS: Check for binderstate before calling endSession" into oc-dr1-dev
am:
58d47a6f04 -s ours
Change-Id: Ie857dfb83ecbfd36f965ad91caddcf3b80848e20
Phil Weaver [Wed, 28 Jun 2017 21:17:42 +0000 (21:17 +0000)]
Merge "Don't break key event stream when enabling a11y" into oc-dev
am:
bb8a7983ff
Change-Id: I5deb45f1e2b2c0f667c5a37e70cdabe643f905ee
Phil Weaver [Wed, 28 Jun 2017 21:17:42 +0000 (21:17 +0000)]
Merge "Don't break key event stream when enabling a11y" into oc-dev
am:
bb8a7983ff
Change-Id: I0e796089c9768ddd8de1c371f0511d7967833e9d
Jason Monk [Wed, 28 Jun 2017 21:14:43 +0000 (21:14 +0000)]
Merge "NavBar: Don't reorient as much, its a waste of work" into oc-dr1-dev
Phil Weaver [Wed, 28 Jun 2017 21:09:03 +0000 (21:09 +0000)]
Merge "Don't break key event stream when enabling a11y" into oc-dev
Brad Ebinger [Wed, 28 Jun 2017 21:06:34 +0000 (21:06 +0000)]
Merge "IMS: Check for binderstate before calling endSession" into oc-dr1-dev
Hall Liu [Wed, 28 Jun 2017 20:53:00 +0000 (20:53 +0000)]
Merge changes from topics 'embms-cleanup-action', 'embms-download-token' am:
c2f33f18eb am:
761bad1c53
am:
8f42a3a281
Change-Id: Ib6c8e17b0d6664ded17ce8eb4314124eb676713c
Hall Liu [Wed, 28 Jun 2017 20:51:57 +0000 (20:51 +0000)]
Add download request tokens and enforce destination clear am:
2043f70acb am:
8763c625a3
am:
fc156f357a
Change-Id: I929fd3306a7bb8bbc2eeb31eb1732c99ec0fb743
Hall Liu [Wed, 28 Jun 2017 20:44:48 +0000 (20:44 +0000)]
Merge changes from topics 'embms-cleanup-action', 'embms-download-token' am:
c2f33f18eb
am:
761bad1c53
Change-Id: I7625defdce4fb4c69355f45d801729828646e659
Hall Liu [Wed, 28 Jun 2017 20:43:45 +0000 (20:43 +0000)]
Add download request tokens and enforce destination clear am:
2043f70acb
am:
8763c625a3
Change-Id: I6704e20ad1182fc8f97bd36700c54c3d2329da28
Alison Cichowlas [Wed, 28 Jun 2017 20:42:09 +0000 (16:42 -0400)]
This import got lost in the merge. Restore to fix build.
Test: built
Change-Id: Iba7e4449ed8ddfb535a45f087e3baf43b52a5f08
Brad Ebinger [Tue, 27 Jun 2017 17:08:55 +0000 (17:08 +0000)]
IMS: Check for binderstate before calling endSession
ImsRegistrationListenerProxy listener, which is registered
as part of ImsManager.open, is not cleared even after moving
feature state to NOT_AVAILABLE because end session
is never called.
Check for binder state instead of feature state READY before
calling end session. End session will be triggered after
moving feature state to NOT_AVAILABLE.
Notify Ims state change only for the supported feature state
change to clients.
Test: Manual
Bug:
62816014
Merged-In: Idfb6dfad51cca574c2ae25e2029ef7bdfe9d725b
Change-Id: Idfb6dfad51cca574c2ae25e2029ef7bdfe9d725b
(cherry picked from commit
913e11fcdfc9cbd7fd3eee1c94d1cb3fced37da9)
Hall Liu [Wed, 28 Jun 2017 20:36:49 +0000 (20:36 +0000)]
Merge changes from topics 'embms-cleanup-action', 'embms-download-token'
am:
c2f33f18eb
Change-Id: I7c2b0b34ed56bc506ce6139fb39649aec8319e81
Hall Liu [Wed, 28 Jun 2017 20:35:54 +0000 (20:35 +0000)]
Add download request tokens and enforce destination clear
am:
2043f70acb
Change-Id: I91e61d8f15815efc9f4d08d71d01944c096dc05f
Hall Liu [Wed, 28 Jun 2017 20:26:15 +0000 (20:26 +0000)]
Merge changes from topics 'embms-cleanup-action', 'embms-download-token'
* changes:
Implement the cleanup action in MbmsDownloadReceiver
Add download request tokens and enforce destination clear
Alison Cichowlas [Wed, 28 Jun 2017 20:17:11 +0000 (20:17 +0000)]
Merge "Disable failing RoundedCornersTest" into oc-dr1-dev
am:
e5c09e42eb
Change-Id: I7924f3e138bdd26e47e6f1c0c7f2526abc0b52f5
OSDN Git Service
