OSDN Git Service
David Friedman [Thu, 30 Oct 2014 10:17:59 +0000 (10:17 +0000)]
am
387675d9: am
79c332a6: am
b2d582d9: am
3c00bc01: Merge "Updates Notifications screenshot for Android 5.0." into lmp-docs automerge:
b648cab
* commit '
387675d9050e699de4d976cfe78faec389673cb1':
Updates Notifications screenshot for Android 5.0.
Eric Gilmore [Thu, 30 Oct 2014 10:17:52 +0000 (10:17 +0000)]
am
7e99cedb: am
3fc61015: am
9a6aa0ff: am
d126294a: Docs: Adding Android Studio instructions for adding IAB service. automerge:
77760e7
* commit '
7e99cedb50bc0712cc879852e16793cfeeb0d85a':
Docs: Adding Android Studio instructions for adding IAB service.
Sebastien Hertz [Thu, 30 Oct 2014 10:06:41 +0000 (11:06 +0100)]
resolved conflicts for merge of
f44baef1 to lmp-mr1-dev-plus-aosp
Change-Id: I754fa19727d0c1db7ca2110b7cae51c9f7c15e00
Elliott Hughes [Thu, 30 Oct 2014 03:19:32 +0000 (03:19 +0000)]
am
b6e00426: am
c8dce896: Merge "Fix not to show a log with empty default ime"
* commit '
b6e004261cc5c1b9b9ab338ce30896f537182336':
Fix not to show a log with empty default ime
Elliott Hughes [Thu, 30 Oct 2014 03:06:12 +0000 (03:06 +0000)]
am
c8dce896: Merge "Fix not to show a log with empty default ime"
* commit '
c8dce8966b84203befb87a24a9d2d8ee87a39f7b':
Fix not to show a log with empty default ime
Elliott Hughes [Thu, 30 Oct 2014 03:01:59 +0000 (03:01 +0000)]
Merge "Fix not to show a log with empty default ime"
Hyejin Kim [Mon, 27 Oct 2014 08:17:06 +0000 (17:17 +0900)]
Fix not to show a log with empty default ime
It'll make reboot to show a log with empty defualt ime.
Bug:
18165757
Change-Id: Ieec2532cbe003cb6307a70748a2f6c8987708eae
Vladimir Marko [Wed, 29 Oct 2014 22:03:18 +0000 (22:03 +0000)]
am
548101cb: am
e5fe7f3f: Merge "Fix android_media_AudioSystem_getMasterMute return type."
* commit '
548101cb96fbc855d4257d46841b2959fe4c9ce4':
Fix android_media_AudioSystem_getMasterMute return type.
Vladimir Marko [Wed, 29 Oct 2014 21:57:16 +0000 (21:57 +0000)]
am
e5fe7f3f: Merge "Fix android_media_AudioSystem_getMasterMute return type."
* commit '
e5fe7f3f4069b176a0465617dceb630a52b710c0':
Fix android_media_AudioSystem_getMasterMute return type.
Vladimir Marko [Wed, 29 Oct 2014 21:52:02 +0000 (21:52 +0000)]
Merge "Fix android_media_AudioSystem_getMasterMute return type."
Vladimir Marko [Wed, 29 Oct 2014 20:34:15 +0000 (20:34 +0000)]
Fix android_media_AudioSystem_getMasterMute return type.
Caused FPU stack overflow on x86.
Bug:
18023418
(cherry picked from commit
c1bcdbb75877d99972f1cd13a9c40126822621bc)
Change-Id: Ia1b5a1da52b20c2e0a84321e784cd795ec649e66
Calin Juravle [Wed, 29 Oct 2014 20:41:55 +0000 (20:41 +0000)]
am
5d5e4b14: am
43a92646: Merge "Use native brige only if we have a private data directory."
* commit '
5d5e4b14f67903370a7805492eb92fbe3b487a14':
Use native brige only if we have a private data directory.
Narayan Kamath [Wed, 29 Oct 2014 19:34:32 +0000 (19:34 +0000)]
am
4ed472ab: resolved conflicts for merge of
3028394c to stage-aosp-master
* commit '
4ed472ab33e78391c0b084ed3908019e06b7dfe5':
Suppress Clang compilation warnings.
Narayan Kamath [Wed, 29 Oct 2014 19:34:10 +0000 (19:34 +0000)]
am
fa945c10: am
e87d36f8: Merge "Revert "Remove unused apache related API.""
* commit '
fa945c105b4f7bb3e3844e8ce467ca701d5f3a9f':
Revert "Remove unused apache related API."
Elliott Hughes [Wed, 29 Oct 2014 19:31:48 +0000 (12:31 -0700)]
resolved conflicts for merge of
d3389e2f to lmp-mr1-dev-plus-aosp
Change-Id: Ic4969a59ef22d4911f74cc1e75ea5ccfab59b770
Narayan Kamath [Wed, 29 Oct 2014 17:47:15 +0000 (17:47 +0000)]
am
b27ea563: am
00fd3639: Merge "Remove tests/SslLoad."
* commit '
b27ea56312692c5ee0f38dad38e2a3832086b40a':
Remove tests/SslLoad.
Andreas Gampe [Wed, 29 Oct 2014 17:47:10 +0000 (17:47 +0000)]
am
dfdc6acc: resolved conflicts for merge of
3c8cf51f into stage-aosp-master
* commit '
dfdc6acc4809f395b9db2136acc89b6de932a1a5':
Stop using apache http to download Gps XTRA data.
Calin Juravle [Wed, 29 Oct 2014 17:47:03 +0000 (17:47 +0000)]
am
5d4deb82: am
f7d24d24: Merge "PreInitializeNativeBridge only if its Available"
* commit '
5d4deb8246b13531a6b2b7611c650ba504e44dc6':
PreInitializeNativeBridge only if its Available
Elliott Hughes [Wed, 29 Oct 2014 17:13:38 +0000 (17:13 +0000)]
am
87ce99ca: am
ced7ebdb: Merge "Migrate off timeFormat12 and timeFormat24."
* commit '
87ce99ca7243e4556a6cfe9f42cc51531301e979':
Migrate off timeFormat12 and timeFormat24.
Craig Mautner [Wed, 29 Oct 2014 17:11:12 +0000 (17:11 +0000)]
am
9d9aac4c: resolved conflicts for merge of
2bf3800b to stage-aosp-master
* commit '
9d9aac4cacce75b4847aebce0f019250dc3b4e93':
Doesn't re-sort app windows when move task to top
Calin Juravle [Wed, 29 Oct 2014 13:21:09 +0000 (13:21 +0000)]
am
43a92646: Merge "Use native brige only if we have a private data directory."
* commit '
43a9264619e08f464dd4f184e53441a440cca09f':
Use native brige only if we have a private data directory.
Calin Juravle [Wed, 29 Oct 2014 13:15:49 +0000 (13:15 +0000)]
Merge "Use native brige only if we have a private data directory."
Calin Juravle [Tue, 28 Oct 2014 12:16:21 +0000 (12:16 +0000)]
Use native brige only if we have a private data directory.
Bug:
18027433
Change-Id: I59b1b1cbe1d7d14b93d8bb6d4255c951d9e469b6
Narayan Kamath [Wed, 29 Oct 2014 12:12:37 +0000 (12:12 +0000)]
resolved conflicts for merge of
3028394c to stage-aosp-master
Change-Id: I980e4c95cdc6a4778cef3298338692656d23e7c6
Narayan Kamath [Wed, 29 Oct 2014 11:30:11 +0000 (11:30 +0000)]
am
e87d36f8: Merge "Revert "Remove unused apache related API.""
* commit '
e87d36f8925a34f85ba80c886757d07ad03fed42':
Revert "Remove unused apache related API."
Narayan Kamath [Wed, 29 Oct 2014 11:23:45 +0000 (11:23 +0000)]
resolved conflicts for merge of
9834af9c to stage-aosp-master
Change-Id: Ibdada14406f49684cf345162204b9810452f25a2
Narayan Kamath [Wed, 29 Oct 2014 05:47:26 +0000 (05:47 +0000)]
am
00fd3639: Merge "Remove tests/SslLoad."
* commit '
00fd36399fd8dd9566b582c24817d130982bc270':
Remove tests/SslLoad.
Andreas Gampe [Wed, 29 Oct 2014 03:42:53 +0000 (20:42 -0700)]
resolved conflicts for merge of
3c8cf51f into stage-aosp-master
Change-Id: I507358be6186c4b8d1968cd4e370afe9fd1a02eb
Ricardo Cervera [Tue, 28 Oct 2014 19:42:19 +0000 (19:42 +0000)]
am
989f4bfd: am
f4e32145: am
61fcad92: docs: Add SearchXonY to Common Intents automerge:
be07f2a
automerge:
cf6a28f
* commit '
cf6a28f813749f9ce1934e9054b53a19d0e30b39':
docs: Add SearchXonY to Common Intents
Jason Monk [Tue, 28 Oct 2014 19:41:21 +0000 (19:41 +0000)]
Merge "QS: Bring back BT/Wi-Fi sub-panels" into lmp-mr1-dev automerge:
8c01dfc
automerge:
caed5a2
* commit '
caed5a29760ac1a32a0248e518b71d2d6df3d33e':
QS: Bring back BT/Wi-Fi sub-panels
Jason Monk [Tue, 28 Oct 2014 19:40:06 +0000 (19:40 +0000)]
Merge "Add hotspot icon to status bar" into lmp-mr1-dev automerge:
09895be
automerge:
dda6193
* commit '
dda619395bc0186b64d6512dae1b422346471158':
Add hotspot icon to status bar
David Friedman [Tue, 28 Oct 2014 19:34:58 +0000 (19:34 +0000)]
am
79c332a6: am
b2d582d9: am
3c00bc01: Merge "Updates Notifications screenshot for Android 5.0." into lmp-docs automerge:
b648cab
* commit '
79c332a694691cef131d049c9f6a8ad59df37000':
Updates Notifications screenshot for Android 5.0.
Eric Gilmore [Tue, 28 Oct 2014 19:29:43 +0000 (19:29 +0000)]
am
3fc61015: am
9a6aa0ff: am
d126294a: Docs: Adding Android Studio instructions for adding IAB service. automerge:
77760e7
* commit '
3fc61015f51a3f8ae8516b5e31d7f867f48b6d84':
Docs: Adding Android Studio instructions for adding IAB service.
Quddus Chong [Tue, 28 Oct 2014 19:29:36 +0000 (19:29 +0000)]
am
50631f97: am
6face8a0: am
2b4b3d28: cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce automerge:
eb07af2
* commit '
50631f97b499ad2fc904d5d1cc13ff4c964bee60':
cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce
Ricardo Cervera [Tue, 28 Oct 2014 19:29:28 +0000 (19:29 +0000)]
am
989f4bfd: am
f4e32145: am
61fcad92: docs: Add SearchXonY to Common Intents automerge:
be07f2a
* commit '
989f4bfd8d06a31dbe42050ea2ce0cbadeacfbfc':
docs: Add SearchXonY to Common Intents
Calin Juravle [Tue, 28 Oct 2014 19:28:42 +0000 (19:28 +0000)]
am
f7d24d24: Merge "PreInitializeNativeBridge only if its Available"
* commit '
f7d24d244319599f62c22e29c3e6540d6cbadf49':
PreInitializeNativeBridge only if its Available
David Friedman [Tue, 28 Oct 2014 19:27:37 +0000 (19:27 +0000)]
am
b2d582d9: am
3c00bc01: Merge "Updates Notifications screenshot for Android 5.0." into lmp-docs
automerge:
b648cab
* commit '
b648cabadfd73bcd3fa8b88db48007f58739300e':
Updates Notifications screenshot for Android 5.0.
Eric Gilmore [Tue, 28 Oct 2014 19:26:43 +0000 (19:26 +0000)]
am
9a6aa0ff: am
d126294a: Docs: Adding Android Studio instructions for adding IAB service.
automerge:
77760e7
* commit '
77760e753eb9a6c533eb2b52f228149e49356f64':
Docs: Adding Android Studio instructions for adding IAB service.
Quddus Chong [Tue, 28 Oct 2014 19:25:57 +0000 (19:25 +0000)]
am
6face8a0: am
2b4b3d28: cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce
automerge:
eb07af2
* commit '
eb07af2ced7aa438dca941fcde2e3ca0b338a620':
cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce
Ricardo Cervera [Tue, 28 Oct 2014 19:25:10 +0000 (19:25 +0000)]
am
f4e32145: am
61fcad92: docs: Add SearchXonY to Common Intents
automerge:
be07f2a
* commit '
be07f2a853cb2a69eeecbd7b0d68f455b55edae6':
docs: Add SearchXonY to Common Intents
David Friedman [Tue, 28 Oct 2014 19:22:40 +0000 (19:22 +0000)]
am
b2d582d9: am
3c00bc01: Merge "Updates Notifications screenshot for Android 5.0." into lmp-docs
* commit '
b2d582d995622cc8379603cfadae7ee6d4163b3e':
Updates Notifications screenshot for Android 5.0.
Eric Gilmore [Tue, 28 Oct 2014 19:22:37 +0000 (19:22 +0000)]
am
9a6aa0ff: am
d126294a: Docs: Adding Android Studio instructions for adding IAB service.
* commit '
9a6aa0ffa460aca1df9ef03501dd6b20b483198b':
Docs: Adding Android Studio instructions for adding IAB service.
Quddus Chong [Tue, 28 Oct 2014 19:22:15 +0000 (19:22 +0000)]
am
6face8a0: am
2b4b3d28: cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce
* commit '
6face8a04c1aa695a744f12ee2ca0e18cdfb5ed0':
cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce
Ricardo Cervera [Tue, 28 Oct 2014 19:22:11 +0000 (19:22 +0000)]
am
f4e32145: am
61fcad92: docs: Add SearchXonY to Common Intents
* commit '
f4e32145a214b28522d67e748c0eff74aa915bf6':
docs: Add SearchXonY to Common Intents
Jason Monk [Tue, 28 Oct 2014 19:16:44 +0000 (19:16 +0000)]
Merge "QS: Bring back BT/Wi-Fi sub-panels" into lmp-mr1-dev
automerge:
8c01dfc
* commit '
8c01dfc5af599398c1c79f87619c302e000e3353':
QS: Bring back BT/Wi-Fi sub-panels
Jason Monk [Tue, 28 Oct 2014 19:15:45 +0000 (19:15 +0000)]
Merge "Add hotspot icon to status bar" into lmp-mr1-dev
automerge:
09895be
* commit '
09895be87e327a7e2090c88cb4a5fc997f33103c':
Add hotspot icon to status bar
Jason Monk [Tue, 28 Oct 2014 18:45:33 +0000 (18:45 +0000)]
Merge "QS: Bring back BT/Wi-Fi sub-panels" into lmp-mr1-dev
Jason Monk [Tue, 28 Oct 2014 18:27:04 +0000 (18:27 +0000)]
Merge "Add hotspot icon to status bar" into lmp-mr1-dev
David Friedman [Tue, 28 Oct 2014 18:15:28 +0000 (18:15 +0000)]
am
3c00bc01: Merge "Updates Notifications screenshot for Android 5.0." into lmp-docs
* commit '
3c00bc01f9c6e82a0859201f74237998b24872da':
Updates Notifications screenshot for Android 5.0.
Eric Gilmore [Tue, 28 Oct 2014 18:15:24 +0000 (18:15 +0000)]
am
d126294a: Docs: Adding Android Studio instructions for adding IAB service.
* commit '
d126294a8f954fb758d3f67bc5271014748ba9e7':
Docs: Adding Android Studio instructions for adding IAB service.
Quddus Chong [Tue, 28 Oct 2014 18:15:20 +0000 (18:15 +0000)]
am
2b4b3d28: cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce
* commit '
2b4b3d289bb26607c8db198dae4bcfbf6247b0c1':
cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce
Ricardo Cervera [Tue, 28 Oct 2014 18:15:17 +0000 (18:15 +0000)]
am
61fcad92: docs: Add SearchXonY to Common Intents
* commit '
61fcad92ab55e3f874eb8fddde39dbe64235c2e5':
docs: Add SearchXonY to Common Intents
Adam Lesinski [Tue, 28 Oct 2014 18:09:20 +0000 (18:09 +0000)]
am
31b76b66: Merge "libandroidfw: Do not build device library when building SDK" into lmp-mr1-dev
automerge:
06caf1b
* commit '
06caf1b1112a6a3e364a46d02b883451e9180a07':
libandroidfw: Do not build device library when building SDK
John Spurlock [Tue, 28 Oct 2014 18:08:11 +0000 (18:08 +0000)]
am
ee990413: Merge "Zen: Show "(until 4:56 PM)" in exit conditions." into lmp-mr1-dev
automerge:
93e40ba
* commit '
93e40ba6c4373402c7c4f430e3e575e4a0cc13eb':
Zen: Show "(until 4:56 PM)" in exit conditions.
George Mount [Tue, 28 Oct 2014 18:06:58 +0000 (18:06 +0000)]
am
95d520f1: Merge "Fix NPE in moveSharedElementsToOverlay" into lmp-mr1-dev
automerge:
8a536bb
* commit '
8a536bb4e04b8a0e4f074c744321d352d5bf08b2':
Fix NPE in moveSharedElementsToOverlay
George Mount [Tue, 28 Oct 2014 18:06:04 +0000 (18:06 +0000)]
am
45b70108: Merge "Fixed: Nested shared elements now transition separately." into lmp-mr1-dev
automerge:
69a3dd8
* commit '
69a3dd85df49d5c5ef67d7c28f1473d23ce46980':
Fixed: Nested shared elements now transition separately.
Nicolas Prevot [Tue, 28 Oct 2014 18:05:09 +0000 (18:05 +0000)]
am
ebee8a4d: Merge "Replace minimum with maximum in method description." into lmp-mr1-dev
automerge:
e86848c
* commit '
e86848c258a2fc42e52eb1e3234c1288acd96a3b':
Replace minimum with maximum in method description.
Benjamin Franz [Tue, 28 Oct 2014 18:04:15 +0000 (18:04 +0000)]
am
f5c00c1c: Merge "Send ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED Broadcast when a user restriction has been changed." into lmp-mr1-dev
automerge:
5852369
* commit '
58523698080af9bd9df49b22a591e1db9f39bf25':
Send ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED Broadcast when a user restriction has been changed.
Jorim Jaggi [Tue, 28 Oct 2014 18:03:23 +0000 (18:03 +0000)]
am
4eedc1d9: Fix jank when launching something from lockscreen
automerge:
76dfffe
* commit '
76dfffeb9f25e5106ae6521b80947d0a10f7e3d1':
Fix jank when launching something from lockscreen
Adrian Roos [Tue, 28 Oct 2014 18:02:27 +0000 (18:02 +0000)]
am
288f65e3: Merge changes Iecd1303f,I2076c500 into lmp-mr1-dev
automerge:
4a915ab
* commit '
4a915ab505b4a39dab9ab99020bcae57e90ff928':
Fix NPE in FlashlightController
Fix stale unlock icon
Adrian Roos [Tue, 28 Oct 2014 18:01:18 +0000 (18:01 +0000)]
am
bd6f4a81: Merge "Ensure trust agents are disabled in safe-mode" into lmp-mr1-dev
automerge:
98a8258
* commit '
98a8258dd8759722b3aedce9297023291e33d724':
Ensure trust agents are disabled in safe-mode
Craig Mautner [Tue, 28 Oct 2014 17:59:39 +0000 (17:59 +0000)]
am
74fe6ce7: Merge "Do not go through a layout if visibility is GONE" into lmp-mr1-dev
automerge:
2381825
* commit '
2381825db49718891e345eebe34b58644beab10d':
Do not go through a layout if visibility is GONE
Adam Lesinski [Tue, 28 Oct 2014 17:45:13 +0000 (17:45 +0000)]
am
31b76b66: Merge "libandroidfw: Do not build device library when building SDK" into lmp-mr1-dev
* commit '
31b76b66b1678eb6483676aa2ef587e10b98d02a':
libandroidfw: Do not build device library when building SDK
Jason Monk [Mon, 27 Oct 2014 15:38:47 +0000 (11:38 -0400)]
QS: Bring back BT/Wi-Fi sub-panels
Bluetooth has stayed pretty much the same, just came back.
Wi-Fi now shows the currently available networks like settings does.
Networks that require extra steps are taken to Settings to complete
the process.
Bug:
17722817
Change-Id: Idfcfd92f557b20168693ced26d4001f3708f08a4
Adam Lesinski [Tue, 28 Oct 2014 17:41:10 +0000 (17:41 +0000)]
Merge "libandroidfw: Do not build device library when building SDK" into lmp-mr1-dev
John Spurlock [Tue, 28 Oct 2014 17:17:03 +0000 (17:17 +0000)]
am
ee990413: Merge "Zen: Show "(until 4:56 PM)" in exit conditions." into lmp-mr1-dev
* commit '
ee990413b51b41e4fe8940cba703bdfb56a12018':
Zen: Show "(until 4:56 PM)" in exit conditions.
John Spurlock [Tue, 28 Oct 2014 17:08:42 +0000 (17:08 +0000)]
Merge "Zen: Show "(until 4:56 PM)" in exit conditions." into lmp-mr1-dev
George Mount [Tue, 28 Oct 2014 17:04:33 +0000 (17:04 +0000)]
am
95d520f1: Merge "Fix NPE in moveSharedElementsToOverlay" into lmp-mr1-dev
* commit '
95d520f160db65f90da56610eee1a047fb60fc4e':
Fix NPE in moveSharedElementsToOverlay
George Mount [Tue, 28 Oct 2014 17:04:28 +0000 (17:04 +0000)]
am
45b70108: Merge "Fixed: Nested shared elements now transition separately." into lmp-mr1-dev
* commit '
45b701085b8507006c07f5eb86d9f29f4ee07457':
Fixed: Nested shared elements now transition separately.
George Mount [Tue, 28 Oct 2014 17:01:23 +0000 (17:01 +0000)]
Merge "Fix NPE in moveSharedElementsToOverlay" into lmp-mr1-dev
George Mount [Tue, 28 Oct 2014 17:00:42 +0000 (17:00 +0000)]
Merge "Fixed: Nested shared elements now transition separately." into lmp-mr1-dev
John Spurlock [Tue, 28 Oct 2014 15:21:42 +0000 (11:21 -0400)]
Zen: Show "(until 4:56 PM)" in exit conditions.
Implement two-line exit conditions, display the duration + end
time on separate lines.
Bug:
16824863
Change-Id: I8dabc83042fce604ccb86b463b9bb547c7903c64
Nicolas Prevot [Tue, 28 Oct 2014 16:44:47 +0000 (16:44 +0000)]
am
ebee8a4d: Merge "Replace minimum with maximum in method description." into lmp-mr1-dev
* commit '
ebee8a4d92a8e80b49feb51e9c9621c79398457c':
Replace minimum with maximum in method description.
Benjamin Franz [Tue, 28 Oct 2014 16:44:42 +0000 (16:44 +0000)]
am
f5c00c1c: Merge "Send ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED Broadcast when a user restriction has been changed." into lmp-mr1-dev
* commit '
f5c00c1c1136c9752b9c0157f9eca6385d7b9448':
Send ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED Broadcast when a user restriction has been changed.
Jorim Jaggi [Tue, 28 Oct 2014 16:44:36 +0000 (16:44 +0000)]
am
4eedc1d9: Fix jank when launching something from lockscreen
* commit '
4eedc1d97e5aa3bfaa60af9894cd991f9e210fc2':
Fix jank when launching something from lockscreen
Adrian Roos [Tue, 28 Oct 2014 16:44:31 +0000 (16:44 +0000)]
am
288f65e3: Merge changes Iecd1303f,I2076c500 into lmp-mr1-dev
* commit '
288f65e3811d17273085bc5c8b553f9ba8833dd4':
Fix NPE in FlashlightController
Fix stale unlock icon
Nicolas Prevot [Tue, 28 Oct 2014 16:33:32 +0000 (16:33 +0000)]
Merge "Replace minimum with maximum in method description." into lmp-mr1-dev
Nicolas Prevot [Mon, 1 Sep 2014 11:24:05 +0000 (12:24 +0100)]
Replace minimum with maximum in method description.
BUG:
18152344
Change-Id: If5d09051e8f74addf53018cfd3be214d96efb9e6
Benjamin Franz [Tue, 28 Oct 2014 16:13:03 +0000 (16:13 +0000)]
Merge "Send ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED Broadcast when a user restriction has been changed." into lmp-mr1-dev
Jorim Jaggi [Mon, 27 Oct 2014 12:45:56 +0000 (13:45 +0100)]
Fix jank when launching something from lockscreen
Apparently, hideRecents blocks around 300ms so we avoid this as a
low-risk fix. In the longer term, we should investigate why it takes
so long.
Bug:
18133433
Change-Id: I3eae659d4720d3c95280e7f7a144e00f0c760388
Adrian Roos [Tue, 28 Oct 2014 15:23:12 +0000 (15:23 +0000)]
Merge changes Iecd1303f,I2076c500 into lmp-mr1-dev
* changes:
Fix NPE in FlashlightController
Fix stale unlock icon
Adrian Roos [Tue, 28 Oct 2014 14:44:28 +0000 (14:44 +0000)]
am
bd6f4a81: Merge "Ensure trust agents are disabled in safe-mode" into lmp-mr1-dev
* commit '
bd6f4a818ef36764eb69ef7308eb6a9bf3740138':
Ensure trust agents are disabled in safe-mode
Adrian Roos [Tue, 28 Oct 2014 14:37:37 +0000 (14:37 +0000)]
Merge "Ensure trust agents are disabled in safe-mode" into lmp-mr1-dev
Craig Mautner [Tue, 28 Oct 2014 14:00:54 +0000 (14:00 +0000)]
am
74fe6ce7: Merge "Do not go through a layout if visibility is GONE" into lmp-mr1-dev
* commit '
74fe6ce72dcbc7af501022e7617528c30a0983bb':
Do not go through a layout if visibility is GONE
Craig Mautner [Tue, 28 Oct 2014 13:56:06 +0000 (13:56 +0000)]
Merge "Do not go through a layout if visibility is GONE" into lmp-mr1-dev
Jason Monk [Mon, 27 Oct 2014 19:28:22 +0000 (15:28 -0400)]
Add hotspot icon to status bar
Bug:
17318034
Change-Id: I291fe6bf7ac8c2faffd37cfda436ef050c1c5ca5
Christoph Studer [Tue, 28 Oct 2014 12:57:50 +0000 (12:57 +0000)]
Merge "NoMan: Add update bit to notification_enqueue log" into lmp-mr1-dev automerge:
6857203
automerge:
3fc8118
* commit '
3fc811803db5f534399697dab1994e19af2a95f3':
NoMan: Add update bit to notification_enqueue log
Christoph Studer [Tue, 28 Oct 2014 12:45:50 +0000 (12:45 +0000)]
Merge "NoMan: Add update bit to notification_enqueue log" into lmp-mr1-dev
automerge:
6857203
* commit '
685720309a582acc513454d674f82368479c5297':
NoMan: Add update bit to notification_enqueue log
Christoph Studer [Tue, 28 Oct 2014 12:41:32 +0000 (12:41 +0000)]
Merge "NoMan: Add update bit to notification_enqueue log" into lmp-mr1-dev
Ari Sachter-Zeltzer [Tue, 28 Oct 2014 09:48:40 +0000 (09:48 +0000)]
am
20edd053: Merge "fixed jank on activity close exit with better alpha interpolation" into lmp-mr1-dev
automerge:
35bedd1
* commit '
35bedd19d4b8a1b902be38bc4765de29376df9e4':
fixed jank on activity close exit with better alpha interpolation
Ari Sachter-Zeltzer [Tue, 28 Oct 2014 09:01:39 +0000 (09:01 +0000)]
am
20edd053: Merge "fixed jank on activity close exit with better alpha interpolation" into lmp-mr1-dev
* commit '
20edd0532738e9df72da0a9b6d39d541b9cb1ca9':
fixed jank on activity close exit with better alpha interpolation
Ari Sachter-Zeltzer [Tue, 28 Oct 2014 08:58:21 +0000 (08:58 +0000)]
Merge "fixed jank on activity close exit with better alpha interpolation" into lmp-mr1-dev
Erik Kline [Tue, 28 Oct 2014 08:54:03 +0000 (08:54 +0000)]
Merge "(re)define the definition of "provisioned"" into lmp-mr1-dev automerge:
dd91fb4
automerge:
8fc600d
* commit '
8fc600d1a8fc4f9cedceee185d129a19b06001c5':
(re)define the definition of "provisioned"
Lorenzo Colitti [Tue, 28 Oct 2014 08:50:41 +0000 (08:50 +0000)]
am
111cc9f5: Merge "Change removeStackedLink to take an interface name." into lmp-mr1-dev
automerge:
35261c4
* commit '
35261c4351ea42b2bbd057e852f50158de8eda9c':
Change removeStackedLink to take an interface name.
Erik Kline [Tue, 28 Oct 2014 07:57:29 +0000 (07:57 +0000)]
Merge "(re)define the definition of "provisioned"" into lmp-mr1-dev
automerge:
dd91fb4
* commit '
dd91fb44743f15ee308a4cfedeca6338b6912fdc':
(re)define the definition of "provisioned"
Erik Kline [Tue, 28 Oct 2014 07:53:36 +0000 (07:53 +0000)]
Merge "(re)define the definition of "provisioned"" into lmp-mr1-dev
Lorenzo Colitti [Tue, 28 Oct 2014 07:13:09 +0000 (07:13 +0000)]
am
111cc9f5: Merge "Change removeStackedLink to take an interface name." into lmp-mr1-dev
* commit '
111cc9f511dc65006fc2972c9ecbf295619e09b9':
Change removeStackedLink to take an interface name.
Lorenzo Colitti [Tue, 28 Oct 2014 07:00:30 +0000 (07:00 +0000)]
Merge "Change removeStackedLink to take an interface name." into lmp-mr1-dev
Lajos Molnar [Tue, 28 Oct 2014 06:23:59 +0000 (06:23 +0000)]
Merge "MediaCodec/Image: handle null cropRect correctly" into lmp-mr1-dev automerge:
aab38b7
automerge:
e4c7a65
* commit '
e4c7a65140b5523325fd6ca86c196136fe183ee8':
MediaCodec/Image: handle null cropRect correctly
Lorenzo Colitti [Mon, 20 Oct 2014 02:08:03 +0000 (11:08 +0900)]
Change removeStackedLink to take an interface name.
This simplifies callers.
Also remove all "implementations" of addStackedLink and
removeStackedLink except the one in LinkProperties, because they
are unused.
Bug:
12111730
Change-Id: Ie294b855facba4b1436299dcb3211b72d9ba448e
OSDN Git Service
