OSDN Git Service

android-x86/frameworks-base.git
9 years agoConsolidate SystemUI SharedPreferences.
Andrew Flynn [Wed, 1 Apr 2015 18:22:37 +0000 (14:22 -0400)]
Consolidate SystemUI SharedPreferences.

Makes it easier to use from any place and gets us type-safety.

Change-Id: I472e340e8332d9a173335b6f337525d58d801881

9 years agoMerge "Editor: Allow invalidation of the Text Selection Action Mode"
Clara Bayarri [Fri, 10 Apr 2015 10:02:19 +0000 (10:02 +0000)]
Merge "Editor: Allow invalidation of the Text Selection Action Mode"

9 years agoCreate DropboxService lazily.
Narayan Kamath [Wed, 8 Apr 2015 12:24:13 +0000 (13:24 +0100)]
Create DropboxService lazily.

We seldom use it from libcore.io.DropBox so there's not much point
(there's only one usage, from a conscrypt SSL error). This saves > 10ms
from ActivityThread.attach.

Change-Id: I360158ef9a36a9ababd700e4f3243c92b74047eb

9 years agoIntroduce Ctrl+Backspace/Ctrl+ForwardDelete shortcut.
Seigo Nonaka [Tue, 7 Apr 2015 12:02:13 +0000 (21:02 +0900)]
Introduce Ctrl+Backspace/Ctrl+ForwardDelete shortcut.

Ctrl+Backspace deletes preceding one word and Ctrl+ForwardDelete delets
following one word.
Used Chrome's implementation/behvior as a reference.

Bug: 17810742
Change-Id: I7b2ca515b2f017e457f7104ec7b8e7473ca4e081

9 years agoMerge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform...
Pirama Arumuga Nainar [Fri, 10 Apr 2015 04:37:01 +0000 (04:37 +0000)]
Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base

9 years agoMerge "Fix unexpected selection cancellation"
Seigo Nonaka [Fri, 10 Apr 2015 04:35:36 +0000 (04:35 +0000)]
Merge "Fix unexpected selection cancellation"

9 years agoam 72fcf9eb: am af61d43d: am 6d718c2f: Merge "Add support for setting the cache direc...
Tim Murray [Fri, 10 Apr 2015 04:35:04 +0000 (04:35 +0000)]
am 72fcf9eb: am af61d43d: am 6d718c2f: Merge "Add support for setting the cache directory."

* commit '72fcf9eb1079312afd7bdbee167c759109af4244':
  Add support for setting the cache directory.

9 years agoam 037dfb94: am 5f8c17b9: am ba2836e6: Merge "Track recent keymaster_defs.h changes."
Alex Klyubin [Fri, 10 Apr 2015 04:34:13 +0000 (04:34 +0000)]
am 037dfb94: am 5f8c17b9: am ba2836e6: Merge "Track recent keymaster_defs.h changes."

* commit '037dfb9423a0988398b67520546dae5673aa54bb':
  Track recent keymaster_defs.h changes.

9 years agoam 04a99c7b: am 82cba6aa: am c6eb6288: Merge "Split key origin into TEE/not and gener...
Alex Klyubin [Fri, 10 Apr 2015 04:33:48 +0000 (04:33 +0000)]
am 04a99c7b: am 82cba6aa: am c6eb6288: Merge "Split key origin into TEE/not and generated/imported."

* commit '04a99c7b4435598e4f9d53fadbe5faca4ad7ebdc':
  Split key origin into TEE/not and generated/imported.

9 years agoam 6951d555: am 56a6d371: am da164973: Merge "Add dalvik subitems for -d in dumpsys...
Mathieu Chartier [Fri, 10 Apr 2015 04:33:25 +0000 (04:33 +0000)]
am 6951d555: am 56a6d371: am da164973: Merge "Add dalvik subitems for -d in dumpsys meminfo "Total PSS by category""

* commit '6951d555c2060e19bd9db46a772852db8aa24dfe':
  Add dalvik subitems for -d in dumpsys meminfo "Total PSS by category"

9 years agoMerge "Use TextView's text locale for capitalization."
Seigo Nonaka [Fri, 10 Apr 2015 03:35:29 +0000 (03:35 +0000)]
Merge "Use TextView's text locale for capitalization."

9 years agoMerge "Expose Cursor.setExtras()."
Jeff Brown [Fri, 10 Apr 2015 03:11:41 +0000 (03:11 +0000)]
Merge "Expose Cursor.setExtras()."

9 years agoMerge "Clean up AbstractCursor API."
Jeff Brown [Fri, 10 Apr 2015 02:50:05 +0000 (02:50 +0000)]
Merge "Clean up AbstractCursor API."

9 years agoMerge "Remove deprecated fields in AbstractCursor."
Jeff Brown [Fri, 10 Apr 2015 02:49:34 +0000 (02:49 +0000)]
Merge "Remove deprecated fields in AbstractCursor."

9 years agoExpose Cursor.setExtras().
Jeff Brown [Fri, 10 Apr 2015 01:28:24 +0000 (18:28 -0700)]
Expose Cursor.setExtras().

Bug: 19369537
Change-Id: I78e319667cbfaeb51f471d18c4fefeac01d49d80

9 years agoClean up AbstractCursor API.
Jeff Brown [Fri, 10 Apr 2015 01:52:52 +0000 (18:52 -0700)]
Clean up AbstractCursor API.

Deprecated three protected fields that should not have been
exposed in the API.

Bug: 6353797
Change-Id: Ic6710f880a452dd1508abf0613907a1d2b1fb557

9 years agoRemove deprecated fields in AbstractCursor.
Jeff Brown [Fri, 10 Apr 2015 01:32:35 +0000 (18:32 -0700)]
Remove deprecated fields in AbstractCursor.

Bug: 6353797
Change-Id: Ibf760f0aeef82c176e3c659a2ced3de07f8e8abe

9 years agoMerge "MediaMetadataRetriever: add key for capture fps"
Chong Zhang [Fri, 10 Apr 2015 02:29:36 +0000 (02:29 +0000)]
Merge "MediaMetadataRetriever: add key for capture fps"

9 years agoMerge "Volume: Update media bluetooth icons."
John Spurlock [Fri, 10 Apr 2015 02:07:51 +0000 (02:07 +0000)]
Merge "Volume: Update media bluetooth icons."

9 years agoVolume: Update media bluetooth icons.
John Spurlock [Fri, 10 Apr 2015 02:04:14 +0000 (22:04 -0400)]
Volume: Update media bluetooth icons.

Note + bt logo.

Bug: 19260237
Change-Id: I32cb497505f7dea94d761637064f8f8e585ffa94

9 years agoMerge "An update on Downtime."
John Spurlock [Fri, 10 Apr 2015 01:48:02 +0000 (01:48 +0000)]
Merge "An update on Downtime."

9 years agoAn update on Downtime.
John Spurlock [Tue, 7 Apr 2015 16:47:12 +0000 (12:47 -0400)]
An update on Downtime.

The update is that Downtime is obsolete.  Replaced by the
ability to define multiple named schedule calendars.

 - Make changes to ZenModeConfig to properly model manual
   and automatic rules.
 - Refactor the zen mode helper (and supporting classes) to
   properly handle / report multiple claims on zen mode.
   The "manual" rule (specified by the user in the UI) vs
   one or more automatic rules.
 - Automatic rules are still backed by condition providers,
   but the layering is now cleaner.  ConditionProviders is now
   completely generic, has no ties to zen mode.
 - Specifically, the new layering for zen mode (below noman) is:
   ZenModeHelper: Source of truth for zen state
     ZenModeFiltering: Subhelper dedicated to filtering rules.
     ZenModeConditions: Subhelper dedicated to managing automatic rules.
       ConditionProviders:  Underlying engine for reporting named boolean state.
 - Migration story for users with existing downtime config, migrated
   to a single new calendar named downtime.
 - For users with no existing downtime, two default calendars are created
   for weeknights + weekends (icu4j for all locales will be done in a followup).
 - Remove obsolete DowntimeConditionProvider/NextAlarmConditionProvider and tracking.
 - Clean up obsolete resources.
 - Add common zen summary description string computation.
 - Add proper noman wrappers for the new model.
 - Change the semantics of the global zen setting.  It is now read-only.  Setters
   must call noman, added a "reason" to all calls for better attribution.
 - Update zenmodepanel + volumedialog to the new model.
 - Display the one or more automatic rules in the new zen footer summary.
 - "Snooze" the automatic rules when the user explicitly turns zen off.

Bug: 20064962
Change-Id: Idd9deb865a6035ad0cfae660198dccb517e6d7cc

9 years agoam af61d43d: am 6d718c2f: Merge "Add support for setting the cache directory."
Tim Murray [Fri, 10 Apr 2015 01:30:14 +0000 (01:30 +0000)]
am af61d43d: am 6d718c2f: Merge "Add support for setting the cache directory."

* commit 'af61d43d6ce065832f906757c2185c3dad74d489':
  Add support for setting the cache directory.

9 years agoam 6d718c2f: Merge "Add support for setting the cache directory."
Tim Murray [Fri, 10 Apr 2015 01:07:26 +0000 (01:07 +0000)]
am 6d718c2f: Merge "Add support for setting the cache directory."

* commit '6d718c2f43f6be057f9a519bc02f6b123405b79d':
  Add support for setting the cache directory.

9 years agoMerge "Add support for setting the cache directory."
Tim Murray [Fri, 10 Apr 2015 00:51:14 +0000 (00:51 +0000)]
Merge "Add support for setting the cache directory."

9 years agoAdd support for setting the cache directory.
Tim Murray [Tue, 7 Apr 2015 22:43:24 +0000 (15:43 -0700)]
Add support for setting the cache directory.

Change-Id: I2bf1874705b877a8a8262ab49b47fe8241e603d5

9 years agoam 5f8c17b9: am ba2836e6: Merge "Track recent keymaster_defs.h changes."
Alex Klyubin [Fri, 10 Apr 2015 00:35:55 +0000 (00:35 +0000)]
am 5f8c17b9: am ba2836e6: Merge "Track recent keymaster_defs.h changes."

* commit '5f8c17b9f6d574eca6a24ddb2f7cc98a37f5aaea':
  Track recent keymaster_defs.h changes.

9 years agoMerge "Add PNG and 9-patch support"
Adam Lesinski [Fri, 10 Apr 2015 00:32:27 +0000 (00:32 +0000)]
Merge "Add PNG and 9-patch support"

9 years agoam ba2836e6: Merge "Track recent keymaster_defs.h changes."
Alex Klyubin [Fri, 10 Apr 2015 00:22:45 +0000 (00:22 +0000)]
am ba2836e6: Merge "Track recent keymaster_defs.h changes."

* commit 'ba2836e6cf5a00855e470705741d9e4b9b1a9df9':
  Track recent keymaster_defs.h changes.

9 years agoAdd PNG and 9-patch support
Adam Lesinski [Mon, 6 Apr 2015 18:46:52 +0000 (11:46 -0700)]
Add PNG and 9-patch support

Change-Id: I9ecdfdf82b82d59084490da518e167e256afd5f2

9 years agoam 82cba6aa: am c6eb6288: Merge "Split key origin into TEE/not and generated/imported."
Alex Klyubin [Fri, 10 Apr 2015 00:06:25 +0000 (00:06 +0000)]
am 82cba6aa: am c6eb6288: Merge "Split key origin into TEE/not and generated/imported."

* commit '82cba6aa3792b7d3b7eddf32c64cbf4a7a47e5a5':
  Split key origin into TEE/not and generated/imported.

9 years agoMerge "Track recent keymaster_defs.h changes."
Alex Klyubin [Fri, 10 Apr 2015 00:01:18 +0000 (00:01 +0000)]
Merge "Track recent keymaster_defs.h changes."

9 years agoTrack recent keymaster_defs.h changes.
Alex Klyubin [Thu, 9 Apr 2015 23:58:58 +0000 (16:58 -0700)]
Track recent keymaster_defs.h changes.

Bug: 18088752
Change-Id: If47bb7cc7a385941db9f12d478676594e9bc9d86

9 years agoam c6eb6288: Merge "Split key origin into TEE/not and generated/imported."
Alex Klyubin [Thu, 9 Apr 2015 23:55:47 +0000 (23:55 +0000)]
am c6eb6288: Merge "Split key origin into TEE/not and generated/imported."

* commit 'c6eb62882b09cf06e1e70c14e7878593d1a76477':
  Split key origin into TEE/not and generated/imported.

9 years agoMerge "Avoid double-apply of dialog theme"
Alan Viverette [Thu, 9 Apr 2015 23:52:38 +0000 (23:52 +0000)]
Merge "Avoid double-apply of dialog theme"

9 years agoam 56a6d371: am da164973: Merge "Add dalvik subitems for -d in dumpsys meminfo "Total...
Mathieu Chartier [Thu, 9 Apr 2015 23:47:20 +0000 (23:47 +0000)]
am 56a6d371: am da164973: Merge "Add dalvik subitems for -d in dumpsys meminfo "Total PSS by category""

* commit '56a6d371bd4978bb7dfa7cce8bfbcc0bb13abd93':
  Add dalvik subitems for -d in dumpsys meminfo "Total PSS by category"

9 years agoam da164973: Merge "Add dalvik subitems for -d in dumpsys meminfo "Total PSS by categ...
Mathieu Chartier [Thu, 9 Apr 2015 23:36:06 +0000 (23:36 +0000)]
am da164973: Merge "Add dalvik subitems for -d in dumpsys meminfo "Total PSS by category""

* commit 'da164973f35aa32e44d0b9336deef28df5b13544':
  Add dalvik subitems for -d in dumpsys meminfo "Total PSS by category"

9 years agoMerge "Split key origin into TEE/not and generated/imported."
Alex Klyubin [Thu, 9 Apr 2015 23:34:44 +0000 (23:34 +0000)]
Merge "Split key origin into TEE/not and generated/imported."

9 years agoMerge "Add IntentFilter auto verification - part 5"
Fabrice Di Meglio [Thu, 9 Apr 2015 23:23:37 +0000 (23:23 +0000)]
Merge "Add IntentFilter auto verification - part 5"

9 years agoAdd IntentFilter auto verification - part 5
Fabrice Di Meglio [Thu, 9 Apr 2015 22:55:42 +0000 (15:55 -0700)]
Add IntentFilter auto verification - part 5

- optimize IntentFilter verification: dont do stuff we dont want
if we dont need to do them.

- improve IntentFilter candidates filtering and also improve
at the same time fix for bug #20128771: we can return the candidates
list rigth the way if the Intent is not related to a Web data URI and
include the "undefined verification state" ones if the first filtering
pass does not leave any.

Change-Id: I19f5c060f58b93530e37b4425d19ed23d2a0f4c0

9 years agoMerge "Add dalvik subitems for -d in dumpsys meminfo "Total PSS by category""
Mathieu Chartier [Thu, 9 Apr 2015 23:14:27 +0000 (23:14 +0000)]
Merge "Add dalvik subitems for -d in dumpsys meminfo "Total PSS by category""

9 years agoAdd dalvik subitems for -d in dumpsys meminfo "Total PSS by category"
Mathieu Chartier [Thu, 9 Apr 2015 21:32:31 +0000 (14:32 -0700)]
Add dalvik subitems for -d in dumpsys meminfo "Total PSS by category"

Example output of "adb shell dumpsys meminfo -d":

Total PSS by category:
   193605 kB: Dalvik
               87561 kB: .Heap
               77863 kB: .LOS
               15333 kB: .Zygote
               12848 kB: .NonMoving
                6770 kB: .GC
                2597 kB: .LinearAlloc
                1180 kB: .JITCache
                1180 kB: .IndirectRef
   103936 kB: EGL mtrack
   101827 kB: Native

Bug: 17643507

(cherry picked from commit 546edc5a31bb5a843048e11d8afb0b1f6441ddb4)

Change-Id: If34627cf93ba5305b428d2278f350a2649d63d5e

9 years agoSplit key origin into TEE/not and generated/imported.
Alex Klyubin [Thu, 9 Apr 2015 22:50:17 +0000 (15:50 -0700)]
Split key origin into TEE/not and generated/imported.

This is to match the upcoming changes in Keymaster HAL API.

Bug: 18088752
Change-Id: I602d56d1c29a839583be1d9efa681a6fab6642db

9 years agoMerge "Add dalvik subitems for -d in dumpsys meminfo "Total PSS by category""
Mathieu Chartier [Thu, 9 Apr 2015 22:48:47 +0000 (22:48 +0000)]
Merge "Add dalvik subitems for -d in dumpsys meminfo "Total PSS by category""

9 years agoAdd expiration update and keys change events
Jeff Tinker [Tue, 31 Mar 2015 22:44:34 +0000 (15:44 -0700)]
Add expiration update and keys change events

In support of unprefixed EME

bug: 19771612
bug: 19771431
Change-Id: Iddef695cfa1a56363a4c173249597e415cb93f50

9 years agoMerge "More work on device idle mode and other power stuff."
Dianne Hackborn [Thu, 9 Apr 2015 22:35:32 +0000 (22:35 +0000)]
Merge "More work on device idle mode and other power stuff."

9 years agoMerge "media: add new MediaCodec Callback onCodecReleased."
Ronghua Wu [Thu, 9 Apr 2015 22:29:13 +0000 (22:29 +0000)]
Merge "media: add new MediaCodec Callback onCodecReleased."

9 years agoam 84debe27: am e0001185: am 1d3c77a2: Merge "Start passing volume UUID to installd."
Jeff Sharkey [Thu, 9 Apr 2015 22:21:50 +0000 (22:21 +0000)]
am 84debe27: am e0001185: am 1d3c77a2: Merge "Start passing volume UUID to installd."

* commit '84debe2761433cfaa8203d5a2defa4ba2ed64b61':
  Start passing volume UUID to installd.

9 years agoam 4acc3392: am 8676a88e: am 97d2d7c4: Merge "Fix minor issues in new Javadocs of...
Alex Klyubin [Thu, 9 Apr 2015 22:21:41 +0000 (22:21 +0000)]
am 4acc3392: am 8676a88e: am 97d2d7c4: Merge "Fix minor issues in new Javadocs of AndroidKeyStore."

* commit '4acc3392c35e5ad98c8e7b650b1368a2956746b7':
  Fix minor issues in new Javadocs of AndroidKeyStore.

9 years agoMerge "Verify that EditorInfo.packageName and uid are consistent"
Yohei Yukaw [Thu, 9 Apr 2015 22:10:45 +0000 (22:10 +0000)]
Merge "Verify that EditorInfo.packageName and uid are consistent"

9 years agoam e0001185: am 1d3c77a2: Merge "Start passing volume UUID to installd."
Jeff Sharkey [Thu, 9 Apr 2015 22:07:29 +0000 (22:07 +0000)]
am e0001185: am 1d3c77a2: Merge "Start passing volume UUID to installd."

* commit 'e000118549c10deaf17c27a14efa866184127b6d':
  Start passing volume UUID to installd.

9 years agoam 8676a88e: am 97d2d7c4: Merge "Fix minor issues in new Javadocs of AndroidKeyStore."
Alex Klyubin [Thu, 9 Apr 2015 22:07:18 +0000 (22:07 +0000)]
am 8676a88e: am 97d2d7c4: Merge "Fix minor issues in new Javadocs of AndroidKeyStore."

* commit '8676a88e60ed342cfb5c576aef80960976e3c396':
  Fix minor issues in new Javadocs of AndroidKeyStore.

9 years agoam 1d3c77a2: Merge "Start passing volume UUID to installd."
Jeff Sharkey [Thu, 9 Apr 2015 21:57:41 +0000 (21:57 +0000)]
am 1d3c77a2: Merge "Start passing volume UUID to installd."

* commit '1d3c77a21e9c8fc59200b42503d9f0effd3f1551':
  Start passing volume UUID to installd.

9 years agoam 97d2d7c4: Merge "Fix minor issues in new Javadocs of AndroidKeyStore."
Alex Klyubin [Thu, 9 Apr 2015 21:57:35 +0000 (21:57 +0000)]
am 97d2d7c4: Merge "Fix minor issues in new Javadocs of AndroidKeyStore."

* commit '97d2d7c42752a52b5fe890cdb9a5dcbbf53837cc':
  Fix minor issues in new Javadocs of AndroidKeyStore.

9 years agomedia: add new MediaCodec Callback onCodecReleased.
Ronghua Wu [Thu, 19 Mar 2015 18:17:20 +0000 (11:17 -0700)]
media: add new MediaCodec Callback onCodecReleased.

Bug: 19620911
Change-Id: I2912c570678861daf1516757dda2160ffddcfa8d

9 years agoMerge "Start passing volume UUID to installd."
Jeff Sharkey [Thu, 9 Apr 2015 21:41:11 +0000 (21:41 +0000)]
Merge "Start passing volume UUID to installd."

9 years agoMerge "Fix minor issues in new Javadocs of AndroidKeyStore."
Alex Klyubin [Thu, 9 Apr 2015 21:40:58 +0000 (21:40 +0000)]
Merge "Fix minor issues in new Javadocs of AndroidKeyStore."

9 years agoAdd dalvik subitems for -d in dumpsys meminfo "Total PSS by category"
Mathieu Chartier [Thu, 9 Apr 2015 21:32:31 +0000 (14:32 -0700)]
Add dalvik subitems for -d in dumpsys meminfo "Total PSS by category"

Example output of "adb shell dumpsys meminfo -d":

Total PSS by category:
   193605 kB: Dalvik
               87561 kB: .Heap
               77863 kB: .LOS
               15333 kB: .Zygote
               12848 kB: .NonMoving
                6770 kB: .GC
                2597 kB: .LinearAlloc
                1180 kB: .JITCache
                1180 kB: .IndirectRef
   103936 kB: EGL mtrack
   101827 kB: Native

Bug: 17643507
Change-Id: Idd3e5560f376157c32094a5fbb84e8b6be4b2843

9 years agoFix minor issues in new Javadocs of AndroidKeyStore.
Alex Klyubin [Thu, 9 Apr 2015 21:33:11 +0000 (14:33 -0700)]
Fix minor issues in new Javadocs of AndroidKeyStore.

Bug: 18088752
Change-Id: Ie84cc6066c82f2659da17a1eb158c2e3acf5094d

9 years agoMerge "Editor: Turn on Floating Toolbar Action Mode for Text Selection"
Clara Bayarri [Thu, 9 Apr 2015 21:31:49 +0000 (21:31 +0000)]
Merge "Editor: Turn on Floating Toolbar Action Mode for Text Selection"

9 years agoStart passing volume UUID to installd.
Jeff Sharkey [Thu, 9 Apr 2015 20:18:44 +0000 (13:18 -0700)]
Start passing volume UUID to installd.

This change adds new method overloads to provide volume UUID.  The
older methods remain for now, and pass through the "null" UUID to
reference internal storage.

Follows the existing pattern where null arguments are passed as "!".

Bug: 19993667
Change-Id: Ia1b7c8550cabc13e4f6e1182eabb650f2c33e44f

9 years agoMore work on device idle mode and other power stuff.
Dianne Hackborn [Wed, 8 Apr 2015 23:55:47 +0000 (16:55 -0700)]
More work on device idle mode and other power stuff.

Add idle mode support to the alarm manager.  Introduce
a new concept of flags associated with alarms to tell
the alarm manager how to treat the alarm -- they allow
everything from the alarm that will bring us out of idle
mode, to alarms that are allowed when idle or should
also bring us out of idle.  The standalone boolean is
now also a flag.

(Note there is currently no protection from user space
setting the flags however it wants; I will be working
on that in a follow-up change.)

When in idle mode, the alarm manager pushes all alarms
that shouldn't execute during that time over to a
separate list that is not executed until out of idle.
To help with this, I reworked a bit how Alarm objects
are managed, so that when rebatching or moving between
lists we don't have to allocated new objects but can
just use the same existing instance.

Also tweaked the sync manager to deal with idle mode,
which currently just means doing the same thing as when
low on storage -- turning off sync.

Add new ACTION_CHARGING and ACTION_DISCHARGING broadcasts
that apps can listen for to know when the device is actively
charging and discharging.  These are better than the old
POWER_CONNECTED and POWER_DISCONNECTED ones because we only
report charging when we actually see that there is enough
power being provided to charge the battery (and will report
discharging if there is not enough power).

The job controller uses these new actions for scheduling
jobs that want to run while plugged in.  Removed the
"stable charging" stuff while doing so, since the new
charging state serves as an even better signal for that.

Introduced two new process states: FOREGROUND_SERVICE and
TOP_SLEEPING.  This will allow us to treat foreground services
specially (such as still allowing network access to them for
background music playback) while not mixing them together with
whatever happens to be the top activity while the device is
asleep.

Also some other small cleanup here and there.

Change-Id: I7a9808b578bad6f50deb8e1baf919298512a0d3a

9 years agoMerge "Add support for Bluetooth MIDI devices"
Mike Lockwood [Thu, 9 Apr 2015 21:02:08 +0000 (21:02 +0000)]
Merge "Add support for Bluetooth MIDI devices"

9 years agoMerge "Add support for flushing MIDI all scheduled MIDI events on a port"
Mike Lockwood [Thu, 9 Apr 2015 21:01:43 +0000 (21:01 +0000)]
Merge "Add support for flushing MIDI all scheduled MIDI events on a port"

9 years agoMerge "Fix breakage from ActionBar animations"
Chet Haase [Thu, 9 Apr 2015 20:38:04 +0000 (20:38 +0000)]
Merge "Fix breakage from ActionBar animations"

9 years agoam 098833c5: am ec01623b: am aeae0f38: Merge "Add asymmetric crypto constants for...
Alex Klyubin [Thu, 9 Apr 2015 20:34:56 +0000 (20:34 +0000)]
am 098833c5: am ec01623b: am aeae0f38: Merge "Add asymmetric crypto constants for AndroidKeyStore API."

* commit '098833c59d8b3984e3983169b460198c2d5e2670':
  Add asymmetric crypto constants for AndroidKeyStore API.

9 years agoam c6112eb7: am 21c4e465: am 8c58ba87: Merge "Add missing mapping between JCA and...
Alex Klyubin [Thu, 9 Apr 2015 20:34:46 +0000 (20:34 +0000)]
am c6112eb7: am 21c4e465: am 8c58ba87: Merge "Add missing mapping between JCA and keystore HMAC names."

* commit 'c6112eb7057f91df1f885da37564f89a423f64e4':
  Add missing mapping between JCA and keystore HMAC names.

9 years agoam ec01623b: am aeae0f38: Merge "Add asymmetric crypto constants for AndroidKeyStore...
Alex Klyubin [Thu, 9 Apr 2015 20:24:28 +0000 (20:24 +0000)]
am ec01623b: am aeae0f38: Merge "Add asymmetric crypto constants for AndroidKeyStore API."

* commit 'ec01623b0b456c9e8f43123f1f96fb2330a6615f':
  Add asymmetric crypto constants for AndroidKeyStore API.

9 years agoam 21c4e465: am 8c58ba87: Merge "Add missing mapping between JCA and keystore HMAC...
Alex Klyubin [Thu, 9 Apr 2015 20:24:22 +0000 (20:24 +0000)]
am 21c4e465: am 8c58ba87: Merge "Add missing mapping between JCA and keystore HMAC names."

* commit '21c4e465f6a4783a9356bf1d88bda42192af022f':
  Add missing mapping between JCA and keystore HMAC names.

9 years agoMerge "Add system API for querying the available restore dataset for a package"
Christopher Tate [Thu, 9 Apr 2015 20:20:24 +0000 (20:20 +0000)]
Merge "Add system API for querying the available restore dataset for a package"

9 years agoMerge "Only parse LayerDrawable child items when necessary"
Alan Viverette [Thu, 9 Apr 2015 20:16:32 +0000 (20:16 +0000)]
Merge "Only parse LayerDrawable child items when necessary"

9 years agoam aeae0f38: Merge "Add asymmetric crypto constants for AndroidKeyStore API."
Alex Klyubin [Thu, 9 Apr 2015 20:15:02 +0000 (20:15 +0000)]
am aeae0f38: Merge "Add asymmetric crypto constants for AndroidKeyStore API."

* commit 'aeae0f384f72d4deca698697b125b82b322f7f90':
  Add asymmetric crypto constants for AndroidKeyStore API.

9 years agoam 8c58ba87: Merge "Add missing mapping between JCA and keystore HMAC names."
Alex Klyubin [Thu, 9 Apr 2015 20:14:56 +0000 (20:14 +0000)]
am 8c58ba87: Merge "Add missing mapping between JCA and keystore HMAC names."

* commit '8c58ba87bb82993b2bd5dbdd948d15fe3297d08e':
  Add missing mapping between JCA and keystore HMAC names.

9 years agoOnly parse LayerDrawable child items when necessary
Alan Viverette [Thu, 9 Apr 2015 20:14:32 +0000 (13:14 -0700)]
Only parse LayerDrawable child items when necessary

Bug: 20098214
Change-Id: Ie9da5f6e494ede47f9fdc94481a3f8ca41d3ef00

9 years agoMerge "Fix bug #20128771 All apps disappeared from app drawer after AAZ08 OTA"
Fabrice Di Meglio [Thu, 9 Apr 2015 20:13:54 +0000 (20:13 +0000)]
Merge "Fix bug #20128771 All apps disappeared from app drawer after AAZ08 OTA"

9 years agoAdd system API for querying the available restore dataset for a package
Christopher Tate [Thu, 9 Apr 2015 03:05:30 +0000 (20:05 -0700)]
Add system API for querying the available restore dataset for a package

Bug 20123585

Change-Id: Ife6e77a224b5d4175178aacdb7c285e9944b9eab

9 years agoMerge "update metrics constants"
Chris Wren [Thu, 9 Apr 2015 20:13:23 +0000 (20:13 +0000)]
Merge "update metrics constants"

9 years agoFix bug #20128771 All apps disappeared from app drawer after AAZ08 OTA
Fabrice Di Meglio [Thu, 9 Apr 2015 20:07:50 +0000 (13:07 -0700)]
Fix bug #20128771 All apps disappeared from app drawer after AAZ08 OTA

- relax a bit Intent resolution. We should still include Apps that
do not support Web domains :-) so in that context add in the result
list the Apps that are with a status INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_UNDEFINED

