OSDN Git Service

android-x86/frameworks-base.git
9 years agoam 83bb765b: Merge "Add IntentFilter auto verification - part 7" into mnc-dev
Fabrice Di Meglio [Fri, 1 May 2015 18:31:22 +0000 (18:31 +0000)]
am 83bb765b: Merge "Add IntentFilter auto verification - part 7" into mnc-dev

* commit '83bb765b046a3c6d90abbd65545d4532f647ae14':
  Add IntentFilter auto verification - part 7

9 years agoam f3280041: Merge "Add Properties to Call.Details." into mnc-dev
Andrew Lee [Fri, 1 May 2015 18:31:17 +0000 (18:31 +0000)]
am f3280041: Merge "Add Properties to Call.Details." into mnc-dev

* commit 'f3280041f0a9b462fd90cc043ea790a5db59daf4':
  Add Properties to Call.Details.

9 years agoam 097d5f10: Merge "Suggestions popup must be dismissed before device rotation."...
Yohei Yukawa [Fri, 1 May 2015 18:31:10 +0000 (18:31 +0000)]
am 097d5f10: Merge "Suggestions popup must be dismissed before device rotation." into mnc-dev

* commit '097d5f107391bb1414124b4de7a510bb6ff47de3':
  Suggestions popup must be dismissed before device rotation.

9 years agoam 92d42057: Merge "Exclude bound app widgets from idle app list" into mnc-dev
Amith Yamasani [Fri, 1 May 2015 18:31:03 +0000 (18:31 +0000)]
am 92d42057: Merge "Exclude bound app widgets from idle app list" into mnc-dev

* commit '92d420579b894de01db347066fbf8f1705e78364':
  Exclude bound app widgets from idle app list

9 years agoMerge "Add IntentFilter auto verification - part 7" into mnc-dev
Fabrice Di Meglio [Fri, 1 May 2015 18:27:29 +0000 (18:27 +0000)]
Merge "Add IntentFilter auto verification - part 7" into mnc-dev

9 years agoMerge "Add Properties to Call.Details." into mnc-dev
Andrew Lee [Fri, 1 May 2015 18:27:20 +0000 (18:27 +0000)]
Merge "Add Properties to Call.Details." into mnc-dev

9 years agoMerge "Suggestions popup must be dismissed before device rotation." into mnc-dev
Yohei Yukawa [Fri, 1 May 2015 18:27:04 +0000 (18:27 +0000)]
Merge "Suggestions popup must be dismissed before device rotation." into mnc-dev

9 years agoAdd IntentFilter auto verification - part 7
Fabrice Di Meglio [Thu, 30 Apr 2015 02:42:41 +0000 (19:42 -0700)]
Add IntentFilter auto verification - part 7

- update packages priming so that it effectively save its data
- use ArraySet instead of ArrayList for list of domains (a set
is preferable as we dont want duplicates)

See bug #19628909

Change-Id: I52085f4bc28dcbc7fbc02ba0898abcd4ae9cf1e2

9 years agoMerge "Exclude bound app widgets from idle app list" into mnc-dev
Amith Yamasani [Fri, 1 May 2015 18:21:39 +0000 (18:21 +0000)]
Merge "Exclude bound app widgets from idle app list" into mnc-dev

9 years agoExclude bound app widgets from idle app list
Amith Yamasani [Fri, 1 May 2015 00:32:25 +0000 (17:32 -0700)]
Exclude bound app widgets from idle app list

Track package names of bound app widgets and use the list when
querying for idle apps.

Bug: 20066058
Change-Id: If8039397a061ef04bb13aa38d57cd7f0221f5fc7

9 years agoam 9fc943d1: Merge "Icon: a clean, parcelable place for images." into mnc-dev
Dan Sandler [Fri, 1 May 2015 18:08:06 +0000 (18:08 +0000)]
am 9fc943d1: Merge "Icon: a clean, parcelable place for images." into mnc-dev

* commit '9fc943d1a69f2ab0f6d8285b09aef7e344a1fd1a':
  Icon: a clean, parcelable place for images.

9 years agoam a7cba44a: Merge "Improve Accessibility behaviour in recents" into mnc-dev
Benjamin Franz [Fri, 1 May 2015 18:08:01 +0000 (18:08 +0000)]
am a7cba44a: Merge "Improve Accessibility behaviour in recents" into mnc-dev

* commit 'a7cba44a22ffdaccf5198bb83b73a31c78091978':
  Improve Accessibility behaviour in recents

9 years agoam 27cfed7b: Merge "Make sure transform matrix is applied when hardware layer is...
Doris Liu [Fri, 1 May 2015 18:07:56 +0000 (18:07 +0000)]
am 27cfed7b: Merge "Make sure transform matrix is applied when hardware layer is re-created" into mnc-dev

* commit '27cfed7ba56b485eb656bd7fbe6506d9d6c73e05':
  Make sure transform matrix is applied when hardware layer is re-created

9 years agoMerge "Icon: a clean, parcelable place for images." into mnc-dev
Dan Sandler [Fri, 1 May 2015 17:57:13 +0000 (17:57 +0000)]
Merge "Icon: a clean, parcelable place for images." into mnc-dev

