Commit Graph

255075 Commits

Author SHA1 Message Date
Andre Eisenbach
4d6be6b308 Merge "Add extra waiting when switching users" into nyc-dev 2016-06-27 23:42:17 +00:00
Christopher Tate
0bdb4cef4a Merge \"Fix #29737133 : content-trigger jobs not running properly\" into nyc-dev
am: f480698298

Change-Id: I56aa1a6ecb2409b905de4a8419e1b76523120efc
2016-06-27 23:24:03 +00:00
Chris Tate
f480698298 Merge "Fix #29737133 : content-trigger jobs not running properly" into nyc-dev 2016-06-27 23:18:31 +00:00
Christopher Tate
4b425712c6 Fix #29737133 : content-trigger jobs not running properly
When removing the ContentObserver wrapper from our internal
bookkeeping we were using the wrong key.  That led to future
re-registrations thinking they were reusing a currently-
registered observers, but instead never getting onChange()
notifications.

Change-Id: Id3111db057ae63194049d7d48d45b75be6bb0000
2016-06-27 16:12:41 -07:00
Pavlin Radoslavov
4140111167 Add extra waiting when switching users
If disabling Bluetooth times out, wait for an additional amount of time
to ensure the process is shut down completely before attempting to restart.

Bug: 29738770
Change-Id: I43dec35a1e03d12cb07863babea97d55baa32528
2016-06-27 23:09:09 +00:00
Dianne Hackborn
a590d2be93 Fix bug where process whitelist manager state would not be correct.
We can't update this in updateOomAdjLocked(), because we very
deliberately only iterate through services in there as needed.
The correct thing to do is update the process as services/connections
are associated with it, so do that.

Now basically all of the logic for tracking the state is in
ActiveServices, as we bind and unbind services and add and removing
them from process records.  It's a little messy because we don't
have a central place for removing them from process records, which
should be cleaned up in the future.

Part of fixes for issue #29480440

Change-Id: Iac96f002a5b4e3b0277df244ff7b90f59a6e8440
2016-06-27 15:40:38 -07:00
John Reck
aecf607eb6 Merge \"Add missing roundOut for layer damage\" into nyc-dev
am: 48cde353eb

Change-Id: If4ca933e218fc33fa78dc063b687e03793635e6c
2016-06-27 22:28:39 +00:00
John Reck
48cde353eb Merge "Add missing roundOut for layer damage" into nyc-dev 2016-06-27 22:22:41 +00:00
John Reck
ac046387be Add missing roundOut for layer damage
fixes: 29771171

This is a regression from HWUI_NEW_OPS, a roundOut
was missing in the new path that was in the old one

Change-Id: Ibf223d550bb5525781864dd9b7f7cd6d73adb98b
2016-06-27 15:18:26 -07:00
Chris Craik
65c0d9d290 Round unclipped saveLayers
am: 45e83338e5

Change-Id: I3ecb7fdd2097779cf7f596c0e6a3f7914902ca39
2016-06-27 21:45:04 +00:00
Chris Craik
45e83338e5 Round unclipped saveLayers
fixes: 29456451

Change-Id: I2be8b47c46936e75071ad0819a718f72b96cbd2b
(cherry picked from commit d5a9011412)
2016-06-27 21:06:35 +00:00
Andrii Kulian
fee6e7f102 Merge \"Resume only activities in focused stack\" into nyc-dev
am: 06b1d786e9

Change-Id: I05dfd276d13b97b06737fecd22b238e791c9bc2b
2016-06-27 21:02:56 +00:00
Jorim Jaggi
f4704889a6 Merge \"Fix smooth panel deceleration\" into nyc-dev
am: e858432241

Change-Id: I4d66bd10517e05b2b9e930ad4860b371df0bc724
2016-06-27 20:54:26 +00:00
Andrii Kulian
06b1d786e9 Merge "Resume only activities in focused stack" into nyc-dev 2016-06-27 20:50:02 +00:00
TreeHugger Robot
e858432241 Merge "Fix smooth panel deceleration" into nyc-dev 2016-06-27 20:44:56 +00:00
Dan Albert
a63521f36a Merge \"Fix mistranslation from the NDK changelog.\" into nyc-dev
am: 95fbc2de1b

