git.osdn.net Git - android-x86/frameworks-base.git/log

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Griff Hazen [Tue, 28 Oct 2014 03:42:46 +0000 (03:42 +0000)]

DO NOT MERGE Fix lmp-sprout-dev build for generics addition automerge: 732e4ec  -s ours automerge: d1cbf9a  -s ours
automerge: eb19a9b  -s ours

* commit 'eb19a9bb8a729d0f13720b88e28fc17ece13af17':
  DO NOT MERGE Fix lmp-sprout-dev build for generics addition

commit | commitdiff | tree

Jason Monk [Tue, 28 Oct 2014 03:41:57 +0000 (03:41 +0000)]

Add missing passive discovery flag automerge: 4444c5b automerge: 07faf0e automerge: e585740
automerge: 8ae1a5e

* commit '8ae1a5e10efdb58b83b510337dddd47759bdc650':
Add missing passive discovery flag

commit | commitdiff | tree

Ying Wang [Tue, 28 Oct 2014 03:41:09 +0000 (03:41 +0000)]

Update current.txt with generics to field types. automerge: 79775d4 automerge: 475d739 -s ours automerge: bc66de0
automerge: dbfdebf

* commit 'dbfdebfff850239a3bd478846bf3fba85df8f67a':
Update current.txt with generics to field types.

commit | commitdiff | tree

Yuncheol Heo [Tue, 28 Oct 2014 03:40:16 +0000 (03:40 +0000)]

Merge "CEC: Send <ReportMenuStatus:active> together sending <ActiveSource>." into lmp-mr1-dev automerge: 571cc6b
automerge: 522e0af

* commit '522e0afa0fc400ceeee034c1b593b73a2787f659':
CEC: Send <ReportMenuStatus:active> together sending <ActiveSource>.

commit | commitdiff | tree

Alan Viverette [Tue, 28 Oct 2014 03:39:26 +0000 (03:39 +0000)]

Merge "Play CLICK sound effect when compound buttons are clicked" into lmp-mr1-dev automerge: e5d27a2
automerge: 8e448af

* commit '8e448aff2df5f41dc4b329134306fd700f497ca6':
Play CLICK sound effect when compound buttons are clicked

commit | commitdiff | tree

Ying Wang [Tue, 28 Oct 2014 03:38:27 +0000 (03:38 +0000)]

Update current.txt with generics to field types. automerge: 80c9fbe
automerge: bf43899

* commit 'bf438996e04d833d882581b25cc24f10d8a2c568':
Update current.txt with generics to field types.

commit | commitdiff | tree

Lajos Molnar [Tue, 28 Oct 2014 03:28:17 +0000 (03:28 +0000)]

Merge "MediaCodec/Image: handle null cropRect correctly" into lmp-mr1-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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>.

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Winson Chung [Tue, 28 Oct 2014 00:37:10 +0000 (00:37 +0000)]

Merge "Fixing potential crash when the task loader is stopped. (Bug 18135583)" into lmp-mr1-dev automerge: b55f7d7
automerge: 0baa55a

* commit '0baa55a74342b558139879201bd55d4f8cc8e5a8':
Fixing potential crash when the task loader is stopped. (Bug 18135583)

commit | commitdiff | tree

Jeff Sharkey [Tue, 28 Oct 2014 00:36:08 +0000 (00:36 +0000)]

Merge "Check upgrade certs before permissions." into lmp-mr1-dev automerge: e795533
automerge: 05cff40

* commit '05cff4047d1c1d0552ce52a6af0151c6b1cc8e4f':
Check upgrade certs before permissions.

commit | commitdiff | tree

John Reck [Tue, 28 Oct 2014 00:35:14 +0000 (00:35 +0000)]

Merge "Cleanup debug options" into lmp-mr1-dev automerge: b0aeaad
automerge: 49a01fc

* commit '49a01fc7dc8d2b9cc7591a94d19f3c209e470aea':
Cleanup debug options

commit | commitdiff | tree

