OSDN Git Service
Winson Chung [Tue, 25 Apr 2017 05:38:51 +0000 (05:38 +0000)]
Merge "Move RecentsImpl task stack listener to background." into oc-dev
am:
024f80ca82
Change-Id: I8d40752e96a1ea30267acad7be0db02905e28e8c
TreeHugger Robot [Tue, 25 Apr 2017 05:33:01 +0000 (05:33 +0000)]
Merge "Move RecentsImpl task stack listener to background." into oc-dev
Felipe Leme [Tue, 25 Apr 2017 05:15:43 +0000 (05:15 +0000)]
Merge "Hide deprecated APIs." into oc-dev
am:
59fe3108fa
Change-Id: Ib7effcaade703c76e13272f030922233061d3efd
Nathan Harold [Tue, 25 Apr 2017 05:13:24 +0000 (05:13 +0000)]
Merge "Remove the docstring dependency on telephony-common" into oc-dev
am:
b06ff6f256
Change-Id: I62bf5f96f48b4e16e48055b490b4da92096f133e
TreeHugger Robot [Tue, 25 Apr 2017 05:09:23 +0000 (05:09 +0000)]
Merge "Hide deprecated APIs." into oc-dev
TreeHugger Robot [Tue, 25 Apr 2017 05:05:35 +0000 (05:05 +0000)]
Merge "Remove the docstring dependency on telephony-common" into oc-dev
Fan Zhang [Tue, 25 Apr 2017 04:55:45 +0000 (04:55 +0000)]
Merge "Fix SettingsDrawerActivityTest on fugu." into oc-dev
am:
940f6a9962
Change-Id: I6346e51b77e03eca1c7496ce9fa3ed41c7de2a04
Todd Kennedy [Tue, 25 Apr 2017 04:48:26 +0000 (04:48 +0000)]
Merge "fix check for provider resolution" into oc-dev
am:
ade1496f96
Change-Id: Iced763d26e0872d3b6cc5a124e95c413ad7fc436
Fan Zhang [Tue, 25 Apr 2017 04:48:19 +0000 (04:48 +0000)]
Merge "Fix SettingsDrawerActivityTest on fugu." into oc-dev
TreeHugger Robot [Tue, 25 Apr 2017 04:44:51 +0000 (04:44 +0000)]
Merge "fix check for provider resolution" into oc-dev
lei.xa.liu [Tue, 25 Apr 2017 04:33:15 +0000 (04:33 +0000)]
Merge "Remove redundant lockscreen shown check" into oc-dev
am:
90c3489525
Change-Id: I77f82bcd38a0cb16226d58a5731c76a630c7e3be
Wale Ogunwale [Tue, 25 Apr 2017 04:31:17 +0000 (04:31 +0000)]
Merge "Don't specify stack bounds for unsizeable home stack in dock mode" into oc-dev
am:
f4472b6507
Change-Id: I2507216075b544eed6b9de4cea0f28e80c5c28d4
TreeHugger Robot [Tue, 25 Apr 2017 04:26:27 +0000 (04:26 +0000)]
Merge "Remove redundant lockscreen shown check" into oc-dev
TreeHugger Robot [Tue, 25 Apr 2017 04:25:30 +0000 (04:25 +0000)]
Merge "Don't specify stack bounds for unsizeable home stack in dock mode" into oc-dev
Chris Forbes [Tue, 25 Apr 2017 04:19:27 +0000 (04:19 +0000)]
Merge "jni: Adjust for libui gralloc flags change" into oc-dev
am:
3b7c1a32f1
Change-Id: Ib3c4d82de642f7db58bf1ce2729df1b1cf934e55
TreeHugger Robot [Tue, 25 Apr 2017 04:12:26 +0000 (04:12 +0000)]
Merge "jni: Adjust for libui gralloc flags change" into oc-dev
Svetoslav Ganov [Tue, 25 Apr 2017 04:03:19 +0000 (04:03 +0000)]
Merge "Move child package feature behind sys prop" into oc-dev
am:
6b3263a6e2
Change-Id: Ia701ccac097b1296b857928e1283d5b995fcdb6a
Svetoslav Ganov [Tue, 25 Apr 2017 03:58:56 +0000 (03:58 +0000)]
Merge "Move child package feature behind sys prop" into oc-dev
Etan Cohen [Tue, 25 Apr 2017 03:32:56 +0000 (03:32 +0000)]
Merge "[AWARE] Add AutoCloseable interface/implementation" into oc-dev
am:
14ff091a1d
Change-Id: Ic6dc86dc91d8024b76c3a6eff506aa5d1aefe594
Etan Cohen [Tue, 25 Apr 2017 03:26:01 +0000 (03:26 +0000)]
Merge "[AWARE] Add AutoCloseable interface/implementation" into oc-dev
Ta-wei Yen [Tue, 25 Apr 2017 03:00:33 +0000 (03:00 +0000)]
Merge "Move sendVisualVoicemailSms and setSmsFilterSettings to Telephony" into oc-dev
am:
3db7350d7d
Change-Id: I428d6e101d46e216a1e6e34048f1d3da2fb5314e
TreeHugger Robot [Tue, 25 Apr 2017 02:55:14 +0000 (02:55 +0000)]
Merge "Move sendVisualVoicemailSms and setSmsFilterSettings to Telephony" into oc-dev
Eugene Susla [Tue, 25 Apr 2017 02:53:02 +0000 (02:53 +0000)]
Remove 'via Bluetooth' from the choosed dialog
am:
b7aec13d51
Change-Id: I2ab4da7de0d7c269c2f3af59813576b392f603bf
Chris Forbes [Thu, 20 Apr 2017 18:58:45 +0000 (11:58 -0700)]
jni: Adjust for libui gralloc flags change
Change-Id: I94b95fba5e6234a07d2beba1d6f487842399367f
Bug: b/
33350696
Test: Bullhead: booted to launcher, take photo, watch youtube
Eugene Susla [Tue, 18 Apr 2017 19:43:15 +0000 (12:43 -0700)]
Remove 'via Bluetooth' from the choosed dialog
We no longer limit the items in a single chooser dialog to a devices from
single medium type.
Test: Ensure the dialog UI reflects the change.
Change-Id: Ia2342861f51f89e870f1c6a7fbebf9c1a37cac6a
Svet Ganov [Thu, 20 Apr 2017 06:51:33 +0000 (23:51 -0700)]
Move child package feature behind sys prop
Now one can do adb shell setprop/getptop to change
"persist.sys.child_packages_enabled" to true/false to
control whether child packages are supported.
Test: manual
bug:
36107077
Change-Id: Ie60e255fd3c248905906cdd5b10adae074c0b717
Android Build Merger (Role) [Mon, 24 Apr 2017 23:47:11 +0000 (23:47 +0000)]
Merge "Merge "Check Bluetooth app id instead of uid" am:
7d4a354fd5 am:
0efa055590 am:
6e7afc78a7" into oc-dev-plus-aosp
Amith Yamasani [Mon, 24 Apr 2017 23:46:28 +0000 (23:46 +0000)]
Merge "Check Bluetooth app id instead of uid" am:
7d4a354fd5 am:
0efa055590
am:
6e7afc78a7
Change-Id: Iec01fcd319146183e6e958974d494aeeb698c7c5
Jean-Michel Trivi [Mon, 24 Apr 2017 23:44:22 +0000 (23:44 +0000)]
Merge "AudioService: make PlaybackActivityMonitor less log-chatty" into oc-dev
am:
9e55fcbdc2
Change-Id: Id7a2620c784e6bc2bee287d0ef3836f890f227b8
Amith Yamasani [Mon, 24 Apr 2017 23:42:27 +0000 (23:42 +0000)]
Merge "Check Bluetooth app id instead of uid" am:
7d4a354fd5
am:
0efa055590
Change-Id: Ibed5b8045215e0d4dd4e20aa2778ec5a16c715e2
Jean-Michel Trivi [Mon, 24 Apr 2017 23:39:41 +0000 (23:39 +0000)]
Merge "AudioService: make PlaybackActivityMonitor less log-chatty" into oc-dev
Amith Yamasani [Mon, 24 Apr 2017 23:36:58 +0000 (23:36 +0000)]
Merge "Check Bluetooth app id instead of uid"
am:
7d4a354fd5
Change-Id: Ib79ace5311606520ae84c4ba37ffc64a538428d6
Adam Lesinski [Mon, 24 Apr 2017 23:31:26 +0000 (23:31 +0000)]
Merge changes I7d2b7e50,I784406a6 into oc-dev
am:
76831f7e39
Change-Id: Ia2a30b7b9f4f11afdbf3ee020288a8d29245a4f4
Treehugger Robot [Mon, 24 Apr 2017 23:30:51 +0000 (23:30 +0000)]
Merge "Check Bluetooth app id instead of uid"
TreeHugger Robot [Mon, 24 Apr 2017 23:26:01 +0000 (23:26 +0000)]
Merge changes I7d2b7e50,I784406a6 into oc-dev
* changes:
AAPT2: Allow truncating of package names
AAPT2: Make BinaryResourceParser more lenient
Felipe Leme [Mon, 24 Apr 2017 23:20:34 +0000 (23:20 +0000)]
Merge "Minor fixes on Autofill Framework:" into oc-dev
am:
0fe852080e
Change-Id: Ic755dc978f745de36018af56a6ad851f138d98b0
Felipe Leme [Mon, 24 Apr 2017 23:10:48 +0000 (23:10 +0000)]
Merge "Minor fixes on Autofill Framework:" into oc-dev
Etan Cohen [Mon, 24 Apr 2017 23:07:42 +0000 (23:07 +0000)]
Merge "[AWARE] Remove match style API" into oc-dev
am:
2be0a532bf
Change-Id: I0d2292b7d7fe932657e17598e2899b36971186a9
Felipe Leme [Fri, 21 Apr 2017 15:56:04 +0000 (08:56 -0700)]
Minor fixes on Autofill Framework:
- Removed default implementation of onProvideAutofillVirtualStructure() that
was using accessibility API (it's useless because without the View calling
AutofillManager.notifyViewEntered(), it would never be triggered).
- Fixed obsolete TODOs.
- Removed obsolete service class name constant.
- Removed unused debug constant.
Fixes:
37078783
Fixes:
33197203
Bug:
33802548
Bug:
35956626
Test: CtsAutoFillServiceTestCases pass
Merged-In: I834d34b8af8bf0d781dc7e0ffcd6e600bfa2d183
Change-Id: I834d34b8af8bf0d781dc7e0ffcd6e600bfa2d183
Etan Cohen [Mon, 24 Apr 2017 22:59:17 +0000 (22:59 +0000)]
Merge "[AWARE] Remove match style API" into oc-dev
Ruben Brunk [Mon, 24 Apr 2017 22:53:53 +0000 (22:53 +0000)]
Merge "Fix re-enabling alert window appop after leaving VR mode." into oc-dev
am:
d8f13bbc3d
Change-Id: I30baa3eeaab4d8cdb189ab4d59c3272c6232f798
Ruben Brunk [Mon, 24 Apr 2017 22:49:07 +0000 (22:49 +0000)]
Merge "Fix re-enabling alert window appop after leaving VR mode." into oc-dev
Chien-Yu Chen [Mon, 24 Apr 2017 22:41:49 +0000 (22:41 +0000)]
Merge "camera: Update for enableZsl values in template" into oc-dev
am:
06d84c3a86
Change-Id: I49afc64341f4bb53287991a48535ad2108afce3f
TreeHugger Robot [Mon, 24 Apr 2017 22:36:50 +0000 (22:36 +0000)]
Merge "camera: Update for enableZsl values in template" into oc-dev
Jeff Sharkey [Mon, 24 Apr 2017 22:25:17 +0000 (22:25 +0000)]
Merge "Bunch of new API lint rules." into oc-dev
am:
57b999605c
Change-Id: I0047174a7cfd43f644d2010f9f0c6662440f4680
Winson Chung [Mon, 24 Apr 2017 19:23:47 +0000 (12:23 -0700)]
Move RecentsImpl task stack listener to background.
- In RecentsTaskLoader, synchronize on anything that might use the
thumbnail cache
- In RecentsLoadPlan, remove synchronization when preloading/executing
since that is done in the loader now
- In RecentsImpl, synchronize on anything that might use the dummy stack
view
Bug:
37550083
Test: Launch Overview and some other tasks, ensure everything still works
Change-Id: I36d04566ebb04296f67a3233730c1dc5bc1569f4
Jeff Sharkey [Mon, 24 Apr 2017 22:18:51 +0000 (22:18 +0000)]
Merge "Bunch of new API lint rules." into oc-dev
Wale Ogunwale [Mon, 24 Apr 2017 21:51:51 +0000 (21:51 +0000)]
Merge "Fixed transition animation from pipable activities" into oc-dev
am:
3fc176913a
Change-Id: Ibcc4ecf80bd9dd10d8f09147a624f095ceb48717
TreeHugger Robot [Mon, 24 Apr 2017 21:46:28 +0000 (21:46 +0000)]
Merge "Fixed transition animation from pipable activities" into oc-dev
Karthik Ravi Shankar [Mon, 24 Apr 2017 21:39:45 +0000 (21:39 +0000)]
Merge changes from topic 'virtual-display-api' into oc-dev
am:
13ba34bf37
Change-Id: Id0195114803007719ff2dab6e8b1ef18983c95ad
Jeff Sharkey [Mon, 24 Apr 2017 21:38:03 +0000 (21:38 +0000)]
Merge "Even more auto-doc work." into oc-dev
am:
880f4f4cc2
Change-Id: I78199f8366fbda65a4b4917675291d946e29285c
TreeHugger Robot [Mon, 24 Apr 2017 21:33:55 +0000 (21:33 +0000)]
Merge changes from topic 'virtual-display-api' into oc-dev
* changes:
Add command line option to set compatibility display properties
Make VR mode virtual display properties customizable
TreeHugger Robot [Mon, 24 Apr 2017 21:33:13 +0000 (21:33 +0000)]
Merge "Even more auto-doc work." into oc-dev
Kang Li [Mon, 24 Apr 2017 21:31:25 +0000 (21:31 +0000)]
Merge "Moved LRResolverRankerService to ExtServices, and added a permission to ensure that ResolverRankerServices are from trust sources." into oc-dev
am:
925d3cf211
Change-Id: I9174e1f12c78ff4f7bbd72446fbf10e09478dbe0
Julia Reynolds [Mon, 24 Apr 2017 21:27:39 +0000 (21:27 +0000)]
Merge "Don't allow devs to create blocked channels" into oc-dev
am:
10e7275965
Change-Id: I1e5293cbd14b23bfffab2e8ff6384ce3c9092a64
Julia Reynolds [Mon, 24 Apr 2017 21:25:55 +0000 (21:25 +0000)]
Merge "Don't consider uri empty a valid sound" into oc-dev
am:
db5f5c3a17
Change-Id: I6ff2dc17f716de58fe4d3f485b6315e7b2bb232b
Kang Li [Mon, 24 Apr 2017 21:21:34 +0000 (21:21 +0000)]
Merge "Moved LRResolverRankerService to ExtServices, and added a permission to ensure that ResolverRankerServices are from trust sources." into oc-dev
Julia Reynolds [Mon, 24 Apr 2017 21:17:12 +0000 (21:17 +0000)]
Merge "Don't allow devs to create blocked channels" into oc-dev
Julia Reynolds [Mon, 24 Apr 2017 21:16:57 +0000 (21:16 +0000)]
Merge "Don't consider uri empty a valid sound" into oc-dev
Amith Yamasani [Mon, 24 Apr 2017 18:30:19 +0000 (11:30 -0700)]
Check Bluetooth app id instead of uid
Fixes the crash on user switches.
Change-Id: If0c003011bd014b437ef5c8bee24a27b68be88d9
Fixes:
37617840
Test: manual - add a user
Jean-Michel Trivi [Mon, 24 Apr 2017 18:59:29 +0000 (11:59 -0700)]
AudioService: make PlaybackActivityMonitor less log-chatty
Do not log error messages on release errors.
Do not try to terminate VolumeShaper when releasing a player.
Use coding convention for "private" and "static" keywords.
Test: make
Change-Id: Ic1ff376c1ce4750708c368756f7b4a8a2c05c50c
Santos Cordon [Mon, 24 Apr 2017 21:10:09 +0000 (21:10 +0000)]
Merge "Clean up ImageReader when VrMode is disabled." into oc-dev
am:
5d1c65971f
Change-Id: I7fd206511601b378b17c042c23a4a761b212241a
Felipe Leme [Fri, 21 Apr 2017 23:25:47 +0000 (16:25 -0700)]
Hide deprecated APIs.
Test: CtsAutoFillServiceTestCases pass
Bug:
37563972
Change-Id: Ia5f33c5624b7a6be3c152e126c99800914d23cbd
TreeHugger Robot [Mon, 24 Apr 2017 21:01:00 +0000 (21:01 +0000)]
Merge "Clean up ImageReader when VrMode is disabled." into oc-dev
Felipe Leme [Mon, 24 Apr 2017 20:56:16 +0000 (20:56 +0000)]
Merge "Replaced getUrl() by getWebDomain()." into oc-dev
am:
ffef2ad2b0
Change-Id: Ie26d572f9b45d82231d31546e47f7080526ed23f
TreeHugger Robot [Mon, 24 Apr 2017 20:45:54 +0000 (20:45 +0000)]
Merge "Replaced getUrl() by getWebDomain()." into oc-dev
Eugene Susla [Mon, 24 Apr 2017 20:42:10 +0000 (20:42 +0000)]
Merge "Change companion languare from 'pair' to 'link'/'ok'" into oc-dev
am:
e4964118c6
Change-Id: I43b0b54fa57713a2d2b2f65f34356dc13f533009
Amith Yamasani [Mon, 24 Apr 2017 20:36:12 +0000 (20:36 +0000)]
Merge "Add link to class with constants" into oc-dev
am:
6c0f8dc0b0
Change-Id: I98dab756a117a46b62aa5ea50e7f998d9747017e
Robert Carr [Mon, 24 Apr 2017 20:34:18 +0000 (20:34 +0000)]
Merge "Prevent leak of AppWindowTokens." into oc-dev
am:
53845068f4
Change-Id: I9699429dfe2e7ab15b42f1459b0c9b1d6644cde1
Ta-wei Yen [Thu, 20 Apr 2017 19:41:17 +0000 (12:41 -0700)]
Move sendVisualVoicemailSms and setSmsFilterSettings to Telephony
Bug:
35766990
Change-Id: Ife9df5baa9b511cd8e9c043cb92236b7697582c1
Fixes:
35766990
Test: CtsTelephonyTestCases VisualVoicemailServiceTest
TreeHugger Robot [Mon, 24 Apr 2017 20:31:03 +0000 (20:31 +0000)]
Merge "Change companion languare from 'pair' to 'link'/'ok'" into oc-dev
TreeHugger Robot [Mon, 24 Apr 2017 20:28:55 +0000 (20:28 +0000)]
Merge "Add link to class with constants" into oc-dev
TreeHugger Robot [Mon, 24 Apr 2017 20:24:16 +0000 (20:24 +0000)]
Merge "Prevent leak of AppWindowTokens." into oc-dev
Pankaj Kanwar [Mon, 24 Apr 2017 20:16:43 +0000 (20:16 +0000)]
Merge "Provide an API to make USSD calls and read the responses." am:
f02b7b7ba6 am:
4ef0e826c4
am:
b12a7c8058 -s ours
Change-Id: Ie3be07dc420536b7531f42ca26d06bc3fa97c6af
Pankaj Kanwar [Mon, 24 Apr 2017 20:09:56 +0000 (20:09 +0000)]
Merge "Provide an API to make USSD calls and read the responses." am:
f02b7b7ba6
am:
4ef0e826c4
Change-Id: I478837412fb4c76ac8d18fed5a5c441bf2d835b3
Pankaj Kanwar [Mon, 24 Apr 2017 20:04:05 +0000 (20:04 +0000)]
Merge "Provide an API to make USSD calls and read the responses."
am:
f02b7b7ba6
Change-Id: Iaaefbd5b0771a945035e4cddb219a86b2519607c
Pankaj Kanwar [Mon, 24 Apr 2017 19:52:32 +0000 (19:52 +0000)]
Merge "Provide an API to make USSD calls and read the responses."
lei.xa.liu [Tue, 20 Sep 2016 12:37:25 +0000 (21:37 +0900)]
Remove redundant lockscreen shown check
Symptom:
USB dialog is displayed incompletely and cannot be scrolled under
lockscreen in multi-window mode.
Root cause:
When lockscreen is shown, the bounds returned by getLaunchBounds()
is null, updateOverrideConfiguration() will finally consider the task
as fullscreen, USB dialog is under lockscreen, not over lockscreen,
as a result, the height measured in ViewRootImpl's performTraversals()
will be incorrect.
Solution:
Remove the lockscreen shown check from getLaunchBounds() which is
originally added to fix app over lockscreen being cropped by docked
stack, and the following commit also fix the behavior of app over
lockscreen.
https://android.googlesource.com/platform/frameworks/base/+/
99732940809058fae558618399323c36b8a0e856
So that above check should be redundant code.
Bug:
31256862
Fixes:
36163229
Test: manual
Change-Id: Iac483f625d2f4b35388290eb78a97a4bd3bd0fe8
Amith Yamasani [Mon, 24 Apr 2017 19:35:08 +0000 (19:35 +0000)]
Merge "Check bluetooth app id instead of uid" into oc-dev
am:
094996a2b3
Change-Id: I21b9c07bef34974601abd27045481bc45cf882b5
Glen Kuhne [Mon, 24 Apr 2017 19:33:02 +0000 (19:33 +0000)]
Merge "Wifi Metrics STA event list" into oc-dev
am:
9870d0bef7
Change-Id: I12af760e97e3344ef453841fc18b9bf10553f939
Pankaj Kanwar [Mon, 24 Apr 2017 19:30:58 +0000 (19:30 +0000)]
Merge "Update USSD API docs per API review comments." into oc-dev
am:
c2d54af521
Change-Id: I8f9f5d809500feb64b522cdda67d5ad5956d9b48
Yang Ni [Mon, 24 Apr 2017 19:28:55 +0000 (19:28 +0000)]
Merge "Validates Intrinsic Blur only takes 2D Allocations" into oc-dev
am:
4d23f258d4
Change-Id: I06192d54348f5a9fba9f3cfb047c95979605fd99
Brad Ebinger [Mon, 24 Apr 2017 19:26:56 +0000 (19:26 +0000)]
Merge "Whitelist PHONE_STATE to wakeup apps" into oc-dev
am:
41bf42a1c7
Change-Id: I0f05d8b0637f7d0b608cbd61cf79924f3593c30b
Geoffrey Pitsch [Mon, 24 Apr 2017 19:23:30 +0000 (19:23 +0000)]
Merge "Hide secondary text for Default channel if not blocked" into oc-dev
am:
9226516cef
Change-Id: Ic891296eea429842559bf010ab11845d1d3eecdc
Jeff Sharkey [Mon, 24 Apr 2017 17:18:03 +0000 (11:18 -0600)]
Even more auto-doc work.
Update docs based on what new lint detector found. Add new @IntDef
to parameters or methods returning constants or flags, and add
@RequiresPermission to methods mentioning permissions.
Test: make -j32 offline-sdk-docs
Bug:
37526420
Change-Id: I7f640f7883fcb66b911a52ae93b83f77306571ec
Android Build Merger (Role) [Mon, 24 Apr 2017 19:17:33 +0000 (19:17 +0000)]
Merge "Merge "Get rid of the IAdvertiserCallabck" am:
7503b11b14 am:
2fb02a252c am:
526719a1a2" into oc-dev-plus-aosp
Android Build Merger (Role) [Mon, 24 Apr 2017 19:17:02 +0000 (19:17 +0000)]
Merge "Merge "Fix ChangeClipBounds to set final clip to null." into oc-dev am:
8a4ff5edb5" into oc-dev-plus-aosp
Jakub Pawlowski [Mon, 24 Apr 2017 19:16:52 +0000 (19:16 +0000)]
Merge "Get rid of the IAdvertiserCallabck" am:
7503b11b14 am:
2fb02a252c
am:
526719a1a2
Change-Id: I432069ce857ec9d79c8afae6e8c278a7fd8e97ca
George Mount [Mon, 24 Apr 2017 19:15:45 +0000 (19:15 +0000)]
Merge "Fix ChangeClipBounds to set final clip to null." into oc-dev
am:
8a4ff5edb5
Change-Id: Icfc4d4b51ca1223c1fba173a62cb96caa7f4bd04
Android Build Merger (Role) [Mon, 24 Apr 2017 19:14:37 +0000 (19:14 +0000)]
Merge "Merge "Deprecate internal Calendar methods." am:
e08bd750c8 am:
5144cd445a am:
30ce9c07ec" into oc-dev-plus-aosp
Ruben Brunk [Mon, 24 Apr 2017 19:07:17 +0000 (12:07 -0700)]
Fix re-enabling alert window appop after leaving VR mode.
Bug:
37526753
Test: Check that system alert windows appear after leaving VR mode.
Change-Id: I2942b2e2bd30308752367963b7ae896462811d2f
Wale Ogunwale [Mon, 24 Apr 2017 01:39:45 +0000 (18:39 -0700)]
Fixed transition animation from pipable activities
- Defer telling the client it is hidden if it can enter Pip and isn't
current stopped or stopping. This gives it a chance to enter Pip in
onPause().
- Once pause is complete set the visiblity to false to stop deferring
hiding client.
- Don't allow FLAG_RESUME_WHILE_PAUSING activity to resume until the
currently resumed activity is puased if the currently resumed activity
can enter Pip.
- Detach child surfaces added by the client process in
WindowState.sendAppVisibilityToClients() right before we notify the
client.
Test: manual
Change-Id: I3848f2b93f4f1d3ceec5a1ccd2e127c614f70fe4
Fixes:
37370508
Fixes:
37622341
Android Build Merger (Role) [Mon, 24 Apr 2017 19:13:21 +0000 (19:13 +0000)]
Merge "Merge "Insert missing breaks" into oc-dev am:
88db7b39cf" into oc-dev-plus-aosp
Joachim Sauer [Mon, 24 Apr 2017 19:13:20 +0000 (19:13 +0000)]
Merge "Deprecate internal Calendar methods." am:
e08bd750c8 am:
5144cd445a
am:
30ce9c07ec
Change-Id: Iecaaf1a5f67b29e1ee53057d13814f8f1ccdd7ae
Jorim Jaggi [Mon, 24 Apr 2017 19:12:29 +0000 (19:12 +0000)]
Merge "Insert missing breaks" into oc-dev
am:
88db7b39cf
Change-Id: Ic668c7d519e59dc3a69c195dccabf5acfdde66d2
Android Build Merger (Role) [Mon, 24 Apr 2017 19:12:06 +0000 (19:12 +0000)]
Merge "Fix check when finding tasks to reuse. am:
91e5c886c8" into oc-dev-plus-aosp
Winson Chung [Mon, 24 Apr 2017 19:11:14 +0000 (19:11 +0000)]
Fix check when finding tasks to reuse.
am:
91e5c886c8
Change-Id: Ica5af20f308ff5c059cef39685aaaa62809ce531
Jakub Pawlowski [Mon, 24 Apr 2017 19:11:07 +0000 (19:11 +0000)]
Merge "Get rid of the IAdvertiserCallabck" am:
7503b11b14
am:
2fb02a252c
Change-Id: Idbdbc555a141b6f231e91cf05525c7812118db49
Android Build Merger (Role) [Mon, 24 Apr 2017 19:10:55 +0000 (19:10 +0000)]
Merge "Merge "fix service binding" into oc-dev am:
4eaeb91e42" into oc-dev-plus-aosp
Todd Kennedy [Mon, 24 Apr 2017 19:10:16 +0000 (19:10 +0000)]
Merge "fix service binding" into oc-dev
am:
4eaeb91e42
Change-Id: I89e8c155baf17cb9c6988dda4723fef3daafc545
OSDN Git Service