9 years agoMerge "Improve Accessibility behaviour in recents" into mnc-dev
Benjamin Franz [Fri, 1 May 2015 17:56:16 +0000 (17:56 +0000)]
Merge "Improve Accessibility behaviour in recents" into mnc-dev

9 years agoMerge "Make sure transform matrix is applied when hardware layer is re-created" into...
Doris Liu [Fri, 1 May 2015 17:54:43 +0000 (17:54 +0000)]
Merge "Make sure transform matrix is applied when hardware layer is re-created" into mnc-dev

9 years agoIcon: a clean, parcelable place for images.
Dan Sandler [Wed, 4 Mar 2015 18:08:49 +0000 (13:08 -0500)]
Icon: a clean, parcelable place for images.

Binder APIs which wish to consume Bitmaps *and* drawable
resources can now do so by using Icon, a kind of union type
that accommodates each of these. Icon also accepts byte
arrays holding compressed Bitmaps (PNG, JPEG, etc), which
saves clients the additional memory cost of decoding and
sending full uncompressed bitmaps through Binder interfaces.
Receiving clients can call loadDrawable{,Async} and then
getDrawable to start immediately using the image in an
ImageView or other Drawable-hosting container.

Bug: 19609468
Change-Id: Ic1343711c2ac0b15876b46f0b6008b0108a49470

9 years agoam 087497d2: Merge "Rename Noto Han fonts to their latest names." into mnc-dev
Roozbeh Pournader [Fri, 1 May 2015 16:58:49 +0000 (16:58 +0000)]
am 087497d2: Merge "Rename Noto Han fonts to their latest names." into mnc-dev

* commit '087497d256d155d432edd976d9e16671ec665462':
  Rename Noto Han fonts to their latest names.

9 years agoam 13a98b6c: Support for bearer_bitmask.
Amit Mahajan [Fri, 1 May 2015 16:58:45 +0000 (16:58 +0000)]
am 13a98b6c: Support for bearer_bitmask.

* commit '13a98b6c6ed28bfa0cb373e49c183167699e30f0':
  Support for bearer_bitmask.

9 years agoMerge "Rename Noto Han fonts to their latest names." into mnc-dev
Roozbeh Pournader [Fri, 1 May 2015 16:50:51 +0000 (16:50 +0000)]
Merge "Rename Noto Han fonts to their latest names." into mnc-dev

9 years agoSupport for bearer_bitmask.
Amit Mahajan [Thu, 26 Feb 2015 18:46:17 +0000 (10:46 -0800)]
Support for bearer_bitmask.

Change-Id: I7cae3d229445607c66b6472124264588f7571097

9 years agoam a320505f: Merge "Move both app code and data together." into mnc-dev
Jeff Sharkey [Fri, 1 May 2015 16:35:49 +0000 (16:35 +0000)]
am a320505f: Merge "Move both app code and data together." into mnc-dev

* commit 'a320505f3a39e21f29065f0f2a01089363825318':
  Move both app code and data together.

9 years agoMerge "Move both app code and data together." into mnc-dev
Jeff Sharkey [Fri, 1 May 2015 16:22:40 +0000 (16:22 +0000)]
Merge "Move both app code and data together." into mnc-dev

9 years agoam 78760b4a: Merge "A bunch more cleanups" into mnc-dev
John Reck [Fri, 1 May 2015 14:51:48 +0000 (14:51 +0000)]
am 78760b4a: Merge "A bunch more cleanups" into mnc-dev

* commit '78760b4ae47f5d59a541cbcbf1fca623bae4508a':
  A bunch more cleanups

9 years agoMerge "A bunch more cleanups" into mnc-dev
John Reck [Fri, 1 May 2015 14:42:49 +0000 (14:42 +0000)]
Merge "A bunch more cleanups" into mnc-dev

9 years agoam 6e761c5d: Merge "Device policy: use owner label instead of name" into mnc-dev
Robin Lee [Fri, 1 May 2015 13:08:45 +0000 (13:08 +0000)]
am 6e761c5d: Merge "Device policy: use owner label instead of name" into mnc-dev

* commit '6e761c5d6b8ed2126c6544ce32db569203c46e2a':
  Device policy: use owner label instead of name

9 years agoMerge "Device policy: use owner label instead of name" into mnc-dev
Robin Lee [Fri, 1 May 2015 12:57:35 +0000 (12:57 +0000)]
Merge "Device policy: use owner label instead of name" into mnc-dev

9 years agoam a78240ba: AlarmManager: Reject non-olson timezones for targetSdk >= M
Narayan Kamath [Fri, 1 May 2015 11:04:54 +0000 (11:04 +0000)]
am a78240ba: AlarmManager: Reject non-olson timezones for targetSdk >= M

* commit 'a78240ba5f891c3fd0acb62a1b13b6dc1bbe9705':
  AlarmManager: Reject non-olson timezones for targetSdk >= M

9 years agoAlarmManager: Reject non-olson timezones for targetSdk >= M
Narayan Kamath [Fri, 24 Apr 2015 12:22:03 +0000 (13:22 +0100)]
AlarmManager: Reject non-olson timezones for targetSdk >= M

