OSDN Git Service
Dan Sandler [Tue, 28 Jun 2016 08:20:40 +0000 (08:20 +0000)]
Merge \"Purr. am:
610f6ede25 am:
45294a6859\" into nyc-mr1-dev-plus-aosp
am:
477d47fa04
Change-Id: I8887cc582d788b9b9de7009b68bf3a15917722d1
Dan Sandler [Tue, 28 Jun 2016 08:20:36 +0000 (08:20 +0000)]
Merge \"Fix SuperNotCalledException. am:
04f8cc2bb3 am:
33a199e241\" into nyc-mr1-dev-plus-aosp
am:
c2fbd0ce33
Change-Id: I0e199ea0c6b79870b90a515aeb55d75fa287061e
Dan Sandler [Tue, 28 Jun 2016 08:20:34 +0000 (08:20 +0000)]
One final tweak to the platlogo. am:
4b7e415803 am:
3fae8ae0c6
am:
5643d0a5f8
Change-Id: Ic1ebdee84229863d6146fac0974ab31379165e6f
Dan Sandler [Tue, 28 Jun 2016 08:20:31 +0000 (08:20 +0000)]
Fix SuperNotCalledException. am:
04f8cc2bb3 am:
ed48cbc8fc
am:
ca3a67d156
Change-Id: I73683acfb018da52d2e69d75edf16913439e4485
Hall Liu [Tue, 28 Jun 2016 08:20:24 +0000 (08:20 +0000)]
Merge \\"Add disable add call during video call extra and carrier config key\\" into nyc-mr1-dev am:
2cd8281a23
am:
2258e483f1
Change-Id: I7283e51cda559e4ea976bbd20d149697f7e54e46
Android Build Merger (Role) [Tue, 28 Jun 2016 07:15:41 +0000 (07:15 +0000)]
Merge "Purr. am:
610f6ede25 am:
45294a6859" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 28 Jun 2016 07:15:33 +0000 (07:15 +0000)]
Merge "Fix SuperNotCalledException. am:
04f8cc2bb3 am:
33a199e241" into nyc-mr1-dev-plus-aosp
Dan Sandler [Tue, 28 Jun 2016 07:14:56 +0000 (07:14 +0000)]
Purr. am:
610f6ede25
am:
45294a6859
Change-Id: I6db945a4ca001c330d658549500521748172d081
Dan Sandler [Tue, 28 Jun 2016 07:14:56 +0000 (07:14 +0000)]
Fix SuperNotCalledException. am:
04f8cc2bb3
am:
33a199e241
Change-Id: I7ebf9e7db1a21e213e3a88c29d215eb6f701cbf6
Dan Sandler [Tue, 28 Jun 2016 07:14:54 +0000 (07:14 +0000)]
One final tweak to the platlogo. am:
4b7e415803
am:
3fae8ae0c6
Change-Id: Icf198e2c7d34703a4cd8856bc08f31925a20b622
Dan Sandler [Tue, 28 Jun 2016 07:14:51 +0000 (07:14 +0000)]
Fix SuperNotCalledException. am:
04f8cc2bb3
am:
ed48cbc8fc
Change-Id: Ie056fe7f9c1ab1a4cb0db9f262e158cedcb94706
Dan Sandler [Tue, 28 Jun 2016 07:07:35 +0000 (07:07 +0000)]
Purr.
am:
610f6ede25
Change-Id: I0dc3c9da110b8a92ecde6dbc28eb572a148ad6f5
Dan Sandler [Tue, 28 Jun 2016 07:07:31 +0000 (07:07 +0000)]
One final tweak to the platlogo.
am:
4b7e415803
Change-Id: Ieef461bb4c1b59fd22e5f830b2b25311422cedae
Dan Sandler [Tue, 28 Jun 2016 07:07:28 +0000 (07:07 +0000)]
Fix SuperNotCalledException.
am:
04f8cc2bb3
Change-Id: Ic981a15b565092ea13a618c7ac0ed9d000854362
Dan Sandler [Tue, 28 Jun 2016 07:07:20 +0000 (07:07 +0000)]
Fix SuperNotCalledException.
am:
04f8cc2bb3
Change-Id: I52977c00a41ec0db599b67cdc2617f1c602667a6
TreeHugger Robot [Tue, 28 Jun 2016 06:54:56 +0000 (06:54 +0000)]
Merge "Delete gender-balanced emoji sequence by one backspace key event."
Dan Sandler [Tue, 28 Jun 2016 05:25:08 +0000 (01:25 -0400)]
Purr.
Bug:
27376882
Change-Id: I071d00c9a7847b8ff9b263ffd17581079b78a432
Seigo Nonaka [Mon, 27 Jun 2016 03:21:27 +0000 (12:21 +0900)]
Delete gender-balanced emoji sequence by one backspace key event.
The gender-balanced emojis are made with ZWJ sequence and emoji
modifiers. For example, U+1F469 U+1F3FD U+200D U+1F4BC should be
deleted at the same time by single backsapce key event. Here, U+1F469
is WOMAN, U+1F3FD is EMOJI MODIFIER FITZPATRICK TYPE-4, U+200D is ZERO
WIDTH JOINER, U+1F4BC is BRIEFCASE.
This CL also renames the state name from STATE_BEFORE_ZWJ_EMOJI to
STATE_BEFORE_EMOJI since now all emoji can be a part of ZWJ sequence
after I572dad42ee108476962d4b3fe9f3a6019cb50098
BUG:
29728397
Change-Id: Ib114295db45c6592f1c65a0773ab236f8bf35209
Dan Sandler [Tue, 28 Jun 2016 02:02:12 +0000 (22:02 -0400)]
One final tweak to the platlogo.
Bug:
27376882
Change-Id: Ie60600018204f48593975b947d6fc10f4dd8a69f
Dan Sandler [Tue, 28 Jun 2016 01:33:27 +0000 (21:33 -0400)]
Fix SuperNotCalledException.
Q. Dan, how did you make such a basic newbie mistake?
A. new phone who dis
Bug:
29779845
Change-Id: Iecba53effcf6252df228afd2cc80df43b2afaa59
Hall Liu [Tue, 28 Jun 2016 02:34:00 +0000 (02:34 +0000)]
Merge \"Add disable add call during video call extra and carrier config key\" into nyc-mr1-dev
am:
2cd8281a23
Change-Id: I98ed6adcc49525db82c09a98e2c632894a4a0bc9
Hall Liu [Tue, 28 Jun 2016 02:29:04 +0000 (02:29 +0000)]
Merge "Add disable add call during video call extra and carrier config key" into nyc-mr1-dev
John Reck [Tue, 28 Jun 2016 01:36:19 +0000 (01:36 +0000)]
Merge \\"Fix SurfaceViewPositionListener race bugs\\" into nyc-mr1-dev am:
8701bff9ba
am:
892f8e7d4f
Change-Id: I1e66186dce36e52cafe6c0d027aeae7c9345703c
John Reck [Tue, 28 Jun 2016 01:31:02 +0000 (01:31 +0000)]
Merge \"Fix SurfaceViewPositionListener race bugs\" into nyc-mr1-dev
am:
8701bff9ba
Change-Id: I17b1cf4e81321edb04ae9ac99449160a705ba824
TreeHugger Robot [Tue, 28 Jun 2016 01:26:42 +0000 (01:26 +0000)]
Merge "Fix SurfaceViewPositionListener race bugs" into nyc-mr1-dev
Amith Yamasani [Tue, 28 Jun 2016 01:12:39 +0000 (01:12 +0000)]
Merge \\"Add tron logging for retail demo session counters\\" into nyc-mr1-dev am:
30a2b43f6d
am:
42daac6289
Change-Id: Iaca83f5e75098e6d74a468b2f4438af4cf96fa33
Amith Yamasani [Tue, 28 Jun 2016 01:06:47 +0000 (01:06 +0000)]
Merge \"Add tron logging for retail demo session counters\" into nyc-mr1-dev
am:
30a2b43f6d
Change-Id: Iaca49cc4aad9285e87d869b112b6c2986073f006
Amith Yamasani [Tue, 28 Jun 2016 01:03:16 +0000 (01:03 +0000)]
Merge "Add tron logging for retail demo session counters" into nyc-mr1-dev
Svetoslav Ganov [Tue, 28 Jun 2016 00:57:03 +0000 (00:57 +0000)]
Merge \"Merge \\\"Mark app pending intents in notification extras\\\" into nyc-dev am:
b2cd9c95bf am:
7878e736f7\" into nyc-mr1-dev-plus-aosp
am:
fdf2884ded
Change-Id: Icdb52b4cf95f06d7777c799eda133ca7b7eafa74
Svet Ganov [Tue, 28 Jun 2016 00:57:00 +0000 (00:57 +0000)]
Merge \\\"Mark app pending intents in notification extras\\\" into nyc-dev am:
b2cd9c95bf am:
5f7f3fa7a9
am:
dc162dde07
Change-Id: I42000bbb614139ee3f0d9a9fcee7f460e52661f8
Android Build Merger (Role) [Tue, 28 Jun 2016 00:52:36 +0000 (00:52 +0000)]
Merge "Merge \\"Mark app pending intents in notification extras\\" into nyc-dev am:
b2cd9c95bf am:
7878e736f7" into nyc-mr1-dev-plus-aosp
Svetoslav Ganov [Tue, 28 Jun 2016 00:52:04 +0000 (00:52 +0000)]
Merge \\"Mark app pending intents in notification extras\\" into nyc-dev am:
b2cd9c95bf
am:
7878e736f7
Change-Id: If05b82ba029bfce142c42eebd3336ca3d5bded3d
Svetoslav Ganov [Tue, 28 Jun 2016 00:52:01 +0000 (00:52 +0000)]
Merge \\"Mark app pending intents in notification extras\\" into nyc-dev am:
b2cd9c95bf
am:
5f7f3fa7a9
Change-Id: Id4bc3ae0c1d79174a22d669dccab3391c231357d
Svet Ganov [Tue, 28 Jun 2016 00:46:58 +0000 (00:46 +0000)]
Merge \"Mark app pending intents in notification extras\" into nyc-dev
am:
b2cd9c95bf
Change-Id: Iac3970763cbaac36ede1b17df7e65001ad6c8447
Svet Ganov [Tue, 28 Jun 2016 00:46:55 +0000 (00:46 +0000)]
Merge \"Mark app pending intents in notification extras\" into nyc-dev
am:
b2cd9c95bf
Change-Id: Idb515255f224c23d60a513713d9e4f93decd7a9c
Svetoslav Ganov [Tue, 28 Jun 2016 00:42:23 +0000 (00:42 +0000)]
Merge "Mark app pending intents in notification extras" into nyc-dev
Svet Ganov [Fri, 24 Jun 2016 02:55:24 +0000 (19:55 -0700)]
Mark app pending intents in notification extras
We need to make every peniding intent that went in the notification
system to allow special handling of such intents when fired by a
notification listener. If a pending intent from a notification
is sent from a notification listener, we white-list the source app
to run in data saver mode for a short period of time. The problem is
that actions and the notificaion can have extras which bundles may
contain pending intents but the system cannot look into the bundles
as they may contain custom parcelable objects. To address this we
keep a list of all pending intents in the notification allowing
the system to access them without touching the bundle. Currently
the pending intents are written to the parcel twice, once in the
bundle and once as the explicit list. We can come up with a scheme
to optimize this but since pending itents are just a binder pointer
it is not worth the excecise.
bug:
29480440
Change-Id: I7328a47017ca226117adf7054900836619f5679b
Hall Liu [Thu, 16 Jun 2016 00:55:00 +0000 (17:55 -0700)]
Add disable add call during video call extra and carrier config key
Bug:
29047863
Change-Id: I977041ec72968bdccc69a706e27dd4b5ec336ba7
Jorim Jaggi [Tue, 28 Jun 2016 00:17:53 +0000 (00:17 +0000)]
Merge \"Merge \\\"Fix smooth panel deceleration\\\" into nyc-dev am:
e858432241 am:
f4704889a6\" into nyc-mr1-dev-plus-aosp
am:
c06f2dd896
Change-Id: Ibf2ca7c53c66df829285916c6735d8539d5a6302
Roozbeh Pournader [Tue, 28 Jun 2016 00:14:21 +0000 (00:14 +0000)]
Merge "Introduce listEllipsize() and deprecate commaEllipsize()"
Dianne Hackborn [Tue, 28 Jun 2016 00:12:05 +0000 (00:12 +0000)]
Merge \"Merge \\\"Fix bug where process whitelist manager state would not be correct.\\\" into nyc-dev am:
a39d380651 am:
91df8559c0\" into nyc-mr1-dev-plus-aosp
am:
83bf61d450
Change-Id: I43bacb1f213c7ada8bdd4600092bd8e4b1be4882
Andreas Gampe [Tue, 28 Jun 2016 00:12:03 +0000 (00:12 +0000)]
Merge \"Merge \\"Frameworks/base: Add new flow to OtaDexoptService\\" into nyc-mr1-dev am:
d06f87399b\" into nyc-mr1-dev-plus-aosp
am:
8299d7156e
Change-Id: I61e73af556b718e58b14a7fed707c7520e3673d9
Dianne Hackborn [Tue, 28 Jun 2016 00:11:59 +0000 (00:11 +0000)]
Merge \\\"Add extra waiting when switching users\\\" into nyc-dev am:
4d6be6b308 am:
9525331c5e
am:
7510331afb
Change-Id: I3f1887f5418f25bef553940668e86f7059985549
Andre Eisenbach [Tue, 28 Jun 2016 00:11:57 +0000 (00:11 +0000)]
Merge \"Merge \\\"Add extra waiting when switching users\\\" into nyc-dev am:
4d6be6b308 am:
e7ce279d9a\" into nyc-mr1-dev-plus-aosp
am:
70e793436d
Change-Id: I4ba520c3fc42c6ab633b2f6b6a8f3dd89b520453
Pavlin Radoslavov [Tue, 28 Jun 2016 00:11:55 +0000 (00:11 +0000)]
Merge \\\"Add extra waiting when switching users\\\" into nyc-dev am:
4d6be6b308 am:
d09f7d0edc
am:
e655b42708
Change-Id: I5927e2058187e3c794e05fa957516bfbd95ce4fe
Christopher Tate [Tue, 28 Jun 2016 00:09:40 +0000 (00:09 +0000)]
Merge \\\"Fix #
29737133 : content-trigger jobs not running properly\\\" into nyc-dev am:
f480698298 am:
defa943074
am:
f54b7abdd8
Change-Id: I358a6d0cc476f5f9061ad6697c69dac5a873715c
Chris Tate [Tue, 28 Jun 2016 00:09:38 +0000 (00:09 +0000)]
Merge \"Merge \\\"Fix #
29737133 : content-trigger jobs not running properly\\\" into nyc-dev am:
f480698298 am:
0bdb4cef4a\" into nyc-mr1-dev-plus-aosp
am:
e2d2c8bfaa
Change-Id: I4ced39cba73f5cb2723dc5750d9ae542a8d3bc27
Bill Yi [Tue, 28 Jun 2016 00:09:35 +0000 (00:09 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am:
95ad00d115 -s ours
am:
f5e54b38aa -s ours
Change-Id: Iec3fb3192da824796df5fea0b8d6be9e4f0295b9
Adam Lesinski [Tue, 28 Jun 2016 00:09:33 +0000 (00:09 +0000)]
Merge \\"Fix AttributeCache\\" into nyc-mr1-dev am:
bdad0ccf3b
am:
fd6fdebdd2
Change-Id: I71403e2e2f7dfbdeb8aaeb6af39f75a249ddb1d9
John Reck [Tue, 28 Jun 2016 00:09:30 +0000 (00:09 +0000)]
Merge \"Merge \\\"Add missing roundOut for layer damage\\\" into nyc-dev am:
48cde353eb am:
11858f170a\" into nyc-mr1-dev-plus-aosp
am:
b7a41144ce
Change-Id: I1cde514edcbb87a1ad4eeb22651e882d3ed32ae5
John Reck [Tue, 28 Jun 2016 00:07:00 +0000 (00:07 +0000)]
Merge \\\"Add missing roundOut for layer damage\\\" into nyc-dev am:
48cde353eb am:
aecf607eb6
am:
27875c2f31
Change-Id: I5a153e5c5a43bbdb7e3ace4b19ea08c08416ffa1
William Harmon [Tue, 28 Jun 2016 00:06:56 +0000 (00:06 +0000)]
Merge \\"Allow system apps to have disabled QS tiles.\\" into nyc-mr1-dev am:
611093b1a1
am:
431910e086
Change-Id: Iaf7b4ea2899ac7793a41586965090def52eaba1a
Chris Craik [Tue, 28 Jun 2016 00:06:54 +0000 (00:06 +0000)]
Round unclipped saveLayers am:
45e83338e5 am:
65c0d9d290
am:
7e784b7bec
Change-Id: I8a474a418e30d439e15c8c27336d8bc860e882f7
Chris Craik [Tue, 28 Jun 2016 00:06:52 +0000 (00:06 +0000)]
Round unclipped saveLayers am:
45e83338e5 am:
90a9370b59
am:
305b574f44
Change-Id: I51f6963d57b6edb1230e2c18a808997bb679a390
Tyler Gunn [Tue, 28 Jun 2016 00:06:48 +0000 (00:06 +0000)]
Merge \\"Add onConferenceSupportedChanged callback, carrier config.\\" into nyc-mr1-dev am:
780648be53
am:
da457b206e
Change-Id: I8d2c147c2455dcf6dfcedfde43890b4962f7b4cd
Jorim Jaggi [Tue, 28 Jun 2016 00:04:11 +0000 (00:04 +0000)]
Merge "Merge \\"Fix smooth panel deceleration\\" into nyc-dev am:
e858432241 am:
f4704889a6" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 28 Jun 2016 00:01:09 +0000 (00:01 +0000)]
Merge "Merge \\"Fix bug where process whitelist manager state would not be correct.\\" into nyc-dev am:
a39d380651 am:
91df8559c0" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 28 Jun 2016 00:00:56 +0000 (00:00 +0000)]
Merge "Merge \"Frameworks/base: Add new flow to OtaDexoptService\" into nyc-mr1-dev am:
d06f87399b" into nyc-mr1-dev-plus-aosp
Andre Eisenbach [Tue, 28 Jun 2016 00:00:18 +0000 (00:00 +0000)]
Merge \\"Add extra waiting when switching users\\" into nyc-dev am:
4d6be6b308
am:
9525331c5e
Change-Id: I670cf48d1aac97dcf26213d7db5627ac7a1ef654
Dianne Hackborn [Tue, 28 Jun 2016 00:00:17 +0000 (00:00 +0000)]
Merge \\"Fix bug where process whitelist manager state would not be correct.\\" into nyc-dev am:
a39d380651
am:
91df8559c0
Change-Id: Ic2fff0bfcc91ba5e791f0a4986fa854e866534e0
Andreas Gampe [Tue, 28 Jun 2016 00:00:13 +0000 (00:00 +0000)]
Merge \"Frameworks/base: Add new flow to OtaDexoptService\" into nyc-mr1-dev
am:
d06f87399b
Change-Id: Iaefa3414cb7ca7d113e9ac776f8f667d5dc724c8
Dianne Hackborn [Mon, 27 Jun 2016 23:57:05 +0000 (23:57 +0000)]
Merge \"Fix bug where process whitelist manager state would not be correct.\" into nyc-dev
am:
a39d380651
Change-Id: I78f5a67a6b08f1275c66b7543e91b2bd016d621e
Dianne Hackborn [Mon, 27 Jun 2016 23:56:58 +0000 (23:56 +0000)]
Merge \"Fix bug where process whitelist manager state would not be correct.\" into nyc-dev
am:
a39d380651
Change-Id: Ideb81a07d14e1fff71593cec822f3120c4f523f6
Android Build Merger (Role) [Mon, 27 Jun 2016 23:56:28 +0000 (23:56 +0000)]
Merge "Merge \\"Add extra waiting when switching users\\" into nyc-dev am:
4d6be6b308 am:
e7ce279d9a" into nyc-mr1-dev-plus-aosp
Andre Eisenbach [Mon, 27 Jun 2016 23:56:03 +0000 (23:56 +0000)]
Merge \\"Add extra waiting when switching users\\" into nyc-dev am:
4d6be6b308
am:
e7ce279d9a
Change-Id: Ib20db3e3e8111ca98b586adbcb83b65a5764f860
Andre Eisenbach [Mon, 27 Jun 2016 23:56:02 +0000 (23:56 +0000)]
Merge \\"Add extra waiting when switching users\\" into nyc-dev am:
4d6be6b308
am:
d09f7d0edc
Change-Id: Ibb19ab5bdf094a250706b2d32de169f61c221a76
Dianne Hackborn [Mon, 27 Jun 2016 23:52:00 +0000 (23:52 +0000)]
Merge "Fix bug where process whitelist manager state would not be correct." into nyc-dev
TreeHugger Robot [Mon, 27 Jun 2016 23:50:36 +0000 (23:50 +0000)]
Merge "Frameworks/base: Add new flow to OtaDexoptService" into nyc-mr1-dev
Pavlin Radoslavov [Mon, 27 Jun 2016 23:46:30 +0000 (23:46 +0000)]
Merge \"Add extra waiting when switching users\" into nyc-dev
am:
4d6be6b308
Change-Id: I3c54d6666d8327a0915d839ec02715961e62565a
Pavlin Radoslavov [Mon, 27 Jun 2016 23:46:27 +0000 (23:46 +0000)]
Merge \"Add extra waiting when switching users\" into nyc-dev
am:
4d6be6b308
Change-Id: Ibf3fc8f0176e2d02fe3548146928c9b66986e428
Andre Eisenbach [Mon, 27 Jun 2016 23:42:15 +0000 (23:42 +0000)]
Merge "Add extra waiting when switching users" into nyc-dev
Chris Tate [Mon, 27 Jun 2016 23:31:37 +0000 (23:31 +0000)]
Merge \\"Fix #
29737133 : content-trigger jobs not running properly\\" into nyc-dev am:
f480698298
am:
defa943074
Change-Id: I8f5f98b47804ade4eabd4f03a0d842ec4553816a
Android Build Merger (Role) [Mon, 27 Jun 2016 23:29:15 +0000 (23:29 +0000)]
Merge "Merge \\"Fix #
29737133 : content-trigger jobs not running properly\\" into nyc-dev am:
f480698298 am:
0bdb4cef4a" into nyc-mr1-dev-plus-aosp
Chris Tate [Mon, 27 Jun 2016 23:28:52 +0000 (23:28 +0000)]
Merge \\"Fix #
29737133 : content-trigger jobs not running properly\\" into nyc-dev am:
f480698298
am:
0bdb4cef4a
Change-Id: I8fa6a0c035f52a9e80817eff1e1d42e91620e049
Bill Yi [Mon, 27 Jun 2016 23:27:46 +0000 (23:27 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am:
95ad00d115 -s ours
Change-Id: Iba00061506c03e399378f2a74b03028c130bf0a1
Christopher Tate [Mon, 27 Jun 2016 23:24:03 +0000 (23:24 +0000)]
Merge \"Fix #
29737133 : content-trigger jobs not running properly\" into nyc-dev
am:
f480698298
Change-Id: I56aa1a6ecb2409b905de4a8419e1b76523120efc
Christopher Tate [Mon, 27 Jun 2016 23:24:01 +0000 (23:24 +0000)]
Merge \"Fix #
29737133 : content-trigger jobs not running properly\" into nyc-dev
am:
f480698298
Change-Id: I957ae07c46573f0e6a066cc1cb0a27b8bafe5811
Bill Yi [Mon, 27 Jun 2016 23:19:28 +0000 (23:19 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Chris Tate [Mon, 27 Jun 2016 23:18:30 +0000 (23:18 +0000)]
Merge "Fix #
29737133 : content-trigger jobs not running properly" into nyc-dev
Adam Lesinski [Mon, 27 Jun 2016 23:17:48 +0000 (23:17 +0000)]
Merge \"Fix AttributeCache\" into nyc-mr1-dev
am:
bdad0ccf3b
Change-Id: I1154b6243c1f972dccc3918964c7243c218749a9
Christopher Tate [Mon, 27 Jun 2016 23:12:41 +0000 (16:12 -0700)]
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
TreeHugger Robot [Mon, 27 Jun 2016 23:11:32 +0000 (23:11 +0000)]
Merge "Fix AttributeCache" into nyc-mr1-dev
Pavlin Radoslavov [Mon, 27 Jun 2016 22:25:18 +0000 (15:25 -0700)]
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
Dianne Hackborn [Mon, 27 Jun 2016 22:07:18 +0000 (15:07 -0700)]
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
Android Build Merger (Role) [Mon, 27 Jun 2016 22:32:07 +0000 (22:32 +0000)]
Merge "Merge \\"Add missing roundOut for layer damage\\" into nyc-dev am:
48cde353eb am:
11858f170a" into nyc-mr1-dev-plus-aosp
John Reck [Mon, 27 Jun 2016 22:31:39 +0000 (22:31 +0000)]
Merge \\"Add missing roundOut for layer damage\\" into nyc-dev am:
48cde353eb
am:
aecf607eb6
Change-Id: Iede184ab8942798a932f67d1ece3f7fd5e0f9d66
John Reck [Mon, 27 Jun 2016 22:31:39 +0000 (22:31 +0000)]
Merge \\"Add missing roundOut for layer damage\\" into nyc-dev am:
48cde353eb
am:
11858f170a
Change-Id: Ibb7d608f220a2d244050ee070bc63e959d56d1ec
John Reck [Mon, 27 Jun 2016 22:28:41 +0000 (22:28 +0000)]
Merge \"Add missing roundOut for layer damage\" into nyc-dev
am:
48cde353eb
Change-Id: I99532e6b7992452523c4fb0716a7161c06b92950
John Reck [Mon, 27 Jun 2016 22:28:39 +0000 (22:28 +0000)]
Merge \"Add missing roundOut for layer damage\" into nyc-dev
am:
48cde353eb
Change-Id: If4ca933e218fc33fa78dc063b687e03793635e6c
John Reck [Mon, 27 Jun 2016 22:22:40 +0000 (22:22 +0000)]
Merge "Add missing roundOut for layer damage" into nyc-dev
Will Harmon [Mon, 27 Jun 2016 22:20:47 +0000 (22:20 +0000)]
Merge \"Allow system apps to have disabled QS tiles.\" into nyc-mr1-dev
am:
611093b1a1
Change-Id: Ie3f832621d982f45af7d0e4d1b786f429cef9f2c
John Reck [Mon, 27 Jun 2016 22:13:54 +0000 (15:13 -0700)]
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
William Harmon [Mon, 27 Jun 2016 22:15:45 +0000 (22:15 +0000)]
Merge "Allow system apps to have disabled QS tiles." into nyc-mr1-dev
Will Harmon [Sat, 25 Jun 2016 00:02:34 +0000 (17:02 -0700)]
Allow system apps to have disabled QS tiles.
Otherwise the tile can get removed on bootup if the tile is disabled by
default.
Fixes:
29509725
Change-Id: Icc6b63b6cf9b9cdca367c79c3175896c87041e05
Andreas Gampe [Fri, 24 Jun 2016 03:27:12 +0000 (20:27 -0700)]
Frameworks/base: Add new flow to OtaDexoptService
Add functionality to capture/intercept installd communication, and
use this to return the full communication for dexopt. These parameters
can be used to drive otapreopt_chroot directly.
Keep the old direct invocation alive until devices have transitioned
to a service that exposes this API.
In preparation for renaming of A/B OTA artifacts to include target
slot names.
Bug:
25612095
Bug:
28069686
Change-Id: I14728ee1266f3882cada8f08dd21891ed5f7a0cb
Chris Craik [Mon, 27 Jun 2016 21:52:37 +0000 (21:52 +0000)]
Round unclipped saveLayers am:
45e83338e5
am:
65c0d9d290
Change-Id: I70d75f110a13cf9b0e1d37b79f582e823469142a
Adam Lesinski [Mon, 27 Jun 2016 21:49:37 +0000 (21:49 +0000)]
Merge "Remove duplicate resource definitions"
Chris Craik [Mon, 27 Jun 2016 21:48:06 +0000 (21:48 +0000)]
Round unclipped saveLayers am:
45e83338e5
am:
90a9370b59
Change-Id: I31ce6a8651137e4e56a180e62623c4132db21406
Chris Craik [Mon, 27 Jun 2016 21:45:04 +0000 (21:45 +0000)]
Round unclipped saveLayers
am:
45e83338e5
Change-Id: I3ecb7fdd2097779cf7f596c0e6a3f7914902ca39
Chris Craik [Mon, 27 Jun 2016 21:45:03 +0000 (21:45 +0000)]
Round unclipped saveLayers
am:
45e83338e5
Change-Id: Ifc598495cb8ad99b9f1534c1d783c3e4f483f1c5
OSDN Git Service