Change-Id: Ibad7b7f577552ac75bba256bb387a75b83524958

9 years agoMerge "Add asymmetric crypto constants for AndroidKeyStore API."
Alex Klyubin [Thu, 9 Apr 2015 20:02:39 +0000 (20:02 +0000)]
Merge "Add asymmetric crypto constants for AndroidKeyStore API."

9 years agoMerge "Add missing mapping between JCA and keystore HMAC names."
Alex Klyubin [Thu, 9 Apr 2015 19:57:12 +0000 (19:57 +0000)]
Merge "Add missing mapping between JCA and keystore HMAC names."

9 years agoupdate metrics constants
Chris Wren [Thu, 9 Apr 2015 19:34:13 +0000 (15:34 -0400)]
update metrics constants

Change-Id: I73ea3fe98a3b41b1072688a846ef1c396a9e9a30

9 years agoMerge "Add permission for AppCompatibilityTest."
wsmlby [Thu, 9 Apr 2015 19:36:52 +0000 (19:36 +0000)]
Merge "Add permission for AppCompatibilityTest."

9 years agoAdd permission for AppCompatibilityTest.
wsmlby [Thu, 9 Apr 2015 19:32:33 +0000 (12:32 -0700)]
Add permission for AppCompatibilityTest.

Bug: 20134812
Change-Id: Iaf9a9963a16af1e2bb157159648db70666a33c48