This has caused a lot of grief, confusion and outright broken
behaviour due to the fact that the Posix spec and the Java spec
define conflicting interpretations of "custom" timezones like
GMT+5:30 (eastern hemisphere for java, western for posix).

bug: 19987403
bug: 19106773
Change-Id: Ia9b007067bb175b0805d4262f17390a0bd98d927

9 years agoam f2cfe6c0: Merge "Fix a bug in ScanSettings constructor." into mnc-dev
Wei Wang [Fri, 1 May 2015 07:59:07 +0000 (07:59 +0000)]
am f2cfe6c0: Merge "Fix a bug in ScanSettings constructor." into mnc-dev

* commit 'f2cfe6c0a9c49d4e47c269ac1ff76b757d9dd8a9':
  Fix a bug in ScanSettings constructor.

9 years agoMerge "Fix a bug in ScanSettings constructor." into mnc-dev
Wei Wang [Fri, 1 May 2015 07:51:39 +0000 (07:51 +0000)]
Merge "Fix a bug in ScanSettings constructor." into mnc-dev

9 years agoFix a bug in ScanSettings constructor.
Wei Wang [Fri, 1 May 2015 07:50:32 +0000 (00:50 -0700)]
Fix a bug in ScanSettings constructor.

Change-Id: I36e6effe8063bacddd61fe2c47c0360d7ffaee71

9 years agoam 043d7a94: am 12b1b8ed: am 026e204e: Fixes velocity tracking bug in SwipeDismissLayout.
Gus Prevas [Fri, 1 May 2015 07:49:31 +0000 (07:49 +0000)]
am 043d7a94: am 12b1b8ed: am 026e204e: Fixes velocity tracking bug in SwipeDismissLayout.

* commit '043d7a94ab3f3c744a5fe6a64e9f6375cd89b9cd':
  Fixes velocity tracking bug in SwipeDismissLayout.

9 years agoam 12b1b8ed: am 026e204e: Fixes velocity tracking bug in SwipeDismissLayout.
Gus Prevas [Fri, 1 May 2015 07:36:43 +0000 (07:36 +0000)]
am 12b1b8ed: am 026e204e: Fixes velocity tracking bug in SwipeDismissLayout.

* commit '12b1b8ed3b5bfe623cd69d3cdafd8b6b5dfe68d8':
  Fixes velocity tracking bug in SwipeDismissLayout.

9 years agoam c90c7604: Merge "Honor Ble scanning settings from Settings UI." into mnc-dev
Wei Wang [Fri, 1 May 2015 05:18:17 +0000 (05:18 +0000)]
am c90c7604: Merge "Honor Ble scanning settings from Settings UI." into mnc-dev

* commit 'c90c760431bce5ce3f7f86b0e7e5e939c2db6a38':
  Honor Ble scanning settings from Settings UI.

9 years agoMerge "Honor Ble scanning settings from Settings UI." into mnc-dev
Wei Wang [Fri, 1 May 2015 05:10:17 +0000 (05:10 +0000)]
Merge "Honor Ble scanning settings from Settings UI." into mnc-dev

9 years agoam b57f236e: Merge changes Icf7d67e2,Ia914ec88,I2490ad75,Ie79f2d28 into mnc-dev
Lorenzo Colitti [Fri, 1 May 2015 03:52:10 +0000 (03:52 +0000)]
am b57f236e: Merge changes Icf7d67e2,Ia914ec88,I2490ad75,Ie79f2d28 into mnc-dev

* commit 'b57f236e30d87bdfa69bb99e6b3f5ec6a3cc07c7':
  Add a hidden method to clear NetworkCapabilities.
  Fix javadoc error for requestNetwork.
  Simplify network callback handling code.
  Document and unhide CALLBACK_PRECHECK.

9 years agoMerge changes Icf7d67e2,Ia914ec88,I2490ad75,Ie79f2d28 into mnc-dev
Lorenzo Colitti [Fri, 1 May 2015 03:45:12 +0000 (03:45 +0000)]
Merge changes Icf7d67e2,Ia914ec88,I2490ad75,Ie79f2d28 into mnc-dev

* changes:
  Add a hidden method to clear NetworkCapabilities.
  Fix javadoc error for requestNetwork.
  Simplify network callback handling code.
  Document and unhide CALLBACK_PRECHECK.

9 years agoAdd a hidden method to clear NetworkCapabilities.
Lorenzo Colitti [Mon, 27 Apr 2015 02:31:55 +0000 (11:31 +0900)]
Add a hidden method to clear NetworkCapabilities.

Change-Id: Icf7d67e24a09113340e9bff2c72526760914ef48

9 years agoFix javadoc error for requestNetwork.
Lorenzo Colitti [Fri, 24 Apr 2015 08:03:31 +0000 (17:03 +0900)]
Fix javadoc error for requestNetwork.

The ConnectivityManager documentation uses {@link requestNetwork}
without specifying which version of that method it refers to.
This results in javadoc incorrectly linking to the version of the
method that takes a PendingIntent instead of the version that
takes a callback.

