OSDN Git Service
Felipe Leme [Wed, 20 Apr 2016 19:04:41 +0000 (19:04 +0000)]
Merge "Only try to add details to zip once." into nyc-dev
am:
0304688
* commit '
03046888822d07ec020eb7a2f685be4f7bcded31':
Only try to add details to zip once.
Change-Id: Ifa0728bac7fa9a138e129ab66f5949fdc0af51ef
Mitchell Wills [Wed, 20 Apr 2016 19:04:40 +0000 (19:04 +0000)]
Update scan and last network info in the WorkThread am:
cf0875a am:
c441faa am:
2dbac6c
am:
de629c7
* commit '
de629c7ac77719ec6223254825a3e3b099c364c1':
Update scan and last network info in the WorkThread
Change-Id: I9e783bd423ca88d4a4094c705b29b314d68f9e5e
Andreas Gampe [Wed, 20 Apr 2016 19:04:38 +0000 (19:04 +0000)]
Merge "Frameworks/base: Add holder to BaseBundle" into nyc-dev
am:
58f2072
* commit '
58f20726e99947a0f2781b5d4be3052be6eb94dd':
Frameworks/base: Add holder to BaseBundle
Change-Id: I46e5f350f8b862132d97b375e8a170e21dc70d31
TreeHugger Robot [Wed, 20 Apr 2016 19:03:01 +0000 (19:03 +0000)]
Merge "Only try to add details to zip once." into nyc-dev
Mitchell Wills [Wed, 20 Apr 2016 19:01:51 +0000 (19:01 +0000)]
Update scan and last network info in the WorkThread am:
cf0875a am:
c441faa
am:
2dbac6c
* commit '
2dbac6cee58c343682ebf6590ae170c2acd067e4':
Update scan and last network info in the WorkThread
Change-Id: I1068111b96b907f9f3c839fc497e9d06e1254d26
Andreas Gampe [Wed, 20 Apr 2016 18:58:30 +0000 (18:58 +0000)]
Merge "Frameworks/base: Add holder to BaseBundle" into nyc-dev
Mitchell Wills [Wed, 20 Apr 2016 18:57:29 +0000 (18:57 +0000)]
Update scan and last network info in the WorkThread am:
cf0875a
am:
c441faa
* commit '
c441faa6de5618e9da029858ce83b3e129be2974':
Update scan and last network info in the WorkThread
Change-Id: I69ee081eb91a521e7c6cdc7ca6e96ebc230c1aba
Mitchell Wills [Wed, 20 Apr 2016 18:53:58 +0000 (18:53 +0000)]
Update scan and last network info in the WorkThread
am:
cf0875a
* commit '
cf0875a9b69da9da5e16563eca33609e775d9195':
Update scan and last network info in the WorkThread
Change-Id: I0b59f1eaa9bad27b300477f31fb88fb8e2eacb38
Trevor Johns [Wed, 20 Apr 2016 18:43:55 +0000 (18:43 +0000)]
Merge changes from topic \'merge_docs_nyc-dev\' into nyc-dev
am:
59c9a93
* commit '
59c9a93fc268e226495d4ee8cf7c507c2ea2c433':
Remove links to createAndInitializeUser() and createUser()
Resolve merge conflicts of
a5060ee to nyc-dev
Change-Id: I3ce213d0e7412125861d39f1726be4b5a751c828
Robert Carr [Wed, 20 Apr 2016 18:37:28 +0000 (18:37 +0000)]
Merge "When restacking IM windows preserve relative order." into nyc-dev
am:
db973df
* commit '
db973df830c32af8e2aeff256053299409f65dfd':
When restacking IM windows preserve relative order.
Change-Id: I83209e07dc6f65285ba2a67dd9393e520908219b
Robert Carr [Wed, 20 Apr 2016 18:37:27 +0000 (18:37 +0000)]
Merge "Respect WRAP_CONTENT when resolving drop down position." into nyc-dev
am:
5a2554a
* commit '
5a2554a8544525953c0847a1d3c975413eb07986':
Respect WRAP_CONTENT when resolving drop down position.
Change-Id: Ie466c526c84d26caddc5577f231e58738733d983
Trevor Johns [Wed, 20 Apr 2016 18:35:54 +0000 (18:35 +0000)]
Merge changes from topic 'merge_docs_nyc-dev' into nyc-dev
* changes:
Remove links to createAndInitializeUser() and createUser()
Resolve merge conflicts of
a5060ee to nyc-dev
Rob Carr [Wed, 20 Apr 2016 18:30:40 +0000 (18:30 +0000)]
Merge "When restacking IM windows preserve relative order." into nyc-dev
Rob Carr [Wed, 20 Apr 2016 18:30:14 +0000 (18:30 +0000)]
Merge "Respect WRAP_CONTENT when resolving drop down position." into nyc-dev
Yi Kong [Wed, 20 Apr 2016 18:13:19 +0000 (18:13 +0000)]
Merge "Track libcore change
be1608980825868eb1c70fab6eb86fe06bd304ce" into nyc-dev
am:
8c205b5
* commit '
8c205b5a2d3b138dc95648188dd15a1abd7dd81e':
Track libcore change
be1608980825868eb1c70fab6eb86fe06bd304ce
Change-Id: Ia0872d3863c03250d36cb9f5369ce54ca125dce1
Sudheer Shanka [Wed, 20 Apr 2016 18:13:17 +0000 (18:13 +0000)]
Merge "Add restrictedSwitchSummary attribute to restricted switch preferences." into nyc-dev
am:
df9ecfc
* commit '
df9ecfc587615edc80c6bf96e67d7dc4d510e03f':
Add restrictedSwitchSummary attribute to restricted switch preferences.
Change-Id: Ie74b078ccf945cba8d702080d5195e77a2be987d
Yi Kong [Wed, 20 Apr 2016 18:04:45 +0000 (18:04 +0000)]
Merge "Track libcore change
be1608980825868eb1c70fab6eb86fe06bd304ce" into nyc-dev
Sudheer Shanka [Wed, 20 Apr 2016 18:04:12 +0000 (18:04 +0000)]
Merge "Add restrictedSwitchSummary attribute to restricted switch preferences." into nyc-dev
Insun Kang [Wed, 20 Apr 2016 17:59:32 +0000 (17:59 +0000)]
Merge "ExifInterface: Fix a bug to return only a JPEG-compressed thumbnail" into nyc-dev
am:
801d416
* commit '
801d4161dd9e872bec73d855d21d030ba39a8b91':
ExifInterface: Fix a bug to return only a JPEG-compressed thumbnail
Change-Id: I149ab7790af6442ce3f1437465723fd331718ef2
Sudheer Shanka [Wed, 20 Apr 2016 17:59:31 +0000 (17:59 +0000)]
Merge "Fix additional summary of RestrictedSwitchPreference." into nyc-dev
am:
205d10b
* commit '
205d10bb136e36a17662fb1e60b0e002ca1f7158':
Fix additional summary of RestrictedSwitchPreference.
Change-Id: I8c16ff47a743a17f31c2db1f88c810aba74823d2
Jason Monk [Wed, 20 Apr 2016 17:52:58 +0000 (17:52 +0000)]
Merge "Daydream -> screen saver" into nyc-dev
am:
eeaaf26
* commit '
eeaaf26805091cad0404bc6030dde38dd4b1edcc':
Daydream -> screen saver
Change-Id: I090caed428e1137a4ecfe628abb1c2974c99c225
Felipe Leme [Wed, 20 Apr 2016 17:52:57 +0000 (17:52 +0000)]
Merge "Added onRestrictBackgroundWhitelistChanged callback." into nyc-dev
am:
9724fba
* commit '
9724fba83545fd075cbda62bb13cdc7820c7291a':
Added onRestrictBackgroundWhitelistChanged callback.
Change-Id: Ic8fdb634babafd5625be2a7c684334cca1cf0a3a
Jae Seo [Wed, 20 Apr 2016 17:50:50 +0000 (17:50 +0000)]
Merge "ExifInterface: Fix a bug to return only a JPEG-compressed thumbnail" into nyc-dev
Sudheer Shanka [Wed, 20 Apr 2016 17:50:18 +0000 (17:50 +0000)]
Merge "Fix additional summary of RestrictedSwitchPreference." into nyc-dev
Jason Monk [Wed, 20 Apr 2016 17:48:47 +0000 (17:48 +0000)]
Merge "Daydream -> screen saver" into nyc-dev
TreeHugger Robot [Wed, 20 Apr 2016 17:44:54 +0000 (17:44 +0000)]
Merge "Added onRestrictBackgroundWhitelistChanged callback." into nyc-dev
Jason Monk [Wed, 20 Apr 2016 17:44:05 +0000 (13:44 -0400)]
Daydream -> screen saver
Change-Id: I604530a721797e6d4b28df3782303a79fabcdac7
Fixes:
28268243
Jason Monk [Wed, 20 Apr 2016 17:38:50 +0000 (17:38 +0000)]
Merge "Allow QS details to scroll when the screen is really small" into nyc-dev
am:
10ea519
* commit '
10ea519fa9dc31721dcf5974f423797cbbf8c80d':
Allow QS details to scroll when the screen is really small
Change-Id: Ic4b2d01b78ede96bf0bee394c61670953d8403ba
Mitchell Wills [Mon, 18 Apr 2016 21:54:53 +0000 (14:54 -0700)]
Update scan and last network info in the WorkThread
This prevents a race condition where mLastInfo is updated while
processing scan results causing a crash.
Change-Id: Ic5147f3851f218c0f697e4ebb324f1cb63d02665
Fixes:
27944510
Jason Monk [Wed, 20 Apr 2016 17:34:18 +0000 (17:34 +0000)]
Merge "Allow QS details to scroll when the screen is really small" into nyc-dev
Jason Monk [Wed, 20 Apr 2016 17:30:11 +0000 (13:30 -0400)]
Allow QS details to scroll when the screen is really small
Change-Id: Ib28b6e9d888e864741c3ac472d30ef7cae06fe67
Fixes:
27276984
Felipe Leme [Wed, 20 Apr 2016 17:20:00 +0000 (10:20 -0700)]
Only try to add details to zip once.
When the user enters details (title or description) to the bugreport,
Shell tries to add a title.txt (and/or description.txt) to the zip and
uses 2 instance variables (addedDetailsToZip and addingDetailsToZip) to
control its state.
The problem with the current approach is that if there is a failure
adding the entries (for example, if the entries already exist), these
variables are not updated and hence when the user taps Share, it will
try to add the entries again, which most likely would fail.
BUG:
28291423
Change-Id: I56a71256be4f8de15f8126b815334277319e8e8a
Vladislav Kaznacheev [Wed, 20 Apr 2016 17:16:11 +0000 (17:16 +0000)]
Merge "Send ACTION_DRAG_EXITED when the pointer moves over a non-touchable window" into nyc-dev
am:
c8df6aa
* commit '
c8df6aa42facbe0cf7c05e4db78ec4a4e224b78b':
Send ACTION_DRAG_EXITED when the pointer moves over a non-touchable window
Change-Id: I001979d4151a8e2b9e71c471a8aa51c0165d3b40
Jason Monk [Wed, 20 Apr 2016 17:16:10 +0000 (17:16 +0000)]
Merge "QS tile lifecycle management" into nyc-dev
am:
e59bbb0
* commit '
e59bbb0899e17710e9380b704141b100ddc2faa0':
QS tile lifecycle management
Change-Id: I739df683b36689dbc58c784c6aa9447e28139ef5
Vladislav Kaznacheev [Wed, 20 Apr 2016 17:11:19 +0000 (17:11 +0000)]
Merge "Send ACTION_DRAG_EXITED when the pointer moves over a non-touchable window" into nyc-dev
Jason Monk [Wed, 20 Apr 2016 17:08:59 +0000 (17:08 +0000)]
Merge "QS tile lifecycle management" into nyc-dev
Yang Ni [Wed, 20 Apr 2016 16:52:41 +0000 (16:52 +0000)]
Merge "Made Element accessors thread-safe" into nyc-dev
am:
c74d2a8
* commit '
c74d2a8b8795bb0679225afcdd4d446c29440d85':
Made Element accessors thread-safe
Change-Id: I0fabd87d166015c0a6593709a32891296e2ade46
Yang Ni [Wed, 20 Apr 2016 16:44:38 +0000 (16:44 +0000)]
Merge "Made Element accessors thread-safe" into nyc-dev
Phil Weaver [Wed, 20 Apr 2016 16:39:50 +0000 (16:39 +0000)]
Merge "Clear calling identity when binding a11y services" into nyc-dev
am:
b72c306
* commit '
b72c30653dc9652d9c6beba979e5ea194c1a4638':
Clear calling identity when binding a11y services
Change-Id: I0bb94ebc66098ca173f3b46e1ebdc87aad937b3f
Phil Weaver [Wed, 20 Apr 2016 16:33:26 +0000 (16:33 +0000)]
Merge "Clear calling identity when binding a11y services" into nyc-dev
Amith Yamasani [Wed, 20 Apr 2016 16:24:31 +0000 (16:24 +0000)]
Merge "Reinitialize voice interaction service on unlock" into nyc-dev
am:
ea61e63
* commit '
ea61e63bf8f1f92a837fc42eed037aabaa8d03b9':
Reinitialize voice interaction service on unlock
Change-Id: I2dd39bb3a2543710c6c5de01878f915d52e4f95c
Amith Yamasani [Wed, 20 Apr 2016 16:19:44 +0000 (16:19 +0000)]
Merge "Reinitialize voice interaction service on unlock" into nyc-dev
Yi Kong [Wed, 20 Apr 2016 15:34:36 +0000 (16:34 +0100)]
Track libcore change
be1608980825868eb1c70fab6eb86fe06bd304ce
Bug:
27704598
Change-Id: I5cb900c7b48bc7b48ed0ea1110ff834e1d316de7
(cherry picked from commit
d7c695d25b1b75657bcbba6b61d62931a1b27d09)
(cherry picked from commit
a69302e9e2ebc04447b16657a4e706fb1241ee6b)
Jason Monk [Wed, 20 Apr 2016 15:41:36 +0000 (11:41 -0400)]
QS tile lifecycle management
Ensure we send out the current QSService and Tile to the TileService
before we write to mWrapper allowing other commands to come through.
Change-Id: Ia3f470083d97d85fa726b1add3706db6278c7d1e
Fixes:
27871492
Jason Monk [Wed, 20 Apr 2016 15:31:51 +0000 (15:31 +0000)]
Merge "QS custom tiles - better handling of invalid icons" into nyc-dev
am:
e6be9c5
* commit '
e6be9c58cca6a523960553faf164398b0297089c':
QS custom tiles - better handling of invalid icons
Change-Id: Ic7438463e3e1d9961e511a8c5b810e6ab975ee50
Jason Monk [Wed, 20 Apr 2016 15:25:42 +0000 (15:25 +0000)]
Merge "QS custom tiles - better handling of invalid icons" into nyc-dev
Jason Monk [Wed, 20 Apr 2016 15:22:32 +0000 (15:22 +0000)]
Merge "Fix QS edit accessibility" into nyc-dev
am:
01dbf41
* commit '
01dbf41311ad24e8c6bcdddfd6720a12d6b30a74':
Fix QS edit accessibility
Change-Id: Ic5beb92ee07c826c6cab66d099e9765a2f6cfcdd
Jason Monk [Wed, 20 Apr 2016 14:54:55 +0000 (10:54 -0400)]
QS custom tiles - better handling of invalid icons
Change-Id: I7b174a078a9df840eb73def101d865a8d630db19
Fixes:
27871180
Jason Monk [Wed, 20 Apr 2016 15:14:50 +0000 (15:14 +0000)]
Merge "Fix QS edit accessibility" into nyc-dev
Jason Monk [Wed, 20 Apr 2016 15:10:23 +0000 (11:10 -0400)]
Fix QS edit accessibility
Change-Id: Ibce7bdf480751994b318cba3a9954365f0ed8786
Fixes:
28194074
Philip P. Moltmann [Wed, 20 Apr 2016 15:06:45 +0000 (15:06 +0000)]
Merge "Expose additional fields needed by PrintRecommendationService GTS test and move files into properly named directory." into nyc-dev
am:
a1a1aa3
* commit '
a1a1aa3c682215f0ac7251c43f77985b9aced2a2':
Expose additional fields needed by PrintRecommendationService GTS test and move files into properly named directory.
Change-Id: I4c06bf5d59ac846035754be6ad1ebbd6ec3f5162
Philip P. Moltmann [Wed, 20 Apr 2016 15:01:03 +0000 (15:01 +0000)]
Merge "Expose additional fields needed by PrintRecommendationService GTS test and move files into properly named directory." into nyc-dev
Jason Monk [Wed, 20 Apr 2016 14:30:30 +0000 (14:30 +0000)]
Merge "Collapse QS panel after details if we expanded it before" into nyc-dev
am:
6dde42f
* commit '
6dde42f0ee2efe09a0021a6172f61d84800ad1c7':
Collapse QS panel after details if we expanded it before
Change-Id: I38d3445a9a53cee3edb21ccd218462ec9ec2b44c
Steve McKay [Wed, 20 Apr 2016 14:30:29 +0000 (14:30 +0000)]
Merge "Only show OPEN button as needed." into nyc-dev
am:
d8c2459
* commit '
d8c2459b5010526853de8f35008efd1cafe950ac':
Only show OPEN button as needed.
Change-Id: I8ed24327745d497f0fb7308671a4820fa21f0953
Jason Monk [Wed, 20 Apr 2016 14:30:27 +0000 (14:30 +0000)]
Merge "Update QS header to handle 320dp without overlapping" into nyc-dev
am:
d637903
* commit '
d637903fe683bd4cf7403ee69e3d59e55e382c29':
Update QS header to handle 320dp without overlapping
Change-Id: I3620fc9aa411f499c704f684c4b40844e13ff486
Jason Monk [Wed, 20 Apr 2016 14:25:22 +0000 (14:25 +0000)]
Merge "Collapse QS panel after details if we expanded it before" into nyc-dev
Steve McKay [Wed, 20 Apr 2016 14:25:05 +0000 (14:25 +0000)]
Merge "Only show OPEN button as needed." into nyc-dev
Jason Monk [Wed, 20 Apr 2016 14:21:25 +0000 (14:21 +0000)]
Merge "Update QS header to handle 320dp without overlapping" into nyc-dev
Jason Monk [Wed, 20 Apr 2016 14:08:55 +0000 (10:08 -0400)]
Update QS header to handle 320dp without overlapping
Change-Id: I7f52ed8aac14bea6c2cdc9a6ef8087ff6ef1b802
Fixes:
28181221
Jason Monk [Wed, 20 Apr 2016 13:56:38 +0000 (13:56 +0000)]
Fix settings drawer when font size is huge
am:
8095309
* commit '
8095309791e276bec10a731e2b13fe8512cd8e42':
Fix settings drawer when font size is huge
Change-Id: Id77ec4974315f4666577540f5a89b5d39e8eb09d
Jason Monk [Wed, 20 Apr 2016 13:44:22 +0000 (09:44 -0400)]
Fix settings drawer when font size is huge
Change-Id: Id720a7e7b471ddf01ed3682882656cd838eb860d
Fixes:
28181614
Rubin Xu [Wed, 20 Apr 2016 09:40:37 +0000 (09:40 +0000)]
Merge "Kill foreground apps when turning off work" into nyc-dev
am:
49425d6
* commit '
49425d612cee3864a316e9ecb6ec3faeae519b1e':
Kill foreground apps when turning off work
Change-Id: Iba7747bb70d2d193249f6b0610b3409d9bab038f
Rubin Xu [Wed, 20 Apr 2016 09:33:51 +0000 (09:33 +0000)]
Merge "Kill foreground apps when turning off work" into nyc-dev
Keisuke Kuroyanagi [Wed, 20 Apr 2016 09:22:17 +0000 (09:22 +0000)]
Merge "Allow switching keyboard layout to null." into nyc-dev
am:
da067dc
* commit '
da067dcbf2f9376814e6a7ea8302f9dfcc5cef59':
Allow switching keyboard layout to null.
Change-Id: Ic8f9e0f0fc6c1c92d253a457426718656e5e3500
Keisuke Kuroyanagi [Wed, 20 Apr 2016 09:12:50 +0000 (09:12 +0000)]
Merge "Allow switching keyboard layout to null." into nyc-dev
Robert Carr [Wed, 20 Apr 2016 05:31:09 +0000 (22:31 -0700)]
When restacking IM windows preserve relative order.
We were still having some troubles with attached windows which we
werent properly promoting here. Now we catch everything with
the mIsImWindow flag. Before it was safe to assume dialogs
were on top of the Input Method but with a whole range of child
windows we need to be more careful. WindowManagerService has
been very careful preparing the window list for us, so carry
out its wishes and preserve the original relative ordering of
input method windows when restacking.
Bug:
28235787
Change-Id: Ied96d83f77b82df81b3b0aa94cb61e9c22999d23
Vladislav Kaznacheev [Tue, 19 Apr 2016 22:24:52 +0000 (15:24 -0700)]
Send ACTION_DRAG_EXITED when the pointer moves over a non-touchable window
Bug:
28276601
Change-Id: Ic8da5c5ae422a9c9dd2d5bef898ee36a66b73afd
Sudheer Shanka [Wed, 20 Apr 2016 04:45:32 +0000 (21:45 -0700)]
Add restrictedSwitchSummary attribute to restricted switch preferences.
Bug:
27659072
Change-Id: If516adaed041ea0d66945ebf1dbe7945331d0da5
Tomasz Mikolajewski [Wed, 20 Apr 2016 04:03:24 +0000 (04:03 +0000)]
Merge changes I5e500724,I40cfb12c into nyc-dev
am:
0fb5135
* commit '
0fb51357afb64a034a59f68a926f79d18213c72c':
Restrict selection to 1000 items in DocumentsUI.
Cancel band selection on directory change.
Change-Id: Id421aa25d0ad1e4134ecfeabd84aad801fdb4f13
Tomasz Mikolajewski [Wed, 20 Apr 2016 03:57:26 +0000 (03:57 +0000)]
Merge changes I5e500724,I40cfb12c into nyc-dev
* changes:
Restrict selection to 1000 items in DocumentsUI.
Cancel band selection on directory change.
Andreas Gampe [Wed, 20 Apr 2016 03:46:43 +0000 (20:46 -0700)]
Frameworks/base: Add holder to BaseBundle
Move EMPTY_PARCEL into an inner holder class. Add holder to
preloaded-classes. Clean up dependencies.
Allows to compile-time initialize:
* android.os.BaseBundle
* android.os.Bundle
* android.os.PersistableBundle
* android.telephony.CarrierConfigManager
Bug:
27265238
Change-Id: Ib8017aa419c2985963b3c68a8046462a38652ef2
Jakub Pawlowski [Wed, 20 Apr 2016 03:20:12 +0000 (03:20 +0000)]
Merge "OobData documentation" into nyc-dev
am:
75760e6
* commit '
75760e6b62e46fc9abcde523878459b08558f9d1':
OobData documentation
Change-Id: I60f7b59f5a7ebeeb1d3c3c522da8e85e7673aab5
Jakub Pawlowski [Wed, 20 Apr 2016 03:15:22 +0000 (03:15 +0000)]
Merge "OobData documentation" into nyc-dev
Adrian Roos [Wed, 20 Apr 2016 03:06:14 +0000 (03:06 +0000)]
Merge "Don\'t do anti-falsing on locked shade" into nyc-dev
am:
c75e08d
* commit '
c75e08d114650dc4c81bc8ffb03eab701bc39509':
Don't do anti-falsing on locked shade
Change-Id: I9ebf97744dd18fda33fa1dcced6993bb93424c0a
TreeHugger Robot [Wed, 20 Apr 2016 03:00:28 +0000 (03:00 +0000)]
Merge "Don't do anti-falsing on locked shade" into nyc-dev
Vineeta Srivastava [Wed, 20 Apr 2016 02:43:13 +0000 (02:43 +0000)]
Merge "Add addRegistrationListener function to IImsService.aidl" into nyc-mr1-dev
Robert Carr [Wed, 20 Apr 2016 02:10:44 +0000 (19:10 -0700)]
Respect WRAP_CONTENT when resolving drop down position.
We recently added the width/height <0 check to prevent
passing unresolved widths in to tryFitVertical or
tryFitHorizontal and produce strange behaviors. This made
more sense than the code before it but still not that much
sense. We need to treat MATCH_PARENT and WRAP_CONTENT differently
as the documentation suggests.
Bug:
28267951
Change-Id: I6f2f248c8d1f63d31bdd75c24f7250c28381c712
Jorim Jaggi [Wed, 20 Apr 2016 01:56:12 +0000 (01:56 +0000)]
Merge "Fix wrong transition when recents is growing when entering" into nyc-dev
am:
50c410c
* commit '
50c410c1c91922e91fb8d1b873f6a541d1e2fd6c':
Fix wrong transition when recents is growing when entering
Change-Id: I632e84aa2e35e33b8d4520525fb8885612706ac2
TreeHugger Robot [Wed, 20 Apr 2016 01:48:38 +0000 (01:48 +0000)]
Merge "Fix wrong transition when recents is growing when entering" into nyc-dev
Adrian Roos [Wed, 20 Apr 2016 01:31:09 +0000 (01:31 +0000)]
Merge "Fix NPE in WallpaperDrawable" into nyc-dev
am:
75db039
* commit '
75db0392b89a7f83650f087227bcccda32833cfa':
Fix NPE in WallpaperDrawable
Change-Id: I9bfca4c47e2f067e516f8b595a34ace9805fd469
Adam Lesinski [Wed, 20 Apr 2016 01:31:08 +0000 (01:31 +0000)]
Merge "Record in progress count when parceling Timer" into nyc-dev
am:
752434a
* commit '
752434a0ff54ac30b7701292b66361e64b2ae5a0':
Record in progress count when parceling Timer
Change-Id: Ia54421b870e7b1519d607ac841fd1470964aab2a
TreeHugger Robot [Wed, 20 Apr 2016 01:27:34 +0000 (01:27 +0000)]
Merge "Fix NPE in WallpaperDrawable" into nyc-dev
Adam Lesinski [Wed, 20 Apr 2016 01:23:38 +0000 (01:23 +0000)]
Merge "Move batterystats stats collection to its own thread" into nyc-dev
am:
b7a92e6
* commit '
b7a92e6009fefc2cb390b886e6a971b0c8a3c2d8':
Move batterystats stats collection to its own thread
Change-Id: If1fa33f99f21811b52185926d6d81ccde30e9648
Adam Lesinski [Wed, 20 Apr 2016 01:22:35 +0000 (01:22 +0000)]
Merge "Record in progress count when parceling Timer" into nyc-dev
Adam Lesinski [Wed, 20 Apr 2016 01:18:48 +0000 (01:18 +0000)]
Merge "Move batterystats stats collection to its own thread" into nyc-dev
Adrian Roos [Wed, 20 Apr 2016 00:41:34 +0000 (00:41 +0000)]
Merge "Disable anti-falsing logic with touch exploration" into nyc-dev
am:
ecdc5c4448
* commit '
ecdc5c44488cef2f1599b3759277c219cfd28da3':
Disable anti-falsing logic with touch exploration
Change-Id: I28a04dfa863019a31398a18f9873bb81172bbbed
Adrian Roos [Wed, 20 Apr 2016 00:38:05 +0000 (00:38 +0000)]
Merge "Disable anti-falsing logic with touch exploration" into nyc-dev
Adam Lesinski [Wed, 20 Apr 2016 00:33:33 +0000 (17:33 -0700)]
Move batterystats stats collection to its own thread
Too many other tasks run on common handlers, and the batterystats collection
may block waiting for a timeout of up to 2 seconds.
Bug:
27857665
Change-Id: I5be1ddc374d69620f4f7d821eb29e8524294c9a4
Adrian Roos [Wed, 20 Apr 2016 00:09:07 +0000 (17:09 -0700)]
Don't do anti-falsing on locked shade
The user has already passed the keyguard test by
dragging down. We're not doing anti falsing at this
point and doing it on the affordance was triggering
a crash on debuggable builds (and not working at all
on regular builds).
Change-Id: Icaf81e8e2a38503851c7b5699a0f5a3d363dac19
Fixes:
28154836
Sudheer Shanka [Wed, 20 Apr 2016 00:27:52 +0000 (17:27 -0700)]
Fix additional summary of RestrictedSwitchPreference.
Bug:
27659072
Change-Id: I27fec7d5bf3daeb5525cf45c328aa2f0c93f7490
Winson [Wed, 20 Apr 2016 00:26:26 +0000 (00:26 +0000)]
Merge "Fixing crash when dumping secondary SystemUI user service." into nyc-dev
am:
5d65340fc5
* commit '
5d65340fc5b5a0becd204b3feb9627b2de33fceb':
Fixing crash when dumping secondary SystemUI user service.
Change-Id: I6fc0594335291a07e7dae79cc8c80b0b3d952acc
Adam Lesinski [Tue, 19 Apr 2016 23:46:20 +0000 (16:46 -0700)]
Record in progress count when parceling Timer
The total time is computed before parceling, but the total count is not.
Bug:
27747854
Change-Id: If3afdca9605f74d96a54fb9df17f6df761b99e55
Winson Chung [Wed, 20 Apr 2016 00:21:38 +0000 (00:21 +0000)]
Merge "Fixing crash when dumping secondary SystemUI user service." into nyc-dev
Amith Yamasani [Wed, 20 Apr 2016 00:04:28 +0000 (17:04 -0700)]
Reinitialize voice interaction service on unlock
Fixes the incomplete initialization on FBE devices when
voice interaction service is not available before unlock.
Change-Id: I397237e4554453d29da643aee59384e289fa3654
Fixes:
28183380
fionaxu [Wed, 20 Apr 2016 00:14:33 +0000 (00:14 +0000)]
Merge "Cold Sim issue fix" into nyc-dev
am:
771fbfef27
* commit '
771fbfef27bcc98c57818b7c7b63a374e555b6db':
Cold Sim issue fix
Change-Id: I266ed3e12d9aebaa06d7fc666465eea6a59fc940
Jorim Jaggi [Wed, 20 Apr 2016 00:14:29 +0000 (00:14 +0000)]
Merge "Fixes for resize thread" into nyc-dev
am:
13219992a0
* commit '
13219992a0e8b08195ffd596d40d9ceecbf741e0':
Fixes for resize thread
Change-Id: If7fd07fb9711516726a192fa056d54a76d197062
Chen Xu [Wed, 20 Apr 2016 00:09:59 +0000 (00:09 +0000)]
Merge "Cold Sim issue fix" into nyc-dev
Jorim Jaggi [Wed, 20 Apr 2016 00:07:52 +0000 (00:07 +0000)]
Merge "Fixes for resize thread" into nyc-dev
Phil Weaver [Wed, 20 Apr 2016 00:01:52 +0000 (17:01 -0700)]
Clear calling identity when binding a11y services
When a UiAutomation is destroyed, accessibility services may get
enabled as a side effect. That was causing these services to be
enabled in a binder thread, which threw a SecurityException.
Bug:
28268310
Bug:
28163652
Change-Id: Ie25ab05569b5b21b5f30e7d7eed24ef73b7ba159
Jorim Jaggi [Mon, 18 Apr 2016 22:32:07 +0000 (15:32 -0700)]
Fix wrong transition when recents is growing when entering
Bug:
27855229
Change-Id: I050305d16df6fe53abf5e74e1f9ee6c882dd7ead
OSDN Git Service
