Android Build Merger (Role)
fdf2884ded
Merge "Merge \\"Mark app pending intents in notification extras\\" into nyc-dev am: b2cd9c95bf am: 7878e736f7" into nyc-mr1-dev-plus-aosp
2016-06-28 00:52:38 +00:00
Svetoslav Ganov
cd6c2bee62
Merge \\"Mark app pending intents in notification extras\\" into nyc-dev am: b2cd9c95bf
...
am: 7878e736f7
2016-06-28 00:52:04 +00:00
Svetoslav Ganov
dc162dde07
Merge \\"Mark app pending intents in notification extras\\" into nyc-dev am: b2cd9c95bf
...
am: 5f7f3fa7a9
2016-06-28 00:52:01 +00:00
Svet Ganov
5f7f3fa7a9
Merge \"Mark app pending intents in notification extras\" into nyc-dev
...
am: b2cd9c95bf
2016-06-28 00:46:58 +00:00
Svet Ganov
7878e736f7
Merge \"Mark app pending intents in notification extras\" into nyc-dev
...
am: b2cd9c95bf
2016-06-28 00:46:55 +00:00
Svetoslav Ganov
b2cd9c95bf
Merge "Mark app pending intents in notification extras" into nyc-dev
2016-06-28 00:42:24 +00:00
Svet Ganov
ddb948896c
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
2016-06-27 17:32:25 -07:00
Jorim Jaggi
c06f2dd896
Merge "Merge \\"Fix smooth panel deceleration\\" into nyc-dev am: e858432241 am: f4704889a6" into nyc-mr1-dev-plus-aosp
2016-06-28 00:04:12 +00:00
Android Build Merger (Role)
83bf61d450
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
2016-06-28 00:01:11 +00:00
Android Build Merger (Role)
8299d7156e
Merge "Merge \"Frameworks/base: Add new flow to OtaDexoptService\" into nyc-mr1-dev am: d06f87399b" into nyc-mr1-dev-plus-aosp
2016-06-28 00:00:57 +00:00
Andre Eisenbach
7510331afb
Merge \\"Add extra waiting when switching users\\" into nyc-dev am: 4d6be6b308
...
am: 9525331c5e
2016-06-28 00:00:18 +00:00
Dianne Hackborn
eb2d3a3488
Merge \\"Fix bug where process whitelist manager state would not be correct.\\" into nyc-dev am: a39d380651
...
am: 91df8559c0
2016-06-28 00:00:17 +00:00
Andreas Gampe
bd2503e5f4
Merge \"Frameworks/base: Add new flow to OtaDexoptService\" into nyc-mr1-dev
...
am: d06f87399b
2016-06-28 00:00:13 +00:00
Dianne Hackborn
9525331c5e
Merge \"Fix bug where process whitelist manager state would not be correct.\" into nyc-dev
...
am: a39d380651
2016-06-27 23:57:05 +00:00
Dianne Hackborn
91df8559c0
Merge \"Fix bug where process whitelist manager state would not be correct.\" into nyc-dev
...
am: a39d380651
2016-06-27 23:56:58 +00:00
Android Build Merger (Role)
70e793436d
Merge "Merge \\"Add extra waiting when switching users\\" into nyc-dev am: 4d6be6b308 am: e7ce279d9a" into nyc-mr1-dev-plus-aosp
2016-06-27 23:56:30 +00:00
Andre Eisenbach
884c30547f
Merge \\"Add extra waiting when switching users\\" into nyc-dev am: 4d6be6b308
...
am: e7ce279d9a
2016-06-27 23:56:03 +00:00
Andre Eisenbach
e655b42708
Merge \\"Add extra waiting when switching users\\" into nyc-dev am: 4d6be6b308
...
am: d09f7d0edc
2016-06-27 23:56:02 +00:00
Dianne Hackborn
a39d380651
Merge "Fix bug where process whitelist manager state would not be correct." into nyc-dev
2016-06-27 23:52:01 +00:00
TreeHugger Robot
d06f87399b
Merge "Frameworks/base: Add new flow to OtaDexoptService" into nyc-mr1-dev
2016-06-27 23:50:37 +00:00
Pavlin Radoslavov
e7ce279d9a
Merge \"Add extra waiting when switching users\" into nyc-dev
...
am: 4d6be6b308
2016-06-27 23:46:30 +00:00
Pavlin Radoslavov
d09f7d0edc
Merge \"Add extra waiting when switching users\" into nyc-dev
...
am: 4d6be6b308
2016-06-27 23:46:27 +00:00
Andre Eisenbach
4d6be6b308
Merge "Add extra waiting when switching users" into nyc-dev
2016-06-27 23:42:17 +00:00
Chris Tate
f54b7abdd8
Merge \\"Fix #29737133 : content-trigger jobs not running properly\\" into nyc-dev am: f480698298
...
am: defa943074
2016-06-27 23:31:37 +00:00
Android Build Merger (Role)
e2d2c8bfaa
Merge "Merge \\"Fix #29737133 : content-trigger jobs not running properly\\" into nyc-dev am: f480698298 am: 0bdb4cef4a" into nyc-mr1-dev-plus-aosp
2016-06-27 23:29:16 +00:00
Chris Tate
ceba6019cf
Merge \\"Fix #29737133 : content-trigger jobs not running properly\\" into nyc-dev am: f480698298
...
am: 0bdb4cef4a
2016-06-27 23:28:52 +00:00
Bill Yi
f5e54b38aa
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
...
am: 95ad00d115
2016-06-27 23:27:46 +00:00
Christopher Tate
0bdb4cef4a
Merge \"Fix #29737133 : content-trigger jobs not running properly\" into nyc-dev
...
am: f480698298
2016-06-27 23:24:03 +00:00
Christopher Tate
defa943074
Merge \"Fix #29737133 : content-trigger jobs not running properly\" into nyc-dev
...
am: f480698298
2016-06-27 23:24:01 +00:00
Bill Yi
95ad00d115
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-06-27 23:19:29 +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
Adam Lesinski
fd6fdebdd2
Merge \"Fix AttributeCache\" into nyc-mr1-dev
...
am: bdad0ccf3b
2016-06-27 23:17:48 +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
TreeHugger Robot
bdad0ccf3b
Merge "Fix AttributeCache" into nyc-mr1-dev
2016-06-27 23:11:33 +00: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
Android Build Merger (Role)
b7a41144ce
Merge "Merge \\"Add missing roundOut for layer damage\\" into nyc-dev am: 48cde353eb am: 11858f170a" into nyc-mr1-dev-plus-aosp
2016-06-27 22:32:08 +00:00
John Reck
27875c2f31
Merge \\"Add missing roundOut for layer damage\\" into nyc-dev am: 48cde353eb
...
am: aecf607eb6
2016-06-27 22:31:39 +00:00
John Reck
ca6d3b4eaa
Merge \\"Add missing roundOut for layer damage\\" into nyc-dev am: 48cde353eb
...
am: 11858f170a
2016-06-27 22:31:39 +00:00
John Reck
11858f170a
Merge \"Add missing roundOut for layer damage\" into nyc-dev
...
am: 48cde353eb
2016-06-27 22:28:41 +00:00
John Reck
aecf607eb6
Merge \"Add missing roundOut for layer damage\" into nyc-dev
...
am: 48cde353eb
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
Will Harmon
431910e086
Merge \"Allow system apps to have disabled QS tiles.\" into nyc-mr1-dev
...
am: 611093b1a1
2016-06-27 22:20:47 +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
William Harmon
611093b1a1
Merge "Allow system apps to have disabled QS tiles." into nyc-mr1-dev
2016-06-27 22:15:46 +00:00
Will Harmon
294af233a9
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
2016-06-27 22:14:21 +00:00
Andreas Gampe
cc241a580c
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
2016-06-27 15:10:12 -07:00
Chris Craik
7e784b7bec
Round unclipped saveLayers am: 45e83338e5
...
am: 65c0d9d290
2016-06-27 21:52:37 +00:00
Chris Craik
305b574f44
Round unclipped saveLayers am: 45e83338e5
...
am: 90a9370b59
2016-06-27 21:48:06 +00:00
Chris Craik
65c0d9d290
Round unclipped saveLayers
...
am: 45e83338e5
2016-06-27 21:45:04 +00:00
