OSDN Git Service
Android Build Merger (Role) [Tue, 28 Jun 2016 20:49:12 +0000 (20:49 +0000)]
Merge "Merge \"Remove redundant setPendingIntentWhitelistDuration() calls.\" into nyc-dev am:
c1374208e3" into nyc-mr1-dev
Felipe Leme [Tue, 28 Jun 2016 20:48:51 +0000 (20:48 +0000)]
Merge \"Remove redundant setPendingIntentWhitelistDuration() calls.\" into nyc-dev
am:
c1374208e3
Change-Id: Ie02a847ac513f89c1c430af0e3f559cf0bc2039d
TreeHugger Robot [Tue, 28 Jun 2016 20:48:36 +0000 (20:48 +0000)]
Merge "Define deprecated fields in IntDef's" into nyc-mr1-dev
TreeHugger Robot [Tue, 28 Jun 2016 20:45:37 +0000 (20:45 +0000)]
Merge "Remove redundant setPendingIntentWhitelistDuration() calls." into nyc-dev
TreeHugger Robot [Tue, 28 Jun 2016 20:18:58 +0000 (20:18 +0000)]
Merge "Show notification while PRE_BOOT receivers run." into nyc-mr1-dev
Felipe Leme [Tue, 28 Jun 2016 19:22:23 +0000 (19:22 +0000)]
Merge \"Fixed whitelistManager set on unbindServiceLocked()\" into nyc-dev
am:
8d78c33c9b
Change-Id: I0339e6ae9261b1ebdd7bbed54540ca253b1b6fd9
Todd Kennedy [Tue, 28 Jun 2016 19:16:40 +0000 (19:16 +0000)]
Merge \"Default minSdkVersion to \'1\'\" into nyc-dev
am:
a98e3e3ede
Change-Id: I8d2b7205f80b3cae5dce04839890df6aafa8449e
TreeHugger Robot [Tue, 28 Jun 2016 19:15:33 +0000 (19:15 +0000)]
Merge "Fixed whitelistManager set on unbindServiceLocked()" into nyc-dev
Todd Kennedy [Tue, 28 Jun 2016 19:14:11 +0000 (12:14 -0700)]
Define deprecated fields in IntDef's
Tools need all of the valid constants to handle legacy apps; even
though we want developers to use the new constant names.
Bug:
29824931
Change-Id: I5f8055d50d1d3f32cfbed7459d8a497cfbd3661e
TreeHugger Robot [Tue, 28 Jun 2016 19:12:48 +0000 (19:12 +0000)]
Merge "Default minSdkVersion to '1'" into nyc-dev
TreeHugger Robot [Tue, 28 Jun 2016 18:54:23 +0000 (18:54 +0000)]
Merge "media: document format keys for MediaExtractor/CodecCapabilities" into nyc-mr1-dev
Jeff Sharkey [Tue, 28 Jun 2016 18:33:12 +0000 (12:33 -0600)]
Show notification while PRE_BOOT receivers run.
Awhile back, we switched to running PRE_BOOT receivers after the user
is unlocked. Since these receivers include providers like Contacts
and MediaStore that can take a long time to upgrade, it may result in
apps like Dialer or Photos appearing to hang, so we need to help the
user understand that the system is still upgrading in the background.
Bug:
28164677
Change-Id: I18448534b6067f8508b1ffb2d43c106c02c265a0
Felipe Leme [Tue, 28 Jun 2016 18:29:54 +0000 (11:29 -0700)]
Remove redundant setPendingIntentWhitelistDuration() calls.
Since all pending intents are stored on a Set in the Notication object,
there is no need to individually check for specific pending intents.
BUG:
29480440
Change-Id: I27a18bb535a9a4bb6cb4e76bdc189e6c315a684a
TreeHugger Robot [Tue, 28 Jun 2016 18:24:22 +0000 (18:24 +0000)]
Merge "Clip GradientDrawable's saveLayer" into nyc-mr1-dev
Philip P. Moltmann [Tue, 28 Jun 2016 18:15:37 +0000 (18:15 +0000)]
Merge "Always reload print services" into nyc-mr1-dev
Felipe Leme [Tue, 28 Jun 2016 17:38:59 +0000 (10:38 -0700)]
Fixed whitelistManager set on unbindServiceLocked()
It must call updateWhitelistManagerLocked() because the app might have
other services with the whitelistManager set, in which case the process
record should not have whitelistManager reset.
Fixes:
29480440
Change-Id: I268278c646aaa89a352f02178b294c02c3c11d35
Chris Craik [Tue, 28 Jun 2016 17:33:26 +0000 (17:33 +0000)]
Merge "Fix savelayer rounding" into nyc-mr1-dev
Todd Kennedy [Tue, 28 Jun 2016 17:31:05 +0000 (10:31 -0700)]
Default minSdkVersion to '1'
Exception when targetSdkVersion is a letter API [eg 'N']. While this
is technically not according to the external docs, it's the behaviour
with prior platforms.
Bug:
29817839
Change-Id: I8382909dbe62de7b2ddfb7995ce11d5c2f43372e
Allen Hair [Tue, 28 Jun 2016 17:30:21 +0000 (17:30 +0000)]
Merge \"Add a flag to enable instrumentation of the framework classes.\" into nyc-dev
am:
15783f0073
Change-Id: I9439934c0fff5c0e23fe0000252c8781f0540a81
Allen Hair [Tue, 28 Jun 2016 17:23:54 +0000 (17:23 +0000)]
Merge "Add a flag to enable instrumentation of the framework classes." into nyc-dev
Lajos Molnar [Thu, 23 Jun 2016 23:52:29 +0000 (16:52 -0700)]
media: document format keys for MediaExtractor/CodecCapabilities
Bug:
29618892
Change-Id: I78049997c153fe00fbcf4475eeefdc937de284dd
Chris Craik [Mon, 27 Jun 2016 23:30:27 +0000 (16:30 -0700)]
Fix savelayer rounding
bug:
29456451
Change-Id: I8022163d2c004510da5db74efdca27582484224d
Chris Craik [Tue, 28 Jun 2016 16:33:04 +0000 (09:33 -0700)]
Clip GradientDrawable's saveLayer
bug:
29456451
Avoid using very expensive unclipped saveLayer codepath.
Change-Id: Ib96a46169faa89eda6889b16813a7941ab402779
Daniel Yu [Tue, 28 Jun 2016 16:28:24 +0000 (16:28 +0000)]
Merge \"resolve merge conflicts of
ac5b340 to nyc-dev\" into nyc-dev
am:
6ec78a6458
Change-Id: Ie77c87f366c21acb05afcf5d03ddc6d75e9b950a
Dan Yu [Tue, 28 Jun 2016 16:21:56 +0000 (16:21 +0000)]
Merge "resolve merge conflicts of
ac5b340 to nyc-dev" into nyc-dev
Philip P. Moltmann [Tue, 28 Jun 2016 16:14:30 +0000 (16:14 +0000)]
Merge "Syncronize renderPage vs. onServiceDisconnected" into nyc-mr1-dev
TreeHugger Robot [Tue, 28 Jun 2016 15:56:41 +0000 (15:56 +0000)]
Merge "media: document VP9 CSD for MediaCodec" into nyc-mr1-dev
Shreyas Basarge [Tue, 28 Jun 2016 15:43:00 +0000 (15:43 +0000)]
Merge \"SyncOperation float cast fix\" into nyc-dev
am:
5f72b129c4
Change-Id: I50ab6249e81ff7523a82f26bd39b52bb362f4ae4
Shreyas Basarge [Tue, 28 Jun 2016 15:38:05 +0000 (15:38 +0000)]
Merge "SyncOperation float cast fix" into nyc-dev
Lajos Molnar [Fri, 24 Jun 2016 00:52:48 +0000 (17:52 -0700)]
media: document VP9 CSD for MediaCodec
Also document that concatenated CSD is only supported for AVC.
Bug:
10672559
Change-Id: I54867655068802ef35f92a6341f8b5bb068555ee
Dan Sandler [Tue, 28 Jun 2016 07:07:24 +0000 (07:07 +0000)]
Purr.
am:
610f6ede25
Change-Id: I252d53781fbe151b21909617ecb92ab9f2e9187a
Dan Sandler [Tue, 28 Jun 2016 07:07:22 +0000 (07:07 +0000)]
One final tweak to the platlogo.
am:
4b7e415803
Change-Id: Ibbe66c569c0be5fc1801d8af9b5810ac997854d8
Dan Sandler [Tue, 28 Jun 2016 07:07:20 +0000 (07:07 +0000)]
Fix SuperNotCalledException.
am:
04f8cc2bb3
Change-Id: I52977c00a41ec0db599b67cdc2617f1c602667a6
Dan Sandler [Tue, 28 Jun 2016 05:25:08 +0000 (01:25 -0400)]
Purr.
Bug:
27376882
Change-Id: I071d00c9a7847b8ff9b263ffd17581079b78a432
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:29:04 +0000 (02:29 +0000)]
Merge "Add disable add call during video call extra and carrier config key" into nyc-mr1-dev
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:03:16 +0000 (01:03 +0000)]
Merge "Add tron logging for retail demo session counters" into nyc-mr1-dev
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
Allen Hair [Tue, 28 Jun 2016 00:01:50 +0000 (17:01 -0700)]
Add a flag to enable instrumentation of the framework classes.
Bug:
29777843
Change-Id: I0f3639ad1303a9b2cc612f99cde427dedff4874f
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
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
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: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
Philip P. Moltmann [Mon, 27 Jun 2016 23:20:08 +0000 (16:20 -0700)]
Always reload print services
We want to reload print service if anything relevant changed. E.g. this can
be the label. Which label is loaded depends on the the resolve info and
the package manager. Hence short of reverse engineering what fields are
used to determine how this is done it is very hard to say how we figure
out the label.
Hence the only option we have is to reload the print services every time
a print services is added, removed or changed.
Change-Id: Iff5a05dd1cad923da42c360a88559a2cc61c95aa
Fixes:
29765394
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
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
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:22:40 +0000 (22:22 +0000)]
Merge "Add missing roundOut for layer damage" into nyc-dev
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:45:03 +0000 (21:45 +0000)]
Round unclipped saveLayers
am:
45e83338e5
Change-Id: Ifc598495cb8ad99b9f1534c1d783c3e4f483f1c5
Tyler Gunn [Mon, 27 Jun 2016 21:35:48 +0000 (21:35 +0000)]
Merge "Add onConferenceSupportedChanged callback, carrier config." into nyc-mr1-dev
Philip P. Moltmann [Mon, 27 Jun 2016 18:41:29 +0000 (11:41 -0700)]
Syncronize renderPage vs. onServiceDisconnected
An async renderPage request might be in progress while the service is
getting disconnected.
Fixes:
29639740
Change-Id: I8a33e5fba96dd76ecb1e14d0e3a26334eb8965a5
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)
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 20:54:29 +0000 (20:54 +0000)]
Merge \"Fix smooth panel deceleration\" into nyc-dev
am:
e858432241
Change-Id: I2520d88620d5f3f12cab60a9422db8a41e40bec8
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: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: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: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
Sanket Padawe [Mon, 27 Jun 2016 19:21:55 +0000 (19:21 +0000)]
Merge "Fix documentation of getTelephonyHistogram() api." into nyc-mr1-dev
Philip Cuadra [Mon, 27 Jun 2016 19:02:06 +0000 (19:02 +0000)]
Merge "Add tracing events for system service lifecycle events" into nyc-mr1-dev
Sanket Padawe [Mon, 27 Jun 2016 18:57:01 +0000 (11:57 -0700)]
Fix documentation of getTelephonyHistogram() api.
Bug:
29760459
Change-Id: Ib7c4df81026331f88f6a8776c0042abf4f32c620
Jorim Jaggi [Mon, 27 Jun 2016 18:50:58 +0000 (11:50 -0700)]
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
Steven Ng [Mon, 27 Jun 2016 18:50:00 +0000 (18:50 +0000)]
Merge "Disallow disable / hide device provision app" into nyc-mr1-dev
Dan Albert [Mon, 27 Jun 2016 18:19:11 +0000 (11:19 -0700)]
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
Cheryl Potter [Mon, 27 Jun 2016 18:17:15 +0000 (18:17 +0000)]
Merge \"Add redirect for new Run/Debug Config doc b/
29615014\" into nyc-dev
am:
5836c9e658
Change-Id: I0ee8a4c36279b6bd339454ad71bb2cba289f8306
Dan Albert [Mon, 27 Jun 2016 17:52:24 +0000 (10:52 -0700)]
Remove reference to obsolete installation step.
Bug: https://github.com/android-ndk/ndk/issues/136
Change-Id: Idd08b009fefd69053675545bf94fda2147e01318
Amith Yamasani [Wed, 22 Jun 2016 22:50:06 +0000 (15:50 -0700)]
Add tron logging for retail demo session counters
Count each demo user creation and time between
first touch (to dismiss the video) and the start
of inactivity timeout.
Fixed an NPE in SysUI when user switcher is missing.
Bug:
29540372
Change-Id: I7bc0e0dde75e7b213a025683c15c9b3e750643a9
Mitchell Wills [Mon, 27 Jun 2016 18:12:39 +0000 (18:12 +0000)]
Merge "Add a WifiScanner API to listener for ongoing scans" into nyc-mr1-dev
Philip P. Moltmann [Mon, 27 Jun 2016 18:12:11 +0000 (18:12 +0000)]
Merge "Do not remove handlers for loaders." into nyc-mr1-dev
Cheryl Potter [Mon, 27 Jun 2016 18:02:53 +0000 (18:02 +0000)]
Merge "Add redirect for new Run/Debug Config doc b/
29615014" into nyc-dev
Amith Yamasani [Mon, 27 Jun 2016 17:40:09 +0000 (10:40 -0700)]
Don't reuse userids that are being cleaned up on boot
During the current session, if we're cleaning up some
old users, mark them as being in the remove pile so
that the userIds are not reused right away. Otherwise
there's a potential for confusing the file-based crypto
layer.
Bug:
29635364
Change-Id: I57a868fbe6c58a02ffcea63809d25eba01360e1e
Andrii Kulian [Mon, 27 Jun 2016 17:53:53 +0000 (10:53 -0700)]
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
Tyler Gunn [Fri, 24 Jun 2016 14:30:10 +0000 (07:30 -0700)]
Add onConferenceSupportedChanged callback, carrier config.
Used to inform listeners when a connection can or cannot be part of a
conference. Used to inform the conference controller so that it can
recalculate the conferencable connections.
Adding carrier config for carrier requirement.
Bug:
29059073
Change-Id: Iab028fd44d87c8dc2bbbe8bba7ba9ccdc223fe51
Bill Yi [Mon, 27 Jun 2016 17:48:16 +0000 (17:48 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
cc67847367 -s ours
Change-Id: I920bd6e3739bf4fe103e5ba8fd26d2a0c10e52b0
TreeHugger Robot [Mon, 27 Jun 2016 17:34:24 +0000 (17:34 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Mon, 27 Jun 2016 17:33:51 +0000 (17:33 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Mon, 27 Jun 2016 17:32:59 +0000 (17:32 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev