summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | | | | am 63ab6eb2: Merge "Frameworks/base: Use ArraySet more explicitly"Andreas Gampe2015-03-051-10/+14
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '63ab6eb220a2a75837d6e3d18d19cbd5dda175eb': Frameworks/base: Use ArraySet more explicitly
| | | * | | | | | | | | | Frameworks/base: Use ArraySet more explicitlyAndreas Gampe2015-03-051-10/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In KeySetManagerService, use ArraySet more explicitly. Avoid for-each loops. Collections API methods on ArraySet are not very efficient. Iterators incur two object allocations: a helper and the actual iterator object. During boot, about 4.5K such calls are made. Using the ArraySet more explicitly like an ArrayList/array avoids the overhead. Bug: 19617481 Change-Id: I25df334fa1d4be3210667fb1404e3c43f2585049
* | | | | | | | | | | | | Merge "AudioService: Add current stream devices to dumpsys output."John Spurlock2015-03-051-0/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | / / / | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
| * | | | | | | | | | | AudioService: Add current stream devices to dumpsys output.John Spurlock2015-03-051-0/+13
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I57ed785154d8d75ac0f189a479252a725e80bd5a
* | | | | | | | | | | Merge "Revert "Cleanup Bitmap JNI""Chad Jones2015-03-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Revert "Cleanup Bitmap JNI"Chad Jones2015-03-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b2915245b74b3b5541b123e38403f8e26426b4b7. Change-Id: Idd7d7f33eec4ea5024c83de6b10d3d1a6ab2b17a
* | | | | | | | | | | | Merge "Made AM package debug log more configurable."Wale Ogunwale2015-03-055-110/+207
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Made AM package debug log more configurable.Wale Ogunwale2015-03-045-110/+207
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | | | | | | | | | | | | Merge "Cleanup Bitmap JNI"John Reck2015-03-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Cleanup Bitmap JNIJohn Reck2015-03-051-1/+1
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a bunch of places where mNativeBitmap was being poked at directly, switch them either to the NDK API or to GraphicsJNI where it made sense Change-Id: I6b3df3712d6497cba828c2d3012e725cb4ebb64d
* | | | | | | | | | | | Add security check for clearDeviceInitializer in the service.Julia Reynolds2015-03-051-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19230954 Change-Id: I5c648492bef0d2b579b6f59b91afc890e3092d36
* | | | | | | | | | | | Clean up the lock task APIs for COSU devices.Benjamin Franz2015-03-053-27/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | Enable Ethernet if the device has FEATURE_USB_HOST.Lorenzo Colitti2015-03-051-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | Merge "CEC: Do not start queued actions for TV device"Jinsuk Kim2015-03-051-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | |
| * | | | | | | | | | | CEC: Do not start queued actions for TV deviceJinsuk Kim2015-02-281-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handling the queued actions is useful for playback device only. It is not useful and does nothing for TV device which has its own delayed message buffer to process the messages to be handled later in time. Change-Id: Ic4d507177cfdbc3b8a474e45dfd3862f4b1bd4a7
* | | | | | | | | | | | Merge "MidiManager: Virtual MIDI devices are now implemented as Services"Mike Lockwood2015-03-052-69/+309
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | MidiManager: Virtual MIDI devices are now implemented as ServicesMike Lockwood2015-03-042-69/+309
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | Merge "Audio: Remove the concept of master volume."John Spurlock2015-03-046-282/+39
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Audio: Remove the concept of master volume.John Spurlock2015-03-046-282/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | | | | | | | | | | | | DOs can clear the DI; rehide hasUserSetupCompleted.Julia Reynolds2015-03-041-11/+3
| |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19230954 Change-Id: I97467229b23f3c9be1c3c4fff1c888a812f14a95
* | | | | | | | | | | | Merge "Allow the device initializer to perform user setup tasks."Julia Reynolds2015-03-042-3/+203
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Allow the device initializer to perform user setup tasks.Julia Reynolds2015-03-042-3/+203
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A device initializer is an application that is allowed to run during user provisioning on device owner devices. During device provisioning (or, user provisioning of the first user of the device), a device initializer is granted device owner permissions. During secondary user provisioning, a device initializer is granted profile owner permissions. Once provisioning is complete for a user, all elevated permissions are removed from the device initializer and the device admin component of the app is disabled. Bug: 19230954 Change-Id: Ib6725fb3b09bb21e4198a5dc0b445ccebb40b27e
* | | | | | | | | | | | | Merge "Remove spammy notification_cancel event log."Chris Wren2015-03-041-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
| * | | | | | | | | | | | Remove spammy notification_cancel event log.Chris Wren2015-03-041-2/+2
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | Merge "Fix a regression in UsbDebuggingManager"Amith Yamasani2015-03-041-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix a regression in UsbDebuggingManagerAmith Yamasani2015-03-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Catch NPE as well if socket object is null. Bug: 19602060 Change-Id: I7cf9cb16abc3fde626170c1aefeba5fc91c5734f
* | | | | | | | | | | | Update immersive cling visualsAdrian Roos2015-03-042-34/+38
| |_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also enables the swipe from top gesture for revealing the navigation bar, even if the status bar is visible. Bug: 19282730 Change-Id: I7b562c2f0f00ff3f05b8b1e44657efe79b45f9c7
* | | | | | | | | | | Merge "Add new "daily stats" tracking to battery stats."Dianne Hackborn2015-03-041-1/+18
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
| * | | | | | | | | | Add new "daily stats" tracking to battery stats.Dianne Hackborn2015-03-031-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently is only used for tracking the daily charge and discharge rates. We keep up to 10 days of data. Change-Id: I54e29e35ff60d9277da9e476cdab22f4a6d540bf
* | | | | | | | | | | am 5d3f00e3: am 358188f5: Merge "Change ActivityView startActivity state ↵Craig Mautner2015-03-032-37/+36
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sequence" into lmp-mr1-modular-dev * commit '5d3f00e38b84c107037de1250a6e55d89f84ef77': Change ActivityView startActivity state sequence
| * | | | | | | | | | am 358188f5: Merge "Change ActivityView startActivity state sequence" into ↵Craig Mautner2015-03-032-37/+36
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-modular-dev * commit '358188f5891f5645dbff4fd8cb1a3e7341371f74': Change ActivityView startActivity state sequence
| | * \ \ \ \ \ \ \ \ \ Merge "Change ActivityView startActivity state sequence" into ↵Craig Mautner2015-03-032-37/+36
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-modular-dev
| | | * | | | | | | | | | Change ActivityView startActivity state sequenceCraig Mautner2015-03-032-37/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problems arise if an activity is started in an ActivityView when the parent activity is not resumed. In particular the ActivityView can be brought to the front in front of other activities that have been started by the parent. This change checks the state of the parent when the ActivityView is starting and if it is not resumed, throws an Exception. This change also removes the queueing up of Intents if the surface does not exist when startActivity is called. Now, the owner of the ActivityView is notified when the surface becomes available. If startActivity is called before that notification an Exception will be thrown. Fixes bug 19147472. Change-Id: I6712cf1929fe65c4238ce7f3feb4e8511ed97244
* | | | | | | | | | | | | am 59e06d3a: am 98fdff61: am 56fde9e7: Merge "SELinuxPolicyInstallReceiver: ↵Nick Kralevich2015-03-031-52/+29
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | / / / / / / / | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent partial or mixed policy updates." * commit '59e06d3ab479ab04df84b783cb119f032549f492': SELinuxPolicyInstallReceiver: Prevent partial or mixed policy updates.
| * | | | | | | | | | | am 98fdff61: am 56fde9e7: Merge "SELinuxPolicyInstallReceiver: Prevent ↵Nick Kralevich2015-03-031-52/+29
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | partial or mixed policy updates." * commit '98fdff61dd651f52d36c0e88dcce8a04568b7cc7': SELinuxPolicyInstallReceiver: Prevent partial or mixed policy updates.
| | * | | | | | | | | | am 56fde9e7: Merge "SELinuxPolicyInstallReceiver: Prevent partial or mixed ↵Nick Kralevich2015-03-031-52/+29
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | policy updates." * commit '56fde9e70ef850ca7e3f076e52567f5c75b5e7da': SELinuxPolicyInstallReceiver: Prevent partial or mixed policy updates.
| | | * | | | | | | | | SELinuxPolicyInstallReceiver: Prevent partial or mixed policy updates.Stephen Smalley2015-02-271-52/+29
| | | | |_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current SELinuxPolicyInstallReceiver logic can yield a partial or mixed (old and new) set of policy files under /data/security/current if there is an error or a crash at certain points before completing the installation of the update. Rewrite the logic to avoid the possibility of such partial or mixed policy updates by using rename on the entire directory of policy files rather than operating on a per-file basis. Also separate the extraction of the policy files from the bundle into their own temporary directory. Make sure we delete any previous temporary directory or backup directory before using them for this update. Drop the use of a symlink for /data/security/current altogether; it provides no benefit. Change-Id: I564af01c2c3ca1531c216013b8724c7511f32de8 Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
| | * | | | | | | | | Merge commit '32acf753e8989766f67fd5300d3eb467f707cc79' into HEADBill Yi2015-02-19191-5916/+14290
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
* | | | | | | | | | | Use scheduled job rather than periodic alarms for key/value backupsChristopher Tate2015-03-022-49/+148
| |_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of a runs-forever periodic alarm that drives key/value backup passes, we instead schedule-on-demand a trigger job that will kick off the pass after a batching interval. The key semantic change is that we now never wake for key/value backup work unless we've been explicitly asked to do so. We also use a rather longer batching interval than was previously the case. Bug 19536032 Change-Id: Ie377562b2812c9aeda0ee73770dfa94af6017778
* | | | | | | | | | Merge "AudioService: Fix typo/grammar in comment."John Spurlock2015-03-031-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | AudioService: Fix typo/grammar in comment.John Spurlock2015-03-021-2/+2
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I311fc5d7531464bbaeef5937c5ff2b757a8e675e
* | | | | | | | | | am 06e9147d: am c8e3784e: am 20a5df62: am bcced5b8: Merge "Fix incorrect ↵Shishir Agrawal2015-03-021-1/+1
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | / / | |_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | condition for sub id check." into lmp-mr1-dev * commit '06e9147d8a9e07aa06433f18323253f8659d27f9': Fix incorrect condition for sub id check.
| * | | | | | | | am c8e3784e: am 20a5df62: am bcced5b8: Merge "Fix incorrect condition for ↵Shishir Agrawal2015-03-021-1/+1
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub id check." into lmp-mr1-dev * commit 'c8e3784e259a1c668193a6590570847c9cd9310b': Fix incorrect condition for sub id check.
| | * | | | | | | am 20a5df62: am bcced5b8: Merge "Fix incorrect condition for sub id check." ↵Shishir Agrawal2015-03-021-1/+1
| | |\ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit '20a5df6205c3d57bfcb5b8e1454fb88c638c8ae3': Fix incorrect condition for sub id check.
| | | * | | | | | am bcced5b8: Merge "Fix incorrect condition for sub id check." into lmp-mr1-devShishir Agrawal2015-03-021-1/+1
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bcced5b834e49bf3a0b57a0009958ba061d31e76': Fix incorrect condition for sub id check.
| | | | * | | | | | Fix incorrect condition for sub id check.Junda Liu2015-02-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: b/19277299 Change-Id: Iea6806926f0e9d9404a3f2613d03b8a0607fea54
* | | | | | | | | | Merge "Fix issue where pruned UsageStats files would not be removed from index"Adam Lesinski2015-03-021-12/+17
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix issue where pruned UsageStats files would not be removed from indexAdam Lesinski2015-03-021-12/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This would cause an exception to be thrown when querying stats that included a deleted file and cause only in-memory stats to be returned. This change now re-indexes after deleting files. Furthermore, we continue reading UsageStats files in order to return more useful data if some other issue (file corruption) leads us to fail reading a file. Change-Id: I4a52739624d68e719e3d7d324a0b16709a62ac7a
* | | | | | | | | | | Merge "Add generic "INTERACTION" event type to UsageStatsManager"Adam Lesinski2015-03-023-1/+35
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Add generic "INTERACTION" event type to UsageStatsManagerAdam Lesinski2015-03-023-1/+35
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow for updating a package's last time used property for packages that are interacted in ways other than launching their activities (interacting with notifications, etc.) Change-Id: Ic6f9519f46fa04abd37ea6fc9475bcd9ea721003