OSDN Git Service
Glenn Kasten [Tue, 10 Mar 2015 01:07:31 +0000 (01:07 +0000)]
Merge "Revert "soundpool: reuse channel for same sample if available""
Glenn Kasten [Tue, 10 Mar 2015 01:06:28 +0000 (01:06 +0000)]
Merge "Revert "soundpool: update sample rate when reusing audiotrack""
Roozbeh Pournader [Tue, 10 Mar 2015 01:06:02 +0000 (01:06 +0000)]
Merge "Fix: Drag handles are not shown for selection/insertion"
Andy Hung [Tue, 10 Mar 2015 00:37:58 +0000 (00:37 +0000)]
Merge "Fix SoundPool playback of multichannel files."
Alan Viverette [Tue, 10 Mar 2015 00:22:37 +0000 (00:22 +0000)]
Merge "Copy ViewPager and PagerAdapter into framework-internal widgets"
Eino-Ville Talvala [Tue, 10 Mar 2015 00:16:14 +0000 (00:16 +0000)]
Merge "Add DEPTH image formats, support in ImageReader"
Eric Laurent [Tue, 10 Mar 2015 00:06:10 +0000 (00:06 +0000)]
Merge "enable FM tuner and hotword capture for system apps."
Adrian Roos [Mon, 9 Mar 2015 23:53:55 +0000 (23:53 +0000)]
Merge "Add prototype of Inline Reply behind debug flag"
Eino-Ville Talvala [Thu, 26 Feb 2015 18:57:55 +0000 (10:57 -0800)]
Add DEPTH image formats, support in ImageReader
- Add an explicit mapping between public ImageFormat/
PixelFormat enums and internal HAL format/dataspace.
- Add DEPTH16 and DEPTH_POINT_CLOUD formats
- Wire up mapping layer to ImageReader to support depth
formats
Change-Id: I8197eccef900cc91baddcfcb934ccd4d8c972eff
Eino-Ville Talvala [Mon, 9 Mar 2015 23:29:10 +0000 (23:29 +0000)]
Merge "Camera2: Add hidden depth stream configuration tags"
Eino-Ville Talvala [Mon, 9 Mar 2015 23:29:09 +0000 (23:29 +0000)]
Merge "Camera2: Remove unused parameters in ICameraDeviceUser#createStream"
Alan Viverette [Mon, 9 Mar 2015 22:53:54 +0000 (22:53 +0000)]
Merge "Make TypedArray and LayoutInflater exceptions more useful"
Alan Viverette [Mon, 9 Mar 2015 22:51:10 +0000 (15:51 -0700)]
Copy ViewPager and PagerAdapter into framework-internal widgets
Converted all compat references to native implementations. Removed all
backwards compatibility SDK version checks.
Bug:
19431364
Change-Id: Ia79ed65bd2d041e4c0de6839b64707b9dba3ac22
Alan Viverette [Mon, 9 Mar 2015 22:32:50 +0000 (15:32 -0700)]
Make TypedArray and LayoutInflater exceptions more useful
Include unresolved TypedValue data in TypedArray exceptions, wrap all
LayoutInflater exceptions with the parser position.
Bug:
19658760
Change-Id: I8965bdc4d0c58c082cb7129c3b692a3e5418cfdb
Adam Lesinski [Mon, 9 Mar 2015 22:23:42 +0000 (15:23 -0700)]
Change WiFi and Bluetooth ActivityEnergyInfo classes
Have them take an elapsed time millis timestamp instead
of having the constructor call System.currentTimeMillis.
Change-Id: Ic9ca8f92347c336beee8ebcc3407de2c1e5b4073
Chris Craik [Mon, 9 Mar 2015 20:40:07 +0000 (20:40 +0000)]
Merge "Rewrite glop texture asserts"
Dianne Hackborn [Mon, 9 Mar 2015 20:36:56 +0000 (20:36 +0000)]
Merge "Battery stats issues: fix jiffy handling, print scan counts."
Chris Craik [Sat, 7 Mar 2015 01:30:11 +0000 (17:30 -0800)]
Rewrite glop texture asserts
bug:
19641517
Also switch Glop VertexAttribFlags to use int for group of flags.
Change-Id: Ib7b1934197a62206a55baa6ab484ac59f5bec816
Eric Laurent [Mon, 9 Mar 2015 16:25:45 +0000 (09:25 -0700)]
enable FM tuner and hotword capture for system apps.
AudioRecord constructor with AudioAttributes and session ID as well
as HOTWORD and RADIO_TUNER audio sources are now system APIs.
Renamed MediaRecorder.AudioSource.FM_TUNER to
MediaRecorder.AudioSource.RADIO_TUNER.
Change-Id: I231c20c21e3e8cffe1837482976ebe284c9af541
John Spurlock [Mon, 9 Mar 2015 18:49:57 +0000 (18:49 +0000)]
Merge "AudioService: Fix device dump in dumpsys output."
John Spurlock [Mon, 9 Mar 2015 18:21:20 +0000 (14:21 -0400)]
AudioService: Fix device dump in dumpsys output.
Bug:
19653026
Change-Id: Id09a502f1507477403c49be32ee0ed0f00ab288f
Dianne Hackborn [Mon, 9 Mar 2015 18:15:41 +0000 (11:15 -0700)]
Battery stats issues: fix jiffy handling, print scan counts.
Issue #
19431959: Framework incorrectly assumes that kernel
clock_ticks are 10ms
We now retrieve the time of a jiffy from the kernel, and all CPU
times are now handled in milliseconds.
Issue #
19571810: Add per-app breakdown of number of WiFi scans
in batterystats checkin data
Added to the report (the information was already being tracked).
Change-Id: If1702d6b9bcf851704129f1811471e68ed576a5d
Eino-Ville Talvala [Mon, 23 Feb 2015 23:55:55 +0000 (15:55 -0800)]
Camera2: Add hidden depth stream configuration tags
Change-Id: Iec1ceb894d90210bc3ab06acc92dcbbe42b74465
Eino-Ville Talvala [Mon, 23 Feb 2015 23:20:51 +0000 (15:20 -0800)]
Camera2: Remove unused parameters in ICameraDeviceUser#createStream
- width, height, format are unused
Change-Id: I26540aab1118108b0325df69cfa2dd23da41849b
Wale Ogunwale [Mon, 9 Mar 2015 17:18:51 +0000 (10:18 -0700)]
resolved conflicts for merge of
ca54b876 to master
Change-Id: I3148551b9809fb5c36007b26f26acf812b2f654d
Adrian Roos [Tue, 10 Feb 2015 19:49:33 +0000 (20:49 +0100)]
Add prototype of Inline Reply behind debug flag
The flag also extracts wear-only RemoteInput actions
to the normal set of actions under certain
circumstances to make this prototype actually useful.
Change-Id: Ide8bbef4e2ab82e2f152d32b143876ed309a8f21
Olawale Ogunwale [Mon, 9 Mar 2015 16:43:16 +0000 (16:43 +0000)]
am
edc3c893: am
14ccc26f: Merge "[ActivityManager] Skip receiver precisely."
* commit '
edc3c8939f3cde4ab9343e7654f5dac1122fb470':
[ActivityManager] Skip receiver precisely.
Olawale Ogunwale [Mon, 9 Mar 2015 16:36:31 +0000 (16:36 +0000)]
am
14ccc26f: Merge "[ActivityManager] Skip receiver precisely."
* commit '
14ccc26f1ce006963f1a0b7a917404aa6a0e9da1':
[ActivityManager] Skip receiver precisely.
Olawale Ogunwale [Mon, 9 Mar 2015 16:30:52 +0000 (16:30 +0000)]
Merge "[ActivityManager] Skip receiver precisely."
Adrian Roos [Mon, 9 Mar 2015 16:06:42 +0000 (16:06 +0000)]
Merge "Remove leftover code causing trust agent issues"
Adrian Roos [Mon, 9 Mar 2015 16:04:17 +0000 (16:04 +0000)]
Merge "Revert "Remove TrustAgent whitelisting API""
Adrian Roos [Mon, 9 Mar 2015 16:03:19 +0000 (16:03 +0000)]
Merge "Prevent receiver leak in TrustAgentWrapper"
Geoff Mendal [Mon, 9 Mar 2015 15:49:29 +0000 (15:49 +0000)]
am
e88afe3e: (-s ours) am
146990b7: (-s ours) Import translations. DO NOT MERGE
* commit '
e88afe3ee7b1944c8814f78f0eea41884d07600d':
Import translations. DO NOT MERGE
Bryce Lee [Mon, 9 Mar 2015 15:49:23 +0000 (15:49 +0000)]
am
1b8df04b: am
8aeab6c8: Allow the keyguard service to be configurable.
* commit '
1b8df04b8d754f68dc6bfa6caa9e0a2666d16933':
Allow the keyguard service to be configurable.
Bryce Lee [Mon, 9 Mar 2015 15:49:13 +0000 (15:49 +0000)]
am
168d0ade: am
1e53b98c: Merge "Allow press and hold from non-interactive." into lmp-mr1-modular-dev
* commit '
168d0ade0cb5a733c83d7dcfdf0a0efa3250cb16':
Allow press and hold from non-interactive.
Glenn Kasten [Mon, 9 Mar 2015 15:36:35 +0000 (08:36 -0700)]
Revert "soundpool: reuse channel for same sample if available"
This reverts commit
570576b51b8123ab05b36707ec752cf966292ca5.
Bug:
19635137
Change-Id: I8385ac4c151a375c19c3606698081c947b6216e3
Glenn Kasten [Mon, 9 Mar 2015 15:36:09 +0000 (08:36 -0700)]
Revert "soundpool: update sample rate when reusing audiotrack"
This reverts commit
a7d57a6f0068b1e2a0f07ca427cfba198b12a9b9.
Bug:
19635137
Change-Id: I1f53a432936dd3d51459e7d8cd86421bde399150
Geoff Mendal [Mon, 9 Mar 2015 15:35:56 +0000 (15:35 +0000)]
am
146990b7: (-s ours) Import translations. DO NOT MERGE
* commit '
146990b7494c3fe6f47f6e8425ecb13f75007418':
Import translations. DO NOT MERGE
Bryce Lee [Mon, 9 Mar 2015 15:35:38 +0000 (15:35 +0000)]
am
8aeab6c8: Allow the keyguard service to be configurable.
* commit '
8aeab6c8b9b89d77108fc05245561e33113fe27f':
Allow the keyguard service to be configurable.
Bryce Lee [Mon, 9 Mar 2015 15:35:05 +0000 (15:35 +0000)]
am
1e53b98c: Merge "Allow press and hold from non-interactive." into lmp-mr1-modular-dev
* commit '
1e53b98c38b6606859f4b33a98d776cbb65f1a42':
Allow press and hold from non-interactive.
Nicolas Prevot [Mon, 9 Mar 2015 14:53:22 +0000 (14:53 +0000)]
Merge "Add a new extra to specify the admin component for provisioning."
Nicolas Prevot [Mon, 9 Mar 2015 14:07:17 +0000 (14:07 +0000)]
Add a new extra to specify the admin component for provisioning.
An app may have several device admins.
For this case, allow the caller to specify which one will become
an active device admin, and the profile owner (in the profile owner flow).
BUG:
19348295
Change-Id: Ia5f995eed6c7f8933eb00d3250daa703ba6ee616
Geoff Mendal [Mon, 9 Mar 2015 14:41:17 +0000 (14:41 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 9 Mar 2015 14:39:13 +0000 (07:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9b6fac7639695f15cc7d1aa5b814bd6fa0872165
Auto-generated-cl: translation import
Geoff Mendal [Mon, 9 Mar 2015 13:55:14 +0000 (13:55 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 9 Mar 2015 13:40:26 +0000 (06:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: I433509f59a78920d4e2ac1e5eb4d44fb81b2fd48
Auto-generated-cl: translation import
Geoff Mendal [Mon, 9 Mar 2015 13:23:28 +0000 (06:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id2e79810aa3f2c1beb932786f579feab06b6825a
Auto-generated-cl: translation import
Geoff Mendal [Mon, 9 Mar 2015 12:34:56 +0000 (05:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9679db5505c907b78d3d97585d061f6746b0af7f
Auto-generated-cl: translation import
Benjamin Franz [Wed, 11 Feb 2015 10:51:10 +0000 (10:51 +0000)]
Block setting wallpapers from managed profiles.
Silently fail when a managed profile app tries to change the
wallpaper and return default values for getters in that case.
This is implemented through a new AppOp that is controlled by
a new user restriction that will be set during provisioning.
Bug:
18725052
Change-Id: I1601852617e738be86560f054daf3435dd9f5a9f
Tor Norbye [Wed, 4 Mar 2015 18:04:07 +0000 (10:04 -0800)]
Annotate methods with size and range annotations
Change-Id: I666861f0dfae31402b1280e9a966a583b88e2e1a
Tor Norbye [Mon, 2 Mar 2015 18:57:08 +0000 (10:57 -0800)]
Annotate return values with @CheckReturn
Change-Id: Icd8fb6adb591ccd7f35f2336ae716b198abf69c5
Tor Norbye [Mon, 2 Mar 2015 18:11:44 +0000 (10:11 -0800)]
Annotate methods to be called from overrides with @CallSuper
Change-Id: Ibc587c2aaee9f3e7f448079f72a75459fe4e15e7
Andreas Gampe [Sun, 8 Mar 2015 00:17:54 +0000 (00:17 +0000)]
am
3f74f638: am
55966006: am
7a4cb563: Merge "Frameworks/base: Remove unnecessary Pattern instance"
* commit '
3f74f6386a15d09f27dbc81edd8dd2c13e298d73':
Frameworks/base: Remove unnecessary Pattern instance
Andreas Gampe [Sun, 8 Mar 2015 00:17:47 +0000 (00:17 +0000)]
am
208e80d9: am
a3d5b230: am
cdc19f3f: Merge "Frameworks/base: Remove unnecessary Pattern instance"
* commit '
208e80d931fd775de925529e0c36a34e9b7f916a':
Frameworks/base: Remove unnecessary Pattern instance
Mathieu Chartier [Sun, 8 Mar 2015 00:17:40 +0000 (00:17 +0000)]
am
ea3d53f5: am
773bcfa7: am
e59b7ce2: Merge "Add JIT system properties"
* commit '
ea3d53f5a8f8e396bf8918041087db4603d444e5':
Add JIT system properties
Miao Wang [Sun, 8 Mar 2015 00:17:34 +0000 (00:17 +0000)]
am
989e03f1: am
c1e2bf95: am
4b5af9bc: Merge "[RenderScript] Update the java API about Allocation copyTo & From FieldPacker"
* commit '
989e03f144e8031f33af08945e845283dddcc8ad':
[RenderScript] Update the java API about Allocation copyTo & From FieldPacker
Miao Wang [Sun, 8 Mar 2015 00:17:27 +0000 (00:17 +0000)]
am
449571c4: am
26f1a538: am
8b86ee9f: Merge "[RenderScript] Add missing variable"
* commit '
449571c45e47e9b8d118c59dbd909b0d512f7e6d':
[RenderScript] Add missing variable
Miao Wang [Sun, 8 Mar 2015 00:17:18 +0000 (00:17 +0000)]
am
ec89c1ea: am
a61832c8: am
288e6f67: Merge "[RenderScript] AutoPadding & Unpadding for Vec3 Elements during copyTo & copyFrom."
* commit '
ec89c1ea731256cd0d71ee58733b2855e1e6e4fa':
[RenderScript] AutoPadding & Unpadding for Vec3 Elements during copyTo & copyFrom.
Andreas Gampe [Sun, 8 Mar 2015 00:08:25 +0000 (00:08 +0000)]
am
55966006: am
7a4cb563: Merge "Frameworks/base: Remove unnecessary Pattern instance"
* commit '
5596600697f54feb944737b7bc55df06123e6e54':
Frameworks/base: Remove unnecessary Pattern instance
Andreas Gampe [Sun, 8 Mar 2015 00:08:19 +0000 (00:08 +0000)]
am
a3d5b230: am
cdc19f3f: Merge "Frameworks/base: Remove unnecessary Pattern instance"
* commit '
a3d5b2304cf2db03ba728d37c87ef7360c7da44f':
Frameworks/base: Remove unnecessary Pattern instance
Mathieu Chartier [Sun, 8 Mar 2015 00:07:18 +0000 (00:07 +0000)]
am
773bcfa7: am
e59b7ce2: Merge "Add JIT system properties"
* commit '
773bcfa7ecb1e06831e7f060ecc3c43d0cf1bf00':
Add JIT system properties
Miao Wang [Sun, 8 Mar 2015 00:07:09 +0000 (00:07 +0000)]
am
c1e2bf95: am
4b5af9bc: Merge "[RenderScript] Update the java API about Allocation copyTo & From FieldPacker"
* commit '
c1e2bf95ab77127ea21ebd44b8615eca85338af1':
[RenderScript] Update the java API about Allocation copyTo & From FieldPacker
Miao Wang [Sun, 8 Mar 2015 00:07:01 +0000 (00:07 +0000)]
am
26f1a538: am
8b86ee9f: Merge "[RenderScript] Add missing variable"
* commit '
26f1a53838b2c8b77c0995801dcc1c7816c47f16':
[RenderScript] Add missing variable
Miao Wang [Sun, 8 Mar 2015 00:06:55 +0000 (00:06 +0000)]
am
a61832c8: am
288e6f67: Merge "[RenderScript] AutoPadding & Unpadding for Vec3 Elements during copyTo & copyFrom."
* commit '
a61832c8fdff8cf086113f578032136c81935904':
[RenderScript] AutoPadding & Unpadding for Vec3 Elements during copyTo & copyFrom.
Mike Lockwood [Sat, 7 Mar 2015 23:50:36 +0000 (23:50 +0000)]
Merge changes Ib5cc22db,I93e0c449,I65cd4cfd,I1cef3bd4,I628c0468
* changes:
MIDI Manager: Add explicit close mechanism for input and output ports
MidiDeviceService: Add getDeviceInfo() accessor method
Add MidiDevice.close() method so we can clean up our ServiceConnection
Make MidiSender and MidiReceiver abstract classes, rename MidiReceiver.post() to receive()
Eliminate MidiPort base class for MidiInputPort and MidiOutputPort
Andreas Gampe [Sat, 7 Mar 2015 17:13:16 +0000 (17:13 +0000)]
am
7a4cb563: Merge "Frameworks/base: Remove unnecessary Pattern instance"
* commit '
7a4cb563a29f05658760739d3bc2e70bd6342174':
Frameworks/base: Remove unnecessary Pattern instance
Andreas Gampe [Sat, 7 Mar 2015 17:13:09 +0000 (17:13 +0000)]
am
cdc19f3f: Merge "Frameworks/base: Remove unnecessary Pattern instance"
* commit '
cdc19f3f8a20b975e8e70f4b4cce5ce2be811726':
Frameworks/base: Remove unnecessary Pattern instance
Scott Kennedy [Sat, 7 Mar 2015 01:34:47 +0000 (01:34 +0000)]
Merge "Add more @Nullable annotations"
Scott Kennedy [Sat, 7 Mar 2015 01:24:58 +0000 (17:24 -0800)]
Add more @Nullable annotations
Change-Id: I5b2935eb5e63289d80ebf9bf70741800b1c0934a
Chih-Hung Hsieh [Sat, 7 Mar 2015 01:13:49 +0000 (01:13 +0000)]
Merge "Fix unused local variale warning from clang/llvm."
Chih-Hung Hsieh [Sat, 28 Feb 2015 00:11:36 +0000 (16:11 -0800)]
Fix unused local variale warning from clang/llvm.
Change-Id: Ib9b5d06313e5bf933edfb38a4522929104c7917a
Andreas Gampe [Sat, 7 Mar 2015 01:03:13 +0000 (01:03 +0000)]
Merge "Frameworks/base: Remove unnecessary Pattern instance"
Dianne Hackborn [Sat, 7 Mar 2015 00:44:56 +0000 (00:44 +0000)]
Merge "Add new debug feature to automatically create heap dumps."
Dianne Hackborn [Wed, 4 Mar 2015 01:04:12 +0000 (17:04 -0800)]
Add new debug feature to automatically create heap dumps.
Not yet working, unless you turn off SELinux enforcing.
We need to update SElinux to allow the system process
to give apps access to /data/system/heapdump/javaheap.bin.
Currently watching can only be enabled through the shell,
such as:
adb shell am set-watch-heap com.android.systemui 1024
The last number is the process pss size in bytes, so this is
asking us to warn if it goes about 1K which will be all the
time.
Change-Id: I2089e5db2927afca0bf01a363c6247ee5dcb26e8
Andreas Gampe [Fri, 6 Mar 2015 23:53:06 +0000 (15:53 -0800)]
Frameworks/base: Remove unnecessary Pattern instance
Using a static Pattern in UriMatcher prevents compile-time
initialization.
It is also not efficient, as String.split has a fast path for simple
splits.
Bug:
19542228
Change-Id: Ie9e5bfe6da04c6d05ec10b1426d0cd136ef46ef2
Andreas Gampe [Sat, 7 Mar 2015 00:18:44 +0000 (00:18 +0000)]
Merge "Frameworks/base: Remove unnecessary Pattern instance"
Andreas Gampe [Fri, 6 Mar 2015 23:29:06 +0000 (15:29 -0800)]
Frameworks/base: Remove unnecessary Pattern instance
Using a static Pattern in ActivityThread prevents compile-time
initialization of ActivityThread and GestureDetector, which depends
on the former.
It is also not efficient, as String.split has a fast path for simple
splits.
Bug:
19542228
Change-Id: I5bb843c08c81e0d259bb8afafa87a8467bb1730e
Yigit Boyar [Sat, 7 Mar 2015 00:09:28 +0000 (00:09 +0000)]
Merge "Remove original movements record from GridLayout"
John Reck [Fri, 6 Mar 2015 23:47:25 +0000 (23:47 +0000)]
Merge "Add percentiles"
John Reck [Fri, 6 Mar 2015 22:40:50 +0000 (14:40 -0800)]
Add percentiles
Change-Id: Ieb6badd177bb6f67dda199dfcb3e0f483c8c4e59
Bryce Lee [Fri, 6 Mar 2015 23:21:46 +0000 (15:21 -0800)]
Allow the keyguard service to be configurable.
Change-Id: I811171c228764c3e0e507ad3ce28835ccad9bb31
Tor Norbye [Fri, 6 Mar 2015 23:15:25 +0000 (23:15 +0000)]
Merge "Annotate ARGB integer parameters with @ColorInt"
Tor Norbye [Fri, 6 Mar 2015 23:08:58 +0000 (23:08 +0000)]
Merge "Additional annotations: @CallSuper, @Keep, etc."
Andy Hung [Fri, 6 Mar 2015 23:00:42 +0000 (15:00 -0800)]
Fix SoundPool playback of multichannel files.
Bug:
17188507
Change-Id: Ia4e43c7f8889181b998673b75b1f3bbf8c43f429
Bryce Lee [Fri, 6 Mar 2015 20:41:12 +0000 (20:41 +0000)]
Merge "Allow press and hold from non-interactive." into lmp-mr1-modular-dev
Mike Lockwood [Fri, 6 Mar 2015 17:18:09 +0000 (09:18 -0800)]
MIDI Manager: Add explicit close mechanism for input and output ports
Relying on errors from closing the file descriptor is not reliable
and was resulting in file descriptor leaks in device servers.
Change-Id: Ib5cc22dba493eae6608a12cc6d4178d8390da77b
Christopher Tate [Fri, 6 Mar 2015 19:43:52 +0000 (19:43 +0000)]
Merge "Don't back up / restore the code_cache/ directory"
Derek Sollenberger [Fri, 6 Mar 2015 18:48:27 +0000 (13:48 -0500)]
SkPorterDuff Multiply mode maps to SkXfermode modulate.
bug:
19627342
Change-Id: I97f26ca1bc8abe2768f4a12cc70fb0fa5d905098
Scott Kennedy [Fri, 6 Mar 2015 18:45:23 +0000 (18:45 +0000)]
Merge "Allow attrs to be @Nullable in TextView and LinearLayout"
Chris Craik [Fri, 6 Mar 2015 18:44:15 +0000 (18:44 +0000)]
Merge "Avoid invalid shader creation for certain blend modes"
Chris Craik [Fri, 6 Mar 2015 18:42:29 +0000 (18:42 +0000)]
Merge "Revert "Revert "Remove references to SkPorterDuff as it is deprecated."""
Chris Craik [Fri, 6 Mar 2015 18:42:15 +0000 (18:42 +0000)]
Revert "Revert "Remove references to SkPorterDuff as it is deprecated.""
Fix build breakage.
This reverts commit
26b4f598c8b1e99b43261614a6861785638c8c00.
Change-Id: If39ce2a41d26a8520091f330234c3d35e413ee92
Chris Craik [Fri, 6 Mar 2015 18:16:44 +0000 (18:16 +0000)]
Merge "Revert "Remove references to SkPorterDuff as it is deprecated.""
Chris Craik [Fri, 6 Mar 2015 18:15:39 +0000 (18:15 +0000)]
Revert "Remove references to SkPorterDuff as it is deprecated."
bug:
19627342
This reverts commit
a9aded1f6253afbea7906509992a8a3721f731ab.
Change-Id: Ic865edfbd31c9e24d18a1397a1d346633376e20a
Chris Craik [Fri, 6 Mar 2015 17:40:35 +0000 (09:40 -0800)]
Avoid invalid shader creation for certain blend modes
bug:
19627342
Change-Id: I41e3c1ce8e6fa52f046ec492d19de7cab92b9ec5
Hiroshi Yamauchi [Fri, 6 Mar 2015 17:43:52 +0000 (17:43 +0000)]
Merge "Deprecate things that rely on Debug.startAllocCounting."
Torne (Richard Coles) [Fri, 6 Mar 2015 17:25:47 +0000 (17:25 +0000)]
Merge "Fix typo in WebSettings javadoc."
Mike Lockwood [Fri, 6 Mar 2015 16:17:33 +0000 (08:17 -0800)]
MidiDeviceService: Add getDeviceInfo() accessor method
so service implementations can access their own device info object.
Change-Id: I93e0c449e72d76568d7b4c9f7f7db00a846b5a33
Glenn Kasten [Fri, 6 Mar 2015 16:14:48 +0000 (16:14 +0000)]
Merge "Fix USB typos"
James Cook [Fri, 6 Mar 2015 15:42:05 +0000 (15:42 +0000)]
Merge "Support undo of some programmatic TextView changes"