Change-Id: Ia390c00f6884b73c625fffa3aabde4b53e4ebe90
2016-06-27 20:22:05 +00:00
TreeHugger Robot
95fbc2de1b Merge "Fix mistranslation from the NDK changelog." into nyc-dev 2016-06-27 20:13:53 +00:00
Dan Albert
6c78203dca Remove reference to obsolete installation step.
am: 17d0ccb1a9

Change-Id: I8d4dc8aff65e01660f504f49815eecd2f20d2eae
2016-06-27 20:02:34 +00:00
Dan Albert
e080bc5bf7 Fix Windows NDK labeling.
32-bit and 64-bit labels are backward.

Bug: http://b/29523188
Bug: https://github.com/android-ndk/ndk/issues/127
Change-Id: I87de0730c54555dc219d170fd600ec23a51decc2
2016-06-27 12:57:20 -07:00
Jorim Jaggi
0fdf574bc8 Fix smooth panel deceleration
State of dismiss view was wrong when the panel was closed, thus, we didn't
apply our logic for smooth panel deceleration anymore.

Bug: 29579394
Change-Id: I79718517e776adad092457aba6db18219998fde1
2016-06-27 18:54:34 +00:00
Dan Albert
cb76aad0c4 Fix mistranslation from the NDK changelog.
Gingerbread begins at API level 9, not 10.

Bug: https://github.com/android-ndk/ndk/issues/136
Change-Id: Ie65e543c06bed925f33e2cac92a27d6b83934a88
2016-06-27 11:19:11 -07:00
Cheryl Potter
9e6ae81296 Merge \"Add redirect for new Run/Debug Config doc b/29615014\" into nyc-dev
am: 5836c9e658

Change-Id: I2cf78a594d415470b2f6512f7583e735f3488042
2016-06-27 18:16:59 +00:00
Dan Albert
17d0ccb1a9 Remove reference to obsolete installation step.
Bug: https://github.com/android-ndk/ndk/issues/136
Change-Id: Idd08b009fefd69053675545bf94fda2147e01318
2016-06-27 11:16:42 -07:00
Cheryl Potter
5836c9e658 Merge "Add redirect for new Run/Debug Config doc b/29615014" into nyc-dev 2016-06-27 18:02:54 +00:00
Andrii Kulian
c11ce7b1cd Resume only activities in focused stack
While performing ensureActivitiesVisibleLocked we should only
resume activity in focused stack. Otherwise we can get several
resumed activities at the same time.

Bug: 29619461
Change-Id: Id65fe1a29841ee3166694bfb6a8236151b9fc7ec
2016-06-27 10:58:13 -07:00
Bill Yi
63d528b12a Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: cc67847367  -s ours

Change-Id: If4759dfe86ce2e9dd89eea01fcb71082a9585327
2016-06-27 17:47:58 +00:00
TreeHugger Robot
cc67847367 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-27 17:34:25 +00:00
Dan Sandler
d563a9594e Merge \"Most cats would prefer chicken.\" into nyc-dev
am: d9069f8c9e

Change-Id: If486049672682e842267209469524611587d0b55
2016-06-27 17:16:46 +00:00
John Reck
8a953d02d9 Merge \"Add missing null checks\" into nyc-dev
am: 02e391585d

Change-Id: Ib081c05d197b01ec3a9039941dd1265bf0b9b92c
2016-06-27 17:06:22 +00:00
Daniel Sandler
d9069f8c9e Merge "Most cats would prefer chicken." into nyc-dev 2016-06-27 16:56:30 +00:00
John Reck
02e391585d Merge "Add missing null checks" into nyc-dev 2016-06-27 16:55:30 +00:00
Dan Sandler
9a9e673bc5 Most cats would prefer chicken.
Bug: 27376882
Change-Id: I2c6d04c2515fd23e44120a3f9ffd6b1668d521ff
2016-06-27 16:34:33 +00:00
Cheryl Potter
2403ac1089 Add redirect for new Run/Debug Config doc
b/29615014