Alan Viverette [Tue, 28 Oct 2014 00:34:22 +0000 (00:34 +0000)]

Merge "Fix min/max date range in DatePicker calendar mode" into lmp-mr1-dev automerge: 3847552
automerge: 5a01fcd

* commit '5a01fcd194bea9cf001709f32247ad851cd5a0dc':
Fix min/max date range in DatePicker calendar mode

commit | commitdiff | tree

Wale Ogunwale [Tue, 28 Oct 2014 00:33:30 +0000 (00:33 +0000)]

Merge "Added documentation for various window frame types." into lmp-mr1-dev automerge: 674f55e
automerge: e1c6d89

* commit 'e1c6d898177bb694ad84ccb1940f3e3df074a290':
Added documentation for various window frame types.

commit | commitdiff | tree

Alan Viverette [Tue, 28 Oct 2014 00:32:19 +0000 (00:32 +0000)]

Merge "Clean up some javadocs in Window.setFeature...()" into lmp-mr1-dev automerge: 253626b
automerge: b64176b

* commit 'b64176bd87e08bcb952d6c22eea7ffd9a8b6df62':
Clean up some javadocs in Window.setFeature...()

commit | commitdiff | tree

Jeff Sharkey [Tue, 28 Oct 2014 00:31:14 +0000 (00:31 +0000)]

Merge "Follow API removal." into lmp-mr1-dev automerge: d634d39
automerge: 19022f6

* commit '19022f6991e2d681dfdc8d5e6464557647a1faa1':
Follow API removal.

commit | commitdiff | tree

Mike Lockwood [Tue, 28 Oct 2014 00:29:57 +0000 (00:29 +0000)]

Merge "Improve toString() methods for audio classes to help with debugging" into lmp-mr1-dev automerge: ac7d8c5
automerge: 9f08a9f

* commit '9f08a9f08a3440e1f4a0b60c3e0cc5fe3dd71f27':
Improve toString() methods for audio classes to help with debugging

commit | commitdiff | tree

Jeff Sharkey [Tue, 28 Oct 2014 00:29:03 +0000 (00:29 +0000)]

Merge "Follow ArraySet refactoring." into lmp-mr1-dev automerge: 9c81373
automerge: 817722b

* commit '817722bb36e81ef0216fd1c75a9174e08238f954':
Follow ArraySet refactoring.

commit | commitdiff | tree

Jeff Sharkey [Tue, 28 Oct 2014 00:27:07 +0000 (00:27 +0000)]

Merge "Drop DEV network stats to save RAM." into lmp-mr1-dev automerge: 49c1527
automerge: a5921b9

* commit 'a5921b9b79a1d95e8a41bd74998cab82b153cb0a':
Drop DEV network stats to save RAM.

commit | commitdiff | tree

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)

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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...()

commit | commitdiff | tree

Jeff Sharkey [Mon, 27 Oct 2014 23:35:57 +0000 (23:35 +0000)]

Merge "Check upgrade certs before permissions." into lmp-mr1-dev

commit | commitdiff | tree

John Reck [Mon, 27 Oct 2014 23:27:29 +0000 (23:27 +0000)]

Merge "Cleanup debug options" into lmp-mr1-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

Jeff Sharkey [Mon, 27 Oct 2014 22:01:57 +0000 (22:01 +0000)]

Merge "Follow API removal." into lmp-mr1-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Jeff Sharkey [Mon, 27 Oct 2014 21:53:40 +0000 (14:53 -0700)]

Follow API removal.

Bug: 18118003
Change-Id: Iad73ce748e05ba0660246e8dbb041415c187f792

commit | commitdiff | tree

Dake Gu [Mon, 27 Oct 2014 21:34:58 +0000 (21:34 +0000)]

am 4c2e3491: Merge "ActivityTransition: Encode scaleType and matrix in snapshot view" into lmp-mr1-dev
automerge: 63964d9

* commit '63964d9eae11b79e3d50ee5f3cc79b08050653fe':
ActivityTransition: Encode scaleType and matrix in snapshot view