9 years agoam e24d36b7: am 1f799a6b: am d9f32b16: Merge "Ensure alignment of Res_png_9patch."
Dan Albert [Thu, 9 Apr 2015 19:06:11 +0000 (19:06 +0000)]
am e24d36b7: am 1f799a6b: am d9f32b16: Merge "Ensure alignment of Res_png_9patch."

* commit 'e24d36b7b744540ccd3401609248ed9d48be4cc9':
  Ensure alignment of Res_png_9patch.

9 years agoam acae606f: am a6b6952b: am 0b1610ff: am 2489a7fd: am 9d6e9587: am 36e3f512: Merge...
Rich Slogar [Thu, 9 Apr 2015 19:06:00 +0000 (19:06 +0000)]
am acae606f: am a6b6952b: am 0b1610ff: am 2489a7fd: am 9d6e9587: am 36e3f512: Merge "docs: remove studio proguard settings from play services" into lmp-docs

* commit 'acae606f5dde5fff990ffc840da89fcc61f03c5b':
  docs: remove studio proguard settings from play services

9 years agoAdd support for Bluetooth MIDI devices
Mike Lockwood [Tue, 24 Mar 2015 15:27:11 +0000 (08:27 -0700)]
Add support for Bluetooth MIDI devices

The Bluetooth MIDI devices are handled in the BluetoothMidiService APK.
Apps wishing to connect to Bluetooth MIDI devices call MidiManager.openBluetoothDevice()
which binds to BluetoothMidiService in a similar way as virtual devices are implemented.