Change-Id: Iff3d896d5f3788d0d20be0bfb6f305a77e094721
2016-06-27 09:23:14 -07:00
Lajos Molnar
3e81ab2c73 Merge \"media: document format keys for MediaMuxer\" into nyc-dev
am: 5059e65fec

Change-Id: I69c5b31fda557ea8d9ca0540f3878f566ada9b56
2016-06-27 16:16:41 +00:00
Lajos Molnar
69484dcd8a Merge \"media: document output image crop and layout for MediaCodec\" into nyc-dev
am: 939484b8ab

Change-Id: Iee0b8c9d07ac7847248e18f23fc26c5d8939f5bb
2016-06-27 16:16:37 +00:00
TreeHugger Robot
5059e65fec Merge "media: document format keys for MediaMuxer" into nyc-dev 2016-06-27 16:10:39 +00:00
TreeHugger Robot
939484b8ab Merge "media: document output image crop and layout for MediaCodec" into nyc-dev 2016-06-27 16:09:52 +00:00
John Reck
474659ccc4 Add missing null checks
Bug: 29743482
Change-Id: Ic4bc5b9d5718eabd41e09a108a765b01aef4e3c8
2016-06-27 07:56:37 -07:00
Shreyas Basarge
ace6f6d5ca SyncOperation float cast fix
Fix casting of Float into Double in SyncOperation.

Bug: 29510536
Change-Id: I553e8988e4bc09c3624e42f6f108f723007d32c4
2016-06-27 12:25:17 +01:00
Bill Yi
09aaab1c6d Import translations. DO NOT MERGE
Change-Id: I284d2545fccfcb6c0d5dbab92090a6dd6d749b64
Auto-generated-cl: translation import
2016-06-27 02:31:14 -07:00
Dirk Dougherty
143a5300f6 Merge \"Update finding success page to feature playbook.\" into nyc-dev
am: 61ae65f260

Change-Id: Ic6676c6a289dd8a4c4739073bd37050b655dfa1b
2016-06-27 02:54:25 +00:00
Dirk Dougherty
61ae65f260 Merge "Update finding success page to feature playbook." into nyc-dev 2016-06-27 02:49:26 +00:00
Dan Sandler
fadfc8e5e5 Cats are not, technically, tasty treats.
am: 27a9fcc618

Change-Id: I04dd4cf9573e88635e814d75162b742fe19b316d
2016-06-26 22:56:01 +00:00
Dan Sandler
27a9fcc618 Cats are not, technically, tasty treats.
Bug: 27376882
Change-Id: I97183339e51c5d07fe6e9404bbcc5178ca605c05
Copilot: Jason Monk <jmonk@google.com>
2016-06-26 15:00:11 +00:00
Dirk Dougherty
4f58324a43 Update finding success page to feature playbook.
Bug: 29207942
Change-Id: Ia8be8fa45bf9e37bb31627bdba042c7b3cfbe8c0
2016-06-24 18:10:48 -07:00
Lajos Molnar
2c35fd0eba media: document output image crop and layout for MediaCodec
These use hidden, now deprecated MediaFormat keys.

Bug: 14127601
Change-Id: Ib51e4ef41204c9be34ad571300fcb7860feb504e
2016-06-24 17:03:02 -07:00
Lajos Molnar
43a2398258 media: document format keys for MediaExtractor/CodecCapabilities
Bug: 29618892
Change-Id: I78049997c153fe00fbcf4475eeefdc937de284dd
2016-06-24 17:01:26 -07:00
Lajos Molnar
5495adca3a media: document format keys for MediaMuxer
Bug: 19461810
Change-Id: Iee4396aa6f00b3f580c02fa99f0b9291700f5738
2016-06-24 16:56:53 -07:00
Lajos Molnar
231746f67c media: document VP9 CSD for MediaCodec
Also document that concatenated CSD is only supported for AVC.

Bug: 10672559
Change-Id: I54867655068802ef35f92a6341f8b5bb068555ee
2016-06-24 16:46:34 -07:00
Adam Lesinski
c038c55f62 Merge \"Update DisplayMetrics when resizing\" into nyc-dev
am: 34ccbe035a

Change-Id: I1b0b6711a3ad8c9fd29bbb967d59d59326fa7d25
2016-06-24 23:42:34 +00:00