OSDN Git Service
smain@google.com [Fri, 17 Oct 2014 07:29:26 +0000 (07:29 +0000)]
am
4561be01: Merge "add TV quality page to Develop landing carousel" into lmp-dev
* commit '
4561be01934cdc462570b56afb4c602cbf3295c4':
add TV quality page to Develop landing carousel
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.
smain@google.com [Fri, 17 Oct 2014 06:51:42 +0000 (06:51 +0000)]
Merge "add TV quality page to Develop landing carousel" into lmp-dev
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
smain@google.com [Fri, 17 Oct 2014 06:17:52 +0000 (23:17 -0700)]
add TV quality page to Develop landing carousel
Change-Id: I736654e248645bfda7f94156b8c0f520a8be4bac
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
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
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
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
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.
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
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:45:31 +0000 (20:45 +0000)]
am
60e74b49: Merge ":docs Platform Tools Rel Note Nexus 6/9 dpi updates" into lmp-dev
* commit '
60e74b4924dee6d033ca61854cac42768006ced5':
:docs Platform Tools Rel Note Nexus 6/9 dpi updates
Rich Slogar [Thu, 16 Oct 2014 20:41:17 +0000 (20:41 +0000)]
Merge ":docs Platform Tools Rel Note Nexus 6/9 dpi updates" into lmp-dev
Chenjie Luo [Thu, 16 Oct 2014 20:31:39 +0000 (13:31 -0700)]
Add system property config.disable_networktime to configure NetworkTimeUpdateService
Bug:
17934875
Change-Id: Ie5acf7266a5766f407db8f23d2c3d26920fa4020
Chenjie Luo [Thu, 16 Oct 2014 20:23:09 +0000 (20:23 +0000)]
Merge "Revert "Add system property config.disable_timeupdate to configure NetworkTimeUpdateService"" into lmp-sprout-dev
Chenjie Luo [Thu, 16 Oct 2014 20:22:24 +0000 (20:22 +0000)]
Revert "Add system property config.disable_timeupdate to configure NetworkTimeUpdateService"
This reverts commit
c597c55ffeb9debcf2dba8a77a80caa9016ea4d1.
Change-Id: Idc83e582c10dda2c6245ec19921785f361a07a68
Svet Ganov [Thu, 16 Oct 2014 19:40:15 +0000 (19:40 +0000)]
am
b22552c3: Merge "Send accessibility events with no window." into lmp-dev
* commit '
b22552c35bc939619c2e7c967e4eae618d8b93cc':
Send accessibility events with no window.
Svet Ganov [Thu, 16 Oct 2014 19:35:40 +0000 (19:35 +0000)]
Merge "Send accessibility events with no window." into lmp-dev
Rich Slogar [Thu, 16 Oct 2014 19:07:35 +0000 (12:07 -0700)]
:docs Platform Tools Rel Note Nexus 6/9 dpi updates
Change-Id: I34d71a4c42fababbce1ad13dee4fa8f722798e7b
Chenjie Luo [Thu, 16 Oct 2014 18:45:07 +0000 (18:45 +0000)]
Merge "Add system property config.disable_timeupdate to configure NetworkTimeUpdateService" into lmp-sprout-dev
Scott Rowe [Thu, 16 Oct 2014 18:42:20 +0000 (18:42 +0000)]
am
447369f2: am
a1e3063e: am
ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs
* commit '
447369f2d2b02f78d01d4a4923fedfca96c1950f':
docs: update reference to FragmentRetainInstance
Joe Fernandez [Thu, 16 Oct 2014 18:42:16 +0000 (18:42 +0000)]
am
7e19b402: am
2f9ea27c: am
58c64870: Merge "Typo fixed in sample code" into klp-modular-docs
* commit '
7e19b402c6651112a56ab8569ea53a7004a3a552':
Typo fixed in sample code
Chenjie Luo [Thu, 16 Oct 2014 17:55:33 +0000 (10:55 -0700)]
Add system property config.disable_timeupdate to configure NetworkTimeUpdateService
Bug:
17934875
Change-Id: Ic1acff13190f38cedb1ecf22783d4dfd3373511d
Scott Rowe [Thu, 16 Oct 2014 18:23:42 +0000 (18:23 +0000)]
am
a1e3063e: am
ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs
* commit '
a1e3063ebe04c8c304f48a02117085962f75cb63':
docs: update reference to FragmentRetainInstance
Joe Fernandez [Thu, 16 Oct 2014 18:23:18 +0000 (18:23 +0000)]
am
2f9ea27c: am
58c64870: Merge "Typo fixed in sample code" into klp-modular-docs
* commit '
2f9ea27c6c95fa53eef0228edc0b3f63dbeb21e7':
Typo fixed in sample code
David Friedman [Thu, 16 Oct 2014 18:10:36 +0000 (18:10 +0000)]
am
d12e6de6: Merge "OpenGL 3.1 and AEP documentation for L-release." into lmp-dev
* commit '
d12e6de645a39e6e902785d544100fb1963aa203':
OpenGL 3.1 and AEP documentation for L-release.
David Friedman [Thu, 16 Oct 2014 18:05:59 +0000 (18:05 +0000)]
Merge "OpenGL 3.1 and AEP documentation for L-release." into lmp-dev
Quddus Chong [Thu, 16 Oct 2014 01:03:27 +0000 (18:03 -0700)]
docs: Updates to Android 5.0 API Overview.
Change-Id: I0dcbb134fc499da0172bfe8d79c5aaa1a4b3ef75
Svet Ganov [Thu, 16 Oct 2014 16:18:34 +0000 (09:18 -0700)]
Send accessibility events with no window.
An app can send an accessibility event by calling the send methods
on view or directly asking the accessibility manager to do that.
While the recommened way to send such events is calling the methods
on view a legacy app or app whose developer did not read the docs
carefully may be calling the accessibility manager APIs directly.
In such a case the event does not have assigned window id and does
not get send. Since events fired by using the accessibility manager
directly lack context to determine whether thier source is important
for accessibility we assume they come from an important view to
avoid breaking backwards compatibility.
bug:
18001711
Change-Id: Ie1c298fa5a0670cbeaedfcd64f820961c296b6ca
Andrew Solovay [Thu, 2 Oct 2014 18:23:42 +0000 (11:23 -0700)]
docs: Updating support library pages for v.21.
For doc stage location, see my comment of Oct 13 3:47 PM.
Change-Id: I4da98448cd95451c82b4e8198dcd95edf64398b8
Rich Slogar [Thu, 16 Oct 2014 17:15:23 +0000 (17:15 +0000)]
am
70807ab1: Merge "docs:Build and Platform Tools Updates for Android 5" into lmp-dev
* commit '
70807ab128c544b972f3710e53eeedd0d40dce2a':
docs:Build and Platform Tools Updates for Android 5
Rich Slogar [Thu, 16 Oct 2014 17:10:47 +0000 (17:10 +0000)]
Merge "docs:Build and Platform Tools Updates for Android 5" into lmp-dev
Andrew Solovay [Thu, 16 Oct 2014 17:08:33 +0000 (17:08 +0000)]
am
34ef4ff9: Merge "Moved TV Input Framework (TIF) page out of preview." into lmp-dev
* commit '
34ef4ff9b7a3625477b0eccd20db15129f2732f3':
Moved TV Input Framework (TIF) page out of preview.
Andrew Solovay [Thu, 16 Oct 2014 17:03:01 +0000 (17:03 +0000)]
Merge "Moved TV Input Framework (TIF) page out of preview." into lmp-dev
Rich Slogar [Thu, 9 Oct 2014 22:45:25 +0000 (15:45 -0700)]
docs:Build and Platform Tools Updates for Android 5
Change-Id: Ib7adf35c302d24a1c2394a89b3a04ca8d77cd296
Scott Rowe [Thu, 16 Oct 2014 17:01:04 +0000 (17:01 +0000)]
am
ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs
* commit '
ab64919c0e683dcd0f32f95f580f0d95ce29476d':
docs: update reference to FragmentRetainInstance
Scott Rowe [Thu, 16 Oct 2014 16:56:54 +0000 (16:56 +0000)]
Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs
Scott Rowe [Thu, 16 Oct 2014 16:44:30 +0000 (16:44 +0000)]
am
8f93624e: docs: delete preview pages
* commit '
8f93624eafd3518d97c88506bbb9a93c81eb7f03':
docs: delete preview pages
Scott Rowe [Wed, 8 Oct 2014 23:39:36 +0000 (16:39 -0700)]
docs: delete preview pages
Change-Id: I76b6b8545bfed3ad0604043105ccf4795ab8be62
Prerepa Viswanadham [Thu, 16 Oct 2014 16:11:26 +0000 (16:11 +0000)]
am
248edc3e: Update javadoc comments for getBluetoothLeAdvertiser()
* commit '
248edc3e969217aec1fcce7f324cbae6c46da0a3':
Update javadoc comments for getBluetoothLeAdvertiser()
Prerepa Viswanadham [Wed, 15 Oct 2014 23:36:01 +0000 (16:36 -0700)]
Update javadoc comments for getBluetoothLeAdvertiser()
To clarify that BluetoothLeAdvertiser object will return null
when BT is off OR if the hw doesn't support these capabilities
bug:
18006072
Change-Id: I635d7971711a3cae7c58f7a0636faf9a03f19970
Joe Fernandez [Thu, 16 Oct 2014 14:39:16 +0000 (14:39 +0000)]
am
58c64870: Merge "Typo fixed in sample code" into klp-modular-docs
* commit '
58c64870a8f3505d032ec7c5ac0fc4faba08347a':
Typo fixed in sample code
Joe Fernandez [Thu, 16 Oct 2014 14:34:46 +0000 (14:34 +0000)]
Merge "Typo fixed in sample code" into klp-modular-docs
Lorenzo Colitti [Thu, 16 Oct 2014 09:23:24 +0000 (09:23 +0000)]
am
b7d85148: Merge "Allow root and system to bypass the always-on VPN firewall rules" into lmp-dev
* commit '
b7d8514822aefbf8274f5464dc12cee151e2b78b':
Allow root and system to bypass the always-on VPN firewall rules
Lorenzo Colitti [Thu, 16 Oct 2014 09:23:21 +0000 (09:23 +0000)]
am
917c547b: Merge "Don\'t make lockdown VPN source firewall rules over-broad." into lmp-dev
* commit '
917c547beb9adecf2e7d2b355e85e37c2557c5d3':
Don't make lockdown VPN source firewall rules over-broad.
Lorenzo Colitti [Thu, 16 Oct 2014 09:23:17 +0000 (09:23 +0000)]
am
28dcf034: Merge "Propagate network state changes to the LockdownVpnTracker." into lmp-dev
* commit '
28dcf0345b2857884c1f1639fadb720318445187':
Propagate network state changes to the LockdownVpnTracker.
Lorenzo Colitti [Thu, 16 Oct 2014 08:46:03 +0000 (08:46 +0000)]
Merge "Allow root and system to bypass the always-on VPN firewall rules" into lmp-dev
Lorenzo Colitti [Thu, 16 Oct 2014 08:45:02 +0000 (08:45 +0000)]
Merge "Don't make lockdown VPN source firewall rules over-broad." into lmp-dev
Lorenzo Colitti [Thu, 16 Oct 2014 08:37:26 +0000 (08:37 +0000)]
Merge "Propagate network state changes to the LockdownVpnTracker." into lmp-dev
Christopher Tate [Thu, 16 Oct 2014 03:36:34 +0000 (03:36 +0000)]
am
185fcadf: Merge "Fix spurious restore session timeouts" into lmp-dev
* commit '
185fcadf898f0fe41461a632177dfd0d7e5dfb70':
Fix spurious restore session timeouts
Christopher Tate [Thu, 16 Oct 2014 03:28:58 +0000 (03:28 +0000)]
Merge "Fix spurious restore session timeouts" into lmp-dev
David Friedman [Mon, 6 Oct 2014 21:36:07 +0000 (14:36 -0700)]
OpenGL 3.1 and AEP documentation for L-release.
Change-Id: I21b75a6f38977729fa8c1c94c66354054bdb780c
Geoff Mendal [Thu, 16 Oct 2014 01:56:04 +0000 (01:56 +0000)]
am
c71a7b3c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
c71a7b3cb8eb1565c01caaf231773759ee63b4cf':
Import translations. DO NOT MERGE
Brian Carlstrom [Thu, 16 Oct 2014 01:56:00 +0000 (01:56 +0000)]
am
20de619d: Merge "Set threads\' contextClassLoader during LoadedApk.makeApplication." into lmp-dev
* commit '
20de619d66a594fd9e6e76a3a2cb79422aef577c':
Set threads' contextClassLoader during LoadedApk.makeApplication.
Geoff Mendal [Thu, 16 Oct 2014 01:48:40 +0000 (01:48 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Geoff Mendal [Thu, 16 Oct 2014 01:47:17 +0000 (18:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3cf464b7c94c35965e627353765c4ef649c2a209
Auto-generated-cl: translation import
Geoff Mendal [Thu, 16 Oct 2014 01:35:17 +0000 (01:35 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Geoff Mendal [Thu, 16 Oct 2014 01:34:07 +0000 (18:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifa43307e6081aa5fae63beb7756b583edf936c72
Auto-generated-cl: translation import
Christopher Tate [Thu, 16 Oct 2014 00:49:42 +0000 (17:49 -0700)]
Fix spurious restore session timeouts
The restore-session idle timeout should not be ticking while we're
doing legitimate restore work. We now explicitly stop the timeout
ticker [a delayed message on our handler thread] whenever we undertake
a valid restore operation. The timer is already correctly resumed
when restore operations conclude.
(In practice we need to suspend the timeout tracking at exactly those
times when we're entering the wakelock-protected restore flow. The
timeout is reestablished when the wakelock is released; this part
is already in the code.)
Bug
17990544
Change-Id: I7318020ce30fd9c35bc3a644f8c101fd3d063c8b
Brian Carlstrom [Thu, 16 Oct 2014 01:01:25 +0000 (01:01 +0000)]
Merge "Set threads' contextClassLoader during LoadedApk.makeApplication." into lmp-dev
Marco Nelissen [Thu, 16 Oct 2014 00:41:10 +0000 (00:41 +0000)]
am
36c931b3: Merge "Also consider secondary storage when verifying paths" into lmp-dev
* commit '
36c931b31a15b4ed740c861ec34b7e6573cfd32e':
Also consider secondary storage when verifying paths
Marco Nelissen [Thu, 16 Oct 2014 00:38:01 +0000 (00:38 +0000)]
Merge "Also consider secondary storage when verifying paths" into lmp-dev
Dirk Dougherty [Thu, 16 Oct 2014 00:23:49 +0000 (00:23 +0000)]
am
a0b3796d: Merge "Doc change: Add diffs for API level 21." into lmp-dev
* commit '
a0b3796d937dff83b5dd94e8f091a36bc9b304dd':
Doc change: Add diffs for API level 21.
OSDN Git Service
