Ben Kwa
bab08460ee
Merge "Clean up/fix some minor focus-related code."
2015-11-10 06:09:29 +00:00
Ben Kwa
02f22f370d
Merge "Clean up some unnecessary imports."
2015-11-10 05:16:39 +00:00
Steve McKay
ad668b2d2c
Merge "Make folders unselectable in as needed."
2015-11-10 04:46:51 +00:00
Steve McKay
f69502ca42
Make folders unselectable in as needed.
...
In some intent handling modes folders shouldn't be selectable.
Note: There are probably *other* conditions where this should be true too.
Bug: 23936872
Change-Id: I5a1f6853df265d65415cc09e95005720bf5f91d7
2015-11-10 13:45:10 +09:00
Filip Gruszczynski
f278c97449
Merge "Don't treat dummy animation as exit animation."
2015-11-10 04:23:56 +00:00
Wale Ogunwale
7422a37434
Merge "Clear task bounds data when removing non-bounds persistable task."
2015-11-10 03:52:28 +00:00
Svetoslav Ganov
59cf3086a9
Merge "Avoid NPE in printspooler when changing language" am: 8d8515e708 am: 5522efb130
...
am: 16009a6dea
* commit '16009a6deaff272c94046facbeb567bafdaacc69':
Avoid NPE in printspooler when changing language
2015-11-10 02:36:02 +00:00
Filip Gruszczynski
291fdb0efc
Don't treat dummy animation as exit animation.
...
This fixes a problem where recents would never be removed, because they
would run a dummy animation.
Bug: 25472312
Change-Id: I5767dc700966a49513e6338f4728c2ff275628ad
2015-11-09 18:20:24 -08:00
Filip Gruszczynski
331d5e078c
Merge "Fix jumping dock divider when dismissing/maximizng."
2015-11-10 02:16:55 +00:00
Winson
c809cbb926
Saving additional context when taking task screenshots.
...
- Save the original task size and screen orientation. This ensures that
we will be able to display the screenshots in the right orientation if
we start taking non-square thumbnails.
Change-Id: I17ffe1fc05a447f67753149695a4eaf0baa36e8e
2015-11-09 17:36:35 -08:00
Daichi Hirono
609b5b8c8e
Merge "Add root information to MtpDatabase."
2015-11-10 01:34:21 +00:00
Daichi Hirono
0378da48c4
Add root information to MtpDatabase.
...
The CLs adds new table to MtpDatabase that contains additional
information to provide DocumentContract.Roots.COLUMN_*. Client code can
obtain these information by using the newly added queryRoots method.
BUG=25162822
Change-Id: Ib6596d38cbb4a42b689c75fffbd73585c0fb524c
2015-11-10 10:32:42 +09:00
Jeff Tinker
3ccb34d707
Improve MediaCodec.CryptoException log messages
...
The message being logged is "Unknown error" even for
known error types. This change provides more descriptive
error strings, for the case when the message isn't
explicitly provided by the DRM plugin.
Change-Id: Ic86478d7685cd33e21ecd2f875ef7dbed351e52e
related-to-bug: 25477595
2015-11-09 17:31:05 -08:00
Roozbeh Pournader
5960b940d4
Merge "Fix case where some locales may have empty langauges."
2015-11-10 01:13:50 +00:00
Todd Kennedy
cab5208adf
Merge "Move 'un/install' to cmd"
2015-11-10 01:12:32 +00:00
Roozbeh Pournader
417bbe0179
Fix case where some locales may have empty langauges.
...
This is to make the behvior the same as before
47f71a697a50e76565fef520a0f51e5d6826ceee for cases when some of the
locales' languages are empty.
Change-Id: Ifee92e199f20130e060670f244eb3b4b7be13872
2015-11-09 17:10:46 -08:00
Svetoslav Ganov
16009a6dea
Merge "Avoid NPE in printspooler when changing language" am: 8d8515e708
...
am: 5522efb130
* commit '5522efb1300cfa87a8434bd396093a2ae076fa69':
Avoid NPE in printspooler when changing language
2015-11-10 01:07:27 +00:00
Svetoslav Ganov
5522efb130
Merge "Avoid NPE in printspooler when changing language"
...
am: 8d8515e708
* commit '8d8515e708f0cebf69587750bbb3abcb315cc61e':
Avoid NPE in printspooler when changing language
2015-11-10 01:03:05 +00:00
Svetoslav Ganov
8d8515e708
Merge "Avoid NPE in printspooler when changing language"
2015-11-10 00:58:28 +00:00
Chong Zhang
29ffd06d46
Merge "Don't hide wallpaper if surface is destroyed due to drag resizing"
2015-11-10 00:55:25 +00:00
Jeff Sharkey
90d3c037b0
Merge "Temporarily disable to fix deadlock."
2015-11-10 00:53:46 +00:00
Jeff Sharkey
3eef5a5273
Temporarily disable to fix deadlock.
...
Bug: 25584022
Change-Id: Icee579cfebfb75c573e9a54622f219e0f81fbd35
2015-11-09 16:50:41 -08:00
Roozbeh Pournader
87e1db355b
Merge "Use the full locale list in resourceQualifierString()."
2015-11-10 00:45:49 +00:00
Jack Yu
6023a99ab4
Merge "Added getServiceState API to TelephonyManager."
2015-11-10 00:34:04 +00:00
Yoshiki Iguchi
118af28d60
Merge "Fix crash on calling removeSelection with showing selection handlers"
2015-11-10 00:27:27 +00:00
Jeff Tinker
b801f7b891
Merge "Extend MediaCodec.CryptoInfo to support Sample AES"
2015-11-09 23:11:21 +00:00
Todd Kennedy
72cfcd02b8
Move 'un/install' to cmd
...
Move the implementation of the install variants and uninstall to the cmd
command. Additionally, make two other important changes: 1) replace calls
to the legacy PackageManager#installPackageAsUser with the PackageInstaller
2) allow streaming package bits for 'pm install'
Change-Id: I5680f57208d377daadb69b2cc09c233c02fe5016
2015-11-09 15:07:18 -08:00
Doris Liu
e252acb582
Merge "Add tests for calling end() before start() on ValueAnimator"
2015-11-09 22:52:41 +00:00
Doris Liu
46a91b6e77
Merge "Fix animator sometimes not being ended when end() is called without start()'ing"
2015-11-09 22:52:24 +00:00
Chong Zhang
6e21cf449a
Don't hide wallpaper if surface is destroyed due to drag resizing
...
We change surface from small to fullscreen size upon resizing,
and keep the old surface around until first draw finishes on the
new surface. This shouln't affect wallpaper. Hiding the wallpaper
causes the background to black out on every surface mode toggle.
bug: 25439788
Change-Id: I28c957dfaf1cc7f28e28cc00d8e97b8efb905349
2015-11-09 14:46:58 -08:00
Doris Liu
66d4856653
Fix animator sometimes not being ended when end() is called without start()'ing
...
Bug: 23713124
Change-Id: I2e00cedb9c74e14d2361579bba89d3d1dbfe4d22
2015-11-09 14:44:35 -08:00
Doris Liu
81963e3d56
Add tests for calling end() before start() on ValueAnimator
...
Bug: 23713124
Change-Id: I55c86a43249fd36a9e633a6f75d6316c2e69ec61
2015-11-09 14:41:07 -08:00
Jeff Sharkey
33de9248da
Merge "Block directory selection in openable modes." into mnc-dr-dev am: 00765ef5a2 am: e6538dcc06 am: d9c10d7edd
...
am: ab62877a07 -s ours
* commit 'ab62877a077376bccb1230f1ab4a22c41441d2d9':
Block directory selection in openable modes.
2015-11-09 22:41:02 +00:00
Jack Yu
39daf8d6f1
Added getServiceState API to TelephonyManager.
...
Added the new API getServiceState to TelephonyManager so
the client can directly retrieve the service state without
being a phone state listener or broadcast receiver.
bug: 21207640
Change-Id: Icef46877bbc844d382cd910b15abd8f6b1d57b23
2015-11-09 14:09:54 -08:00
Filip Gruszczynski
7704905429
Fix jumping dock divider when dismissing/maximizng.
...
Bug: 25590262
Change-Id: I7e3f145fde7fa763a81807163a206ba8971c65f1
2015-11-09 14:02:07 -08:00
Jeff Sharkey
ab62877a07
Merge "Block directory selection in openable modes." into mnc-dr-dev am: 00765ef5a2 am: e6538dcc06
...
am: d9c10d7edd
* commit 'd9c10d7edd52f5c1efb6d40f1c36b376b7a34934':
Block directory selection in openable modes.
2015-11-09 21:58:49 +00:00
Jeff Sharkey
d9c10d7edd
Merge "Block directory selection in openable modes." into mnc-dr-dev am: 00765ef5a2
...
am: e6538dcc06
* commit 'e6538dcc06c2547ac8a58c265e6b586fc9652ef3':
Block directory selection in openable modes.
2015-11-09 21:53:02 +00:00
Jeff Sharkey
e6538dcc06
Merge "Block directory selection in openable modes." into mnc-dr-dev
...
am: 00765ef5a2
* commit '00765ef5a2a0981d18a15f3acaf4119592d42996':
Block directory selection in openable modes.
2015-11-09 21:46:06 +00:00
Marco Nelissen
ff5fe15d34
Merge "Fix race condition when setting default ringtones" into mnc-dr-dev am: 83702ec3ed am: 02bf433f90 am: 8fb0121cb6
...
am: b67ae42ad0
* commit 'b67ae42ad07ed6a5b4927c41089076e6eafd6949':
Fix race condition when setting default ringtones
2015-11-09 21:46:06 +00:00
Jeff Sharkey
00765ef5a2
Merge "Block directory selection in openable modes." into mnc-dr-dev
2015-11-09 21:40:29 +00:00
Marco Nelissen
b67ae42ad0
Merge "Fix race condition when setting default ringtones" into mnc-dr-dev am: 83702ec3ed am: 02bf433f90
...
am: 8fb0121cb6
* commit '8fb0121cb60ddf54a22bff088670594f422edea9':
Fix race condition when setting default ringtones
2015-11-09 21:39:41 +00:00
Filip Gruszczynski
94ec1cb3a1
Merge "Fix no thumbnail animation from app to recents."
2015-11-09 21:37:40 +00:00
Marco Nelissen
8fb0121cb6
Merge "Fix race condition when setting default ringtones" into mnc-dr-dev am: 83702ec3ed
...
am: 02bf433f90
* commit '02bf433f902aa34483aa2fc1b410f393b35058f1':
Fix race condition when setting default ringtones
2015-11-09 21:34:14 +00:00
Marco Nelissen
02bf433f90
Merge "Fix race condition when setting default ringtones" into mnc-dr-dev
...
am: 83702ec3ed
* commit '83702ec3edf3bd17eff90a409cc3cf5efab48cff':
Fix race condition when setting default ringtones
2015-11-09 21:28:32 +00:00
Marco Nelissen
83702ec3ed
Merge "Fix race condition when setting default ringtones" into mnc-dr-dev
2015-11-09 21:21:55 +00:00
Wale Ogunwale
ae814fb63e
Merge "Added removed null checks around calls to WindowSurfaceController"
2015-11-09 21:12:07 +00:00
Filip Gruszczynski
7248c568a0
Fix no thumbnail animation from app to recents.
...
Bug: 25584190
Change-Id: Ifdb7e51f077ddeff907c1e23c925cd374ed794b0
2015-11-09 13:07:08 -08:00
Wale Ogunwale
f9e0978a05
Added removed null checks around calls to WindowSurfaceController
...
The checks were removed in the refactor in
e6a8351bc715999d1e42dcc1003a6eda6c318dd9
Bug: 25564523
Change-Id: Ia7c571fa48bc5c14bb76c3aa5b6fcbcc7323ed2f
2015-11-09 12:46:40 -08:00
Nick Kralevich
0afcfdca96
Merge "system_server: allow /proc read access to other UIDs" am: 51b48b3877 am: 02cc328d9d
...
am: 7907271af1
* commit '7907271af1f9024b1c5896a2d5006f7c868c771c':
system_server: allow /proc read access to other UIDs
2015-11-09 20:40:22 +00:00
Nick Kralevich
7907271af1
Merge "system_server: allow /proc read access to other UIDs" am: 51b48b3877
...
am: 02cc328d9d
* commit '02cc328d9df39a4abae55bf047a88a9e8129783d':
system_server: allow /proc read access to other UIDs
2015-11-09 20:34:02 +00:00