Change-Id: Ie3fbca757928fd7873a009f9bf9e0ce0be487da6

9 years agoAdd support for flushing MIDI all scheduled MIDI events on a port
Mike Lockwood [Wed, 8 Apr 2015 15:45:37 +0000 (08:45 -0700)]
Add support for flushing MIDI all scheduled MIDI events on a port

Change-Id: I39d7862540d4d4b9e2df1265f9dd253541adb4c2

9 years agoFix breakage from ActionBar animations
Chet Haase [Thu, 9 Apr 2015 18:42:30 +0000 (11:42 -0700)]
Fix breakage from ActionBar animations

Real fix will come later, but this disables the animations to work
around the current crash.

Issue #20125407 Settings Crashes when changing orientation of device

Change-Id: I748e8889f72483c82cff084c5815322057f16f03

9 years agoAdd asymmetric crypto constants for AndroidKeyStore API.
Alex Klyubin [Thu, 9 Apr 2015 18:38:44 +0000 (11:38 -0700)]
Add asymmetric crypto constants for AndroidKeyStore API.

Bug: 18088752
Change-Id: Iee72a4c230f3a2cd30d9eb4d29c4301f3e113f31

9 years agoam 1f799a6b: am d9f32b16: Merge "Ensure alignment of Res_png_9patch."
Dan Albert [Thu, 9 Apr 2015 18:31:38 +0000 (18:31 +0000)]
am 1f799a6b: am d9f32b16: Merge "Ensure alignment of Res_png_9patch."