Change-Id: Ia914ec88005a6401b6391c5b4fc92f988baa3922

9 years agoSimplify network callback handling code.
Lorenzo Colitti [Fri, 24 Apr 2015 06:21:21 +0000 (15:21 +0900)]
Simplify network callback handling code.

Change-Id: I2490ad754bf2a1282f27302c8556fb19983cc6b1

9 years agoDocument and unhide CALLBACK_PRECHECK.
Lorenzo Colitti [Fri, 24 Apr 2015 03:23:24 +0000 (12:23 +0900)]
Document and unhide CALLBACK_PRECHECK.

Bug: 20038463
Change-Id: Ie79f2d28c06cf611289504e49c471b55ffb9890f

9 years agoam f1207122: Merge "MediaPlayer: provide mime type for all track types" into mnc-dev
Robert Shih [Fri, 1 May 2015 00:46:54 +0000 (00:46 +0000)]
am f1207122: Merge "MediaPlayer: provide mime type for all track types" into mnc-dev

* commit 'f12071222fcf7c762bb8d28800ae693ec58347f4':
  MediaPlayer: provide mime type for all track types

9 years agoam bbfa9b23: Merge "[RenderScript] typo fix in BLAS, TRMM & TSMM" into mnc-dev
Miao Wang [Fri, 1 May 2015 00:46:49 +0000 (00:46 +0000)]
am bbfa9b23: Merge "[RenderScript] typo fix in BLAS, TRMM & TSMM" into mnc-dev

* commit 'bbfa9b23c6b569003fc9bf0d698e8d64666f36a7':
  [RenderScript] typo fix in BLAS, TRMM & TSMM

9 years agoMerge "MediaPlayer: provide mime type for all track types" into mnc-dev
Robert Shih [Fri, 1 May 2015 00:31:22 +0000 (00:31 +0000)]
Merge "MediaPlayer: provide mime type for all track types" into mnc-dev

9 years agoam 56c58a2e: Merge "Fix typo. bug: b/20610710" into mnc-dev
tturney [Fri, 1 May 2015 00:28:21 +0000 (00:28 +0000)]
am 56c58a2e: Merge "Fix typo. bug: b/20610710" into mnc-dev

* commit '56c58a2e278fb4644963dfe2a49b74471afe71c9':
  Fix typo. bug: b/20610710

9 years agoMerge "[RenderScript] typo fix in BLAS, TRMM & TSMM" into mnc-dev
Miao Wang [Fri, 1 May 2015 00:26:31 +0000 (00:26 +0000)]
Merge "[RenderScript] typo fix in BLAS, TRMM & TSMM" into mnc-dev

9 years agoSuggestions popup must be dismissed before device rotation.
Yohei Yukawa [Thu, 30 Apr 2015 03:12:37 +0000 (20:12 -0700)]
Suggestions popup must be dismissed before device rotation.

This is a follow up CL for Ia515fc576ddf2127b2f9863cc2652aeb619fff6e
for Bug 5420741, which had basically the same goal to Bug 20158984.

The goal here is to dismiss any popup window opened by the TextView
when the device is about to be rotated.  This is important because
Window Manager and Input Method Manager Service are really sensitive
about which window is focused before and after the device is rotated.

In Ia515fc576ddf2127b2f9863cc2652aeb619fff6e, we tried to distinguish
two kinds of focus-lost. One is the true focus lost where suggestions
pop-up (if any) should be dismissed, and the other is an side effect
of showing the suggestions pop-up itself. We have used isShowingUp()
to distinguish distinguish one from the other. In short, it
indicates whether onWindowFocusChanged() is not called yet or is
called at least once.

In extract edit mode, however, it turned out that
onWindowFocusChanged() is never called (at least in recent builds).
As a result, the popup window is not dismissed when it should be.
One of the smallest solution would checking isShowingUp() only when
the target TextView is not ExtractEditText.

Adding unit test would be handled as Issue #20703391.

BUG: 5420741
BUG: 20158984
BUG: 20703391
Change-Id: I1706cf2ea0b0bdfe8894ab57fc3caa8ff12d8aab

9 years agoAdd Properties to Call.Details.
Andrew Lee [Wed, 29 Apr 2015 21:38:11 +0000 (14:38 -0700)]
Add Properties to Call.Details.

Moved some capabilities to properties which seemed appropriate.

Bug: 20160395
Change-Id: Iacef4365822e5c3e50f0c41a501bf295c22055f1

9 years agoMerge "Fix typo. bug: b/20610710" into mnc-dev
tturney [Fri, 1 May 2015 00:17:40 +0000 (00:17 +0000)]
Merge "Fix typo. bug: b/20610710" into mnc-dev

9 years agoMake sure transform matrix is applied when hardware layer is re-created
Doris Liu [Fri, 1 May 2015 00:00:35 +0000 (17:00 -0700)]
Make sure transform matrix is applied when hardware layer is re-created

Bug: 11168275
Change-Id: I9234a2efc7580d27ac8b7f0e60ceed7df23f5f25

