183832 Commits

Author SHA1 Message Date
Andreas Gampe
f9345e93db 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
2015-03-04 17:14:10 -08:00
smain@google.com
182059f875 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
2015-03-05 01:12:15 +00:00
Eric Gilmore
761203089d 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.
2015-03-05 01:10:56 +00:00
Eric Gilmore
8edf64e9e9 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.
2015-03-05 01:02:55 +00:00
smain@google.com
ca10a4352f am f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs
* commit 'f4bbec09a4c3795bc72d6a95aab3488c6c49ce6e':
  add tags for wakelock and other API names
2015-03-05 00:59:24 +00:00
Bart Sears
1445dec74f 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
2015-03-05 00:59:01 +00:00
Eric Gilmore
28d11557d6 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.
2015-03-05 00:55:38 +00:00
Bart Sears
5a1cec86cf 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
2015-03-05 00:52:58 +00:00
smain@google.com
f4bbec09a4 Merge "add tags for wakelock and other API names" into lmp-docs 2015-03-05 00:49:49 +00:00
Eric Gilmore
498691d264 am 62777b18: am 5c30adfd: am 22d1c1ce: Merge "Fixing broken link per b/19503824." into lmp-docs
* commit '62777b189dc31c250c4ae06915aae0a337950e1c':
  Fixing broken link per b/19503824.
2015-03-05 00:49:21 +00:00
Bart Sears
0c3052a667 am 4eedcceb: Merge "Merge commit \'83a63bac\' into manualmerge" into lmp-mr1-dev
* commit '4eedccebb7f4c3f9e2f1890f92bead4b9c2a9819':
  Do not make ActivityContainer available to apps. DO NOT MERGE
2015-03-05 00:40:13 +00:00
Bart Sears
4eedccebb7 Merge "Merge commit '83a63bac' into manualmerge" into lmp-mr1-dev 2015-03-05 00:35:08 +00:00
Tucker Sylvestro
60b9a5e773 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)
2015-03-05 00:32:51 +00:00
Tucker Sylvestro
80cb73006d 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)
2015-03-05 00:27:13 +00:00
Mike Lockwood
20821ecbe8 Eliminate MidiPort base class for MidiInputPort and MidiOutputPort
Change-Id: I628c0468ac980eee909add53a4d6e55e9b358603
2015-03-04 16:15:45 -08:00
Tucker Sylvestro
5a6b44c435 Merge "DO NOT MERGE ANYWHERE Bluetooth native dumpsys logging support (3/4)" into lmp-mr1-modular-dev 2015-03-05 00:15:08 +00:00
Anthony Hugh
6550bf5e39 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
2015-03-04 16:12:08 -08:00
Adam Powell
27b7c1f526 Merge "Add ChooserTargetService API" 2015-03-05 00:07:53 +00:00
Mike Lockwood
c623ec973b Merge "MidiManager: Virtual MIDI devices are now implemented as Services" 2015-03-05 00:01:33 +00:00
Miao Wang
87e908dfde [RenderScript] AutoPadding & Unpadding for Vec3 Elements during
copyTo & copyFrom.

Change-Id: I10b6fb235717e181ebb30b92e4dbe23e6183a29c
2015-03-04 15:50:11 -08:00
Chris Craik
ef7aa4fc19 Merge "Patch cleanup, reenable Patch Glops" 2015-03-04 23:41:42 +00:00
Chris Craik
8820fd1d82 Patch cleanup, reenable Patch Glops
bug:19597454

Change-Id: If12b95e83588b81a553210cd8c2437c6c771073a
2015-03-04 15:32:47 -08:00
John Spurlock
f0f293f0fa Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base 2015-03-04 23:26:01 +00:00
Glenn Kasten
fad60c343a Merge "soundpool: update sample rate when reusing audiotrack" 2015-03-04 23:25:28 +00:00
Glenn Kasten
9e9e2f7014 Merge "soundpool: reuse channel for same sample if available" 2015-03-04 23:25:03 +00:00
John Spurlock
1bea125ca8 am 3bedeb01: am bd438742: am b879e739: am c974ac11: MediaProjectionPermissionActivity: Fix NPE.
* commit '3bedeb010103f4da26241c23929aa38598758f93':
  MediaProjectionPermissionActivity: Fix NPE.
2015-03-04 23:24:53 +00:00
John Spurlock
3bedeb0101 am bd438742: am b879e739: am c974ac11: MediaProjectionPermissionActivity: Fix NPE.
* commit 'bd438742870a51eacea3554376f671bd1be0e30c':
  MediaProjectionPermissionActivity: Fix NPE.
2015-03-04 23:15:51 +00:00
Andrew Lee
67fc92bd44 Add methods for device telephony configs.
+ Expose method for whether DTMF length can be changed.
+ Expose method for whether the device is a world phone.

