OSDN Git Service
Jim Miller [Thu, 23 Jun 2016 00:25:06 +0000 (00:25 +0000)]
Merge \\"Enable fingerprint sensor navigation to invoke QuickSettings - rename \\"FP_NAV\\" to more generic \\"SYSTEM_NAVIGATION\\"\\" into nyc-mr1-dev am:
0520091641
am:
0a7efa1e47
Change-Id: Id8de76d28e581f5a4fa448dd48dc33870d81b538
Jim Miller [Thu, 23 Jun 2016 00:20:57 +0000 (00:20 +0000)]
Merge \"Enable fingerprint sensor navigation to invoke QuickSettings - rename \"FP_NAV\" to more generic \"SYSTEM_NAVIGATION\"\" into nyc-mr1-dev
am:
0520091641
Change-Id: I285f751bd449c89685a88ad30073cd011dfe5061
Jim Miller [Thu, 23 Jun 2016 00:13:38 +0000 (00:13 +0000)]
Merge "Enable fingerprint sensor navigation to invoke QuickSettings - rename "FP_NAV" to more generic "SYSTEM_NAVIGATION"" into nyc-mr1-dev
John Reck [Thu, 23 Jun 2016 00:01:02 +0000 (00:01 +0000)]
Merge \"Merge \\\"Change approach for windowPositionLostRT\\\" into nyc-dev am:
16038a0c5f am:
0a3a75e121\" into nyc-mr1-dev-plus-aosp
am:
045e8cadf6
Change-Id: I6b39d68223ef9a63abd0ebedb5770e9e15b773c9
John Reck [Wed, 22 Jun 2016 23:56:23 +0000 (23:56 +0000)]
Merge \\\"Change approach for windowPositionLostRT\\\" into nyc-dev am:
16038a0c5f am:
fdff97caf0
am:
c95bebfe39
Change-Id: I5536e84c5ded1213f315a3ab50fa9feb71e7d9cb
Android Build Merger (Role) [Wed, 22 Jun 2016 23:51:22 +0000 (23:51 +0000)]
Merge "Merge \\"Change approach for windowPositionLostRT\\" into nyc-dev am:
16038a0c5f am:
0a3a75e121" into nyc-mr1-dev-plus-aosp
John Reck [Wed, 22 Jun 2016 23:50:54 +0000 (23:50 +0000)]
Merge \\"Change approach for windowPositionLostRT\\" into nyc-dev am:
16038a0c5f
am:
0a3a75e121
Change-Id: I579930de1951b2112ce51016007a0358067f9934
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:45:34 +0000 (23:45 +0000)]
Merge \"Change approach for windowPositionLostRT\" into nyc-dev
am:
16038a0c5f
Change-Id: Ia6d1b8cfa2c5d126b702eb84895093fa3f893b00
Adam Powell [Wed, 22 Jun 2016 23:40:25 +0000 (23:40 +0000)]
Merge "Clarify Fragment#setUserVisibleHint guarantees in docs"
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:17:09 +0000 (23:17 +0000)]
Merge "Merge \"Merge \\\"Fix adb backup/restore\\\" into nyc-dev am:
45c79447ad am:
c5202cac7f\" into nyc-mr1-dev-plus-aosp am:
ac8a04c06f"
Android Build Merger (Role) [Wed, 22 Jun 2016 23:16:59 +0000 (23:16 +0000)]
Merge "Merge \\\"Fix adb backup/restore\\\" into nyc-dev am:
45c79447ad am:
77d15483ad am:
c0f59ce9e8"
Christopher Tate [Wed, 22 Jun 2016 23:16:36 +0000 (23:16 +0000)]
Merge \"Merge \\\"Fix adb backup/restore\\\" into nyc-dev am:
45c79447ad am:
c5202cac7f\" into nyc-mr1-dev-plus-aosp
am:
ac8a04c06f
Change-Id: I0c0b43d2b223c363abaa57819789dd35940d0ab7
Christopher Tate [Wed, 22 Jun 2016 23:16:34 +0000 (23:16 +0000)]
Merge \\\"Fix adb backup/restore\\\" into nyc-dev am:
45c79447ad am:
77d15483ad
am:
c0f59ce9e8
Change-Id: I834fb11b8bfe94118f444b080ccc30da3ab70cd3
Etan Cohen [Wed, 22 Jun 2016 23:16:14 +0000 (23:16 +0000)]
WakeupMessage: add mechanism to specify the object member of Message.
am:
5b63e6c05a -s ours
Change-Id: I10e7ed6db8ba570ece21bc31709ed3a853502c70
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
Phil Weaver [Wed, 22 Jun 2016 23:09:33 +0000 (23:09 +0000)]
Merge \"Merge \\\"Report all content changes to a11y services.\\\" into nyc-dev am:
8ac5bcbab2 am:
2abe1c44e0\" into nyc-mr1-dev-plus-aosp
am:
01c28c0097
Change-Id: If80004e8977f4cbb328c9469d239379b8b7efcd4
Phil Weaver [Wed, 22 Jun 2016 23:09:30 +0000 (23:09 +0000)]
Merge \\\"Report all content changes to a11y services.\\\" into nyc-dev am:
8ac5bcbab2 am:
403ee9c3e0
am:
4db107306b
Change-Id: I09ff2970856768fbb717490c2c5ee16d42562a29
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
Fyodor Kupolov [Wed, 22 Jun 2016 23:01:00 +0000 (23:01 +0000)]
Merge \\\"Use granted userId to look up provider info\\\" into nyc-dev am:
f9f2c7ceef am:
eb3f3aa46d
am:
fa2b51cd4b
Change-Id: I7cd7e125eb472dcbbc60099647d2d86597a0a834
Adam Lesinski [Wed, 22 Jun 2016 23:00:53 +0000 (23:00 +0000)]
Merge \\\"Fix build due to missing abstract method impl\\\" into nyc-dev am:
aeef7c4748 am:
a34b917ce0
am:
0f6beb1977
Change-Id: I5998ec0477bd06fbe1c378a09173a91e6108d101
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
Fyodor Kupolov [Wed, 22 Jun 2016 22:54:09 +0000 (22:54 +0000)]
Merge \\\"Use granted userId to look up provider info\\\" into nyc-dev am:
f9f2c7ceef am:
7bc1db96ed
am:
d50b61ff36
Change-Id: Iceec1009f0ac020d402b980e6952a0de7d0a671c
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
Adam Lesinski [Wed, 22 Jun 2016 22:54:06 +0000 (22:54 +0000)]
Merge \\\"Fix build due to missing abstract method impl\\\" into nyc-dev am:
aeef7c4748 am:
e0dc709ac8
am:
c8aa7f98c1
Change-Id: Id3b9a1e0797f26d34415938dee0a032541be2a6c
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
Jim Miller [Wed, 22 Jun 2016 22:18:13 +0000 (15:18 -0700)]
Enable fingerprint sensor navigation to invoke QuickSettings
- rename "FP_NAV" to more generic "SYSTEM_NAVIGATION"
Fixes bug
28869612
Change-Id: I321240ee54506633d63a29e987b8d8638c652391
Roozbeh Pournader [Wed, 22 Jun 2016 21:36:56 +0000 (21:36 +0000)]
Merge \\"Don\\'t match locales with different scripts in ResourceFilter\\" into nyc-mr1-dev am:
9d2a3188fa
am:
8a24cfb055
Change-Id: I0c3e03c508680edd7db133b5cc93dbab1383b960
Robert Greenwalt [Wed, 22 Jun 2016 21:36:49 +0000 (21:36 +0000)]
Merge \\"Add a Carrier-config specific ratcheter of RATs.\\" into nyc-mr1-dev am:
23cac795b0
am:
eafd6a2c2d
Change-Id: I4adc4c549ce01d233ab1c47da4f5b6bd3ccf1e6e
Felipe Leme [Wed, 22 Jun 2016 21:36:44 +0000 (21:36 +0000)]
Merge \"Merge \\\"Fixed whitelistManager assignment.\\\" into nyc-dev am:
dea7aa0da1 am:
1f358b11ae\" into nyc-mr1-dev-plus-aosp
am:
96ead0023e
Change-Id: I1fd9109d53b04b96846f28b63f5aa790a1ba9d71
Felipe Leme [Wed, 22 Jun 2016 21:36:41 +0000 (21:36 +0000)]
Merge \\\"Fixed whitelistManager assignment.\\\" into nyc-dev am:
dea7aa0da1 am:
3aa1952e5c
am:
df404d3780
Change-Id: I4ced4f9d02e406ae9f2d7b69b7f9ecb986d77680
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
Jeff Sharkey [Wed, 22 Jun 2016 21:24:00 +0000 (21:24 +0000)]
Merge \"Merge \\\"Avoid runtime restart when storage is missing.\\\" into nyc-dev am:
18553f5f73 am:
5d1d637086\" into nyc-mr1-dev-plus-aosp
am:
729f34c560
Change-Id: I54b3cff57627e59ab3061459ab8801ad747df2d0
Jeff Sharkey [Wed, 22 Jun 2016 21:23:57 +0000 (21:23 +0000)]
Merge \\\"Avoid runtime restart when storage is missing.\\\" into nyc-dev am:
18553f5f73 am:
c14abae170
am:
5bea25e4f0
Change-Id: Icf7a47091dd071d445840c9c626bfa0d116b3788
Lifu Tang [Wed, 22 Jun 2016 21:23:54 +0000 (21:23 +0000)]
Merge \\\"Added more logs to track WakeLock usages\\\" into nyc-dev am:
335387a1df am:
a956144f0d
am:
96b83c6b90
Change-Id: I4a143269cb94e9f110be3412170504c37661d165
Lifu Tang [Wed, 22 Jun 2016 21:23:51 +0000 (21:23 +0000)]
Merge \\\"Added more logs to track WakeLock usages\\\" into nyc-dev am:
335387a1df am:
f6bfce5202
am:
da8f2515af
Change-Id: I620d32059af0531c04f1e2555426852b735cb960
Adam Lesinski [Wed, 22 Jun 2016 21:23:37 +0000 (21:23 +0000)]
Merge \"Merge \\\"ContextImpl: Keep DisplayAdjustments and Display in sync\\\" into nyc-dev am:
0bf31c3fa6 am:
e894efa9b6\" into nyc-mr1-dev-plus-aosp
am:
f64d010e56
Change-Id: I615fb4a37374493b26efdbe7d8a5cb22dab84855
Adam Lesinski [Wed, 22 Jun 2016 21:22:15 +0000 (21:22 +0000)]
Merge \\\"ContextImpl: Keep DisplayAdjustments and Display in sync\\\" into nyc-dev am:
0bf31c3fa6 am:
a72a6aae37
am:
ce71c120df
Change-Id: I93c1714ded50dc0233185f68b08b7b7803cfc264
smain@google.com [Wed, 22 Jun 2016 21:22:13 +0000 (21:22 +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
am:
7dcad6e188
Change-Id: I0e01df8325e66b8132afd9e4b7063d5521cd81ab
smain@google.com [Wed, 22 Jun 2016 21:22:10 +0000 (21:22 +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
am:
ea29b66d65
Change-Id: I29e9fe7581127a1bc5eff85e9be15c3375cd2ef5
Jeff Sharkey [Wed, 22 Jun 2016 21:22:08 +0000 (21:22 +0000)]
Merge \\\"Start primary storage move outside lock.\\\" into nyc-dev am:
a3290363e1 am:
b688e58c4a
am:
2d823538fe
Change-Id: I4ce0310830da6adaeaf2b467b4c16805463d5943
Jeff Sharkey [Wed, 22 Jun 2016 21:22:05 +0000 (21:22 +0000)]
Merge \\\"Start primary storage move outside lock.\\\" into nyc-dev am:
a3290363e1 am:
7cf0e024c1
am:
5784147845
Change-Id: I285d7b9ddbf83ddeaad1b4cc1d9f31e5a7c5e7db
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
Rob Carr [Wed, 22 Jun 2016 21:17:43 +0000 (21:17 +0000)]
Merge "resolve merge conflicts of
79116da to master"
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
Adam Powell [Wed, 22 Jun 2016 17:23:02 +0000 (10:23 -0700)]
Clarify Fragment#setUserVisibleHint guarantees in docs
Note that setUserVisibleHint can be called from outside of the
fragment lifecycle. Some apps override it and expect otherwise,
and the bug fix for N will affect their expectations.
https://code.google.com/p/android/issues/detail?id=213681
Bug
29526496
Change-Id: I68d5690cefe5f354313f3d89e8ec5ebccaf2544f
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
Robert Carr [Wed, 22 Jun 2016 19:39:12 +0000 (12:39 -0700)]
resolve merge conflicts of
79116da to master
Change-Id: Ia6e42d99097da86e23b9d33659259d264a365c45
John Reck [Wed, 22 Jun 2016 19:36:49 +0000 (19:36 +0000)]
Merge "Delete unused args"
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
OSDN Git Service