9 years ago[RenderScript] typo fix in BLAS, TRMM & TSMM
Miao Wang [Fri, 1 May 2015 00:14:28 +0000 (17:14 -0700)]
[RenderScript] typo fix in BLAS, TRMM & TSMM

Change-Id: I78f014a864700369c7ccdfb46a257851a45abd7c

9 years agoam 05ebffe6: media: Hook up MediaPlayer and MediaSync to new settings
Lajos Molnar [Fri, 1 May 2015 00:07:45 +0000 (00:07 +0000)]
am 05ebffe6: media: Hook up MediaPlayer and MediaSync to new settings

* commit '05ebffe6bf6cdacc6de4b3bbf480c31869a81661':
  media: Hook up MediaPlayer and MediaSync to new settings

9 years agomedia: Hook up MediaPlayer and MediaSync to new settings
Lajos Molnar [Thu, 30 Apr 2015 03:41:19 +0000 (20:41 -0700)]
media: Hook up MediaPlayer and MediaSync to new settings

Bug: 19666434
Change-Id: Ib815a80a991d4be9ce179514ac517c54f98234fd

9 years agoMediaPlayer: provide mime type for all track types
Robert Shih [Thu, 30 Apr 2015 21:36:48 +0000 (14:36 -0700)]
MediaPlayer: provide mime type for all track types

Bug: 20729923
Change-Id: Id05ca0616a72f66abe6a541417baef491c49a417

9 years agoam aba035d2: Merge "Fix layoutlib build breakage" into mnc-dev
Alan Viverette [Thu, 30 Apr 2015 23:09:25 +0000 (23:09 +0000)]
am aba035d2: Merge "Fix layoutlib build breakage" into mnc-dev

* commit 'aba035d2ed4a0c39d59ca039b52af2bc3f5980b4':
  Fix layoutlib build breakage

9 years agoMove both app code and data together.
Jeff Sharkey [Thu, 30 Apr 2015 23:04:50 +0000 (16:04 -0700)]
Move both app code and data together.

Refactor app movement code into the normal install flow as a new
flavor of InstallArgs.  It copies both app code and data during the
copy step, and just updates paths during the rename step.

Measure free space before kicking off a move.  Spawn a thread to
derive a hacky progress estimate based on free disk space counting
down.

Remove checkFreeStorage() and getLegacyNativeLibraryPath() which
nobody was calling.  Fix deadlocks around package broadcasts, and fix
wrong lock ordering when loading packages.

Bug: 199936672027557820370140
Change-Id: I7bbf14c924a724d6ebb8a41a02434750fa3302bc

9 years agoMerge "Fix layoutlib build breakage" into mnc-dev
Alan Viverette [Thu, 30 Apr 2015 23:00:28 +0000 (23:00 +0000)]
Merge "Fix layoutlib build breakage" into mnc-dev

9 years agoFix layoutlib build breakage
Alan Viverette [Thu, 30 Apr 2015 22:57:42 +0000 (15:57 -0700)]
Fix layoutlib build breakage

Change-Id: Id3a9b79ac47ef27b04a96ff3ee50688bbb58f9c0

9 years agoam 5b8b0df7: Merge "Add handler parameter for callbacks." into mnc-dev
Andrew Lee [Thu, 30 Apr 2015 22:34:50 +0000 (22:34 +0000)]
am 5b8b0df7: Merge "Add handler parameter for callbacks." into mnc-dev

* commit '5b8b0df7bfcbeb8a6ac165fcbcad57aa2b597004':
  Add handler parameter for callbacks.

9 years agoMerge "Add handler parameter for callbacks." into mnc-dev
Andrew Lee [Thu, 30 Apr 2015 22:27:21 +0000 (22:27 +0000)]
Merge "Add handler parameter for callbacks." into mnc-dev

9 years agoAdd handler parameter for callbacks.
Andrew Lee [Thu, 23 Apr 2015 22:47:06 +0000 (15:47 -0700)]
Add handler parameter for callbacks.

Bug: 20160491
Change-Id: I94639b06b8c97b6585e169d667a67ce328e716af

9 years agoam 7dc7d09b: am a1c7176b: am a03e2658: am 7c267f66: am f4b1df34: am 2a3aa2d3: docs...
Rich Slogar [Thu, 30 Apr 2015 21:52:46 +0000 (21:52 +0000)]
am 7dc7d09b: am a1c7176b: am a03e2658: am 7c267f66: am f4b1df34: am 2a3aa2d3: docs: studio 1.2 updates

* commit '7dc7d09ba5abdc99eb5f106cf3ce545355d4c9be':

9 years agoam 8febd74e: am 7fbde8f5: am 408aeb05: am b6ad1ce8: am 541dda1c: am 999b08b7: Merge...
Rich Slogar [Thu, 30 Apr 2015 21:52:42 +0000 (21:52 +0000)]
am 8febd74e: am 7fbde8f5: am 408aeb05: am b6ad1ce8: am 541dda1c: am 999b08b7: Merge "docs: studio 1.2 downloads" into lmp-docs

* commit '8febd74eaf72e84ae9bf7b93714d2a075b189adc':

