OSDN Git Service
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
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: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: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 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
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
Erik Kline [Fri, 24 Oct 2014 12:50:20 +0000 (21:50 +0900)]
(re)define the definition of "provisioned"
Specifically:
[1] provide a hasIPv4(), and
[2] a hasIPv6()
each of which requires an IP address, a default route, and
address-family-specific DNS servers to evaluate to true.
Additionally:
[3] redefine isProvisioned() to return the logical OR
of [1] and [2] above.
Any external caller can still use any of the has*() methods to
construct its own, different definition of "provisioned".
Bug:
17769720
Change-Id: Ia692fb8508484ff403d3920c94d0e1db4563f807
Lajos Molnar [Tue, 28 Oct 2014 04:11:38 +0000 (04:11 +0000)]
Merge "MediaCodec/Image: handle null cropRect correctly" into lmp-mr1-dev
automerge:
aab38b7
* commit '
aab38b7ea0b1774d158789772d0f6b1b99c1d3c9':
MediaCodec/Image: handle null cropRect correctly
Lajos Molnar [Tue, 28 Oct 2014 03:28:17 +0000 (03:28 +0000)]
Merge "MediaCodec/Image: handle null cropRect correctly" into lmp-mr1-dev
Griff Hazen [Tue, 28 Oct 2014 03:08:11 +0000 (03:08 +0000)]
DO NOT MERGE Fix lmp-sprout-dev build for generics addition automerge:
732e4ec -s ours
automerge:
d1cbf9a -s ours
* commit '
d1cbf9a8703a0fa2eefd9ad0f565f99120b61c3b':
DO NOT MERGE Fix lmp-sprout-dev build for generics addition
Jason Monk [Tue, 28 Oct 2014 03:07:22 +0000 (03:07 +0000)]
Add missing passive discovery flag automerge:
4444c5b automerge:
07faf0e
automerge:
e585740
* commit '
e58574026b265b4773f1e9bc896ba53530c7a580':
Add missing passive discovery flag
Ying Wang [Tue, 28 Oct 2014 03:05:59 +0000 (03:05 +0000)]
Update current.txt with generics to field types. automerge:
79775d4 automerge:
475d739 -s ours
automerge:
bc66de0
* commit '
bc66de0df9421ea0ffc36a1a6f6d8fd8bd7dfcda':
Update current.txt with generics to field types.
Griff Hazen [Tue, 28 Oct 2014 02:23:34 +0000 (02:23 +0000)]
DO NOT MERGE Fix lmp-sprout-dev build for generics addition
automerge:
732e4ec -s ours
* commit '
732e4ecbee3168c19e49469934f0e1cd3268e001':
DO NOT MERGE Fix lmp-sprout-dev build for generics addition
Jason Monk [Tue, 28 Oct 2014 02:21:20 +0000 (02:21 +0000)]
Add missing passive discovery flag automerge:
4444c5b
automerge:
07faf0e
* commit '
07faf0e1a1d32408dfdc863a0996baa8522c5fdb':
Add missing passive discovery flag
Ying Wang [Tue, 28 Oct 2014 02:20:25 +0000 (02:20 +0000)]
Update current.txt with generics to field types. automerge:
79775d4
automerge:
475d739 -s ours
* commit '
475d7393bf0cbb80dd1911df30a6ba0292da09c3':
Update current.txt with generics to field types.
Griff Hazen [Tue, 28 Oct 2014 02:19:22 +0000 (19:19 -0700)]
DO NOT MERGE Fix lmp-sprout-dev build for generics addition
Change-Id: I66f10264476df5504086a7fbc24d729798187d05
Yuncheol Heo [Tue, 28 Oct 2014 01:57:50 +0000 (01:57 +0000)]
Merge "CEC: Send <ReportMenuStatus:active> together sending <ActiveSource>." into lmp-mr1-dev
automerge:
571cc6b
* commit '
571cc6b19511b07d77418b1f0288eb467d367a9a':
CEC: Send <ReportMenuStatus:active> together sending <ActiveSource>.
Alan Viverette [Tue, 28 Oct 2014 01:56:59 +0000 (01:56 +0000)]
Merge "Play CLICK sound effect when compound buttons are clicked" into lmp-mr1-dev
automerge:
e5d27a2
* commit '
e5d27a22a6908026d346e86389cf414b5badeab6':
Play CLICK sound effect when compound buttons are clicked
Ying Wang [Tue, 28 Oct 2014 01:55:59 +0000 (01:55 +0000)]
Update current.txt with generics to field types.
automerge:
80c9fbe
* commit '
80c9fbe36fe8b1e298a70c465e85ee677fc12e12':
Update current.txt with generics to field types.
Yuncheol Heo [Tue, 28 Oct 2014 01:04:06 +0000 (01:04 +0000)]
Merge "CEC: Send <ReportMenuStatus:active> together sending <ActiveSource>." into lmp-mr1-dev
Alan Viverette [Tue, 28 Oct 2014 00:57:10 +0000 (00:57 +0000)]
Merge "Play CLICK sound effect when compound buttons are clicked" into lmp-mr1-dev
Jason Monk [Tue, 28 Oct 2014 00:52:56 +0000 (00:52 +0000)]
Add missing passive discovery flag
automerge:
4444c5b
* commit '
4444c5b27874866f18cd8f4abb8914cc17857ea7':
Add missing passive discovery flag
Alan Viverette [Tue, 28 Oct 2014 00:50:51 +0000 (17:50 -0700)]
Play CLICK sound effect when compound buttons are clicked
Also plays the sound effect when the switch changes state as a result
of dragging, since that's effectively the same as the click action.
BUG:
16308311
Change-Id: Ic187ece2a8190082617f5ac7aaf05c3511fa80b5
Ying Wang [Tue, 28 Oct 2014 00:42:04 +0000 (17:42 -0700)]
Update current.txt with generics to field types.
Bug:
17014855
Change-Id: I14672092f79374f6c5b2362bd3c2aaac84e0c2ae
Winson Chung [Mon, 27 Oct 2014 23:53:52 +0000 (23:53 +0000)]
Merge "Fixing potential crash when the task loader is stopped. (Bug
18135583)" into lmp-mr1-dev
automerge:
b55f7d7
* commit '
b55f7d79d19e8d8786fab8faabedb2f253bfacf8':
Fixing potential crash when the task loader is stopped. (Bug
18135583)
Jeff Sharkey [Mon, 27 Oct 2014 23:53:00 +0000 (23:53 +0000)]
Merge "Check upgrade certs before permissions." into lmp-mr1-dev
automerge:
e795533
* commit '
e79553355b10815be2cd44f7b84ae39c91a12bb1':
Check upgrade certs before permissions.
John Reck [Mon, 27 Oct 2014 23:42:35 +0000 (23:42 +0000)]
Merge "Cleanup debug options" into lmp-mr1-dev
automerge:
b0aeaad
* commit '
b0aeaad442e6cd4920d75a63d65a91267cf9199a':
Cleanup debug options
Alan Viverette [Mon, 27 Oct 2014 23:41:44 +0000 (23:41 +0000)]
Merge "Fix min/max date range in DatePicker calendar mode" into lmp-mr1-dev
automerge:
3847552
* commit '
384755230c52f0951820ba496f300959dcc84ead':
Fix min/max date range in DatePicker calendar mode
Wale Ogunwale [Mon, 27 Oct 2014 23:40:54 +0000 (23:40 +0000)]
Merge "Added documentation for various window frame types." into lmp-mr1-dev
automerge:
674f55e
* commit '
674f55e515d0895475d136f7793f6ce9929d859c':
Added documentation for various window frame types.
Winson Chung [Mon, 27 Oct 2014 23:39:09 +0000 (23:39 +0000)]
Merge "Fixing potential crash when the task loader is stopped. (Bug
18135583)" into lmp-mr1-dev
Alan Viverette [Mon, 27 Oct 2014 23:39:09 +0000 (23:39 +0000)]
Merge "Clean up some javadocs in Window.setFeature...()" into lmp-mr1-dev
automerge:
253626b
* commit '
253626b822b3b20fdb9727705593b4b5b55b8553':
Clean up some javadocs in Window.setFeature...()
Jeff Sharkey [Mon, 27 Oct 2014 23:35:57 +0000 (23:35 +0000)]
Merge "Check upgrade certs before permissions." into lmp-mr1-dev
John Reck [Mon, 27 Oct 2014 23:27:29 +0000 (23:27 +0000)]
Merge "Cleanup debug options" into lmp-mr1-dev
Jason Monk [Mon, 27 Oct 2014 23:20:02 +0000 (19:20 -0400)]
Add missing passive discovery flag
MediaProjectionManagerService had an active media callback which
was causing a service to be bound 100% of the time. Adding a
passive flag makes it only observe events, and allow the service
to only be bound when needed by apps requesting active discovery.
Bug:
18042409
Bug:
17969854
Change-Id: I1bfa6609e2aa507ee2ce227de50f0e5ae951e000
Alan Viverette [Mon, 27 Oct 2014 23:16:25 +0000 (23:16 +0000)]
Merge "Fix min/max date range in DatePicker calendar mode" into lmp-mr1-dev
Wale Ogunwale [Mon, 27 Oct 2014 23:05:38 +0000 (23:05 +0000)]
Merge "Added documentation for various window frame types." into lmp-mr1-dev
Alan Viverette [Mon, 27 Oct 2014 22:39:11 +0000 (22:39 +0000)]
Merge "Clean up some javadocs in Window.setFeature...()" into lmp-mr1-dev
Jeff Sharkey [Mon, 27 Oct 2014 22:38:25 +0000 (15:38 -0700)]
Check upgrade certs before permissions.
We're now checking for permission redefinition early during the
install process, which can result in a confusing error message when
the real problem is a mis-signed app. So do a quick signature
sanity check before checking permissions.
Bug:
18095637
Change-Id: I9a9b48da9c5dc7fb9bde6f3f338ea08e53b6b705
Ying Wang [Mon, 27 Oct 2014 22:35:59 +0000 (22:35 +0000)]
Update current.txt with generics to field types.
automerge:
79775d4
* commit '
79775d4bc4fa71994942dbd1d441aa62827c34be':
Update current.txt with generics to field types.
Jeff Sharkey [Mon, 27 Oct 2014 22:19:21 +0000 (22:19 +0000)]
Merge "Follow API removal." into lmp-mr1-dev
automerge:
d634d39
* commit '
d634d39c605553e669a16fd8fd406aa4695f54af':
Follow API removal.
Mike Lockwood [Mon, 27 Oct 2014 22:18:05 +0000 (22:18 +0000)]
Merge "Improve toString() methods for audio classes to help with debugging" into lmp-mr1-dev
automerge:
ac7d8c5
* commit '
ac7d8c5cc85dc5929b5d1c9d7836aca58a4e9ea5':
Improve toString() methods for audio classes to help with debugging
Jeff Sharkey [Mon, 27 Oct 2014 22:16:59 +0000 (22:16 +0000)]
Merge "Follow ArraySet refactoring." into lmp-mr1-dev
automerge:
9c81373
* commit '
9c81373bc99dd97c3e89138b008ea4c5c77c9b47':
Follow ArraySet refactoring.
Jeff Sharkey [Mon, 27 Oct 2014 22:14:44 +0000 (22:14 +0000)]
Merge "Drop DEV network stats to save RAM." into lmp-mr1-dev
automerge:
49c1527
* commit '
49c1527cd530d880b37c2f0becf57043740b491c':
Drop DEV network stats to save RAM.
Jeff Sharkey [Mon, 27 Oct 2014 22:01:57 +0000 (22:01 +0000)]
Merge "Follow API removal." into lmp-mr1-dev
Lajos Molnar [Mon, 27 Oct 2014 21:54:33 +0000 (14:54 -0700)]
MediaCodec/Image: handle null cropRect correctly
- allow Media.Image.setCropRect(null) to unset cropRect
- use full image if cropRect is null in MediaCodec$Image
Bug:
18124320
Change-Id: I7abb6175402a1fe913e16c0a682fabee79c55741
Jeff Sharkey [Mon, 27 Oct 2014 21:53:40 +0000 (14:53 -0700)]
Follow API removal.
Bug:
18118003
Change-Id: Iad73ce748e05ba0660246e8dbb041415c187f792
Craig Mautner [Thu, 23 Oct 2014 20:16:53 +0000 (13:16 -0700)]
Do not go through a layout if visibility is GONE
An unnecessary layout based on dimensions changing catches up
with us later when the next layout doesn't occur.
In this case
we layed out the Settings panel because visibility changed from
visible to GONE and the requested width/height didn't match the
current window width height. When the visibility changed back
to visible the dimensions matched and another layout was not
performed.
This fix delays the layout until the window becomes visible again.
Fixes bug
17681754.
Change-Id: I0a3ff9479dca93e78c5d3a3df40faceffc10ecbd
George Mount [Mon, 27 Oct 2014 21:25:12 +0000 (14:25 -0700)]
Fix NPE in moveSharedElementsToOverlay
Bug
18119532
Change-Id: I334bda2d63427032583a15a483e000412024c150
Mike Lockwood [Mon, 27 Oct 2014 21:10:21 +0000 (21:10 +0000)]
Merge "Improve toString() methods for audio classes to help with debugging" into lmp-mr1-dev
Mike Lockwood [Mon, 27 Oct 2014 20:34:45 +0000 (13:34 -0700)]
Improve toString() methods for audio classes to help with debugging
bug:
18139399
Change-Id: I6076f9f5daa3b485bc80a4ff1b16a583e6c93f67
Jeff Sharkey [Mon, 27 Oct 2014 21:02:07 +0000 (21:02 +0000)]
Merge "Follow ArraySet refactoring." into lmp-mr1-dev
Jeff Sharkey [Mon, 27 Oct 2014 20:49:56 +0000 (13:49 -0700)]
Follow ArraySet refactoring.
Bug:
18115729
Change-Id: I2c32965b621b5bb57ff3bde02b00b31b59a5cd6d
Jeff Sharkey [Mon, 27 Oct 2014 20:38:05 +0000 (20:38 +0000)]
Merge "Drop DEV network stats to save RAM." into lmp-mr1-dev
Dake Gu [Mon, 27 Oct 2014 20:37:03 +0000 (20:37 +0000)]
am
4c2e3491: Merge "ActivityTransition: Encode scaleType and matrix in snapshot view" into lmp-mr1-dev
* commit '
4c2e3491ec6cf20bcf95a922f396473e33bc4e98':
ActivityTransition: Encode scaleType and matrix in snapshot view
Jeff Sharkey [Mon, 27 Oct 2014 20:36:59 +0000 (20:36 +0000)]
am
e67b8d28: Merge "Reduce PackageManager RAM usage: ArrayMap/Set." into lmp-mr1-dev
* commit '
e67b8d28294d9af440d2ea23f1b2c68dfcba8b1b':
Reduce PackageManager RAM usage: ArrayMap/Set.
Eric Laurent [Mon, 27 Oct 2014 20:36:54 +0000 (20:36 +0000)]
am
670a82cb: Merge "audioservice: fix default stream volume" into lmp-mr1-dev
* commit '
670a82cbb1b62e69fa7ef7387eed545a76c96f76':
audioservice: fix default stream volume
Jeff Hao [Mon, 27 Oct 2014 20:36:49 +0000 (20:36 +0000)]
am
e8d9810c: Merge "Get UsageStats if no PackageUsage is available for boot dexopt filtering." into lmp-mr1-dev
* commit '
e8d9810cdef5b3e288f54f42adc3205532343406':
Get UsageStats if no PackageUsage is available for boot dexopt filtering.
Wink Saville [Mon, 27 Oct 2014 20:36:44 +0000 (20:36 +0000)]
am
4dec130c: Merge "Change subId to int from long" into lmp-mr1-dev
* commit '
4dec130c396b95c888b52693796f790205d374e7':
Change subId to int from long
Evan Charlton [Mon, 27 Oct 2014 20:36:39 +0000 (20:36 +0000)]
am
2ad5eb53: Merge "Move telecom permission to the public API" into lmp-mr1-dev
* commit '
2ad5eb538ddddb56fe96482a644c0519156bf2bd':
Move telecom permission to the public API
Geoff Mendal [Mon, 27 Oct 2014 20:36:35 +0000 (20:36 +0000)]
am
649fee03: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev automerge:
5a1a14a -s ours
* commit '
649fee03263decf9df12db01f02cf77779a388ce':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 27 Oct 2014 20:36:30 +0000 (20:36 +0000)]
am
496f0ea6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
496f0ea68ae043dd8fd26b8a9577c496e25083c0':
Import translations. DO NOT MERGE
Adrian Roos [Mon, 27 Oct 2014 20:36:25 +0000 (20:36 +0000)]
am
4bc3c8bd: Merge "SampleTrustAgent: Exercise KeyguardManager.isKeyguardInTrustedState" into lmp-mr1-dev
* commit '
4bc3c8bd643ca6840bf5b3fe01d8221f3a389d96':
SampleTrustAgent: Exercise KeyguardManager.isKeyguardInTrustedState
Jorim Jaggi [Mon, 27 Oct 2014 20:36:20 +0000 (20:36 +0000)]
am
f129ee37: Merge "Fix padding between battery and system icons" into lmp-mr1-dev
* commit '
f129ee377ab2771a5159fde9208da8c26207d41b':
Fix padding between battery and system icons
Jorim Jaggi [Mon, 27 Oct 2014 20:36:16 +0000 (20:36 +0000)]
am
9016d8fa: Merge "Fix system icon widths" into lmp-mr1-dev
* commit '
9016d8fa80d1f3d17c612fdc7edcfabb70b1c29e':
Fix system icon widths
Jorim Jaggi [Mon, 27 Oct 2014 20:36:10 +0000 (20:36 +0000)]
am
312c1e79: Merge "Add padding when both data icon and wifi icon is visible" into lmp-mr1-dev
* commit '
312c1e79d49a1ce7f7202f3bedb3a8d1fa110e4d':
Add padding when both data icon and wifi icon is visible
George Mount [Mon, 27 Oct 2014 20:36:05 +0000 (20:36 +0000)]
am
e0f76e9a: Merge "Fix transition being canceled improperly." into lmp-mr1-dev
* commit '
e0f76e9a6d352c45a1729b99ea0df59bd4359423':
Fix transition being canceled improperly.
George Mount [Mon, 27 Oct 2014 20:35:59 +0000 (20:35 +0000)]
am
03d5c6f5: Merge "Add resizeClip attribute to ChangeBounds." into lmp-mr1-dev
* commit '
03d5c6f55b316a5b0e1aae405077d1083df60b36':
Add resizeClip attribute to ChangeBounds.
Dake Gu [Mon, 27 Oct 2014 20:23:26 +0000 (20:23 +0000)]
Merge "ActivityTransition: Encode scaleType and matrix in snapshot view" into lmp-mr1-dev
Jeff Sharkey [Mon, 27 Oct 2014 19:56:59 +0000 (19:56 +0000)]
Merge "Reduce PackageManager RAM usage: ArrayMap/Set." into lmp-mr1-dev
OSDN Git Service
