OSDN Git Service
Bill Yi [Thu, 30 Jun 2016 03:23:54 +0000 (03:23 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
bb07b0b372 -s ours
Change-Id: Ibc2fb6d61c5e391b9804411bd6e0d1f646766910
TreeHugger Robot [Thu, 30 Jun 2016 03:14:05 +0000 (03:14 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Dan Albert [Thu, 30 Jun 2016 02:08:07 +0000 (02:08 +0000)]
Merge \"Fix Windows NDK labeling.\" into nyc-dev
am:
d1364cf0f1
Change-Id: Ie289f8cad00443ced27f452ef4d5ed122f7ca85f
TreeHugger Robot [Thu, 30 Jun 2016 01:59:33 +0000 (01:59 +0000)]
Merge "Fix Windows NDK labeling." into nyc-dev
Jeff Sharkey [Wed, 29 Jun 2016 23:53:57 +0000 (23:53 +0000)]
Move getRecentTasks() to ParceledListSlice.
am:
479212cf50
Change-Id: Ifb3a5deacda0ff8b73469234d36f9cf711e616c2
Jeff Sharkey [Wed, 29 Jun 2016 22:00:55 +0000 (16:00 -0600)]
Move getRecentTasks() to ParceledListSlice.
In extreme cases the list of recent tasks can grow beyond the size
of a single Binder transaction. This change moves over to
ParceledListSlice which handles chunking any large results.
Bug:
29635557
Change-Id: Iaf1227234f5f8c9451f73a6a5c1dc89f2067f05f
Bert McMeen [Wed, 29 Jun 2016 22:08:20 +0000 (22:08 +0000)]
Docs: Links added to pages for permissions and configuration activity am:
cdfe5e4f55 am:
7a6494aeaf
am:
ae5a14bc99
Change-Id: Iad34d5eb26322b13e01f0480191ab1ae6b2b3425
Bert McMeen [Wed, 29 Jun 2016 21:59:31 +0000 (21:59 +0000)]
Docs: Links added to pages for permissions and configuration activity am:
cdfe5e4f55
am:
7a6494aeaf
Change-Id: I907cf418d0a53827a7448135b0d712f41d0024e8
Bert McMeen [Wed, 29 Jun 2016 21:54:42 +0000 (21:54 +0000)]
Docs: Links added to pages for permissions and configuration activity
am:
cdfe5e4f55
Change-Id: I3e9cde3cb24c5c779059c4708b144a2376c9616c
Dianne Hackborn [Wed, 29 Jun 2016 20:45:36 +0000 (20:45 +0000)]
Merge \"Fix issue #
29871385: Need JobScheduler.scheduleAsPackage to be system API\" into nyc-dev
am:
205bc262ce
Change-Id: I910f4db4503ad20ecce46032691001d1f971bdbf
Bill Yi [Wed, 29 Jun 2016 20:45:21 +0000 (13:45 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idf8c50b91f8f1f39e6dd41a310f529aaeb5ae36c
Auto-generated-cl: translation import
Dianne Hackborn [Wed, 29 Jun 2016 20:38:17 +0000 (20:38 +0000)]
Merge "Fix issue #
29871385: Need JobScheduler.scheduleAsPackage to be system API" into nyc-dev
Eric Schmidt [Wed, 29 Jun 2016 20:31:57 +0000 (20:31 +0000)]
Merge \"docs: Edits to Instant Apps FAQs, index page.\" into nyc-dev
am:
7a4d857c45
Change-Id: I8bf1098f3fcd7db37d1ceb74776f1c0a6e98c288
David Friedman [Wed, 29 Jun 2016 20:26:41 +0000 (20:26 +0000)]
Merge "docs: Edits to Instant Apps FAQs, index page." into nyc-dev
Sid Soundararajan [Wed, 29 Jun 2016 20:13:54 +0000 (20:13 +0000)]
Merge \"Recents: Make sure blacklist checks the package name as well as activity name\" into nyc-dev
am:
10b2fee05f
Change-Id: If4ddf850d2be037d50a7aa3ddbce040c7ad4b7cd
Sid Soundararajan [Wed, 29 Jun 2016 20:02:51 +0000 (20:02 +0000)]
Merge "Recents: Make sure blacklist checks the package name as well as activity name" into nyc-dev
Sid Soundararajan [Wed, 29 Jun 2016 18:57:21 +0000 (11:57 -0700)]
Recents: Make sure blacklist checks the package name as well as activity name
BUG:
28719274
BUG:
28764678
Change-Id: Ib17d3feda8997ce5b29060bff47d51f503c868dc
Dianne Hackborn [Wed, 29 Jun 2016 18:48:14 +0000 (11:48 -0700)]
Fix issue #
29871385: Need JobScheduler.scheduleAsPackage to be system API
Change-Id: I0034b1681158b9a010d01fb0fcbe7990d9038c1f
Alan Viverette [Wed, 29 Jun 2016 17:01:22 +0000 (17:01 +0000)]
Merge \"Disable constant state sharing for VectorDrawable\" into nyc-dev
am:
f66bdf9b57
Change-Id: I05799d473194db7e9a1a42871f988e81d41baf61
Alan Viverette [Wed, 29 Jun 2016 16:54:28 +0000 (16:54 +0000)]
Merge "Disable constant state sharing for VectorDrawable" into nyc-dev
Alan Viverette [Wed, 29 Jun 2016 15:32:13 +0000 (11:32 -0400)]
Disable constant state sharing for VectorDrawable
Bug:
29854240
Change-Id: Icc58d04ad6f471d05b085a9089893e4f7205eb7d
Robert Carr [Wed, 29 Jun 2016 03:33:24 +0000 (03:33 +0000)]
Merge \"Only use one SurfaceControlWithBackground per AppToken.\" into nyc-dev
am:
55427a6650
Change-Id: I4a516ef8a56a0241a8c257dbaabed048d9cd1de4
Rob Carr [Wed, 29 Jun 2016 03:27:47 +0000 (03:27 +0000)]
Merge "Only use one SurfaceControlWithBackground per AppToken." into nyc-dev
Robert Carr [Wed, 29 Jun 2016 00:32:37 +0000 (17:32 -0700)]
Only use one SurfaceControlWithBackground per AppToken.
In the past, if an app never renders to a SurfaceView, it will be
invisible despite having FLAG_OPAQUE. This means an app could leave a
totally empty SurfaceView (never drawing in to it) on top of a second
SurfaceView, and expect the second one to be visible. This is probably
buggy app behavior because FLAG_OPAQUE means if they ever draw anything at all
in to the top SurfaceView the bottom one will become totally invisible.
However this has worked in the past, so we have to preserve things for
apps. To accomplish this we ensure only the bottom most visible
SurfaceView for a given AppToken will receive a background. We achieve
this by synchronizing through the app token whenever visibility or
layering of a SurfaceView changes.
Bug:
29580298
Change-Id: I0023326323cb961b56404fd49093384e7b72aa54
Winson [Wed, 29 Jun 2016 02:20:47 +0000 (02:20 +0000)]
Move preloading to boot complete.
am:
16ef39a7f6
Change-Id: Ib10db04397d2a962c50530ce537f9ac1b2863a0a
Winson [Wed, 29 Jun 2016 01:25:15 +0000 (18:25 -0700)]
Move preloading to boot complete.
Bug:
29320695
Change-Id: I14b5127b218597f3c32e647e0443a88b5a708ce1
Jim Miller [Wed, 29 Jun 2016 00:45:09 +0000 (00:45 +0000)]
Merge \"Relax security constraint around getAuthenticatorId().\" into nyc-dev
am:
60c04126c9
Change-Id: I367432f84032da91ea5b9a39e8f4cf6a8eb6ea81
Jim Miller [Wed, 29 Jun 2016 00:37:41 +0000 (00:37 +0000)]
Merge "Relax security constraint around getAuthenticatorId()." into nyc-dev
Jim Miller [Tue, 28 Jun 2016 23:43:57 +0000 (16:43 -0700)]
Relax security constraint around getAuthenticatorId().
Fixes bug
28603656
Change-Id: I54216d4b9a3ab23f9d5bfe0f40f2dd27e723c21e
Bert McMeen [Tue, 28 Jun 2016 23:24:13 +0000 (16:24 -0700)]
Docs: Links added to pages for permissions and configuration activity
Bug:
28864917
Change-Id: Ieab325f20dac3bba6028e5c70813d4035063d0cf
Lajos Molnar [Tue, 28 Jun 2016 22:32:07 +0000 (22:32 +0000)]
Merge \"media: document VP9 CSD for MediaCodec\" into nyc-dev
am:
1fe8871f04
Change-Id: I20c207b5bc735221eaf8982759d00b7a2a89a983
Lajos Molnar [Tue, 28 Jun 2016 22:27:52 +0000 (22:27 +0000)]
Merge "media: document VP9 CSD for MediaCodec" into nyc-dev
Lajos Molnar [Tue, 28 Jun 2016 22:27:05 +0000 (22:27 +0000)]
Merge \"media: document rotation and scaling issues for MediaCodec\" into nyc-dev
am:
af9d9f9b3e
Change-Id: I9a34f84efbc54d49ecc90c1e095be643d26876d3
Lajos Molnar [Tue, 28 Jun 2016 22:26:58 +0000 (22:26 +0000)]
Merge \"media: document format keys for MediaExtractor/CodecCapabilities\" into nyc-dev
am:
556e012979
Change-Id: I259b49699bf3e606da8e40aba85288b5a41fe31f
Lajos Molnar [Tue, 28 Jun 2016 22:21:01 +0000 (22:21 +0000)]
Merge "media: document rotation and scaling issues for MediaCodec" into nyc-dev
Lajos Molnar [Tue, 28 Jun 2016 22:19:29 +0000 (22:19 +0000)]
Merge "media: document format keys for MediaExtractor/CodecCapabilities" into nyc-dev
Oren Blasberg [Tue, 28 Jun 2016 21:19:30 +0000 (21:19 +0000)]
Merge \"Fix popup context menu appearing brokenly.\" into nyc-dev
am:
29ea814354
Change-Id: I722e88756c576acca7419d53738d5883bf864260
Oren Blasberg [Tue, 28 Jun 2016 21:12:26 +0000 (21:12 +0000)]
Merge "Fix popup context menu appearing brokenly." into nyc-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: Iae3e7fb2ff674046422cc77f10761c8543cd83c5
TreeHugger Robot [Tue, 28 Jun 2016 20:45:37 +0000 (20:45 +0000)]
Merge "Remove redundant setPendingIntentWhitelistDuration() calls." into nyc-dev
Oren Blasberg [Tue, 28 Jun 2016 18:07:42 +0000 (11:07 -0700)]
Fix popup context menu appearing brokenly.
Add missing attribute to the base Theme to ensure the context menu
does not appear completely invisibly.
Bug:
29796385
Change-Id: I4f50579622e97656e09a5ddb6e13313f84efc972
Felipe Leme [Tue, 28 Jun 2016 19:22:34 +0000 (19:22 +0000)]
Merge \"Fixed whitelistManager set on unbindServiceLocked()\" into nyc-dev
am:
8d78c33c9b
Change-Id: Ie86c30d925119f4ebfdb420ff0093d508e8274cb
Todd Kennedy [Tue, 28 Jun 2016 19:16:35 +0000 (19:16 +0000)]
Merge \"Default minSdkVersion to \'1\'\" into nyc-dev
am:
a98e3e3ede
Change-Id: Ib3d99a331f49c2e8af2fcda24149314fc939f4c0
TreeHugger Robot [Tue, 28 Jun 2016 19:15:33 +0000 (19:15 +0000)]
Merge "Fixed whitelistManager set on unbindServiceLocked()" into nyc-dev
TreeHugger Robot [Tue, 28 Jun 2016 19:12:48 +0000 (19:12 +0000)]
Merge "Default minSdkVersion to '1'" into nyc-dev
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
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
Lajos Molnar [Fri, 24 Jun 2016 01:07:58 +0000 (18:07 -0700)]
media: document rotation and scaling issues for MediaCodec
Bug:
23709311
Bug:
28512795
Change-Id: Iddebd13b4cd4c50bca8736d3aca71571ad16633a
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:28 +0000 (17:30 +0000)]
Merge \"Add a flag to enable instrumentation of the framework classes.\" into nyc-dev
am:
15783f0073
Change-Id: Ie9e71eb96ad654fc1d34317177cce8013bc2dcb9
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
Daniel Yu [Tue, 28 Jun 2016 16:28:34 +0000 (16:28 +0000)]
Merge \"resolve merge conflicts of
ac5b340 to nyc-dev\" into nyc-dev
am:
6ec78a6458
Change-Id: I8c631533ad43598475938bc1e3f9f0f171511c0a
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
Shreyas Basarge [Tue, 28 Jun 2016 15:42:59 +0000 (15:42 +0000)]
Merge \"SyncOperation float cast fix\" into nyc-dev
am:
5f72b129c4
Change-Id: I907544c36783e192a17a2aa7f629a3093a516de2
Shreyas Basarge [Tue, 28 Jun 2016 15:38:05 +0000 (15:38 +0000)]
Merge "SyncOperation float cast fix" into nyc-dev
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 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
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
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
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:52:00 +0000 (23:52 +0000)]
Merge "Fix bug where process whitelist manager state would not be correct." into nyc-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
Andre Eisenbach [Mon, 27 Jun 2016 23:42:15 +0000 (23:42 +0000)]
Merge "Add extra waiting when switching users" into nyc-dev
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
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
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: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
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
Chris Craik [Mon, 27 Jun 2016 21:45:04 +0000 (21:45 +0000)]
Round unclipped saveLayers
am:
45e83338e5
Change-Id: I3ecb7fdd2097779cf7f596c0e6a3f7914902ca39
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: I05dfd276d13b97b06737fecd22b238e791c9bc2b
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
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
TreeHugger Robot [Mon, 27 Jun 2016 20:13:52 +0000 (20:13 +0000)]
Merge "Fix mistranslation from the NDK changelog." into nyc-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 19:56:37 +0000 (12:56 -0700)]
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
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
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:16:59 +0000 (18:16 +0000)]
Merge \"Add redirect for new Run/Debug Config doc b/
29615014\" into nyc-dev
am:
5836c9e658
Change-Id: I2cf78a594d415470b2f6512f7583e735f3488042
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
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
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
Bill Yi [Mon, 27 Jun 2016 17:47:58 +0000 (17:47 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
cc67847367 -s ours
Change-Id: If4759dfe86ce2e9dd89eea01fcb71082a9585327
TreeHugger Robot [Mon, 27 Jun 2016 17:34:24 +0000 (17:34 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Dan Sandler [Mon, 27 Jun 2016 17:16:46 +0000 (17:16 +0000)]
Merge \"Most cats would prefer chicken.\" into nyc-dev
am:
d9069f8c9e
Change-Id: If486049672682e842267209469524611587d0b55
John Reck [Mon, 27 Jun 2016 17:06:22 +0000 (17:06 +0000)]
Merge \"Add missing null checks\" into nyc-dev
am:
02e391585d
Change-Id: Ib081c05d197b01ec3a9039941dd1265bf0b9b92c
Daniel Sandler [Mon, 27 Jun 2016 16:56:29 +0000 (16:56 +0000)]
Merge "Most cats would prefer chicken." into nyc-dev
John Reck [Mon, 27 Jun 2016 16:55:28 +0000 (16:55 +0000)]
Merge "Add missing null checks" into nyc-dev
Dan Sandler [Mon, 27 Jun 2016 15:51:14 +0000 (11:51 -0400)]
Most cats would prefer chicken.
Bug:
27376882
Change-Id: I2c6d04c2515fd23e44120a3f9ffd6b1668d521ff