9 years agoam 9c6e6050: am ac9c751d: am 62cfe97d: am 2653774a: am b874dc04: am 07aca646: Merge...
Rich Slogar [Thu, 30 Apr 2015 21:52:38 +0000 (21:52 +0000)]
am 9c6e6050: am ac9c751d: am 62cfe97d: am 2653774a: am b874dc04: am 07aca646: Merge "docs: plugin 1.2.0 revision updates" into lmp-docs

* commit '9c6e60500d560515256a374ce79fee4aa4648ff7':

9 years agoam 50c29a3e: am 994d6ffe: am 7a258afa: am af73c6e7: am ff24e8e1: am 5b7546a6: Merge...
Rich Slogar [Thu, 30 Apr 2015 21:52:33 +0000 (21:52 +0000)]
am 50c29a3e: am 994d6ffe: am 7a258afa: am af73c6e7: am ff24e8e1: am 5b7546a6: Merge "docs: studio 1.2 revision updates" into lmp-docs

* commit '50c29a3e09850cf180417671cedb7c0b1bea3633':

9 years agoHonor Ble scanning settings from Settings UI.
Wei Wang [Mon, 27 Apr 2015 00:04:29 +0000 (17:04 -0700)]
Honor Ble scanning settings from Settings UI.

Bug:20643039

Change-Id: Ib1465108e26b8537c9da1bfbb31a99d2e33da910

9 years agoam a1c7176b: am a03e2658: am 7c267f66: am f4b1df34: am 2a3aa2d3: docs: studio 1.2...
Rich Slogar [Thu, 30 Apr 2015 21:37:11 +0000 (21:37 +0000)]
am a1c7176b: am a03e2658: am 7c267f66: am f4b1df34: am 2a3aa2d3: docs: studio 1.2 updates

* commit 'a1c7176bdcc810000f782460dd02d99fda5e0250':

9 years agoam 7fbde8f5: am 408aeb05: am b6ad1ce8: am 541dda1c: am 999b08b7: Merge "docs: studio...
Rich Slogar [Thu, 30 Apr 2015 21:37:07 +0000 (21:37 +0000)]
am 7fbde8f5: am 408aeb05: am b6ad1ce8: am 541dda1c: am 999b08b7: Merge "docs: studio 1.2 downloads" into lmp-docs

* commit '7fbde8f508cf5148f395280753c99b63cc525e45':

9 years agoam ac9c751d: am 62cfe97d: am 2653774a: am b874dc04: am 07aca646: Merge "docs: plugin...
Rich Slogar [Thu, 30 Apr 2015 21:37:02 +0000 (21:37 +0000)]
am ac9c751d: am 62cfe97d: am 2653774a: am b874dc04: am 07aca646: Merge "docs: plugin 1.2.0 revision updates" into lmp-docs

* commit 'ac9c751d74135994ddaa9ccc14e87809efc08693':

9 years agoam 994d6ffe: am 7a258afa: am af73c6e7: am ff24e8e1: am 5b7546a6: Merge "docs: studio...
Rich Slogar [Thu, 30 Apr 2015 21:36:58 +0000 (21:36 +0000)]
am 994d6ffe: am 7a258afa: am af73c6e7: am ff24e8e1: am 5b7546a6: Merge "docs: studio 1.2 revision updates" into lmp-docs

* commit '994d6ffec75b50ff199760f4c3cf464b2d0f0e83':

9 years agoA bunch more cleanups
John Reck [Mon, 13 Apr 2015 22:20:29 +0000 (15:20 -0700)]
A bunch more cleanups

Switch a few places to using android::canvas
instead of SkCanvas as well which eliminated
some JNI

Change-Id: I8f98b56442a06362b82b984cd1bd3a92398d8dbc

9 years agoam 24863faa: Merge "resolved conflicts for merge of edf44562 to mnc-dev" into mnc-dev
Rich Slogar [Thu, 30 Apr 2015 21:34:44 +0000 (21:34 +0000)]
am 24863faa: Merge "resolved conflicts for merge of edf44562 to mnc-dev" into mnc-dev

* commit '24863faa05dc8934f790e13f8cf153c0edb4a32a':
  docs: studio 1.2 updates

9 years agoam 8724d359: Merge "[RenderScript] typo fix in rs BLAS jni, to correctly handle compl...
Miao Wang [Thu, 30 Apr 2015 21:34:40 +0000 (21:34 +0000)]
am 8724d359: Merge "[RenderScript] typo fix in rs BLAS jni, to correctly handle complex params." into mnc-dev

* commit '8724d359bfe1f95fd4c558b55069e1624b461f28':
  [RenderScript] typo fix in rs BLAS jni, to correctly handle complex params.

9 years agoam 01060a33: Merge "[RenderScript] fix edges cases about Transpose for SYMM & SYR2K...
Miao Wang [Thu, 30 Apr 2015 21:34:36 +0000 (21:34 +0000)]
am 01060a33: Merge "[RenderScript] fix edges cases about Transpose for SYMM & SYR2K" into mnc-dev

* commit '01060a33a446a496cafcb06487c60df25775a1b9':
  [RenderScript] fix edges cases about Transpose for SYMM & SYR2K