commit | commitdiff | tree

Jeff Sharkey [Mon, 27 Oct 2014 21:33:55 +0000 (21:33 +0000)]

am e67b8d28: Merge "Reduce PackageManager RAM usage: ArrayMap/Set." into lmp-mr1-dev
automerge: 301b563

* commit '301b563107c7458a21e4460254e81694b45f0e35':
Reduce PackageManager RAM usage: ArrayMap/Set.

commit | commitdiff | tree

Eric Laurent [Mon, 27 Oct 2014 21:32:52 +0000 (21:32 +0000)]

am 670a82cb: Merge "audioservice: fix default stream volume" into lmp-mr1-dev
automerge: af93061

* commit 'af9306149323120d8098f5fdef15b923e36d9569':
audioservice: fix default stream volume

commit | commitdiff | tree

Jeff Hao [Mon, 27 Oct 2014 21:31:54 +0000 (21:31 +0000)]

am e8d9810c: Merge "Get UsageStats if no PackageUsage is available for boot dexopt filtering." into lmp-mr1-dev
automerge: ad1a613

* commit 'ad1a613c5291af54df0a26cf5c34434079782692':
Get UsageStats if no PackageUsage is available for boot dexopt filtering.

commit | commitdiff | tree

Wink Saville [Mon, 27 Oct 2014 21:30:48 +0000 (21:30 +0000)]

am 4dec130c: Merge "Change subId to int from long" into lmp-mr1-dev
automerge: e5b4c12

* commit 'e5b4c1219a32a086508d83101c10605dd894e4d2':
Change subId to int from long

commit | commitdiff | tree

Evan Charlton [Mon, 27 Oct 2014 21:29:55 +0000 (21:29 +0000)]

am 2ad5eb53: Merge "Move telecom permission to the public API" into lmp-mr1-dev
automerge: 8e25057

* commit '8e2505760c7d06823717c1d394bf323db0dd0caa':
Move telecom permission to the public API

commit | commitdiff | tree

Geoff Mendal [Mon, 27 Oct 2014 21:29:03 +0000 (21:29 +0000)]

am 649fee03: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev automerge: 5a1a14a  -s ours
automerge: 39545fc  -s ours

* commit '39545fce48e41a3de73df3b6a423c43e72d49457':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 27 Oct 2014 21:28:04 +0000 (21:28 +0000)]

am 496f0ea6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
automerge: e5661ee -s ours

* commit 'e5661ee3deb18c060b36fd12ee88ca37ec25fdda':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Adrian Roos [Mon, 27 Oct 2014 21:27:01 +0000 (21:27 +0000)]

am 4bc3c8bd: Merge "SampleTrustAgent: Exercise KeyguardManager.isKeyguardInTrustedState" into lmp-mr1-dev
automerge: f9b36d5

* commit 'f9b36d5ef94c92a66c08167d5e7e911e5ea8c645':
SampleTrustAgent: Exercise KeyguardManager.isKeyguardInTrustedState

commit | commitdiff | tree

Jorim Jaggi [Mon, 27 Oct 2014 21:25:59 +0000 (21:25 +0000)]

am f129ee37: Merge "Fix padding between battery and system icons" into lmp-mr1-dev
automerge: 97f1a97

* commit '97f1a97d89366159374c2be3d74e0642705d80bf':
Fix padding between battery and system icons

commit | commitdiff | tree

Jorim Jaggi [Mon, 27 Oct 2014 21:24:41 +0000 (21:24 +0000)]

am 9016d8fa: Merge "Fix system icon widths" into lmp-mr1-dev
automerge: 876820e

* commit '876820eb670936815e9064f816a8ce14bda64455':
Fix system icon widths

commit | commitdiff | tree

Jorim Jaggi [Mon, 27 Oct 2014 21:23:43 +0000 (21:23 +0000)]

am 312c1e79: Merge "Add padding when both data icon and wifi icon is visible" into lmp-mr1-dev
automerge: 286f361

