OSDN Git Service
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:28 +0000 (07:07 +0000)]
Fix SuperNotCalledException.
am:
04f8cc2bb3
Change-Id: Ic981a15b565092ea13a618c7ac0ed9d000854362
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: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: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
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: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
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
Tyler Gunn [Mon, 27 Jun 2016 21:40:04 +0000 (21:40 +0000)]
Merge \"Add onConferenceSupportedChanged callback, carrier config.\" into nyc-mr1-dev
am:
780648be53
Change-Id: I71c24e971bf8d36fd5448497b85660be43417632
Tyler Gunn [Mon, 27 Jun 2016 21:35:48 +0000 (21:35 +0000)]
Merge "Add onConferenceSupportedChanged callback, carrier config." into nyc-mr1-dev
Android Build Merger (Role) [Mon, 27 Jun 2016 21:07:53 +0000 (21:07 +0000)]
Merge "Merge \\"Resume only activities in focused stack\\" into nyc-dev am:
06b1d786e9 am:
fee6e7f102" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Mon, 27 Jun 2016 21:07:42 +0000 (21:07 +0000)]
Merge "Merge \\"Fix smooth panel deceleration\\" into nyc-dev am:
e858432241 am:
f4704889a6" into nyc-mr1-dev-plus-aosp
Andrii Kulian [Mon, 27 Jun 2016 21:07:15 +0000 (21:07 +0000)]
Merge \\"Resume only activities in focused stack\\" into nyc-dev am:
06b1d786e9
am:
fee6e7f102
Change-Id: Idbf14558dfacaa7eecee4cb8f747d0aa4aa67dee
Jorim Jaggi [Mon, 27 Jun 2016 21:07:13 +0000 (21:07 +0000)]
Merge \\"Fix smooth panel deceleration\\" into nyc-dev am:
e858432241
am:
f4704889a6
Change-Id: I5c7b90fc1b46059a35430ab46bd85bf6eac372b2
Andrii Kulian [Mon, 27 Jun 2016 21:06:51 +0000 (21:06 +0000)]
Merge \\"Resume only activities in focused stack\\" into nyc-dev am:
06b1d786e9
am:
bb7c5aca25
Change-Id: Ibc9dec731ffa71d67f66431329d10a9707b69d1d
Chris Craik [Fri, 24 Jun 2016 20:53:37 +0000 (13:53 -0700)]
Round unclipped saveLayers
fixes:
29456451
Change-Id: I2be8b47c46936e75071ad0819a718f72b96cbd2b
(cherry picked from commit
d5a90114128f4d3d528f1a0e93651496c968f940)
Jorim Jaggi [Mon, 27 Jun 2016 21:02:56 +0000 (21:02 +0000)]
Merge \\"Fix smooth panel deceleration\\" into nyc-dev am:
e858432241
am:
f4704889a6
Change-Id: I31b28f404cf34ec451f5938eeb97321743bb6cdd
Andrii Kulian [Mon, 27 Jun 2016 21:02:56 +0000 (21:02 +0000)]
Merge \"Resume only activities in focused stack\" into nyc-dev
am:
06b1d786e9
Change-Id: I05dfd276d13b97b06737fecd22b238e791c9bc2b
Andrii Kulian [Mon, 27 Jun 2016 21:02:56 +0000 (21:02 +0000)]
Merge \"Resume only activities in focused stack\" into nyc-dev
am:
06b1d786e9
Change-Id: I699695002213bdc0482d6b44447a5c26a27445d1
Jorim Jaggi [Mon, 27 Jun 2016 21:02:56 +0000 (21:02 +0000)]
Merge \\"Fix smooth panel deceleration\\" into nyc-dev am:
e858432241
am:
573e85fff8
Change-Id: Ifd3c5ce0f2857d30a1fd9b632a2fcc0522cedf70
Jorim Jaggi [Mon, 27 Jun 2016 20:54:29 +0000 (20:54 +0000)]
Merge \"Fix smooth panel deceleration\" into nyc-dev
am:
e858432241
Change-Id: I2520d88620d5f3f12cab60a9422db8a41e40bec8
Jorim Jaggi [Mon, 27 Jun 2016 20:54:26 +0000 (20:54 +0000)]
Merge \"Fix smooth panel deceleration\" into nyc-dev
am:
e858432241
Change-Id: I4d66bd10517e05b2b9e930ad4860b371df0bc724
Andrii Kulian [Mon, 27 Jun 2016 20:50:01 +0000 (20:50 +0000)]
Merge "Resume only activities in focused stack" into nyc-dev
TreeHugger Robot [Mon, 27 Jun 2016 20:44:55 +0000 (20:44 +0000)]
Merge "Fix smooth panel deceleration" into nyc-dev
John Reck [Mon, 27 Jun 2016 20:27:23 +0000 (13:27 -0700)]
Fix SurfaceViewPositionListener race bugs
Bug:
29628138
1: Make windowPositionLost synchronous as that's
what the Java side was expecting
2: Make the listener ref counted as otherwise
there's a race condition with the GC, which could
end up with use-after-frees
3: Ensure that all position updates are invoked
prior to frame completion
Change-Id: Iedbc017f611ba2878a49b4586612f79249ca2fe3
Android Build Merger (Role) [Mon, 27 Jun 2016 20:31:50 +0000 (20:31 +0000)]
Merge "Merge \"Merge \\"Fix mistranslation from the NDK changelog.\\" into nyc-dev am:
95fbc2de1b\" into nyc-mr1-dev am:
157c6811de" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Mon, 27 Jun 2016 20:31:37 +0000 (20:31 +0000)]
Merge "Merge \"Use a flag to grant a temporary URI permission.\" into nyc-mr1-dev am:
cb56978912" into nyc-mr1-dev-plus-aosp
Dan Albert [Mon, 27 Jun 2016 20:30:53 +0000 (20:30 +0000)]
Merge \"Merge \\"Fix mistranslation from the NDK changelog.\\" into nyc-dev am:
95fbc2de1b\" into nyc-mr1-dev
am:
157c6811de
Change-Id: I8af9358fdbd6ae79887426671e1498cd6f875c0c
Yohei Yukawa [Mon, 27 Jun 2016 20:30:49 +0000 (20:30 +0000)]
Merge \"Use a flag to grant a temporary URI permission.\" into nyc-mr1-dev
am:
cb56978912
Change-Id: I20e1481c6f68a5af4f33e699f5bc505b3a4c1457
Dan Albert [Mon, 27 Jun 2016 20:29:58 +0000 (20:29 +0000)]
Merge \\"Fix mistranslation from the NDK changelog.\\" into nyc-dev am:
95fbc2de1b
am:
a63521f36a
Change-Id: I89d6e42aee6a9662947a1846937bdb485629aa23
Amith Yamasani [Mon, 27 Jun 2016 20:22:43 +0000 (20:22 +0000)]
Merge \"Don\'t reuse userids that are being cleaned up on boot\" into nyc-mr1-dev
am:
88a4c5ba4e
Change-Id: Ifb86a71c449d02ae4732bd214e9651c86eef8b6a
Dan Albert [Mon, 27 Jun 2016 20:22:05 +0000 (20:22 +0000)]
Merge \"Fix mistranslation from the NDK changelog.\" into nyc-dev
am:
95fbc2de1b
Change-Id: Ia390c00f6884b73c625fffa3aabde4b53e4ebe90
Android Build Merger (Role) [Mon, 27 Jun 2016 20:21:25 +0000 (20:21 +0000)]
Merge "Merge \"Fix mistranslation from the NDK changelog.\" into nyc-dev am:
95fbc2de1b" into nyc-mr1-dev
Dan Albert [Mon, 27 Jun 2016 20:21:01 +0000 (20:21 +0000)]
Merge \"Fix mistranslation from the NDK changelog.\" into nyc-dev
am:
95fbc2de1b
Change-Id: I612b9e58060b46af2b1dce7f6d0faf91d9674d8c
Yohei Yukawa [Mon, 27 Jun 2016 20:18:50 +0000 (20:18 +0000)]
Merge "Use a flag to grant a temporary URI permission." into nyc-mr1-dev
TreeHugger Robot [Mon, 27 Jun 2016 20:13:52 +0000 (20:13 +0000)]
Merge "Fix mistranslation from the NDK changelog." into nyc-dev
Amith Yamasani [Mon, 27 Jun 2016 20:13:00 +0000 (20:13 +0000)]
Merge "Don't reuse userids that are being cleaned up on boot" into nyc-mr1-dev
Android Build Merger (Role) [Mon, 27 Jun 2016 20:07:37 +0000 (20:07 +0000)]
Merge "Merge \"Remove reference to obsolete installation step. am:
17d0ccb1a9\" into nyc-mr1-dev am:
61ef7897bd" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Mon, 27 Jun 2016 20:07:25 +0000 (20:07 +0000)]
Merge "Merge \"Add new private theme for Dialer.\" into nyc-mr1-dev am:
26a17dc894" into nyc-mr1-dev-plus-aosp
Dan Albert [Mon, 27 Jun 2016 20:06:51 +0000 (20:06 +0000)]
Merge \"Remove reference to obsolete installation step. am:
17d0ccb1a9\" into nyc-mr1-dev
am:
61ef7897bd
Change-Id: Iacd62ee6d33a58dd2e041a2818b2cfeb08e2edf8
Andrew Sapperstein [Mon, 27 Jun 2016 20:06:46 +0000 (20:06 +0000)]
Merge \"Add new private theme for Dialer.\" into nyc-mr1-dev
am:
26a17dc894
Change-Id: I4cda0072968d46a4d99a6d84ff23a14747c09287
Dan Albert [Mon, 27 Jun 2016 20:06:40 +0000 (20:06 +0000)]
Remove reference to obsolete installation step. am:
17d0ccb1a9
am:
6c78203dca
Change-Id: I089fe8e83bc1c05b500900ee9e2d3f9447783efd
Android Build Merger (Role) [Mon, 27 Jun 2016 20:02:54 +0000 (20:02 +0000)]
Merge "Remove reference to obsolete installation step. am:
17d0ccb1a9" into nyc-mr1-dev
Dan Albert [Mon, 27 Jun 2016 20:02:34 +0000 (20:02 +0000)]
Remove reference to obsolete installation step.
am:
17d0ccb1a9
Change-Id: I8d4dc8aff65e01660f504f49815eecd2f20d2eae
Dan Albert [Mon, 27 Jun 2016 20:02:29 +0000 (20:02 +0000)]
Remove reference to obsolete installation step.
am:
17d0ccb1a9
Change-Id: Iee295980a2c19e4319f569e81f9875d61b52506f
Andrew Sapperstein [Mon, 27 Jun 2016 20:01:31 +0000 (20:01 +0000)]
Merge "Add new private theme for Dialer." into nyc-mr1-dev
Adam Lesinski [Mon, 27 Jun 2016 19:30:02 +0000 (12:30 -0700)]
Fix AttributeCache
AttributeCache relied on the frequency of the garbage collector
to clean up resource references. The garbage collector seems to have
gotten faster and the cache essentially doesn't cache anything.
Switch to using an LRU cache that holds strong references to
a finite set of Resources. This should be very small, just to
keep the few working apps involved in app switches in memory.
Bug:
29405575
Change-Id: I64b34742c820f1e7872061a574e6cf1a76887149