9 years agoMerge "resolved conflicts for merge of edf44562 to mnc-dev" into mnc-dev
Rich Slogar [Thu, 30 Apr 2015 21:27:44 +0000 (21:27 +0000)]
Merge "resolved conflicts for merge of edf44562 to mnc-dev" into mnc-dev

9 years agoMerge "[RenderScript] typo fix in rs BLAS jni, to correctly handle complex params...
Miao Wang [Thu, 30 Apr 2015 21:25:18 +0000 (21:25 +0000)]
Merge "[RenderScript] typo fix in rs BLAS jni, to correctly handle complex params." into mnc-dev

9 years agoMerge "[RenderScript] fix edges cases about Transpose for SYMM & SYR2K" into mnc-dev
Miao Wang [Thu, 30 Apr 2015 21:25:01 +0000 (21:25 +0000)]
Merge "[RenderScript] fix edges cases about Transpose for SYMM & SYR2K" into mnc-dev

9 years agoresolved conflicts for merge of edf44562 to mnc-dev
Rich Slogar [Thu, 30 Apr 2015 21:20:12 +0000 (14:20 -0700)]
resolved conflicts for merge of edf44562 to mnc-dev

Change-Id: I2df8255d12feed8c17b9c9f009453701cd412676

9 years agoam ac7927a8: Merge "LayoutInflater should always try to generate LayoutParams for...
Alan Viverette [Thu, 30 Apr 2015 21:09:51 +0000 (21:09 +0000)]
am ac7927a8: Merge "LayoutInflater should always try to generate LayoutParams for include" into mnc-dev

* commit 'ac7927a89519a79ab73723a13ed9ea12ca16056f':
  LayoutInflater should always try to generate LayoutParams for include

9 years agoam cf2999aa: Merge "Handle KM_ERROR_CALLER_NONCE_PROHIBITED." into mnc-dev
Alex Klyubin [Thu, 30 Apr 2015 21:09:46 +0000 (21:09 +0000)]
am cf2999aa: Merge "Handle KM_ERROR_CALLER_NONCE_PROHIBITED." into mnc-dev

* commit 'cf2999aacf45506ff6f9c2876bfd4fd5a99fc394':
  Handle KM_ERROR_CALLER_NONCE_PROHIBITED.

9 years agoam db672b03: Merge "Change how Java Bitmaps are accessed in a few places" into mnc-dev
John Reck [Thu, 30 Apr 2015 21:09:41 +0000 (21:09 +0000)]
am db672b03: Merge "Change how Java Bitmaps are accessed in a few places" into mnc-dev

* commit 'db672b03a2de26127b40dbe50c794b5697b01c37':
  Change how Java Bitmaps are accessed in a few places

9 years agoam 0069301d: Merge "Fix thread affinity of FingerprintManager." into mnc-dev
Alex Klyubin [Thu, 30 Apr 2015 21:09:36 +0000 (21:09 +0000)]
am 0069301d: Merge "Fix thread affinity of FingerprintManager." into mnc-dev

* commit '0069301d364a219bbd4b166ba6f4d9be854d556f':
  Fix thread affinity of FingerprintManager.

9 years agoMerge "LayoutInflater should always try to generate LayoutParams for include" into...
Alan Viverette [Thu, 30 Apr 2015 21:03:22 +0000 (21:03 +0000)]
Merge "LayoutInflater should always try to generate LayoutParams for include" into mnc-dev

9 years agoMerge "Handle KM_ERROR_CALLER_NONCE_PROHIBITED." into mnc-dev
Alex Klyubin [Thu, 30 Apr 2015 21:00:59 +0000 (21:00 +0000)]
Merge "Handle KM_ERROR_CALLER_NONCE_PROHIBITED." into mnc-dev

9 years agoMerge "Change how Java Bitmaps are accessed in a few places" into mnc-dev
John Reck [Thu, 30 Apr 2015 21:00:07 +0000 (21:00 +0000)]
Merge "Change how Java Bitmaps are accessed in a few places" into mnc-dev

9 years agoHandle KM_ERROR_CALLER_NONCE_PROHIBITED.
Alex Klyubin [Thu, 30 Apr 2015 20:57:44 +0000 (13:57 -0700)]
Handle KM_ERROR_CALLER_NONCE_PROHIBITED.

This converts KM_ERROR_CALLER_NONCE_PROHIBITED into
InvalidAlgorithmParameterSpec, as expected by the contract of JCA
Cipher.

Bug: 18088752
Change-Id: I6a01e2d7118c478b27a0d7a5a14a127de8913755

9 years agoMerge "Fix thread affinity of FingerprintManager." into mnc-dev
Alex Klyubin [Thu, 30 Apr 2015 20:56:17 +0000 (20:56 +0000)]
Merge "Fix thread affinity of FingerprintManager." into mnc-dev

9 years agoam 10a54a79: Merge "Remove dependency upon FragmentActivity" into mnc-dev
Todd Kennedy [Thu, 30 Apr 2015 20:51:21 +0000 (20:51 +0000)]
am 10a54a79: Merge "Remove dependency upon FragmentActivity" into mnc-dev

