184259 Commits

Author SHA1 Message Date
Ed Heyl
33dd7a4684 Merge "Fix build: Revert "Properly set up local transport data dirs after an initialize operation"" 2015-03-13 21:03:07 +00:00
Ed Heyl
0a809733da Fix build: Revert "Properly set up local transport data dirs after an initialize operation"
This reverts commit dc205b3f9530ab8f25b9d8fdbe0fd942fcfc750e.

Change-Id: I6ed27c1eb8ddd1894bf0374b989a1b4e3d7761a3
2015-03-13 21:00:45 +00:00
Christopher Tate
6bfcc6bf1c Merge "Properly set up local transport data dirs after an initialize operation" 2015-03-13 20:12:44 +00:00
Svetoslav
aa357ebe7a Merge "Persist settings on a normal priority thread." 2015-03-13 19:13:29 +00:00
Jeff Brown
3e0045e0df Merge "Avoid rebuilding epoll set when PFD status report is done." 2015-03-13 19:12:04 +00:00
Jeff Brown
031b7feb0f Merge "Revert "Revert "Update ParcelFileDescriptor to use non-blocking I/O.""" 2015-03-13 19:11:39 +00:00
Svetoslav
d289e64a2d Persist settings on a normal priority thread.
We were doing the work for persisting settings on a background
priority thread and as a result persistence was not happening
correctly on a low end devices. Now we use a worker thread with
normal priority.

bug:19611897

Change-Id: I378c6e324935f5e3def8b986bd48486bfab55265
2015-03-13 12:08:45 -07:00
Luan Nguyen
916e076a8c am 83b96e02: am d9eb3881: am 0c89bdb7: am 0d756f7d: am 217a4356: am a8bdd2f3: am 42bb44db: Merge "docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit" into lmp-docs
* commit '83b96e02a4bc8b0e9f5308b441609411ee347baf':
  docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit
2015-03-13 18:56:47 +00:00
Luan Nguyen
83b96e02a4 am d9eb3881: am 0c89bdb7: am 0d756f7d: am 217a4356: am a8bdd2f3: am 42bb44db: Merge "docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit" into lmp-docs
* commit 'd9eb3881f452ecb4b77062eb6505a3d7601d0a8c':
  docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit
2015-03-13 18:50:45 +00:00
Jeff Tinker
5609a32366 am 0d22633e: am 62632e25: Merge "Handle NULL keys and NULL values in MediaDrm JNI HashMap"
* commit '0d22633e07a6911403383a22bb3164f53b4f4409':
  Handle NULL keys and NULL values in MediaDrm JNI HashMap
2015-03-13 18:43:36 +00:00
Luan Nguyen
d9eb3881f4 am 0c89bdb7: am 0d756f7d: am 217a4356: am a8bdd2f3: am 42bb44db: Merge "docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit" into lmp-docs
* commit '0c89bdb7a7eb491c503c369c0f1d9e523c8ae34a':
  docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit
2015-03-13 18:42:03 +00:00
John Spurlock
78d08ee44a Merge "VolumePolicy: Debounce adjustments from vibrate->silent." 2015-03-13 18:41:50 +00:00
Jeff Tinker
0d22633e07 am 62632e25: Merge "Handle NULL keys and NULL values in MediaDrm JNI HashMap"
* commit '62632e25f57989d5e5ac406e21f037a3e2f39b9c':
  Handle NULL keys and NULL values in MediaDrm JNI HashMap
2015-03-13 18:35:32 +00:00
Luan Nguyen
0c89bdb7a7 am 0d756f7d: am 217a4356: am a8bdd2f3: am 42bb44db: Merge "docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit" into lmp-docs
* commit '0d756f7d5646f84753a3db5f702f4ac79bda22bf':
  docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit
2015-03-13 18:28:45 +00:00
Nick Kralevich
d028356056 am 870110e0: am 30fcd2aa: Merge "Drop unusable SELinux APIs."
* commit '870110e01af5c4875a9cf7134cee7c6842fd31af':
  Drop unusable SELinux APIs.
2015-03-13 18:26:20 +00:00
Chad Brubaker
a19ff28c8f am 99e9acd9: am f1654c60: Merge "Add initial Keymaster 1.0 tests"
* commit '99e9acd9402679e28e6f4c3ee71cef2cc91b3311':
  Add initial Keymaster 1.0 tests
2015-03-13 18:26:11 +00:00
Jeff Tinker
62632e25f5 Merge "Handle NULL keys and NULL values in MediaDrm JNI HashMap" 2015-03-13 18:20:43 +00:00
Nick Kralevich
870110e01a am 30fcd2aa: Merge "Drop unusable SELinux APIs."
* commit '30fcd2aa8a87ca97e1d6dbc3203c3a485a56dac9':
  Drop unusable SELinux APIs.