* commit '1f799a6b96eaa74a776bc2d1b3d52b937dd1a9ea':
  Ensure alignment of Res_png_9patch.

9 years agoam a6b6952b: am 0b1610ff: am 2489a7fd: am 9d6e9587: am 36e3f512: Merge "docs: remove...
Rich Slogar [Thu, 9 Apr 2015 18:31:31 +0000 (18:31 +0000)]
am a6b6952b: am 0b1610ff: am 2489a7fd: am 9d6e9587: am 36e3f512: Merge "docs: remove studio proguard settings from play services" into lmp-docs

* commit 'a6b6952bb6aedf747e58055c120e98383e4491a3':
  docs: remove studio proguard settings from play services

9 years agoam d9f32b16: Merge "Ensure alignment of Res_png_9patch."
Dan Albert [Thu, 9 Apr 2015 18:26:34 +0000 (18:26 +0000)]
am d9f32b16: Merge "Ensure alignment of Res_png_9patch."

* commit 'd9f32b164be11b6c42ee36ca6945623073e82c99':
  Ensure alignment of Res_png_9patch.

9 years agoam 0b1610ff: am 2489a7fd: am 9d6e9587: am 36e3f512: Merge "docs: remove studio progua...
Rich Slogar [Thu, 9 Apr 2015 18:21:06 +0000 (18:21 +0000)]
am 0b1610ff: am 2489a7fd: am 9d6e9587: am 36e3f512: Merge "docs: remove studio proguard settings from play services" into lmp-docs

