Michael Kwan
93f5c571ed
Merge "Revert "Change activity dismiss animation to move left to right."" into cw-f-dev am: 7f2554cfb7 am: 615bda5be9
...
am: ef62f8a5cd
2016-12-06 02:32:27 +00:00
Michael Kwan
b796f1a485
Merge "Revert "Change activity dismiss animation to move left to right." am: ac9443ef9c am: 7b1d53f1f0" into nyc-mr2-dev-plus-aosp
...
am: c0c7a9e844
2016-12-06 02:30:39 +00:00
Michael Kwan
2990b3daa1
Revert "Change activity dismiss animation to move left to right." am: ac9443ef9c am: 7b1d53f1f0
...
am: d4b161198e
2016-12-06 02:30:30 +00:00
Michael Kwan
5310a90354
Revert "Change activity dismiss animation to move left to right." am: ac9443ef9c am: e309596c62
...
am: ad12efa3d8
2016-12-06 02:29:20 +00:00
Ned Burns
3601d3c239
Merge "Modify SwipeDismissLayout to perform its own exit animation" into cw-f-dev
2016-12-06 02:26:43 +00:00
Elliot Waite
6f1c9a4cc3
Merge "Merge "Change insecure HTTP resource link to scheme-relative link." into nyc-mr1-dev am: 050cf854c7 am: 5a701867d5 am: 38e1cc9790" into nyc-mr2-dev-plus-aosp
...
am: 6e9cf8d8fd
2016-12-06 02:22:45 +00:00
Elliot Waite
260cb6a65a
Merge "Change insecure HTTP resource link to scheme-relative link." into nyc-mr1-dev am: 050cf854c7 am: 5a701867d5 am: 38e1cc9790
...
am: 3cf0c7a195
2016-12-06 02:22:35 +00:00
Elliot Waite
ee5d35744c
Merge "Merge "Change insecure HTTP resource link to scheme-relative link." into nyc-mr1-dev am: 050cf854c7 am: 5a701867d5 am: d41497de6c" into nyc-mr2-dev-plus-aosp
...
am: 142129854e
2016-12-06 02:20:50 +00:00
Elliot Waite
a12350650a
Merge "Change insecure HTTP resource link to scheme-relative link." into nyc-mr1-dev am: 050cf854c7 am: 5a701867d5 am: d41497de6c
...
am: bf7955d10f
2016-12-06 02:20:40 +00:00
Android Build Merger (Role)
56739549fe
Merge "Merge "Revert "Change activity dismiss animation to move left to right."" into cw-f-dev am: 7f2554cfb7 am: e384a782e0" into nyc-mr2-dev-plus-aosp
2016-12-06 02:19:58 +00:00
Android Build Merger (Role)
3a46ce8a89
Merge "Merge "Revert "Change activity dismiss animation to move left to right."" into cw-f-dev am: 7f2554cfb7 am: 615bda5be9" into nyc-mr2-dev-plus-aosp
2016-12-06 02:19:26 +00:00
Michael Kwan
042c1b8d3c
Merge "Revert "Change activity dismiss animation to move left to right."" into cw-f-dev am: 7f2554cfb7
...
am: e384a782e0
2016-12-06 02:19:10 +00:00
Elliot Waite
d92c40f0ea
Merge "Change insecure HTTP resource link to scheme-relative link. am: fc175c08cb am: c67ea5e3ff am: 634f858088" into nyc-mr2-dev-plus-aosp
...
am: bc6aff4013
2016-12-06 02:19:05 +00:00
Elliot Waite
11f92ccf83
Change insecure HTTP resource link to scheme-relative link. am: fc175c08cb am: c67ea5e3ff am: 634f858088
...
am: 80b23f9757
2016-12-06 02:18:55 +00:00
Android Build Merger (Role)
c0c7a9e844
Merge "Revert "Change activity dismiss animation to move left to right." am: ac9443ef9c am: 7b1d53f1f0" into nyc-mr2-dev-plus-aosp
2016-12-06 02:18:52 +00:00
Michael Kwan
ef62f8a5cd
Merge "Revert "Change activity dismiss animation to move left to right."" into cw-f-dev am: 7f2554cfb7
...
am: 615bda5be9
2016-12-06 02:18:47 +00:00
Elliot Waite
ce6660d1d4
Change insecure HTTP resource link to scheme-relative link. am: fc175c08cb am: c67ea5e3ff am: 4835467efa
...
am: 27e3cf2a3f
2016-12-06 02:17:45 +00:00
Michael Kwan
ad12efa3d8
Revert "Change activity dismiss animation to move left to right." am: ac9443ef9c
...
am: e309596c62
2016-12-06 02:17:44 +00:00
Michael Kwan
d4b161198e
Revert "Change activity dismiss animation to move left to right." am: ac9443ef9c
...
am: 7b1d53f1f0
2016-12-06 02:17:42 +00:00
Android Build Merger (Role)
6e9cf8d8fd
Merge "Merge "Change insecure HTTP resource link to scheme-relative link." into nyc-mr1-dev am: 050cf854c7 am: 5a701867d5 am: 38e1cc9790" into nyc-mr2-dev-plus-aosp
2016-12-06 02:14:12 +00:00
Android Build Merger (Role)
142129854e
Merge "Merge "Change insecure HTTP resource link to scheme-relative link." into nyc-mr1-dev am: 050cf854c7 am: 5a701867d5 am: d41497de6c" into nyc-mr2-dev-plus-aosp
2016-12-06 02:13:27 +00:00
Elliot Waite
3cf0c7a195
Merge "Change insecure HTTP resource link to scheme-relative link." into nyc-mr1-dev am: 050cf854c7 am: 5a701867d5
...
am: 38e1cc9790
2016-12-06 02:13:23 +00:00
Android Build Merger (Role)
bc6aff4013
Merge "Change insecure HTTP resource link to scheme-relative link. am: fc175c08cb am: c67ea5e3ff am: 634f858088" into nyc-mr2-dev-plus-aosp
2016-12-06 02:13:00 +00:00
Elliot Waite
bf7955d10f
Merge "Change insecure HTTP resource link to scheme-relative link." into nyc-mr1-dev am: 050cf854c7 am: 5a701867d5
...
am: d41497de6c
2016-12-06 02:12:37 +00:00
Elliot Waite
80b23f9757
Change insecure HTTP resource link to scheme-relative link. am: fc175c08cb am: c67ea5e3ff
...
am: 634f858088
2016-12-06 02:12:07 +00:00
Michael Kwan
e384a782e0
Merge "Revert "Change activity dismiss animation to move left to right."" into cw-f-dev
...
am: 7f2554cfb7
2016-12-06 02:11:46 +00:00
Michael Kwan
615bda5be9
Merge "Revert "Change activity dismiss animation to move left to right."" into cw-f-dev
...
am: 7f2554cfb7
2016-12-06 02:11:41 +00:00
Michael Kwan
7b1d53f1f0
Revert "Change activity dismiss animation to move left to right."
...
am: ac9443ef9c
2016-12-06 02:11:40 +00:00
Michael Kwan
e309596c62
Revert "Change activity dismiss animation to move left to right."
...
am: ac9443ef9c
2016-12-06 02:11:38 +00:00
Elliot Waite
27e3cf2a3f
Change insecure HTTP resource link to scheme-relative link. am: fc175c08cb am: c67ea5e3ff
...
am: 4835467efa
2016-12-06 02:11:36 +00:00
Elliot Waite
d41497de6c
Merge "Change insecure HTTP resource link to scheme-relative link." into nyc-mr1-dev am: 050cf854c7
...
am: 5a701867d5
2016-12-06 02:06:25 +00:00
Elliot Waite
38e1cc9790
Merge "Change insecure HTTP resource link to scheme-relative link." into nyc-mr1-dev am: 050cf854c7
...
am: 5a701867d5
2016-12-06 02:06:13 +00:00
Alan Viverette
b991378efb
Merge "Show popup transitions when there is no anchor set" into nyc-mr2-dev am: 6ad979a637
...
am: 2cb81f2559
2016-12-06 02:05:39 +00:00
Elliot Waite
634f858088
Change insecure HTTP resource link to scheme-relative link. am: fc175c08cb
...
am: c67ea5e3ff
2016-12-06 02:05:14 +00:00
Elliot Waite
4835467efa
Change insecure HTTP resource link to scheme-relative link. am: fc175c08cb
...
am: c67ea5e3ff
2016-12-06 02:05:08 +00:00
TreeHugger Robot
7f2554cfb7
Merge "Revert "Change activity dismiss animation to move left to right."" into cw-f-dev
2016-12-06 02:04:30 +00:00
Damien Bargiacchi
45a7644004
Centre clock text on visible characters instead of : character
...
Bug: 33340845
Change-Id: I235ad7c6aafc62daa55242f81df2d076f27c56df
2016-12-05 18:02:18 -08:00
Alan Viverette
05444ecf46
Show popup transitions when there is no anchor set am: 61edf5bbff
...
am: 09ce7433e9
2016-12-06 02:02:07 +00:00
Elliot Waite
5a701867d5
Merge "Change insecure HTTP resource link to scheme-relative link." into nyc-mr1-dev
...
am: 050cf854c7
2016-12-06 01:59:16 +00:00
Elliot Waite
c67ea5e3ff
Change insecure HTTP resource link to scheme-relative link.
...
am: fc175c08cb
2016-12-06 01:59:12 +00:00
Elliot Waite
050cf854c7
Merge "Change insecure HTTP resource link to scheme-relative link." into nyc-mr1-dev
2016-12-06 01:52:12 +00:00
John Reck
91e2e7f460
DO NOT MERGE: Add TouchLatency test
...
Change-Id: Ic3a788f6b06bf6477ab23b183fb8c76ae8870b6b
(cherry picked from commit d136ce902c
2016-12-06 01:23:43 +00:00
Alan Viverette
2cb81f2559
Merge "Show popup transitions when there is no anchor set" into nyc-mr2-dev
...
am: 6ad979a637
2016-12-06 01:07:49 +00:00
Alan Viverette
09ce7433e9
Show popup transitions when there is no anchor set
...
am: 61edf5bbff
2016-12-06 01:07:43 +00:00
Tomasz Mikolajewski
b061fc2bb5
Fix crashing StrictJarFile due to doubled closing.
...
If the constuctor throws, then the handles would be closed without
setting "closed" to true. As a result, the finalizer would close
the handles again, which would cause a crash on the native side.
Test: Unit tests are no longer flaky.
Bug: 33301253
Change-Id: I527ba38d5d65ce844258d894441d4fe16bac6e23
2016-12-06 10:05:05 +09:00
Fyodor Kupolov
311b9fac00
2-phase initialization of NetworkPolicyManagerService
...
Split systemReady() into 2 callbacks:
1) networkScoreAndNetworkManagementServiceReady - called when required
services are ready. NetworkPolicyManagerService starts its initialization
on the worker thread
2) systemReady - wait for phase (1) to finish so that the service is fully
initialized
NetworkPolicyManagerService is now prepared in parallel with
ConnectivityService and NetworkStatsService
Test: device boots without errors
Test: HostsideRestrictBackgroundNetworkTests and NetworkPolicyManagerServiceTest pass
Bug: 32315581
Change-Id: Ic9755ed096900247fa0bbb43f396d8bcb97ae6db
2016-12-05 17:02:27 -08:00
Alan Viverette
6ad979a637
Merge "Show popup transitions when there is no anchor set" into nyc-mr2-dev
2016-12-06 01:02:06 +00:00
Stephen Chen
6a0c879de3
Add Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED flag.
...
This flag enables the NetworkScoreService.requestRecommendations API,
defined in b/32909424.
Bug: 32913919
Bug: 32909424
Test: runtest --path
frameworks/base/packages/SettingsProvider/test/src/com/android/providers/settings/SettingsProviderTest.java
Change-Id: If592e4a2ec574929aa0c829c39ad4ce9b0317805
2016-12-05 17:01:57 -08:00
Wale Ogunwale
3d0bfd9530
Prevent orphaning of windows when token is removed
...
When the owner of a window token requests window manager to remove the
token, we were removing it from it's parent which orphaned the token
and all it's windows and prevented them from being accessed from calls
like forAllWindows(). This problem wasn't visible before as the token
windows would still be in the window list, so they can still be accessed
for the exit animation transition which eventually removes them.
We no longer remove tokens from their parent we when are asked to remove
them from the system. We just set WindowToken.setExiting() so the token
can be removed once all its windows are removed at the end of the exit
animation.
Also,
- In AppWindowToken.removeIfPossible() and Task.removeIfPossible(), call
removeImmediately() instead of parent.removeChild() to make sure the
token and its windows are properly clean-up and avoid orphaning if they
aren't.
- Added DisplayContent.reParentWindowToken() for changing the display a
window token is on which is different from DisplayContent.removeWindowToken
which prepares the token and it's windows to be removed from the system.
- Renamed WindowToken.explicit to WindowToken.mPersistOnEmpty which is
what it does.
Fixes: 33098800
Test: bit FrameworksServicesTests:com.android.server.wm.WindowTokenTests
Test: Make sure toast windows don't persist on screen.
Change-Id: I40e0e8832141514b614e79d8e95cd27f24e52366
2016-12-05 16:50:03 -08:00
Jeff Sharkey
0dd0dafdb9
Merge "Initial Binder interface for installd." am: 19fc36fa33 am: 2ab7bff525 am: 48eb4e390e
...
am: 043c4c575c
2016-12-06 00:42:18 +00:00