Bug: 19372734
Change-Id: I542e87cab1924eb600fdce929f5227e36112964b
2015-03-04 15:12:18 -08:00
John Spurlock
bd43874287 am b879e739: am c974ac11: MediaProjectionPermissionActivity: Fix NPE.
* commit 'b879e7395fa9446952b840b1d576ff225b039774':
  MediaProjectionPermissionActivity: Fix NPE.
2015-03-04 23:09:19 +00:00
John Spurlock
b879e7395f am c974ac11: MediaProjectionPermissionActivity: Fix NPE.
* commit 'c974ac11f808968648d26e83a0b64a7fba02ad15':
  MediaProjectionPermissionActivity: Fix NPE.
2015-03-04 23:01:26 +00:00
John Spurlock
75328b703f Merge "Audio: Remove the concept of master volume." 2015-03-04 22:59:41 +00:00
John Spurlock
ee5ad729b9 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
2015-03-04 17:51:44 -05:00
Julia Reynolds
a9b33ddf31 Merge "DOs can clear the DI; rehide hasUserSetupCompleted." 2015-03-04 22:38:23 +00:00
Julia Reynolds
e925440a55 DOs can clear the DI; rehide hasUserSetupCompleted.
Bug: 19230954
Change-Id: I97467229b23f3c9be1c3c4fff1c888a812f14a95
2015-03-04 17:36:00 -05:00
Chris Craik
92c2ca9526 Merge "Temporarily disable Patch glops" 2015-03-04 22:31:00 +00:00
Raph Levien
35091569b9 Merge "Some refactoring of StaticLayout" 2015-03-04 22:28:19 +00:00
Chris Craik
a9761e698e Temporarily disable Patch glops
bug:19597454

Change-Id: I9dbe781a714582717a5585113b9a56821265b36e
2015-03-04 14:25:10 -08:00
Adam Powell
e30c9af356 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
2015-03-04 14:23:30 -08:00
Andre Eisenbach
a0eaaa2a22 DO NOT MERGE ANYWHERE Bluetooth native dumpsys logging support (3/4)
Bug: 18508263
Change-Id: I88f9c90dab8b0c825010c8617709449a3dd704b2
2015-03-04 17:17:20 -05:00
Dan Albert
030f536009 Stop using namespace std.
The pattern of #include and using namespace std here fails to build
with GCC. At first glance it's a GCC bug rather than libc++ doing
something wrong. Regardless, it can be worked around by just
specifying std:: where appropriate.

Bug: 19606303
Change-Id: I5652682eae7ca7559cf2a9307909859013440781
2015-03-04 13:54:20 -08:00
Raph Levien
d3ab692d28 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
2015-03-04 13:49:12 -08:00
Mike Lockwood
11fd96d6ff 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
2015-03-04 13:45:38 -08:00
Dianne Hackborn
e56301f16a Merge "Fix reading of daily data." 2015-03-04 21:34:12 +00:00
Dianne Hackborn
8cfb58bd58 Fix reading of daily data.
Change-Id: I1f581197c938109cfe5cc21109eea57b4e0434dc
2015-03-04 13:28:36 -08:00
Julia Reynolds
fca04ca096 Allow device and profile owners to set a user icon.
Change-Id: I7c2bafb85cff3fa063af7a2f27b76c69172f0525
2015-03-04 16:04:22 -05:00
Wale Ogunwale
d57969f6ec Made AM package debug log more configurable.
* Added class ActivityManagerDebugConfig.java for housing all debug
log configuration for activity manager package.
* Added ability for using default activity manager log tag or class
specified tag string which is very helpful during debugging.
* Added ability to prepend log category name to log tag that can
also be useful during debugging.
* Converted BroadcastQueue.java and ActiveService.java to use the
new log class. Other classes in the package will be gradually
converted.

Change-Id: I0e4b343da75cb2e539b5ad5f0f79f6bc7af46d7b
2015-03-04 11:04:17 -08:00
Julia Reynolds
aa7e7318e3 Merge "Allow the device initializer to perform user setup tasks." 2015-03-04 19:01:31 +00:00
John Spurlock
c974ac11f8 MediaProjectionPermissionActivity: Fix NPE.
Avoid dismissing a null dialog.

Bug: 19492919
Change-Id: I6642bb5194d9818ff3db1266c7c78ed752e23ecf
(cherry picked from commit 3d332f4e67a484abe597576bf329d89655afe720)
2015-03-04 18:58:18 +00:00
Chris Wren
d17696904d Merge "Remove spammy notification_cancel event log." 2015-03-04 18:40:21 +00:00
Craig Mautner
bbd2ac5adf Merge commit '83a63bac' into manualmerge 2015-03-04 10:10:34 -08:00