* commit '0b1610ff49b042df19fc9071f2811efb642f7df9':
  docs: remove studio proguard settings from play services

9 years agoMerge "Revert "Allow delay of showing/hiding shared element when transferring.""
George Mount [Thu, 9 Apr 2015 18:14:00 +0000 (18:14 +0000)]
Merge "Revert "Allow delay of showing/hiding shared element when transferring.""

9 years agoRevert "Allow delay of showing/hiding shared element when transferring."
George Mount [Thu, 9 Apr 2015 18:13:40 +0000 (18:13 +0000)]
Revert "Allow delay of showing/hiding shared element when transferring."

This reverts commit bd93e69c8e0b06fc0b0bbba4bdd9e426b37f98e1.

Change-Id: I38daa39e8560f4901b242acc6394dfa37f3d084a

9 years agoam 2489a7fd: am 9d6e9587: am 36e3f512: Merge "docs: remove studio proguard settings...
Rich Slogar [Thu, 9 Apr 2015 18:11:24 +0000 (18:11 +0000)]
am 2489a7fd: am 9d6e9587: am 36e3f512: Merge "docs: remove studio proguard settings from play services" into lmp-docs

* commit '2489a7fd5fbafde339ac58f2f1e7a5854e7e4936':
  docs: remove studio proguard settings from play services

9 years agoMerge "Ensure alignment of Res_png_9patch."
Dan Albert [Thu, 9 Apr 2015 18:09:09 +0000 (18:09 +0000)]
Merge "Ensure alignment of Res_png_9patch."

9 years agoMerge "Update the light Y shift value"
ztenghui [Thu, 9 Apr 2015 18:06:25 +0000 (18:06 +0000)]
Merge "Update the light Y shift value"

9 years agoUpdate the light Y shift value
ztenghui [Thu, 9 Apr 2015 18:01:40 +0000 (11:01 -0700)]
Update the light Y shift value

This is accidentally missed from the previous shadow update

Change-Id: I52d499bede843d6a71db55cca9be38716c9bb620

9 years agoam 9d6e9587: am 36e3f512: Merge "docs: remove studio proguard settings from play...
Rich Slogar [Thu, 9 Apr 2015 17:57:20 +0000 (17:57 +0000)]
am 9d6e9587: am 36e3f512: Merge "docs: remove studio proguard settings from play services" into lmp-docs

* commit '9d6e95879aff4608db400c270fa8f89b6b55d0e6':
  docs: remove studio proguard settings from play services