2015-03-13 18:16:58 +00:00
Chad Brubaker
99e9acd940 am f1654c60: Merge "Add initial Keymaster 1.0 tests"
* commit 'f1654c6015dbf30b7dae3575d787ca141ae84028':
  Add initial Keymaster 1.0 tests
2015-03-13 18:16:52 +00:00
Luan Nguyen
0d756f7d56 am 217a4356: am a8bdd2f3: am 42bb44db: Merge "docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit" into lmp-docs
* commit '217a435665880076abb71085e9d76aec4ff83b6d':
  docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit
2015-03-13 18:13:39 +00:00
Nick Kralevich
30fcd2aa8a Merge "Drop unusable SELinux APIs." 2015-03-13 18:02:47 +00:00
Stephen Smalley
16d1cce8ff Drop unusable SELinux APIs.
setSELinuxEnforce is not allowed by policy.
get/setBooleanValue and getBooleanNames are moot since SELinux
policy booleans are forbidden by CTS.

Change-Id: I512953edd1c38828efce698ae8475603775c32e8
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2015-03-13 14:09:26 -04:00
Luan Nguyen
217a435665 am a8bdd2f3: am 42bb44db: Merge "docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit" into lmp-docs
* commit 'a8bdd2f341ded0f2096e2750d176873e3e9e89c7':
  docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit
2015-03-13 17:57:02 +00:00
Luan Nguyen
a8bdd2f341 am 42bb44db: Merge "docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit" into lmp-docs
* commit '42bb44dbf5bffc5d3fcf89eacfd5c561dbe8095c':
  docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit
2015-03-13 17:49:46 +00:00
Chad Brubaker
f1654c6015 Merge "Add initial Keymaster 1.0 tests" 2015-03-13 17:48:09 +00:00
Luan Nguyen
42bb44dbf5 Merge "docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit" into lmp-docs 2015-03-13 17:42:15 +00:00
Mike Lockwood
4011e20921 Merge "MidiDeviceInfo meta-data improvements:" 2015-03-13 17:27:37 +00:00
Raph Levien
676fa348d0 Merge "Start moving text measurement into native code" 2015-03-13 17:26:32 +00:00
Raph Levien
70616ecd22 Start moving text measurement into native code
We want to move text measurement into native code, mostly so that
alternate measurement for hyphens can be performant. This patch begins
that migration, in the main StaticLayout case, but still surfaces the
widths array to Java (for ellipsis calculation), and also includes a
hack (used mostly for testing) for computing widths in Java and sending
them down to native code when TextPaint is subclassed.

Change-Id: I476c9e8b3aa8e4e3552eb18f66c4bcd5683f3a72
2015-03-13 10:11:57 -07:00
John Spurlock
07e72432ac VolumePolicy: Debounce adjustments from vibrate->silent.
Disallows volume adjustments (lower) from vibrate to silent
until a small period of time after an adjustment from normal
to vibrate.

This provides for enough time for the user to see the state change
to vibrate and feel the associated haptic feedback before yet
another state change to silent.

Bug: 19260237
Change-Id: I5843a1c144d56146a83db194f352832c8d85159d
2015-03-13 12:42:47 -04:00
Dianne Hackborn
484bc6e5a7 Merge "More work on collecting assist data." 2015-03-13 16:41:29 +00:00
Fyodor Kupolov
916b1e503d Merge "Changed the logic of calculating effective password limits" 2015-03-13 16:17:10 +00:00
Benjamin Franz
815eca184e Merge "Allow DO to set Settings.Global.STAY_ON_WHILE_PLUGGED_IN" 2015-03-13 16:03:05 +00:00
Santos Cordon
50ac385417 Merge "Do not hide any call log entries when they are added." 2015-03-13 16:00:37 +00:00
John Spurlock
d5a622279d Merge "AudioService: Define minimum levels for volume streams." 2015-03-13 15:45:31 +00:00
John Spurlock
b6e19e3e0f AudioService: Define minimum levels for volume streams.
- Set a floor of 1 for voice call + bluetooth sco, otherwise 0.
 - All api calls validated to ensure a floor of the min level.
 - Volume UI updated to shift the seekbar by the min value.
 - Remove duplicate static max method in AudioService.
 - Ensure streams with a min level > 0 are not considered muteable.

Bug: 19260237
Change-Id: I213180c9c277f51bd3897b7f777e5f88ed1db125
2015-03-13 11:02:01 -04:00
Yohei Yukawa
2fbea7ff90 Merge "Expose isSystemImeThatHasSubtypeOf to Settings" 2015-03-13 13:46:40 +00:00
Yohei Yukawa
9c83ff471d Expose isSystemImeThatHasSubtypeOf to Settings
This is a follow up CL for a recent attempt to minimize
the number of default enabled IMEs.
- part1: I831502db502f4073c9c2f50ce7705a4e45e2e1e3
- part2: Ife93d909fb8a24471c425c903e2b7048826e17a3
- part3: I6571d464a46453934f0a8f5e79018a67a9a3c845
- part4: I871ccda787eb0f1099ba3574356c1da4b33681f3