* commit '286f36112e424a173a5a57f881545045c54ec76b':
Add padding when both data icon and wifi icon is visible

commit | commitdiff | tree

George Mount [Mon, 27 Oct 2014 21:22:49 +0000 (21:22 +0000)]

am e0f76e9a: Merge "Fix transition being canceled improperly." into lmp-mr1-dev
automerge: 7b042be

* commit '7b042be5e2975eddf1da915be052ad70fc07c115':
Fix transition being canceled improperly.

commit | commitdiff | tree

George Mount [Mon, 27 Oct 2014 21:21:18 +0000 (21:21 +0000)]

am 03d5c6f5: Merge "Add resizeClip attribute to ChangeBounds." into lmp-mr1-dev
automerge: 3437192

* commit '34371925470e43dfe1b194fd3f6d0b942f13f1bd':
Add resizeClip attribute to ChangeBounds.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Jeff Sharkey [Mon, 27 Oct 2014 21:02:07 +0000 (21:02 +0000)]

Merge "Follow ArraySet refactoring." into lmp-mr1-dev

commit | commitdiff | tree

Jeff Sharkey [Mon, 27 Oct 2014 20:49:56 +0000 (13:49 -0700)]

Follow ArraySet refactoring.

Bug: 18115729
Change-Id: I2c32965b621b5bb57ff3bde02b00b31b59a5cd6d

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

Jeff Sharkey [Mon, 27 Oct 2014 19:56:59 +0000 (19:56 +0000)]

Merge "Reduce PackageManager RAM usage: ArrayMap/Set." into lmp-mr1-dev

commit | commitdiff | tree

John Reck [Mon, 27 Oct 2014 19:38:48 +0000 (12:38 -0700)]

Cleanup debug options

Bug: 18138852
Bug: 18065434
Change-Id: Ibb07b73b147c2a8b287fe8aee3f6624582f21b00

commit | commitdiff | tree

Eric Laurent [Mon, 27 Oct 2014 19:40:29 +0000 (19:40 +0000)]

Merge "audioservice: fix default stream volume" into lmp-mr1-dev

commit | commitdiff | tree

winsonchung [Mon, 27 Oct 2014 19:01:14 +0000 (12:01 -0700)]

Fixing potential crash when the task loader is stopped. (Bug 18135583)

Change-Id: I44f766e52f05c38a1b6c4a2e7942e3d6ecaae501

commit | commitdiff | tree

Ying Wang [Mon, 20 Oct 2014 20:44:30 +0000 (13:44 -0700)]

Update current.txt with generics to field types.

Bug: 17014855
Change-Id: I14672092f79374f6c5b2362bd3c2aaac84e0c2ae

commit | commitdiff | tree

Jeff Hao [Mon, 27 Oct 2014 17:46:22 +0000 (17:46 +0000)]

Merge "Get UsageStats if no PackageUsage is available for boot dexopt filtering." into lmp-mr1-dev

commit | commitdiff | tree

Wink Saville [Mon, 27 Oct 2014 17:34:46 +0000 (17:34 +0000)]

Merge "Change subId to int from long" into lmp-mr1-dev

commit | commitdiff | tree

Eric Laurent [Fri, 10 Oct 2014 22:24:04 +0000 (15:24 -0700)]

audioservice: fix default stream volume

When the max stream volume is configurable by
a system property, the default stream volume should
be set accordingly.

Bug: 17507571.

Change-Id: I9d9378292fc7b9c9e32acc55a275cc0ae5b203d4

commit | commitdiff | tree

Evan Charlton [Mon, 27 Oct 2014 17:08:31 +0000 (17:08 +0000)]

Merge "Move telecom permission to the public API" into lmp-mr1-dev

commit | commitdiff | tree

Geoff Mendal [Mon, 27 Oct 2014 16:42:51 +0000 (16:42 +0000)]

Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
automerge: 5a1a14a -s ours

* commit '5a1a14a8174213edcd5f1d7f8fbc427122b25f99':
Import translations. DO NOT MERGE