OSDN Git Service
Scott Rowe [Fri, 17 Oct 2014 19:00:17 +0000 (19:00 +0000)]
am
5100b72c: am
fafb6c70: am
dd886683: docs: Notifications changes for L
* commit '
5100b72cba49b0371ccead241e18420ebf8c3ee9':
docs: Notifications changes for L
Joe Fernandez [Fri, 17 Oct 2014 19:00:12 +0000 (19:00 +0000)]
am
5f13e2f0: am
f8d6891c: am
4deed3ec: Merge "docs: Android TV App Quality Requirements v2" into lmp-dev
* commit '
5f13e2f0fb56976351d0decb314a9cac85e8d1ba':
docs: Android TV App Quality Requirements v2
Scott Rowe [Fri, 17 Oct 2014 19:00:08 +0000 (19:00 +0000)]
am
c371b0af: am
583cf69c: am
6bd081ca: docs: Displaying a Now Playing Card
* commit '
c371b0afab75759a6c9bed9d0754aefe5cb4065b':
docs: Displaying a Now Playing Card
Joe Fernandez [Fri, 17 Oct 2014 19:00:03 +0000 (19:00 +0000)]
am
39f69b79: am
770f57e0: am
321e7645: Merge "docs: Recents screen for tasks and activities" into lmp-dev
* commit '
39f69b7984591b57d560ffb0c3e147121543b7fd':
docs: Recents screen for tasks and activities
smain@google.com [Fri, 17 Oct 2014 18:59:56 +0000 (18:59 +0000)]
am
53805450: am
4a0f162d: am
c6400892: Merge "add Lollipop highlights and revision to 5.0 API overview intro" into lmp-dev
* commit '
5380545023a7c7cbf690c732c3edab6d140d32fa':
add Lollipop highlights and revision to 5.0 API overview intro
Joe Fernandez [Fri, 17 Oct 2014 18:59:51 +0000 (18:59 +0000)]
am
36d13e6a: am
491fa057: am
d664dc93: Merge "Android 5.0 changes to IME switching" into lmp-dev
* commit '
36d13e6ae8ccef31fde01118fd457f13f10d288f':
Android 5.0 changes to IME switching
Joe Fernandez [Fri, 17 Oct 2014 18:59:46 +0000 (18:59 +0000)]
am
b07f08f1: am
be097523: am
c49acf02: Merge "docs: Update Android TV home for L announcement" into lmp-dev
* commit '
b07f08f13751ae68e03501795d8f448c306a6180':
docs: Update Android TV home for L announcement
David Friedman [Fri, 17 Oct 2014 18:59:42 +0000 (18:59 +0000)]
am
9ce4e565: am
4e5ebb99: am
c2a556ff: Merge "Notificiations Design for Android L Release" into lmp-dev
* commit '
9ce4e565204c0d8828a05928be8f8177031dc52d':
Notificiations Design for Android L Release
David Friedman [Fri, 17 Oct 2014 18:59:37 +0000 (18:59 +0000)]
am
30be8be4: am
981c97ec: am
597d3861: Merge "NDK-r10c release notes (change log) for publication to NDK page on DAC." into lmp-dev
* commit '
30be8be4d4fd42a245aa481d4abf3ae299e9e17e':
NDK-r10c release notes (change log) for publication to NDK page on DAC.
smain@google.com [Fri, 17 Oct 2014 18:59:32 +0000 (18:59 +0000)]
am
fd756b9f: am
238b4795: am
271078f5: update L preview landing page for 5.0 SDK launch includes new system images also update the DAC homepage announcement
* commit '
fd756b9ffdcd6a354878a885cce21c9ab2dfc7c4':
update L preview landing page for 5.0 SDK launch includes new system images also update the DAC homepage announcement
Ricardo Cervera [Fri, 17 Oct 2014 18:59:22 +0000 (18:59 +0000)]
am
c1c31327: am
f1425001: am
2e57c2c9: Merge "docs: Migrating material design info from the Preview site" into lmp-dev
* commit '
c1c3132774a9a87e1a6dd625d6a284939652cc38':
docs: Migrating material design info from the Preview site
Quddus Chong [Fri, 17 Oct 2014 18:59:16 +0000 (18:59 +0000)]
am
b14e07e3: am
0fae717e: am
67b5c8eb: Merge "docs: Updates to Android 5.0 API Overview." into lmp-dev
* commit '
b14e07e34428e64d9a9525ea0322aa161b05efe6':
docs: Updates to Android 5.0 API Overview.
Scott Rowe [Fri, 17 Oct 2014 18:52:17 +0000 (18:52 +0000)]
am
fafb6c70: am
dd886683: docs: Notifications changes for L
* commit '
fafb6c708096d809ce6b8b57ac8c2293698cdf6a':
docs: Notifications changes for L
Joe Fernandez [Fri, 17 Oct 2014 18:52:13 +0000 (18:52 +0000)]
am
f8d6891c: am
4deed3ec: Merge "docs: Android TV App Quality Requirements v2" into lmp-dev
* commit '
f8d6891c69d9ef716f1e7f4df206522cf6356e00':
docs: Android TV App Quality Requirements v2
Scott Rowe [Fri, 17 Oct 2014 18:52:08 +0000 (18:52 +0000)]
am
583cf69c: am
6bd081ca: docs: Displaying a Now Playing Card
* commit '
583cf69c00326a1d67d5ca8c8a0d9597ec50aa93':
docs: Displaying a Now Playing Card
Joe Fernandez [Fri, 17 Oct 2014 18:52:04 +0000 (18:52 +0000)]
am
770f57e0: am
321e7645: Merge "docs: Recents screen for tasks and activities" into lmp-dev
* commit '
770f57e06837c8d2b7e42776b569b568d2360057':
docs: Recents screen for tasks and activities
smain@google.com [Fri, 17 Oct 2014 18:52:00 +0000 (18:52 +0000)]
am
4a0f162d: am
c6400892: Merge "add Lollipop highlights and revision to 5.0 API overview intro" into lmp-dev
* commit '
4a0f162df7ca0079b25b61cd4734340cbe5de7f4':
add Lollipop highlights and revision to 5.0 API overview intro
Joe Fernandez [Fri, 17 Oct 2014 18:51:56 +0000 (18:51 +0000)]
am
491fa057: am
d664dc93: Merge "Android 5.0 changes to IME switching" into lmp-dev
* commit '
491fa0570def75b1e056dc1c0954f07d2b524a7f':
Android 5.0 changes to IME switching
Joe Fernandez [Fri, 17 Oct 2014 18:51:52 +0000 (18:51 +0000)]
am
be097523: am
c49acf02: Merge "docs: Update Android TV home for L announcement" into lmp-dev
* commit '
be097523180eab10ec3dec73ec4cc2b7056fed6e':
docs: Update Android TV home for L announcement
David Friedman [Fri, 17 Oct 2014 18:51:47 +0000 (18:51 +0000)]
am
4e5ebb99: am
c2a556ff: Merge "Notificiations Design for Android L Release" into lmp-dev
* commit '
4e5ebb994a7d96c86f598c499956f04a1256e6a7':
Notificiations Design for Android L Release
David Friedman [Fri, 17 Oct 2014 18:51:43 +0000 (18:51 +0000)]
am
981c97ec: am
597d3861: Merge "NDK-r10c release notes (change log) for publication to NDK page on DAC." into lmp-dev
* commit '
981c97ecc0347b2647682a54556d06f2e52ad16a':
NDK-r10c release notes (change log) for publication to NDK page on DAC.
smain@google.com [Fri, 17 Oct 2014 18:51:39 +0000 (18:51 +0000)]
am
238b4795: am
271078f5: update L preview landing page for 5.0 SDK launch includes new system images also update the DAC homepage announcement
* commit '
238b4795468bf8ab93ab7c50b9855e8e84d2f49d':
update L preview landing page for 5.0 SDK launch includes new system images also update the DAC homepage announcement
Ricardo Cervera [Fri, 17 Oct 2014 18:51:23 +0000 (18:51 +0000)]
am
f1425001: am
2e57c2c9: Merge "docs: Migrating material design info from the Preview site" into lmp-dev
* commit '
f14250014b11fd61dec427dd0813fbb43d2fe3ff':
docs: Migrating material design info from the Preview site
Quddus Chong [Fri, 17 Oct 2014 18:51:18 +0000 (18:51 +0000)]
am
0fae717e: am
67b5c8eb: Merge "docs: Updates to Android 5.0 API Overview." into lmp-dev
* commit '
0fae717e207d18a36148c7ddb4a203d4f7447bf7':
docs: Updates to Android 5.0 API Overview.
Alan Viverette [Fri, 17 Oct 2014 18:50:41 +0000 (18:50 +0000)]
Alan Viverette [Fri, 17 Oct 2014 18:36:38 +0000 (11:36 -0700)]
Fix build
Change-Id: Idd7ae84c0d128bd40f0e7a83882e4ed4181e8a4d
Alan Viverette [Fri, 17 Oct 2014 17:23:20 +0000 (17:23 +0000)]
am
2f68a204: Merge "Check type resolution on declared methods and fields in ViewDebug" into lmp-mr1-dev
* commit '
2f68a204b2299029dd492ab25bd3bcfe7216bafc':
Check type resolution on declared methods and fields in ViewDebug
Alan Viverette [Fri, 17 Oct 2014 17:18:34 +0000 (17:18 +0000)]
Merge "Check type resolution on declared methods and fields in ViewDebug" into lmp-mr1-dev
Dianne Hackborn [Fri, 17 Oct 2014 17:15:29 +0000 (17:15 +0000)]
am
686a41ef: Merge "Add API level for MR1." into lmp-mr1-dev
* commit '
686a41ef2b05b3fb1c5c5f44ec6270ab317ce9d5':
Add API level for MR1.
Dianne Hackborn [Fri, 17 Oct 2014 17:12:00 +0000 (17:12 +0000)]
Merge "Add API level for MR1." into lmp-mr1-dev
John Spurlock [Fri, 17 Oct 2014 16:43:42 +0000 (16:43 +0000)]
am
6daac003: Merge "PowerUI: Uncategorize battery notifications as _SYSTEM." into lmp-mr1-dev
* commit '
6daac00331fa79d8ab249ef148a8116e58ca9a56':
PowerUI: Uncategorize battery notifications as _SYSTEM.
John Spurlock [Fri, 17 Oct 2014 16:39:19 +0000 (16:39 +0000)]
Merge "PowerUI: Uncategorize battery notifications as _SYSTEM." into lmp-mr1-dev
John Spurlock [Fri, 17 Oct 2014 16:20:48 +0000 (16:20 +0000)]
am
289d797a: QS: 7 day timeout for color-inversion tile.
* commit '
289d797a6a748cfc7dcca8c815fab6c37061bf05':
QS: 7 day timeout for color-inversion tile.
John Spurlock [Fri, 17 Oct 2014 16:16:57 +0000 (12:16 -0400)]
PowerUI: Uncategorize battery notifications as _SYSTEM.
So they don't interrupt in priority mode.
Bug:
17691121
Change-Id: I51757c0275ec461a786d1e254b0e71f7b27b5029
John Spurlock [Fri, 17 Oct 2014 16:06:38 +0000 (12:06 -0400)]
QS: 7 day timeout for color-inversion tile.
Bug:
17631628
Change-Id: I4f8a6ce3ea1f79d696686760732c3e8216bfb6c4
Scott Rowe [Fri, 17 Oct 2014 07:29:22 +0000 (07:29 +0000)]
am
dd886683: docs: Notifications changes for L
* commit '
dd88668392839509c812a544b1132185b3825b69':
docs: Notifications changes for L
Joe Fernandez [Fri, 17 Oct 2014 07:29:19 +0000 (07:29 +0000)]
am
4deed3ec: Merge "docs: Android TV App Quality Requirements v2" into lmp-dev
* commit '
4deed3ecc3b47d520ca6084f2fa6ad7a9dc8c018':
docs: Android TV App Quality Requirements v2
Scott Rowe [Fri, 17 Oct 2014 07:29:15 +0000 (07:29 +0000)]
am
6bd081ca: docs: Displaying a Now Playing Card
* commit '
6bd081ca8a555fd71fbe856374b8efe68ede6144':
docs: Displaying a Now Playing Card
Joe Fernandez [Fri, 17 Oct 2014 07:29:12 +0000 (07:29 +0000)]
am
321e7645: Merge "docs: Recents screen for tasks and activities" into lmp-dev
* commit '
321e7645c305dbc4f7444d364c879bad8946da2b':
docs: Recents screen for tasks and activities
smain@google.com [Fri, 17 Oct 2014 07:29:08 +0000 (07:29 +0000)]
am
c6400892: Merge "add Lollipop highlights and revision to 5.0 API overview intro" into lmp-dev
* commit '
c6400892b56ee217ed01a41abb769fb1aebc9830':
add Lollipop highlights and revision to 5.0 API overview intro
Joe Fernandez [Fri, 17 Oct 2014 07:29:04 +0000 (07:29 +0000)]
am
d664dc93: Merge "Android 5.0 changes to IME switching" into lmp-dev
* commit '
d664dc93f47e32df865384718055b200585e0e88':
Android 5.0 changes to IME switching
Joe Fernandez [Fri, 17 Oct 2014 07:29:00 +0000 (07:29 +0000)]
am
c49acf02: Merge "docs: Update Android TV home for L announcement" into lmp-dev
* commit '
c49acf029e65928d07815631a0160fe179458add':
docs: Update Android TV home for L announcement
David Friedman [Fri, 17 Oct 2014 07:28:56 +0000 (07:28 +0000)]
am
c2a556ff: Merge "Notificiations Design for Android L Release" into lmp-dev
* commit '
c2a556ffe8a5949a0e3d7baf8122ea38b4ae1d30':
Notificiations Design for Android L Release
David Friedman [Fri, 17 Oct 2014 07:28:53 +0000 (07:28 +0000)]
am
597d3861: Merge "NDK-r10c release notes (change log) for publication to NDK page on DAC." into lmp-dev
* commit '
597d3861298d8c3e2bc50c92ecffb4003cd265f7':
NDK-r10c release notes (change log) for publication to NDK page on DAC.
smain@google.com [Fri, 17 Oct 2014 07:28:49 +0000 (07:28 +0000)]
am
271078f5: update L preview landing page for 5.0 SDK launch includes new system images also update the DAC homepage announcement
* commit '
271078f50dc730e0fda8e80c66b81ac2442f64f0':
update L preview landing page for 5.0 SDK launch includes new system images also update the DAC homepage announcement
Ricardo Cervera [Fri, 17 Oct 2014 07:28:45 +0000 (07:28 +0000)]
am
2e57c2c9: Merge "docs: Migrating material design info from the Preview site" into lmp-dev
* commit '
2e57c2c956588b3f08111c323e811d4cbe46dabd':
docs: Migrating material design info from the Preview site
Quddus Chong [Fri, 17 Oct 2014 07:28:41 +0000 (07:28 +0000)]
am
67b5c8eb: Merge "docs: Updates to Android 5.0 API Overview." into lmp-dev
* commit '
67b5c8ebc4a9895e065a9314cb9afbf8e3e60197':
docs: Updates to Android 5.0 API Overview.
Scott Rowe [Mon, 6 Oct 2014 18:49:54 +0000 (11:49 -0700)]
docs: Notifications changes for L
Change-Id: I53c744734358401adefbcffd5ce5a3676d6d955a
Joe Fernandez [Fri, 17 Oct 2014 06:38:36 +0000 (06:38 +0000)]
Merge "docs: Android TV App Quality Requirements v2" into lmp-dev
Joe Fernandez [Sat, 11 Oct 2014 04:36:46 +0000 (21:36 -0700)]
docs: Android TV App Quality Requirements v2
Change-Id: I54c53d90faf1605945bb8397278b9057a9c687f4
Scott Rowe [Wed, 15 Oct 2014 21:27:25 +0000 (14:27 -0700)]
docs: Displaying a Now Playing Card
Change-Id: I68cd305618caff24cf2de564d7b085c663702d0c
Joe Fernandez [Fri, 17 Oct 2014 05:40:42 +0000 (05:40 +0000)]
Merge "docs: Recents screen for tasks and activities" into lmp-dev
smain@google.com [Fri, 17 Oct 2014 05:17:01 +0000 (05:17 +0000)]
Merge "add Lollipop highlights and revision to 5.0 API overview intro" into lmp-dev
Scott Rowe [Mon, 15 Sep 2014 21:08:44 +0000 (14:08 -0700)]
docs: Recents screen for tasks and activities
Change-Id: I94774e60e6a7453a047ad394c3bbfff0cc4dfc7d
smain@google.com [Fri, 17 Oct 2014 05:15:18 +0000 (22:15 -0700)]
add Lollipop highlights and revision to 5.0 API overview intro
Change-Id: Ic50db6ea2ea9893088f271ce2427ccda69fc6b75
Joe Fernandez [Fri, 17 Oct 2014 05:01:02 +0000 (05:01 +0000)]
Merge "Android 5.0 changes to IME switching" into lmp-dev
Joe Fernandez [Fri, 17 Oct 2014 04:58:02 +0000 (04:58 +0000)]
Merge "docs: Update Android TV home for L announcement" into lmp-dev
David Friedman [Wed, 8 Oct 2014 17:38:31 +0000 (10:38 -0700)]
Android 5.0 changes to IME switching
Change-Id: I158736ee36706889a5277f02a652162194289514
David Friedman [Fri, 17 Oct 2014 04:48:31 +0000 (04:48 +0000)]
Merge "Notificiations Design for Android L Release" into lmp-dev
David Friedman [Thu, 2 Oct 2014 22:23:45 +0000 (15:23 -0700)]
Notificiations Design for Android L Release
Change-Id: I32723dafa2d3bd455da9c6e03c09c668b2bd6446
Joe Fernandez [Fri, 10 Oct 2014 05:18:03 +0000 (22:18 -0700)]
docs: Update Android TV home for L announcement
Change-Id: Ie98da5efa59dd3c797dda38bb465b7cc66b4d2e7
David Friedman [Fri, 17 Oct 2014 04:30:27 +0000 (04:30 +0000)]
Merge "NDK-r10c release notes (change log) for publication to NDK page on DAC." into lmp-dev
David Friedman [Tue, 14 Oct 2014 04:45:44 +0000 (21:45 -0700)]
NDK-r10c release notes (change log) for publication to NDK page on DAC.
Change-Id: I0f8bc87b741ec1ef978c3fc22954d43519172299
smain@google.com [Fri, 10 Oct 2014 00:00:20 +0000 (17:00 -0700)]
update L preview landing page for 5.0 SDK launch
includes new system images
also update the DAC homepage announcement
Change-Id: I6e249e4ec5ef4b4329b145b334b31cfe11dd136c
Dianne Hackborn [Fri, 17 Oct 2014 01:14:12 +0000 (18:14 -0700)]
Add API level for MR1.
Change-Id: I3f2fd6b47f762f9b81afa4c9ae1e19997484b59e
Ricardo Cervera [Fri, 17 Oct 2014 01:06:05 +0000 (01:06 +0000)]
Merge "docs: Migrating material design info from the Preview site" into lmp-dev
Ricardo Cervera [Thu, 9 Oct 2014 00:00:30 +0000 (17:00 -0700)]
docs: Migrating material design info from the Preview site
Change-Id: I3a2f71e41cc1371b8cce2d8860b116cf0f8b8ed2
Nancy Chen [Fri, 17 Oct 2014 00:43:13 +0000 (00:43 +0000)]
am
a6a1c52f: Merge "Use Telecom API for checking if a number is voicemail (1/2)" into lmp-sprout-dev
automerge:
df385ff
* commit '
df385fffe822a7854fb7ce9c5e46ee007646c89e':
Use Telecom API for checking if a number is voicemail (1/2)
Christopher Tate [Fri, 17 Oct 2014 00:41:31 +0000 (00:41 +0000)]
am
61737d81: am
040d89bb: Merge "Eliminate race condition around backup completion + resumption" into lmp-dev
automerge:
11bac0e
* commit '
11bac0ed21e67c2282ae6fff38ed026e904571d4':
Eliminate race condition around backup completion + resumption
Nancy Chen [Fri, 17 Oct 2014 00:39:51 +0000 (00:39 +0000)]
am
c913c2de: Merge "Revert "Add API method to extract subscription ID from phone account (1/3)"" into lmp-sprout-dev
automerge:
6f0c3f1
* commit '
6f0c3f1a9a0a7a72c560e756504541e5fa8ac584':
Revert "Add API method to extract subscription ID from phone account (1/3)"
Quddus Chong [Fri, 17 Oct 2014 00:39:30 +0000 (00:39 +0000)]
Merge "docs: Updates to Android 5.0 API Overview." into lmp-dev
Andrew Solovay [Fri, 17 Oct 2014 00:38:47 +0000 (00:38 +0000)]
am
8150734f: am
6b53fb62: Merge "docs: Updating support library pages for v.21." into lmp-dev
automerge:
f029a41
* commit '
f029a419189954beccd8cddd4f9fb48aa79ae51e':
docs: Updating support library pages for v.21.
Andrew Solovay [Fri, 17 Oct 2014 00:37:39 +0000 (00:37 +0000)]
am
32b459e5: am
4461e926: Merge "docs: Restored the preview license." into lmp-dev
automerge:
f1816c2
* commit '
f1816c2bc7ba64055c56805dc47036cc261921f5':
docs: Restored the preview license.
Nancy Chen [Fri, 17 Oct 2014 00:05:36 +0000 (00:05 +0000)]
am
a6a1c52f: Merge "Use Telecom API for checking if a number is voicemail (1/2)" into lmp-sprout-dev
* commit '
a6a1c52f58f24194de2665bb922577a9d7f6dccf':
Use Telecom API for checking if a number is voicemail (1/2)
Christopher Tate [Fri, 17 Oct 2014 00:05:22 +0000 (00:05 +0000)]
am
61737d81: am
040d89bb: Merge "Eliminate race condition around backup completion + resumption" into lmp-dev
* commit '
61737d81a2e0a2cc327210bf771239655f62c3d9':
Eliminate race condition around backup completion + resumption
Nancy Chen [Fri, 17 Oct 2014 00:05:14 +0000 (00:05 +0000)]
am
c913c2de: Merge "Revert "Add API method to extract subscription ID from phone account (1/3)"" into lmp-sprout-dev
* commit '
c913c2dec18519ae5b989f65b207c7b3fec2d0ef':
Revert "Add API method to extract subscription ID from phone account (1/3)"
Andrew Solovay [Fri, 17 Oct 2014 00:05:10 +0000 (00:05 +0000)]
am
8150734f: am
6b53fb62: Merge "docs: Updating support library pages for v.21." into lmp-dev
* commit '
8150734faa7feb8547f369db949c1149663ae2ee':
docs: Updating support library pages for v.21.
Andrew Solovay [Fri, 17 Oct 2014 00:05:06 +0000 (00:05 +0000)]
am
32b459e5: am
4461e926: Merge "docs: Restored the preview license." into lmp-dev
* commit '
32b459e5c56cd1ccb0c9bb15336f796cb75e75f0':
docs: Restored the preview license.
Alan Viverette [Fri, 17 Oct 2014 00:00:30 +0000 (00:00 +0000)]
Merge "Update AM/PM selectors for clock face TimePicker" into lmp-mr1-dev
automerge:
0db6536
* commit '
0db6536190fa34910c0bfe376c47b8d594f32a25':
Update AM/PM selectors for clock face TimePicker
Alan Viverette [Thu, 16 Oct 2014 23:48:35 +0000 (23:48 +0000)]
Merge "Update AM/PM selectors for clock face TimePicker" into lmp-mr1-dev
xinhe [Thu, 16 Oct 2014 23:32:11 +0000 (23:32 +0000)]
Merge "telephony re-registry error" into lmp-mr1-dev
automerge:
efdddef
* commit '
efdddefaf5932f81b16aa49a2394f9b3d4e48bf5':
telephony re-registry error
xinhe [Thu, 16 Oct 2014 22:37:42 +0000 (22:37 +0000)]
Merge "telephony re-registry error" into lmp-mr1-dev
Nancy Chen [Thu, 16 Oct 2014 22:00:28 +0000 (22:00 +0000)]
Merge "Use Telecom API for checking if a number is voicemail (1/2)" into lmp-sprout-dev
xinhe [Thu, 16 Oct 2014 18:49:45 +0000 (11:49 -0700)]
telephony re-registry error
telephony re-registry do not update the callback and other parameter
Bug:
17920733
Change-Id: I288e8b9a6747fc3c5c4794553435b29b49d379f0
Nancy Chen [Wed, 15 Oct 2014 22:48:21 +0000 (15:48 -0700)]
Use Telecom API for checking if a number is voicemail (1/2)
Since we don't want to communicate directly with Telephony in dialer, call
PhoneNumberUtils.isVoiceMailNumber (a Telephony method) through the
Telecom API. Add a method in TelecomManager to do this.
Bug:
17925501
Change-Id: Iecea82a0e5f0b106eaf105e9026d606110acf122
Christopher Tate [Thu, 16 Oct 2014 21:30:39 +0000 (21:30 +0000)]
am
040d89bb: Merge "Eliminate race condition around backup completion + resumption" into lmp-dev
* commit '
040d89bb0a4563d93073b7a27b3f201ce11dcf58':
Eliminate race condition around backup completion + resumption
Christopher Tate [Thu, 16 Oct 2014 21:26:25 +0000 (21:26 +0000)]
Merge "Eliminate race condition around backup completion + resumption" into lmp-dev
Nancy Chen [Thu, 16 Oct 2014 21:16:59 +0000 (21:16 +0000)]
Merge "Revert "Add API method to extract subscription ID from phone account (1/3)"" into lmp-sprout-dev
Andrew Solovay [Thu, 16 Oct 2014 21:14:56 +0000 (21:14 +0000)]
am
6b53fb62: Merge "docs: Updating support library pages for v.21." into lmp-dev
* commit '
6b53fb6227b884db2761fa146ed2f4f28100962d':
docs: Updating support library pages for v.21.
Chenjie Luo [Thu, 16 Oct 2014 21:12:10 +0000 (21:12 +0000)]
am
b08ee9b7: am
76ed803f: Merge "Add system property config.disable_networktime to configure NetworkTimeUpdateService" into lmp-sprout-dev
* commit '
b08ee9b728347abf67ee193981b84db54810538b':
Add system property config.disable_networktime to configure NetworkTimeUpdateService
Andrew Solovay [Thu, 16 Oct 2014 21:10:19 +0000 (21:10 +0000)]
Merge "docs: Updating support library pages for v.21." into lmp-dev
Andrew Solovay [Thu, 16 Oct 2014 21:09:57 +0000 (21:09 +0000)]
am
4461e926: Merge "docs: Restored the preview license." into lmp-dev
* commit '
4461e9268ba010f9cd6e8881a57b7af7b031ea31':
docs: Restored the preview license.
Nancy Chen [Thu, 16 Oct 2014 21:08:39 +0000 (21:08 +0000)]
Revert "Add API method to extract subscription ID from phone account (1/3)"
This reverts commit
b0cad32c3cadd0387f6dcd82aade629e6f2f6bee.
Change-Id: I54b6373ba0fc7d1ecc64c6ceedc7b371c7017cd8
Chenjie Luo [Thu, 16 Oct 2014 21:05:51 +0000 (21:05 +0000)]
am
76ed803f: Merge "Add system property config.disable_networktime to configure NetworkTimeUpdateService" into lmp-sprout-dev
* commit '
76ed803fbd3d7be015cc25f521b73a9436c14fdb':
Add system property config.disable_networktime to configure NetworkTimeUpdateService
Andrew Solovay [Thu, 16 Oct 2014 21:01:06 +0000 (21:01 +0000)]
Merge "docs: Restored the preview license." into lmp-dev
Chenjie Luo [Thu, 16 Oct 2014 20:57:55 +0000 (20:57 +0000)]
Merge "Add system property config.disable_networktime to configure NetworkTimeUpdateService" into lmp-sprout-dev
Andrew Solovay [Tue, 14 Oct 2014 19:23:31 +0000 (12:23 -0700)]
docs: Restored the preview license.
Added the preview license back, with changes as previously negotiated
with legal.
See first comment for staging directory link.
Change-Id: Ibc23d4d89b4380546d61ed052ba15dc81b8b1336
Christopher Tate [Thu, 16 Oct 2014 20:44:00 +0000 (13:44 -0700)]
Eliminate race condition around backup completion + resumption
Ensure that the callback always sees the current-operation state in sync
with the various other bits of internal backup-operation state. Previously
only the current-operation state was managed inside the critical section;
this resulted in a slim race window where a callback could see an ongoing
operation as still valid, but after the internal state on which that
operation depended had already been cleared.
Bug
17931760
Change-Id: Ia032668e7a9d22f1029c57fc98db9e86484d5719
Rich Slogar [Thu, 16 Oct 2014 20:55:03 +0000 (20:55 +0000)]
am
18535b07: am
68c537f1: am
60e74b49: Merge ":docs Platform Tools Rel Note Nexus 6/9 dpi updates" into lmp-dev
* commit '
18535b07a8a8e244f89ccce8c07226c24055c748':
:docs Platform Tools Rel Note Nexus 6/9 dpi updates
Rich Slogar [Thu, 16 Oct 2014 20:49:53 +0000 (20:49 +0000)]
am
68c537f1: am
60e74b49: Merge ":docs Platform Tools Rel Note Nexus 6/9 dpi updates" into lmp-dev
* commit '
68c537f1981970f0ccac0fe46d5c522d5e05a82c':
:docs Platform Tools Rel Note Nexus 6/9 dpi updates
OSDN Git Service