In the avobe CLs, an internal (hidden) method
InputMethodUtils.isValidSystemDefaultIme was marked as
deprecated and we decided to migrate to
InputMethodUtils.isSystemImeThatHasSubtypeOf.

To finish this refactoring, this CL make the new
method visible to the settings app.

InputMethodUtils.isValidSystemDefaultIme remains
to be an internal method. No behavior change is
intended.

Change-Id: I8cb9ca40d15af099c3d1ded46797fb57f14fb9e8
2015-03-13 22:43:06 +09:00
Clara Bayarri
67e4392bf6 Merge "Support a Primary and a Floating ActionMode in DecorView." 2015-03-13 12:17:39 +00:00
Derek Sollenberger
ee248599d4 Refactor DisplayList path caching.
This removes dependence on SkPath ptrs that HWUI does not control
the lifecycle of. This clears up some errors where the paths are
not generated from Java, but rather the Skia test suites.

Cherry-pick of a change that originally landed in master-skia and is
dependent on a skia merge (ag/655422).

Change-Id: I41b9797a2b0af5d6b4ea51891565469d4f1d832d
2015-03-13 08:05:55 -04:00
Leon Scroggins III
247dc6e125 Fix use of SkMutex.
Recent change to Skia moved SkMutex into its own header file. Include
it to use and SkMutex.

Use SK_DECLARE_STATIC_MUTEX to remove static initializer/finalizer.

Fixes master-skia build.

Change-Id: I2ab43c511587167b81310d5d55a65604d82761f5
2015-03-13 08:05:07 -04:00
Derek Sollenberger
130cf8ce1f Merge "SkStream is no longer a ref counted object." 2015-03-13 12:02:24 +00:00
Clara Bayarri
80c3856122 Support a Primary and a Floating ActionMode in DecorView.
This CL modifies the support for a single ActionMode in PhoneWindow.
DecorView to support both a Primary and a Floating ActionModes
simultaneously.

Things pending after this CL:
- Handling an actual Floating ActionMode
- Cleaning up the now unused ActionModeWrapper and its related code

Change-Id: Ie2e5ec27393ce9eededadf5bc379bab39981a365
2015-03-13 10:51:51 +00:00
Clara Bayarri
4423d91de5 Add a type parameter to startActionMode() calls.
This requires adding a new method to View and Window.Callback to pass
down the type as a parameter.

For compatibility purposes, the new method implementations keep the
type and call the old method, in case clients have subclassed it.

Change-Id: If5d857f131e33be8cc6a8814f2e9c4e85ad2da25
2015-03-13 10:51:51 +00:00
Benjamin Franz
68cc42009e Allow DO to set Settings.Global.STAY_ON_WHILE_PLUGGED_IN
Bug: 19704419
Change-Id: I3fc970eae8ef947775b6b565916bb245dea1b43b
2015-03-13 09:44:44 +00:00
Craig Mautner
993d128477 am e8ef4af3: am 5be1afed: am 7151b1ef: am 98560bdf: am bfcc60a3: am 2825a9c6: am 470ad0fa: Merge "Correct docs to specify leading slash in paths." into lmp-docs
* commit 'e8ef4af3dfdf35d1094c57c79c84527310480d41':
  Correct docs to specify leading slash in paths.
2015-03-13 07:41:26 +00:00
Andreas Gampe
1b4e56ac36 resolved conflicts for merge of 1d67698b to master
Change-Id: I866d342320c34e91494b4c70f27d0b79ec33358b
2015-03-13 00:17:40 -07:00
Olawale Ogunwale
ce389e00cf am 2f952916: am 1b4933d1: Merge "Wait for visible wallpaper drawn before starting app transitions"
* commit '2f9529168974fb6ca3a70372fd802e845e015bfd':
  Wait for visible wallpaper drawn before starting app transitions
2015-03-13 07:09:55 +00:00
Roozbeh Pournader
4d446913e9 am 8a264dd2: am 07e01e07: am 11b6e235: am db56b5a6: Move Noto Sans Tai Le to the end of the font fallback list.
* commit '8a264dd289df13dfae7d5c89fc4b6f69b30230be':
  Move Noto Sans Tai Le to the end of the font fallback list.
2015-03-13 07:08:55 +00:00
Lorenzo Colitti
2cabb7ddb6 am 4a61eaf7: am 1c24b3f1: Merge "Fix build, broken by https://android-review.googlesource.com/#/c/115890/"
* commit '4a61eaf784fb085e66a21e9e4d4fa8aeb6b41c2b':
  Fix build, broken by https://android-review.googlesource.com/#/c/115890/
2015-03-13 07:07:54 +00:00