* commit '10a54a7989a03eb0fdee7641c5795ac85b57e0dc':
  Remove dependency upon FragmentActivity

9 years ago[RenderScript] typo fix in rs BLAS jni, to correctly handle complex
Miao Wang [Thu, 30 Apr 2015 20:44:49 +0000 (13:44 -0700)]
[RenderScript] typo fix in rs BLAS jni, to correctly handle complex
params.

Change-Id: Ie44f430dc7ed4155f40aa9f9c2864fb0429c97fe

9 years agoam 2757fed2: Merge "Clarifying which receiver method to call." into mnc-dev
Glenn Kasten [Thu, 30 Apr 2015 20:39:21 +0000 (20:39 +0000)]
am 2757fed2: Merge "Clarifying which receiver method to call." into mnc-dev

* commit '2757fed2d612b7d7331e8ad9067df24b154ff8d7':
  Clarifying which receiver method to call.

9 years agoMerge "Remove dependency upon FragmentActivity" into mnc-dev
Todd Kennedy [Thu, 30 Apr 2015 20:38:48 +0000 (20:38 +0000)]
Merge "Remove dependency upon FragmentActivity" into mnc-dev

9 years ago[RenderScript] fix edges cases about Transpose for SYMM & SYR2K
Miao Wang [Thu, 30 Apr 2015 17:47:42 +0000 (10:47 -0700)]
[RenderScript] fix edges cases about Transpose for SYMM & SYR2K

Change-Id: Id86d5fe8475060a22f49b06b6e1f8f3eae7c7e9f

9 years agoFix thread affinity of FingerprintManager.
Alex Klyubin [Thu, 30 Apr 2015 20:30:48 +0000 (13:30 -0700)]
Fix thread affinity of FingerprintManager.

FingerprintManager internally creates a Handler which needs to be
bound to a Looper thread. Prior to this CL the Handler was bound to
the Looper of the current thread. This caused issues:
* Different instances of FingerprintManager could be bound to
  different Looper threads.
* Callbacks from FingerprintManager were invoked on arbitrary
  threads (or not at all if the Looper was there but wasn't running).
* FingerprintManager couldn't be obtained by apps on most non-main
  threads leading to java.lang.RuntimeException: Can't create handler
  inside thread that has not called Looper.prepare().

This CL fixes the issue by binding the FingerprintManager's Handler to
the Looper running on the main thread.

Bug: 20725228
Change-Id: I4a0382d6e11df9f23b8db9f0deec77369af31b5e

9 years agoMerge "Clarifying which receiver method to call." into mnc-dev
Glenn Kasten [Thu, 30 Apr 2015 20:27:59 +0000 (20:27 +0000)]
Merge "Clarifying which receiver method to call." into mnc-dev

9 years agoam 033dc46b: Merge "Switch from FingerprintService to FingerprintManager." into mnc-dev
Alex Klyubin [Thu, 30 Apr 2015 19:59:17 +0000 (19:59 +0000)]
am 033dc46b: Merge "Switch from FingerprintService to FingerprintManager." into mnc-dev

* commit '033dc46bb949a9a5e42ed51bbff1e055a7c58ca2':
  Switch from FingerprintService to FingerprintManager.

9 years agoam 3cd8ec3c: Merge "Cleanup logic for per-op auth keys." into mnc-dev
Alex Klyubin [Thu, 30 Apr 2015 19:59:13 +0000 (19:59 +0000)]
am 3cd8ec3c: Merge "Cleanup logic for per-op auth keys." into mnc-dev

* commit '3cd8ec3c6832ee142e217e2653cce58de3f1dba1':
  Cleanup logic for per-op auth keys.

9 years agoRemove dependency upon FragmentActivity
Todd Kennedy [Wed, 15 Apr 2015 01:22:54 +0000 (18:22 -0700)]
Remove dependency upon FragmentActivity

The FragmentManagerImpl is intimately tied with a FragmentActivity. In
many cases, we want to be able to create / manage Fragments outside of
a FragmentManager. This defines a FragmentController interface that can
be used by any class to host Fragments.

Bug: 19569654
Change-Id: I6816a5c1815122d206062b9f4584ad460b3d41dd

9 years agoChange how Java Bitmaps are accessed in a few places
John Reck [Fri, 10 Apr 2015 20:52:57 +0000 (13:52 -0700)]
Change how Java Bitmaps are accessed in a few places

Stop assuming that a Java Bitmap has a SkBitmap* that
has some externally managed lifecycle, and instead switch
a bunch of users to accessing the bitmap by providing
their own SkBitmap* on which to set the (ref counted!)
SkPixelRef* instead

Attempt #2 to land this, original issue was in getSkBitmap
and should be fixed

Change-Id: I0fd9e193968b41e5597784140d56b4885906864a

9 years agoMerge "Switch from FingerprintService to FingerprintManager." into mnc-dev
Alex Klyubin [Thu, 30 Apr 2015 19:45:54 +0000 (19:45 +0000)]
Merge "Switch from FingerprintService to FingerprintManager." into mnc-dev