OSDN Git Service
John Reck [Wed, 22 Jun 2016 23:50:38 +0000 (23:50 +0000)]
Merge \\"Change approach for windowPositionLostRT\\" into nyc-dev am:
16038a0c5f
am:
fdff97caf0
Change-Id: I1a2158abc35bd9da5e1e7b5cfc93867a938a5b70
John Reck [Wed, 22 Jun 2016 23:45:50 +0000 (23:45 +0000)]
Merge \"Change approach for windowPositionLostRT\" into nyc-dev
am:
16038a0c5f
Change-Id: I80f6bf6d169c43a10106857627f5c127d94d00a4
John Reck [Wed, 22 Jun 2016 23:38:23 +0000 (23:38 +0000)]
Merge "Change approach for windowPositionLostRT" into nyc-dev
Android Build Merger (Role) [Wed, 22 Jun 2016 23:10:06 +0000 (23:10 +0000)]
Merge "Merge \\"Fix adb backup/restore\\" into nyc-dev am:
45c79447ad am:
c5202cac7f" into nyc-mr1-dev-plus-aosp
John Reck [Wed, 22 Jun 2016 21:23:31 +0000 (14:23 -0700)]
Change approach for windowPositionLostRT
Bug:
29547000
Instead of shifting the window off screen fall
back to the UI-thread calculated values. This fixes
a race issue around tear-down where we stop
drawing long before our window is actually no longer
visible, as well as fixes a funky issue with
PRESERVE_GEOMETRY during first draw.
Change-Id: I792d1966f5aaee1e703295ae79166c723b97a1dc
Christopher Tate [Wed, 22 Jun 2016 23:09:42 +0000 (23:09 +0000)]
Merge \\"Fix adb backup/restore\\" into nyc-dev am:
45c79447ad
am:
c5202cac7f
Change-Id: I910b4740a535536f53b7d7971f497967089872a1
Christopher Tate [Wed, 22 Jun 2016 23:09:11 +0000 (23:09 +0000)]
Merge \\"Fix adb backup/restore\\" into nyc-dev am:
45c79447ad
am:
77d15483ad
Change-Id: Ica4b633fd67d3d2bd8b939138c61a64b2022503f
Christopher Tate [Wed, 22 Jun 2016 23:05:05 +0000 (23:05 +0000)]
Merge \"Fix adb backup/restore\" into nyc-dev
am:
45c79447ad
Change-Id: Ieab601b2676f18f068280a9f5dfd8501fd5978f0
Christopher Tate [Wed, 22 Jun 2016 23:04:44 +0000 (23:04 +0000)]
Merge \"Fix adb backup/restore\" into nyc-dev
am:
45c79447ad
Change-Id: Ie3bce4a97ec1ecb4ba742ef65555b7db510f10d0
Android Build Merger (Role) [Wed, 22 Jun 2016 23:01:32 +0000 (23:01 +0000)]
Merge "Merge \\"Report all content changes to a11y services.\\" into nyc-dev am:
8ac5bcbab2 am:
2abe1c44e0" into nyc-mr1-dev-plus-aosp
Phil Weaver [Wed, 22 Jun 2016 23:00:51 +0000 (23:00 +0000)]
Merge \\"Report all content changes to a11y services.\\" into nyc-dev am:
8ac5bcbab2
am:
2abe1c44e0
Change-Id: Ic761e3a1a23a6e6842881bc43a123bcb03189d36
Phil Weaver [Wed, 22 Jun 2016 23:00:48 +0000 (23:00 +0000)]
Merge \\"Report all content changes to a11y services.\\" into nyc-dev am:
8ac5bcbab2
am:
403ee9c3e0
Change-Id: I57789628dea63b871a378121dbe67f0bc3af9fb9
TreeHugger Robot [Wed, 22 Jun 2016 22:56:34 +0000 (22:56 +0000)]
Merge "Fix adb backup/restore" into nyc-dev
Phil Weaver [Wed, 22 Jun 2016 22:54:08 +0000 (22:54 +0000)]
Merge \"Report all content changes to a11y services.\" into nyc-dev
am:
8ac5bcbab2
Change-Id: I45c63d9887eee21f571984c2e7b2aa31bd80c790
Phil Weaver [Wed, 22 Jun 2016 22:53:17 +0000 (22:53 +0000)]
Merge \"Report all content changes to a11y services.\" into nyc-dev
am:
8ac5bcbab2
Change-Id: I9338fd3ef749f80c4b0252c7c749fe6e395b3c0a
Fyodor Kupolov [Wed, 22 Jun 2016 22:51:28 +0000 (22:51 +0000)]
Merge \\"Use granted userId to look up provider info\\" into nyc-dev am:
f9f2c7ceef
am:
eb3f3aa46d
Change-Id: I4a58dc629d8562f33dcc0f43ef2b9aace8e91fa5
Adam Lesinski [Wed, 22 Jun 2016 22:51:22 +0000 (22:51 +0000)]
Merge \\"Fix build due to missing abstract method impl\\" into nyc-dev am:
aeef7c4748
am:
a34b917ce0
Change-Id: I53fe91a7fcb745accf0e660b675b53f76aa55734
Phil Weaver [Wed, 22 Jun 2016 22:48:49 +0000 (22:48 +0000)]
Merge "Report all content changes to a11y services." into nyc-dev
Fyodor Kupolov [Wed, 22 Jun 2016 22:47:46 +0000 (22:47 +0000)]
Merge \\"Use granted userId to look up provider info\\" into nyc-dev am:
f9f2c7ceef
am:
7bc1db96ed
Change-Id: I914c389f3b326eefdada42e2d55c116d308521c4
Adam Lesinski [Wed, 22 Jun 2016 22:47:39 +0000 (22:47 +0000)]
Merge \\"Fix build due to missing abstract method impl\\" into nyc-dev am:
aeef7c4748
am:
e0dc709ac8
Change-Id: I2360c6d049352c4e32f33096d3f659d636941417
Fyodor Kupolov [Wed, 22 Jun 2016 22:41:57 +0000 (22:41 +0000)]
Merge \"Use granted userId to look up provider info\" into nyc-dev
am:
f9f2c7ceef
Change-Id: I7af8b1867bb4a1784658f445c91158c0e4c43667
Adam Lesinski [Wed, 22 Jun 2016 22:41:52 +0000 (22:41 +0000)]
Merge \"Fix build due to missing abstract method impl\" into nyc-dev
am:
aeef7c4748
Change-Id: I9d12601b4db0108f313c1a69ada67c92929f548b
Fyodor Kupolov [Wed, 22 Jun 2016 22:41:42 +0000 (22:41 +0000)]
Merge \"Use granted userId to look up provider info\" into nyc-dev
am:
f9f2c7ceef
Change-Id: Ifb6876fbb424632d3b47ec68686c01b56720b0a4
Adam Lesinski [Wed, 22 Jun 2016 22:41:38 +0000 (22:41 +0000)]
Merge \"Fix build due to missing abstract method impl\" into nyc-dev
am:
aeef7c4748
Change-Id: I38fc7c88e9c4ea5abf50a0bec5f2302c4622605f
Fyodor Kupolov [Wed, 22 Jun 2016 22:28:37 +0000 (22:28 +0000)]
Merge "Use granted userId to look up provider info" into nyc-dev
Adam Lesinski [Wed, 22 Jun 2016 22:20:54 +0000 (22:20 +0000)]
Merge "Fix build due to missing abstract method impl" into nyc-dev
Roozbeh Pournader [Wed, 22 Jun 2016 21:26:29 +0000 (21:26 +0000)]
Merge \"Don\'t match locales with different scripts in ResourceFilter\" into nyc-mr1-dev
am:
9d2a3188fa
Change-Id: I9874c4a5d880407ed7b38e63f2c551defedbf8e5
Roozbeh Pournader [Wed, 22 Jun 2016 21:20:42 +0000 (21:20 +0000)]
Merge "Don't match locales with different scripts in ResourceFilter" into nyc-mr1-dev
Robert Greenwalt [Wed, 22 Jun 2016 21:19:01 +0000 (21:19 +0000)]
Merge \"Add a Carrier-config specific ratcheter of RATs.\" into nyc-mr1-dev
am:
23cac795b0
Change-Id: Ifa8987968a04e4df3eb3b85610c23a1b241de247
Robert Greenwalt [Wed, 22 Jun 2016 21:12:14 +0000 (21:12 +0000)]
Merge "Add a Carrier-config specific ratcheter of RATs." into nyc-mr1-dev
Christopher Tate [Fri, 17 Jun 2016 20:24:02 +0000 (13:24 -0700)]
Fix adb backup/restore
* Exclude key/value-only backup participants until we have a chance to
augment the archive format with proper handling.
* Don't back up 'stopped' apps, which would un-stop them
* Fix unspecified-user bindService/startActivity invocations
* Teach adb restore about the onRestoreFinished() lifecycle method
* Implement proper app timeout handling in the adb data flows
* Backstop wallpaper backup against rare leftover-state issues
Bug
28056941
Change-Id: Ia59c71a2c74a632a2c2a527b9b7374229c440d46
Android Build Merger (Role) [Wed, 22 Jun 2016 20:52:03 +0000 (20:52 +0000)]
Merge "Merge \\"Fixed whitelistManager assignment.\\" into nyc-dev am:
dea7aa0da1 am:
1f358b11ae" into nyc-mr1-dev-plus-aosp
Felipe Leme [Wed, 22 Jun 2016 20:51:26 +0000 (20:51 +0000)]
Merge \\"Fixed whitelistManager assignment.\\" into nyc-dev am:
dea7aa0da1
am:
3aa1952e5c
Change-Id: I0cacc3e9824e580cd8902b15bc28439f79993bd8
Felipe Leme [Wed, 22 Jun 2016 20:51:21 +0000 (20:51 +0000)]
Merge \\"Fixed whitelistManager assignment.\\" into nyc-dev am:
dea7aa0da1
am:
1f358b11ae
Change-Id: Idaf93ee269522d0a37b424d5360a7505484cdbf7
Felipe Leme [Wed, 22 Jun 2016 20:46:01 +0000 (20:46 +0000)]
Merge \"Fixed whitelistManager assignment.\" into nyc-dev
am:
dea7aa0da1
Change-Id: I5b535a8dbbbf4f567435d666d07d909a9e79021e
Felipe Leme [Wed, 22 Jun 2016 20:45:54 +0000 (20:45 +0000)]
Merge \"Fixed whitelistManager assignment.\" into nyc-dev
am:
dea7aa0da1
Change-Id: I3ba91e222cf0a04e2a08bbefc7d0aeea20485bcb
TreeHugger Robot [Wed, 22 Jun 2016 20:40:19 +0000 (20:40 +0000)]
Merge "Fixed whitelistManager assignment." into nyc-dev
Android Build Merger (Role) [Wed, 22 Jun 2016 20:20:36 +0000 (20:20 +0000)]
Merge "Merge \\"Avoid runtime restart when storage is missing.\\" into nyc-dev am:
18553f5f73 am:
5d1d637086" into nyc-mr1-dev-plus-aosp
Jeff Sharkey [Wed, 22 Jun 2016 20:20:09 +0000 (20:20 +0000)]
Merge \\"Avoid runtime restart when storage is missing.\\" into nyc-dev am:
18553f5f73
am:
5d1d637086
Change-Id: I0544e3b50df9c7cc821f2612183b15e2e87d4044
Jeff Sharkey [Wed, 22 Jun 2016 20:20:05 +0000 (20:20 +0000)]
Merge \\"Avoid runtime restart when storage is missing.\\" into nyc-dev am:
18553f5f73
am:
c14abae170
Change-Id: I0784fd084dc7767f511b60ee95b702ebd8e063a0
Jeff Sharkey [Wed, 22 Jun 2016 20:14:54 +0000 (20:14 +0000)]
Merge \"Avoid runtime restart when storage is missing.\" into nyc-dev
am:
18553f5f73
Change-Id: I0f8e9b715eb0ddddbf36dcbcdf78e75e692303dc
Jeff Sharkey [Wed, 22 Jun 2016 20:14:45 +0000 (20:14 +0000)]
Merge \"Avoid runtime restart when storage is missing.\" into nyc-dev
am:
18553f5f73
Change-Id: I9303aa177f25f27db7090bf2464218d690aaeafe
Adam Lesinski [Wed, 22 Jun 2016 20:11:40 +0000 (13:11 -0700)]
Fix build due to missing abstract method impl
getDisplay() was added to Context, which needs to be implemented
for BridgeContext.
Bug:
28388969
Change-Id: I7b0ffcbbe252403e35f08d3fa40d6b0e4dbf0daa
TreeHugger Robot [Wed, 22 Jun 2016 20:08:17 +0000 (20:08 +0000)]
Merge "Avoid runtime restart when storage is missing." into nyc-dev
Lifu Tang [Wed, 22 Jun 2016 20:02:14 +0000 (20:02 +0000)]
Merge \\"Added more logs to track WakeLock usages\\" into nyc-dev am:
335387a1df
am:
a956144f0d
Change-Id: Ida29ff96b8a9c395304c3976c68915e4309d88d2
Lifu Tang [Wed, 22 Jun 2016 19:59:15 +0000 (19:59 +0000)]
Merge \\"Added more logs to track WakeLock usages\\" into nyc-dev am:
335387a1df
am:
f6bfce5202
Change-Id: I2517f587c172f261ee83b6e953bdcc53fb2bbd02
Lifu Tang [Wed, 22 Jun 2016 19:56:30 +0000 (19:56 +0000)]
Merge \"Added more logs to track WakeLock usages\" into nyc-dev
am:
335387a1df
Change-Id: I1383a36b05e50d7a20e477f70c5c8f64ce36041c
Lifu Tang [Wed, 22 Jun 2016 19:56:11 +0000 (19:56 +0000)]
Merge \"Added more logs to track WakeLock usages\" into nyc-dev
am:
335387a1df
Change-Id: Ia6311e420898226086bdaedab992f9ae7c6b3f44
Lifu Tang [Wed, 22 Jun 2016 19:50:47 +0000 (19:50 +0000)]
Merge "Added more logs to track WakeLock usages" into nyc-dev
Phil Weaver [Mon, 20 Jun 2016 18:54:59 +0000 (11:54 -0700)]
Report all content changes to a11y services.
Changes were discarded if they arrived too quickly in
A11yManagerService. Excuse content change events from
throttling at this level.
Bug:
29355115
Change-Id: Ifd9da07315ce0c18f59c1dad6a621110ad48343b
Android Build Merger (Role) [Wed, 22 Jun 2016 19:28:24 +0000 (19:28 +0000)]
Merge "Merge \\"ContextImpl: Keep DisplayAdjustments and Display in sync\\" into nyc-dev am:
0bf31c3fa6 am:
e894efa9b6" into nyc-mr1-dev-plus-aosp
Adam Lesinski [Wed, 22 Jun 2016 19:27:30 +0000 (19:27 +0000)]
Merge \\"ContextImpl: Keep DisplayAdjustments and Display in sync\\" into nyc-dev am:
0bf31c3fa6
am:
a72a6aae37
Change-Id: I8c85a4bb67d470c5bba5bcf81915e4684019027b
Adam Lesinski [Wed, 22 Jun 2016 19:27:24 +0000 (19:27 +0000)]
Merge \\"ContextImpl: Keep DisplayAdjustments and Display in sync\\" into nyc-dev am:
0bf31c3fa6
am:
e894efa9b6
Change-Id: I9269ed26a879f26db173336c921daba0a6cc9746
Adam Lesinski [Wed, 22 Jun 2016 19:17:43 +0000 (19:17 +0000)]
Merge \"ContextImpl: Keep DisplayAdjustments and Display in sync\" into nyc-dev
am:
0bf31c3fa6
Change-Id: If0da3136f1fcb17c43a5b8c22ca890b8abcfc25c
Adam Lesinski [Wed, 22 Jun 2016 19:16:44 +0000 (19:16 +0000)]
Merge \"ContextImpl: Keep DisplayAdjustments and Display in sync\" into nyc-dev
am:
0bf31c3fa6
Change-Id: Id0d16d2f9d69b87d4b4c01370eeceafe329d1817
Adam Lesinski [Wed, 22 Jun 2016 19:11:34 +0000 (19:11 +0000)]
Merge "ContextImpl: Keep DisplayAdjustments and Display in sync" into nyc-dev
Scott Main [Wed, 22 Jun 2016 18:58:28 +0000 (18:58 +0000)]
Merge \\\\"Move conceptual test info into \\\\"Getting Started with Testing\\\\" and move the procedural information into the corresponding guides for creating unit tests.\\\\" into mnc-io-docs am:
8af7a89820 am:
359b8cd443 am:
9802883bb3
am:
a1489339c7
Change-Id: I662eba328d35c989407b675d865fe63e7cd97497
Scott Main [Wed, 22 Jun 2016 18:55:30 +0000 (18:55 +0000)]
Merge \\\\"Move conceptual test info into \\\\"Getting Started with Testing\\\\" and move the procedural information into the corresponding guides for creating unit tests.\\\\" into mnc-io-docs am:
8af7a89820 am:
359b8cd443 am:
9802883bb3
am:
c5dc951937
Change-Id: I2e1716450b3f9faa4840f064cd3f84d3cc77fbe6
smain@google.com [Wed, 22 Jun 2016 18:52:44 +0000 (18:52 +0000)]
Merge \\\"Move conceptual test info into \\\"Getting Started with Testing\\\" and move the procedural information into the corresponding guides for creating unit tests.\\\" into mnc-io-docs am:
8af7a89820 am:
359b8cd443
am:
9802883bb3
Change-Id: Ie11cf8e7ccf0557f1cb35fcfff63a20578e2f7f8
smain@google.com [Wed, 22 Jun 2016 18:52:41 +0000 (18:52 +0000)]
Merge \\\"Move conceptual test info into \\\"Getting Started with Testing\\\" and move the procedural information into the corresponding guides for creating unit tests.\\\" into mnc-io-docs am:
8af7a89820 am:
359b8cd443
am:
9802883bb3
Change-Id: I72640ba34ea604639cd7da7a2cae4fabcfa98dbb
Jeff Sharkey [Wed, 22 Jun 2016 18:50:10 +0000 (18:50 +0000)]
Merge \\"Start primary storage move outside lock.\\" into nyc-dev am:
a3290363e1
am:
b688e58c4a
Change-Id: Id91ef6859c61a5be02d13619cebe7304f1aaf330
Scott Main [Wed, 22 Jun 2016 18:49:25 +0000 (18:49 +0000)]
Merge \\"Move conceptual test info into \\"Getting Started with Testing\\" and move the procedural information into the corresponding guides for creating unit tests.\\" into mnc-io-docs am:
8af7a89820
am:
359b8cd443
Change-Id: I91ac419c6c7778b0e357719e1822fe1f6adfe0c3
Jeff Sharkey [Wed, 22 Jun 2016 18:45:08 +0000 (18:45 +0000)]
Merge \\"Start primary storage move outside lock.\\" into nyc-dev am:
a3290363e1
am:
7cf0e024c1
Change-Id: Ie91e7d3721e30a4abba9c1b5e37ac37dcfa4afa7
Jeff Sharkey [Wed, 22 Jun 2016 18:45:01 +0000 (18:45 +0000)]
Merge \"Start primary storage move outside lock.\" into nyc-dev
am:
a3290363e1
Change-Id: I35256b066ab041703928052bbfbedb0e8f7afd49
smain@google.com [Wed, 22 Jun 2016 18:42:27 +0000 (18:42 +0000)]
Merge \"Move conceptual test info into \"Getting Started with Testing\" and move the procedural information into the corresponding guides for creating unit tests.\" into mnc-io-docs
am:
8af7a89820
Change-Id: I7d153a79fa01b2b35540e3fe1e965a99201110f0
Jeff Sharkey [Wed, 22 Jun 2016 18:41:18 +0000 (18:41 +0000)]
Merge \"Start primary storage move outside lock.\" into nyc-dev
am:
a3290363e1
Change-Id: Idac9cb8408687f580910fe784802da1b584ade85
Scott Main [Wed, 22 Jun 2016 18:37:10 +0000 (18:37 +0000)]
Merge "Move conceptual test info into "Getting Started with Testing" and move the procedural information into the corresponding guides for creating unit tests." into mnc-io-docs
Jeff Sharkey [Wed, 22 Jun 2016 16:35:29 +0000 (10:35 -0600)]
Avoid runtime restart when storage is missing.
When primary shared storage is completely missing, catch the thrown
exception and treat as if ejected.
Bug:
29461637
Change-Id: I8eb5cdeb01983efbf26da3d32ab19a6630662156
TreeHugger Robot [Wed, 22 Jun 2016 18:36:06 +0000 (18:36 +0000)]
Merge "Start primary storage move outside lock." into nyc-dev
Robert Greenwalt [Thu, 9 Jun 2016 23:28:40 +0000 (16:28 -0700)]
Add a Carrier-config specific ratcheter of RATs.
Only reports transitions to higher RATs within a given family.
Reset when we move to a new cell.
Avoids costly propogation of RAT flapping within the family,
for example every outgoing data pops us into a higher RAT and
idle time pops us back down.
bug:
27360321
Change-Id: I549d79c1c74325981bee284cef452bd096184d86
smain@google.com [Tue, 14 Jun 2016 18:37:19 +0000 (11:37 -0700)]
Move conceptual test info into "Getting Started with Testing" and
move the procedural information into the corresponding guides for creating
unit tests.
This is part of a cleanup for the Android Studio test docs, simplifying the
amount of content covered with Android Studio to be strictly how to create
and run tests. Bug:
28470079
Related: https://critique.corp.google.com/#review/
125115510
Change-Id: I8b9590045b42a03c618e7011e0c3741aede77cd8
Felipe Leme [Tue, 21 Jun 2016 22:33:43 +0000 (15:33 -0700)]
Fixed whitelistManager assignment.
It must be set before looping through all app services...
Fixes:
29480440
Change-Id: I38f78255ea44f00ea4226010d334b94fb4baadb4
Lifu Tang [Wed, 22 Jun 2016 17:57:55 +0000 (10:57 -0700)]
Added more logs to track WakeLock usages
Bug:
28829595
Change-Id: I607745a27e830e42300ee307412e57c2254bff55
Robert Carr [Wed, 22 Jun 2016 17:49:12 +0000 (17:49 +0000)]
Merge changes from topic \'seamless-rotation\' into nyc-mr1-dev
am:
f8142e5bf3
Change-Id: I2facb8e9453e370219c61159a6738827baa9a7d9
Adam Lesinski [Wed, 22 Jun 2016 17:49:01 +0000 (17:49 +0000)]
Merge \\"Prevent early boot crash reading PowerProfile\\" into nyc-dev am:
ec6db57ac7
am:
21ce707021
Change-Id: I884b8f96e70703234009498b9e76f123ad619cfa
smain@google.com [Wed, 22 Jun 2016 17:48:57 +0000 (17:48 +0000)]
add direct path to sdk manager docs for studio UI help button bug:
28982864 am:
31b49837a1
am:
183287c96d
Change-Id: I0e9557aa345c3972e47a1cfe07c6221ee70d106a
Adam Lesinski [Wed, 22 Jun 2016 17:41:15 +0000 (17:41 +0000)]
Merge \\"Prevent early boot crash reading PowerProfile\\" into nyc-dev am:
ec6db57ac7
am:
31ef27c249
Change-Id: I370e3d0caacae88865ad26d0ef6049ba2abd774c
smain@google.com [Wed, 22 Jun 2016 17:41:12 +0000 (17:41 +0000)]
add direct path to sdk manager docs for studio UI help button bug:
28982864 am:
31b49837a1
am:
7100667c16
Change-Id: Ie309d75630e2da04fc13c71ef5de225a7b9be17a
TreeHugger Robot [Wed, 22 Jun 2016 17:40:46 +0000 (17:40 +0000)]
Merge changes from topic 'seamless-rotation' into nyc-mr1-dev
* changes:
Enable resize during relayout fix for all stacks.
SurfaceView: Careful with FLAG_PRESERVE_GEOMETRY.
Implement seamless rotation mode.
Android Build Merger (Role) [Wed, 22 Jun 2016 17:38:07 +0000 (17:38 +0000)]
Merge "Merge \\"add redirect for old link to publishing docs\\" into nyc-dev am:
7bb456d6c5 am:
4362ea6d74" into nyc-mr1-dev-plus-aosp
Adam Lesinski [Wed, 22 Jun 2016 17:37:41 +0000 (17:37 +0000)]
Merge \"Prevent early boot crash reading PowerProfile\" into nyc-dev
am:
ec6db57ac7
Change-Id: I6366fcaa2b1a85b271d74df321100d590fd258a1
Adam Lesinski [Wed, 22 Jun 2016 17:37:41 +0000 (17:37 +0000)]
Merge \"Prevent early boot crash reading PowerProfile\" into nyc-dev
am:
ec6db57ac7
Change-Id: Id0327572c549eff30dfe0a8fd70007bcaccf7a32
smain@google.com [Wed, 22 Jun 2016 17:37:36 +0000 (17:37 +0000)]
add direct path to sdk manager docs for studio UI help button bug:
28982864
am:
31b49837a1
Change-Id: Ia44cb1d0084e3d4d05bae0081a97d7c533340132
smain@google.com [Wed, 22 Jun 2016 17:37:35 +0000 (17:37 +0000)]
add direct path to sdk manager docs for studio UI help button bug:
28982864
am:
31b49837a1
Change-Id: I0c3fef376b787e8cf1c52b8a81221549b2921ddd
Scott Main [Wed, 22 Jun 2016 17:37:35 +0000 (17:37 +0000)]
Merge \\"add redirect for old link to publishing docs\\" into nyc-dev am:
7bb456d6c5
am:
4362ea6d74
Change-Id: I5d72ca42ea8138581177e1bf30ad769115f161ab
Scott Main [Wed, 22 Jun 2016 17:36:55 +0000 (17:36 +0000)]
Merge \\"add redirect for old link to publishing docs\\" into nyc-dev am:
7bb456d6c5
am:
cf51c3941e
Change-Id: I859c89c83cb82cda9240dcb8389c84f985c6ca5e
Adam Lesinski [Wed, 22 Jun 2016 17:31:34 +0000 (17:31 +0000)]
Merge "Prevent early boot crash reading PowerProfile" into nyc-dev
Fyodor Kupolov [Mon, 20 Jun 2016 21:03:44 +0000 (14:03 -0700)]
Use granted userId to look up provider info
In getPersistedUriPermissions, use granted userId instead of the calling
userId to look up provider info.
Bug:
29058113
Change-Id: Ia637be414f9ef3b8e9bce13bb56bd335cfb28ac7
Android Build Merger (Role) [Wed, 22 Jun 2016 17:29:26 +0000 (17:29 +0000)]
Merge "Merge \\"Unblock \\'am start -W\\' if activity is brought to front without launching\\" into nyc-dev am:
75c7cc6ca9 am:
9800ee6fc1" into nyc-mr1-dev-plus-aosp
smain@google.com [Wed, 22 Jun 2016 17:29:07 +0000 (17:29 +0000)]
Merge \"add redirect for old link to publishing docs\" into nyc-dev
am:
7bb456d6c5
Change-Id: I6d7342cb2192c2aee0cb8fa345f525d08300feb3
smain@google.com [Wed, 22 Jun 2016 17:29:06 +0000 (17:29 +0000)]
Merge \"add redirect for old link to publishing docs\" into nyc-dev
am:
7bb456d6c5
Change-Id: I8760984a4686cd44a659408efcd9ead9ccd8893e
Chong Zhang [Wed, 22 Jun 2016 17:28:57 +0000 (17:28 +0000)]
Merge \\"Unblock \\'am start -W\\' if activity is brought to front without launching\\" into nyc-dev am:
75c7cc6ca9
am:
9800ee6fc1
Change-Id: I05eb218286e328b2f0de5af44e9da9d1278b2d19
Adam Lesinski [Wed, 22 Jun 2016 17:28:47 +0000 (10:28 -0700)]
Prevent early boot crash reading PowerProfile
The PowerProfile in BatteryStatsImpl may not be ready when
resetting stats early in the boot sequence.
Bug:
29559031
Change-Id: I51bba762231a08804f1b68505bb1b0523476081d
Chong Zhang [Wed, 22 Jun 2016 17:28:08 +0000 (17:28 +0000)]
Merge \\"Unblock \\'am start -W\\' if activity is brought to front without launching\\" into nyc-dev am:
75c7cc6ca9
am:
6098085aba
Change-Id: I1403d63a542c5ca9664df3b713ed67906c2ccc8f
smain@google.com [Wed, 22 Jun 2016 17:28:02 +0000 (10:28 -0700)]
add direct path to sdk manager docs for studio UI help button
bug:
28982864
Change-Id: I4186de00d0a80e54066dd209d55ecf1348a30337
Android Build Merger (Role) [Wed, 22 Jun 2016 17:24:56 +0000 (17:24 +0000)]
Merge "Merge \\"Fix issue #
29545190: JobScheduler ContentUri NOTIFY_FOR_DESCENDANTS flag...\\" into nyc-dev am:
a62a7eef24 am:
3f19c95ec5" into nyc-mr1-dev-plus-aosp
Chong Zhang [Wed, 22 Jun 2016 17:24:29 +0000 (17:24 +0000)]
Merge \"Unblock \'am start -W\' if activity is brought to front without launching\" into nyc-dev
am:
75c7cc6ca9
Change-Id: I97a3841d4862d7b8b4972d32fd43d8e99a7aacff
Dianne Hackborn [Wed, 22 Jun 2016 17:24:25 +0000 (17:24 +0000)]
Merge \\"Fix issue #
29545190: JobScheduler ContentUri NOTIFY_FOR_DESCENDANTS flag...\\" into nyc-dev am:
a62a7eef24
am:
56197c9e9e
Change-Id: I332d08b49f51558d090b43ff0ed566ae9fbfa002
Chong Zhang [Wed, 22 Jun 2016 17:24:17 +0000 (17:24 +0000)]
Merge \"Unblock \'am start -W\' if activity is brought to front without launching\" into nyc-dev
am:
75c7cc6ca9
Change-Id: I983331f65f03d50c26b7929866e3ce5d5ae19966
Dianne Hackborn [Wed, 22 Jun 2016 17:24:16 +0000 (17:24 +0000)]
Merge \\"Fix issue #
29545190: JobScheduler ContentUri NOTIFY_FOR_DESCENDANTS flag...\\" into nyc-dev am:
a62a7eef24
am:
3f19c95ec5
Change-Id: If22df24b87aab9c8f10ffc2d2441b685da1a3f1e
OSDN Git Service
