OSDN Git Service
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
Julia Reynolds [Thu, 5 Mar 2015 17:52:20 +0000 (17:52 +0000)]
Merge "Add security check for clearDeviceInitializer in the service."
Andreas Gampe [Thu, 5 Mar 2015 17:41:14 +0000 (17:41 +0000)]
am
ecb48c16: am
9c0ba24f: am
6695b992: Merge "Frameworks/base: Add removeAll for ArraySet"
* commit '
ecb48c16b7839bdcda84ac0ba7c61248b814eb71':
Frameworks/base: Add removeAll for ArraySet
Chris Craik [Thu, 5 Mar 2015 17:37:44 +0000 (17:37 +0000)]
Merge "Fix push shader to native"
Andreas Gampe [Thu, 5 Mar 2015 17:33:13 +0000 (17:33 +0000)]
am
9c0ba24f: am
6695b992: Merge "Frameworks/base: Add removeAll for ArraySet"
* commit '
9c0ba24f3b54fa7916626f3d76ec6818d78ca47e':
Frameworks/base: Add removeAll for ArraySet
Chris Craik [Thu, 5 Mar 2015 17:32:19 +0000 (09:32 -0800)]
Fix push shader to native
bug:
19586908
Change-Id: Ie6205bc76667222f2df2da60a27244988f3a2b3b
Andreas Gampe [Thu, 5 Mar 2015 17:15:58 +0000 (17:15 +0000)]
am
6695b992: Merge "Frameworks/base: Add removeAll for ArraySet"
* commit '
6695b9920d15f8d9a17d6b0c66b863d1c2e38584':
Frameworks/base: Add removeAll for ArraySet
Andreas Gampe [Thu, 5 Mar 2015 17:10:30 +0000 (17:10 +0000)]
Merge "Frameworks/base: Add removeAll for ArraySet"
Julia Reynolds [Thu, 5 Mar 2015 15:06:41 +0000 (10:06 -0500)]
Add security check for clearDeviceInitializer in the service.
Bug:
19230954
Change-Id: I5c648492bef0d2b579b6f59b91afc890e3092d36
Derek Sollenberger [Thu, 5 Mar 2015 15:45:27 +0000 (15:45 +0000)]
Merge "Remove references to SkPorterDuff as it is deprecated."
Tom Hudson [Thu, 5 Mar 2015 15:40:45 +0000 (15:40 +0000)]
Merge "Fix bug, change crashes to warnings"
Tom Hudson [Thu, 5 Mar 2015 15:30:18 +0000 (10:30 -0500)]
Fix bug, change crashes to warnings
Improve behavior when we get a call to draw 0 points.
Replace one ALWAYS_FATAL statements with noop.
Change-Id: I864b7a9633dfa3dc6eefa403beca4cc7ae14074f
John Spurlock [Thu, 5 Mar 2015 15:26:35 +0000 (15:26 +0000)]
Merge "Add a list verb to the settings cmd."
Mady Mellor [Thu, 5 Mar 2015 15:15:25 +0000 (15:15 +0000)]
Merge "Text selection changes - smart handles & drag accelerator"
Benjamin Franz [Wed, 11 Feb 2015 15:59:44 +0000 (15:59 +0000)]
Clean up the lock task APIs for COSU devices.
Clean up and increase readability of internal handling of lock task mode APIs.
Add a public API to query the lock task mode state with pinned and locked as
possible outcomes. Additionally, change wording in lock task toasts when in
locked mode and update the javadoc regarding onLockTaskModeEntering and
onLockTaskModeExiting to represent the actual behaviour.
Bug:
19377096
Change-Id: Ia563078ca6ef6d6fc7e75130e6b94ba18af69340
Andrew Shulaev [Thu, 5 Mar 2015 14:39:52 +0000 (14:39 +0000)]
Merge "Added function to render a drawable in all available states"
Derek Sollenberger [Wed, 4 Mar 2015 15:44:46 +0000 (10:44 -0500)]
Remove references to SkPorterDuff as it is deprecated.
Change-Id: Ic0722cfef4ed61aa546c495924397097a45cfe77
John Spurlock [Wed, 4 Mar 2015 19:55:37 +0000 (14:55 -0500)]
Add a list verb to the settings cmd.
Change-Id: I8a203eefced3431085fd1981b1d120baab2cb77a
Andrew Shulaev [Thu, 5 Mar 2015 11:51:38 +0000 (11:51 +0000)]
Added function to render a drawable in all available states
This reverts commit
01cdf8b135be3bf67b9386dc929109c3db82c730.
Change-Id: I596855047d78c3c718744ad61432fc45e1239634
Diego Perez [Thu, 5 Mar 2015 10:13:00 +0000 (10:13 +0000)]
Merge "Fix crash when shadowSize is 0"
Lorenzo Colitti [Thu, 5 Mar 2015 08:23:30 +0000 (08:23 +0000)]
Merge "Enable Ethernet if the device has FEATURE_USB_HOST."
Lorenzo Colitti [Tue, 25 Nov 2014 12:52:12 +0000 (21:52 +0900)]
Enable Ethernet if the device has FEATURE_USB_HOST.
Any device that supports USB OTG is capable of running Ethernet
via a USB OTG cable and Ethernet to USB adapter.
Currently, we only start the Ethernet system service if the
device has FEATURE_ETHERNET, but this requires that every device
explicitly declare FEATURE_ETHERNET, which causes bugs like
http://b/
18515146 , where the L OTA broke Ethernet on nakasi.
Therefore, start the Ethernet service on all devices that have
FEATURE_USB_HOST.
Bug:
18515146
Change-Id: I3b4e85d1ad8e1aea9baa046a27f5b4dd68c42028
smain@google.com [Thu, 5 Mar 2015 06:40:13 +0000 (06:40 +0000)]
am
9f4e1f7f: am
b488a256: am
4f674bbd: am
8b2be54a: am
182059f8: am
ca10a435: am
f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs
* commit '
9f4e1f7f501b934b72e7abefecc61b5666ee4463':
add tags for wakelock and other API names
Brian Carlstrom [Thu, 5 Mar 2015 06:35:09 +0000 (06:35 +0000)]
am
233baedc: am
686a1b2f: am
165c2564: Merge "Manually add SignalStrength to preloaded-classes"
* commit '
233baedce82ba244e06044dca803496dc2c48a9c':
Manually add SignalStrength to preloaded-classes
smain@google.com [Thu, 5 Mar 2015 06:32:35 +0000 (06:32 +0000)]
am
b488a256: am
4f674bbd: am
8b2be54a: am
182059f8: am
ca10a435: am
f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs
* commit '
b488a256308c8c7598da19d109be99d19a08a76d':
add tags for wakelock and other API names
Brian Carlstrom [Thu, 5 Mar 2015 06:27:40 +0000 (06:27 +0000)]
am
686a1b2f: am
165c2564: Merge "Manually add SignalStrength to preloaded-classes"
* commit '
686a1b2f4ac90c3fb522405258212c8a91ed5148':
Manually add SignalStrength to preloaded-classes
smain@google.com [Thu, 5 Mar 2015 06:25:43 +0000 (06:25 +0000)]
am
4f674bbd: am
8b2be54a: am
182059f8: am
ca10a435: am
f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs
* commit '
4f674bbdf83056141f3dccf1af8af3113e17af87':
add tags for wakelock and other API names
Brian Carlstrom [Thu, 5 Mar 2015 06:22:18 +0000 (06:22 +0000)]
am
165c2564: Merge "Manually add SignalStrength to preloaded-classes"
* commit '
165c25641ccedf6447d09dfec00f485df1361c35':
Manually add SignalStrength to preloaded-classes
smain@google.com [Thu, 5 Mar 2015 06:18:45 +0000 (06:18 +0000)]
am
8b2be54a: am
182059f8: am
ca10a435: am
f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs
* commit '
8b2be54a629e4567152d8b0e6c81332632b0b877':
add tags for wakelock and other API names
Brian Carlstrom [Thu, 5 Mar 2015 06:15:53 +0000 (06:15 +0000)]
Merge "Manually add SignalStrength to preloaded-classes"
smain@google.com [Thu, 5 Mar 2015 06:10:54 +0000 (06:10 +0000)]
am
182059f8: am
ca10a435: am
f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs
* commit '
182059f875bedc778a3ce9710a4f634197d1e959':
add tags for wakelock and other API names
Brian Carlstrom [Thu, 5 Mar 2015 05:56:26 +0000 (21:56 -0800)]
Manually add SignalStrength to preloaded-classes
Bug:
19323020
Change-Id: I61e9d2dd5d06fe2353da17e5646f259122e5ea98
Anthony Hugh [Thu, 5 Mar 2015 04:14:06 +0000 (04:14 +0000)]
am
7b737c80: am
097f8d5f: Merge "Update "Optimizing app X from Y string"" into lmp-mr1-modular-dev
* commit '
7b737c809d95343ebf18d68dd9f503f5efe127be':
Update "Optimizing app X from Y string"
Anthony Hugh [Thu, 5 Mar 2015 04:08:32 +0000 (04:08 +0000)]
am
097f8d5f: Merge "Update "Optimizing app X from Y string"" into lmp-mr1-modular-dev
* commit '
097f8d5f6b82f27e71ec72795dee053dfc698ac5':
Update "Optimizing app X from Y string"
Anthony Hugh [Thu, 5 Mar 2015 04:04:04 +0000 (04:04 +0000)]
Merge "Update "Optimizing app X from Y string"" into lmp-mr1-modular-dev
Jinsuk Kim [Thu, 5 Mar 2015 03:44:47 +0000 (03:44 +0000)]
Merge "CEC: Do not start queued actions for TV device"
Eric Gilmore [Thu, 5 Mar 2015 01:53:38 +0000 (01:53 +0000)]
am
76120308: am
8edf64e9: am
28d11557: am
498691d2: am
62777b18: am
5c30adfd: am
22d1c1ce: Merge "Fixing broken link per b/
19503824." into lmp-docs
* commit '
761203089d46a208000140a1090deb7b6c8c8356':
Fixing broken link per b/
19503824.
Bart Sears [Thu, 5 Mar 2015 01:29:43 +0000 (01:29 +0000)]
am
1445dec7: am
5a1cec86: am
0c3052a6: am
4eedcceb: Merge "Merge commit \'
83a63bac\' into manualmerge" into lmp-mr1-dev
* commit '
1445dec74f0411206e8964d4efbf01668a791e2e':
Do not make ActivityContainer available to apps. DO NOT MERGE
Andreas Gampe [Thu, 5 Mar 2015 01:14:10 +0000 (17:14 -0800)]
Frameworks/base: Add removeAll for ArraySet
Add a simple ArraySet.removeAll(ArraySet) method. This avoids two
allocations, a MapCollections helper and an Iterator object, over
the removeAll(Collection) code.
KeySetManagerService heavily calls removeAll during boot (about 9K
times in AOSP). This reduces GC stress and optimizes the removal
(about half the time the removed collection has only one element).
The removal method in KeySetManagerService is also done under a lock,
so that it gates parallelization efforts in PackageManagerService.
Bug:
19498314
Change-Id: Ib0e483adfd09831cd66ab19a820ebf6544a2b66f
smain@google.com [Thu, 5 Mar 2015 01:12:15 +0000 (01:12 +0000)]
am
ca10a435: am
f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs
* commit '
ca10a4352f07652d82da59f6c1630e8607d82dda':
add tags for wakelock and other API names
Eric Gilmore [Thu, 5 Mar 2015 01:10:56 +0000 (01:10 +0000)]
am
8edf64e9: am
28d11557: am
498691d2: am
62777b18: am
5c30adfd: am
22d1c1ce: Merge "Fixing broken link per b/
19503824." into lmp-docs
* commit '
8edf64e9e903f2dcd54d52b74ef1bbfefcbbca3d':
Fixing broken link per b/
19503824.
Eric Gilmore [Thu, 5 Mar 2015 01:02:55 +0000 (01:02 +0000)]
am
28d11557: am
498691d2: am
62777b18: am
5c30adfd: am
22d1c1ce: Merge "Fixing broken link per b/
19503824." into lmp-docs
* commit '
28d11557d6846e7ea7fb2593a6ed4d3a16f5eef6':
Fixing broken link per b/
19503824.
smain@google.com [Thu, 5 Mar 2015 00:59:24 +0000 (00:59 +0000)]
am
f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs
* commit '
f4bbec09a4c3795bc72d6a95aab3488c6c49ce6e':
add tags for wakelock and other API names
Bart Sears [Thu, 5 Mar 2015 00:59:01 +0000 (00:59 +0000)]
am
5a1cec86: am
0c3052a6: am
4eedcceb: Merge "Merge commit \'
83a63bac\' into manualmerge" into lmp-mr1-dev
* commit '
5a1cec86cfb3f08fac06ed26fe81247c3415d3ca':
Do not make ActivityContainer available to apps. DO NOT MERGE
Eric Gilmore [Thu, 5 Mar 2015 00:55:38 +0000 (00:55 +0000)]
am
498691d2: am
62777b18: am
5c30adfd: am
22d1c1ce: Merge "Fixing broken link per b/
19503824." into lmp-docs
* commit '
498691d2641deb1ca30938c7777a9a63882ffd87':
Fixing broken link per b/
19503824.
Bart Sears [Thu, 5 Mar 2015 00:52:58 +0000 (00:52 +0000)]
am
0c3052a6: am
4eedcceb: Merge "Merge commit \'
83a63bac\' into manualmerge" into lmp-mr1-dev
* commit '
0c3052a6675ed528c2898bd2ecb92576bca78df9':
Do not make ActivityContainer available to apps. DO NOT MERGE
smain@google.com [Thu, 5 Mar 2015 00:49:48 +0000 (00:49 +0000)]
Merge "add tags for wakelock and other API names" into lmp-docs
Eric Gilmore [Thu, 5 Mar 2015 00:49:21 +0000 (00:49 +0000)]
am
62777b18: am
5c30adfd: am
22d1c1ce: Merge "Fixing broken link per b/
19503824." into lmp-docs
* commit '
62777b189dc31c250c4ae06915aae0a337950e1c':
Fixing broken link per b/
19503824.
Bart Sears [Thu, 5 Mar 2015 00:40:13 +0000 (00:40 +0000)]
am
4eedcceb: Merge "Merge commit \'
83a63bac\' into manualmerge" into lmp-mr1-dev
* commit '
4eedccebb7f4c3f9e2f1890f92bead4b9c2a9819':
Do not make ActivityContainer available to apps. DO NOT MERGE
Bart Sears [Thu, 5 Mar 2015 00:35:07 +0000 (00:35 +0000)]
Merge "Merge commit '
83a63bac' into manualmerge" into lmp-mr1-dev
Tucker Sylvestro [Thu, 5 Mar 2015 00:32:51 +0000 (00:32 +0000)]
am
80cb7300: (-s ours) am
5a6b44c4: (-s ours) Merge "DO NOT MERGE ANYWHERE Bluetooth native dumpsys logging support (3/4)" into lmp-mr1-modular-dev
* commit '
80cb73006d6c14f9a9cd506172d9223cbca8606f':
DO NOT MERGE ANYWHERE Bluetooth native dumpsys logging support (3/4)
Tucker Sylvestro [Thu, 5 Mar 2015 00:27:13 +0000 (00:27 +0000)]
am
5a6b44c4: (-s ours) Merge "DO NOT MERGE ANYWHERE Bluetooth native dumpsys logging support (3/4)" into lmp-mr1-modular-dev
* commit '
5a6b44c435fb06817a66bb74c66a5a6d19690616':
DO NOT MERGE ANYWHERE Bluetooth native dumpsys logging support (3/4)
Tucker Sylvestro [Thu, 5 Mar 2015 00:15:06 +0000 (00:15 +0000)]
Merge "DO NOT MERGE ANYWHERE Bluetooth native dumpsys logging support (3/4)" into lmp-mr1-modular-dev
Anthony Hugh [Wed, 4 Mar 2015 00:50:05 +0000 (16:50 -0800)]
Update "Optimizing app X from Y string"
The word "Optimizing" is rendering on two lines on Lenok due to being too
long. New design is to shorten the string on watches to avoid this issue.
BUG:
18388692
BUG:
18902013
BUG:
16493311
Change-Id: I8d9a9e8fcade460e50f9bf71d5cb0c6e415f871e
Adam Powell [Thu, 5 Mar 2015 00:07:52 +0000 (00:07 +0000)]
Merge "Add ChooserTargetService API"
Mike Lockwood [Thu, 5 Mar 2015 00:00:31 +0000 (00:00 +0000)]
Merge "MidiManager: Virtual MIDI devices are now implemented as Services"
Chris Craik [Wed, 4 Mar 2015 23:41:41 +0000 (23:41 +0000)]
Merge "Patch cleanup, reenable Patch Glops"
Chris Craik [Tue, 3 Mar 2015 22:20:47 +0000 (14:20 -0800)]
Patch cleanup, reenable Patch Glops
bug:
19597454
Change-Id: If12b95e83588b81a553210cd8c2437c6c771073a
John Spurlock [Wed, 4 Mar 2015 23:26:01 +0000 (23:26 +0000)]
Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base
Glenn Kasten [Wed, 4 Mar 2015 23:25:25 +0000 (23:25 +0000)]
Merge "soundpool: update sample rate when reusing audiotrack"
Glenn Kasten [Wed, 4 Mar 2015 23:25:01 +0000 (23:25 +0000)]
Merge "soundpool: reuse channel for same sample if available"
John Spurlock [Wed, 4 Mar 2015 23:24:53 +0000 (23:24 +0000)]
am
3bedeb01: am
bd438742: am
b879e739: am
c974ac11: MediaProjectionPermissionActivity: Fix NPE.
* commit '
3bedeb010103f4da26241c23929aa38598758f93':
MediaProjectionPermissionActivity: Fix NPE.
John Spurlock [Wed, 4 Mar 2015 23:15:51 +0000 (23:15 +0000)]
am
bd438742: am
b879e739: am
c974ac11: MediaProjectionPermissionActivity: Fix NPE.
* commit '
bd438742870a51eacea3554376f671bd1be0e30c':
MediaProjectionPermissionActivity: Fix NPE.
John Spurlock [Wed, 4 Mar 2015 23:09:19 +0000 (23:09 +0000)]
am
b879e739: am
c974ac11: MediaProjectionPermissionActivity: Fix NPE.
* commit '
b879e7395fa9446952b840b1d576ff225b039774':
MediaProjectionPermissionActivity: Fix NPE.
John Spurlock [Wed, 4 Mar 2015 23:01:26 +0000 (23:01 +0000)]
am
c974ac11: MediaProjectionPermissionActivity: Fix NPE.
* commit '
c974ac11f808968648d26e83a0b64a7fba02ad15':
MediaProjectionPermissionActivity: Fix NPE.
John Spurlock [Wed, 4 Mar 2015 22:59:39 +0000 (22:59 +0000)]
Merge "Audio: Remove the concept of master volume."
John Spurlock [Tue, 3 Mar 2015 21:17:21 +0000 (16:17 -0500)]
Audio: Remove the concept of master volume.
- Remove two config resources (use master volume, and volume ramp).
- Remove master volume adjustments / getters / intents.
- Retain @hidden setMasterMute, needed for device admin
- Remove master volume logic in AudioService.
- Remove master volume logic in VolumePanel.
- Rename "getMasterStreamType" to "getUiSoundsStreamType" to avoid confusion.
Bug:
19582978
Change-Id: Id02c8fa4898cff3b913147f5ac1b4038e2e7cc24
Julia Reynolds [Wed, 4 Mar 2015 22:38:16 +0000 (22:38 +0000)]
Merge "DOs can clear the DI; rehide hasUserSetupCompleted."
Julia Reynolds [Wed, 11 Feb 2015 17:34:08 +0000 (12:34 -0500)]
DOs can clear the DI; rehide hasUserSetupCompleted.
Bug:
19230954
Change-Id: I97467229b23f3c9be1c3c4fff1c888a812f14a95
Chris Craik [Wed, 4 Mar 2015 22:30:59 +0000 (22:30 +0000)]
Merge "Temporarily disable Patch glops"
Raph Levien [Wed, 4 Mar 2015 22:28:18 +0000 (22:28 +0000)]
Merge "Some refactoring of StaticLayout"
Chris Craik [Wed, 4 Mar 2015 22:25:09 +0000 (14:25 -0800)]
Temporarily disable Patch glops
bug:
19597454
Change-Id: I9dbe781a714582717a5585113b9a56821265b36e
Adam Powell [Fri, 27 Feb 2015 23:51:11 +0000 (15:51 -0800)]
Add ChooserTargetService API
A ChooserTargetService can be implemented by apps that wish to offer
additional deep-link targets for the system intent chooser to in turn
offer to the user. This allows apps to create contextually relevant
shortcuts for UI flows that would otherwise require several steps of
explicit disambiguation. For example, a chat app might offer one-touch
access to recent conversations when sharing a photo to it from
elsewhere.
The chooser implementation must limit the number of
ChooserTargetServices it elects to query in order to respect available
system resources. Only the system chooser is permitted to bind to a
ChooserTargetService.
Change-Id: Ia7e075ee649c51cf2035f20aee166c5a27d91aeb
Andre Eisenbach [Fri, 5 Dec 2014 17:31:30 +0000 (09:31 -0800)]
DO NOT MERGE ANYWHERE Bluetooth native dumpsys logging support (3/4)
Bug:
18508263
Change-Id: I88f9c90dab8b0c825010c8617709449a3dd704b2
Raph Levien [Mon, 2 Mar 2015 22:30:53 +0000 (14:30 -0800)]
Some refactoring of StaticLayout
This patch refactors construction of StaticLayout to use an explicit
Builder object, which is intended to hold state used for constructing
the layout but not needed for merely reading out the results.
Builder objects are allocated from a pool and explicitly recycled,
so there is insignificant additional allocation cost.
This patch has very little impact on performance (it does avoid
allocating a FontMetricsInt object) but opens the way for significant
performance and functionality improvements as more of the Builder
functionality migrates to native code.
Change-Id: I2a576643e573a38b61f895a80d5d92a85c94b6b4
Mike Lockwood [Mon, 2 Mar 2015 20:07:49 +0000 (12:07 -0800)]
MidiManager: Virtual MIDI devices are now implemented as Services
To implement a virtual MIDI device, include a subclass of MidiDeviceService in
your application. This service is identified by an intent filter and meta-data
in the application's manifest to allow the MIDI manager to register the virtual device
without actually running the application. Instead, the application's MidiDeviceService
subclass is started on demand when MIDI manager clients want to open the device.
Here is an example of how the MidiDeviceService might be described in the application manifest:
<service android:name="VirtualDeviceService">
<intent-filter>
<action android:name="android.media.midi.MidiDeviceService" />
</intent-filter>
<meta-data android:name="android.media.midi.MidiDeviceService"
android:resource="@xml/device_info" />
</service>
and the device_info.xml meta-data:
<devices>
<device manufacturer="Sample Manufacturer" model="Sample Model" private="false">
<input-port name="my input port" />
<output-port name="my output port" />
</device>
</devices>
(note that the <input-port> and <output-port> names are not currently used, but support for these
will be added in a subsequent change)
Client's of the virtual device will bind directly to the hosting application's MidiDeviceService subclass.
To support this, MidiManager.openDevice() now returns the MidiDevice asynchronously via a callback.
This change also adds a utility class called MidiDispatcher, which is a MidiReceiver
that dispatches all data it receives to a list of other MidiReceivers.
We now use this internally in MidiInputPort and MidiDeviceServer, but developers
may use it for other purposes as well.
Change-Id: Ic3009f06d56f3d5edbd87de3f0c330b51a1c217d
Dianne Hackborn [Wed, 4 Mar 2015 21:34:11 +0000 (21:34 +0000)]
Merge "Fix reading of daily data."
Dianne Hackborn [Wed, 4 Mar 2015 21:28:36 +0000 (13:28 -0800)]
Fix reading of daily data.
Change-Id: I1f581197c938109cfe5cc21109eea57b4e0434dc
Julia Reynolds [Wed, 4 Mar 2015 19:01:30 +0000 (19:01 +0000)]
Merge "Allow the device initializer to perform user setup tasks."
John Spurlock [Tue, 24 Feb 2015 17:14:06 +0000 (12:14 -0500)]
MediaProjectionPermissionActivity: Fix NPE.
Avoid dismissing a null dialog.
Bug:
19492919
Change-Id: I6642bb5194d9818ff3db1266c7c78ed752e23ecf
(cherry picked from commit
3d332f4e67a484abe597576bf329d89655afe720)
Chris Wren [Wed, 4 Mar 2015 18:40:20 +0000 (18:40 +0000)]
Merge "Remove spammy notification_cancel event log."
Craig Mautner [Wed, 4 Mar 2015 18:10:34 +0000 (10:10 -0800)]
Merge commit '
83a63bac' into manualmerge
Amith Yamasani [Wed, 4 Mar 2015 18:04:01 +0000 (18:04 +0000)]
Merge "Fix a regression in UsbDebuggingManager"
Amith Yamasani [Wed, 4 Mar 2015 18:00:11 +0000 (10:00 -0800)]
Fix a regression in UsbDebuggingManager
Catch NPE as well if socket object is null.
Bug:
19602060
Change-Id: I7cf9cb16abc3fde626170c1aefeba5fc91c5734f
Eric Gilmore [Wed, 4 Mar 2015 17:53:31 +0000 (17:53 +0000)]
am
5c30adfd: am
22d1c1ce: Merge "Fixing broken link per b/
19503824." into lmp-docs
* commit '
5c30adfdb6ef4b004ef0b88006660598f40eb6f5':
Fixing broken link per b/
19503824.
Eric Gilmore [Wed, 4 Mar 2015 17:47:01 +0000 (17:47 +0000)]
am
22d1c1ce: Merge "Fixing broken link per b/
19503824." into lmp-docs
* commit '
22d1c1ce1dc3c84d7517ba64a5d07b5946e49514':
Fixing broken link per b/
19503824.
Andrew Shulaev [Wed, 4 Mar 2015 17:44:10 +0000 (17:44 +0000)]
Merge "Revert "Added function to render a drawable in all available states""
Evan Charlton [Wed, 4 Mar 2015 17:43:38 +0000 (17:43 +0000)]
Merge "Fix some javadocs typos"
Andrew Shulaev [Wed, 4 Mar 2015 17:43:19 +0000 (17:43 +0000)]
Revert "Added function to render a drawable in all available states"
This reverts commit
63483e17de4d2441acaabcee4185b0bb25e1d94c.
Change-Id: I07fced229759e63d4fa4f94b7dac48b3e9342b18
Eric Gilmore [Wed, 4 Mar 2015 17:40:15 +0000 (17:40 +0000)]
Merge "Fixing broken link per b/
19503824." into lmp-docs
Dhananjay Kumar [Tue, 3 Mar 2015 16:30:32 +0000 (22:00 +0530)]
soundpool: update sample rate when reusing audiotrack
User might update playback rate while calling Play on a sample.
Update sample rate if reusing existing audio track.
Change-Id: I7007c335fa405baf663a322408b92b9df53efdb0
Signed-off-by: Glenn Kasten <gkasten@google.com>
Haynes Mathew George [Fri, 30 Jan 2015 02:20:20 +0000 (18:20 -0800)]
soundpool: reuse channel for same sample if available
Reuse channel for same sample if the channel completed
current playback and is not reallocated to another sample,
i.e. not stolen by other sample.
authored-by: Ashish Jain <ashishj@codeaurora.org>
Change-Id: Ibe7ee318c7dc11f3c4fd3a2f57d861318b10973b
Signed-off-by: Glenn Kasten <gkasten@google.com>
Andrew Shulaev [Wed, 4 Mar 2015 16:59:29 +0000 (16:59 +0000)]
Merge "Added function to render a drawable in all available states"
Andrew Shulaev [Wed, 4 Mar 2015 16:20:19 +0000 (16:20 +0000)]
Added function to render a drawable in all available states
Change-Id: I230cc5775a09120efe9c82a4017b001aa510ddff
Chris Wren [Wed, 4 Mar 2015 16:47:46 +0000 (08:47 -0800)]
Remove spammy notification_cancel event log.
We also log when notifications are actually canceled,
so this only tells us how often clients cancel non-existent
notifications. The answer: quite often.
Bug:
19599876
Change-Id: I812866cb080d51974d4db0b6e6b3eb50c3aeb560
Diego Perez [Fri, 27 Feb 2015 15:31:36 +0000 (15:31 +0000)]
Fix crash when shadowSize is 0
Change-Id: I9f131afc95a2571fbc8a737df37f43653cfbb90d
Adrian Roos [Wed, 4 Mar 2015 16:30:18 +0000 (16:30 +0000)]
Merge "Update immersive cling visuals"
Adrian Roos [Wed, 25 Feb 2015 17:05:34 +0000 (18:05 +0100)]
Update immersive cling visuals
Also enables the swipe from top gesture for revealing
the navigation bar, even if the status bar is visible.
Bug:
19282730
Change-Id: I7b562c2f0f00ff3f05b8b1e44657efe79b45f9c7
Craig Mautner [Wed, 4 Mar 2015 16:15:35 +0000 (16:15 +0000)]
am
8fa394fa: Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-dev
* commit '
8fa394fa8c4eb3ca832dac36baf5645a40d449f1':
Do not make ActivityContainer available to apps. DO NOT MERGE
Craig Mautner [Wed, 4 Mar 2015 16:09:28 +0000 (16:09 +0000)]
Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-dev