190226 Commits

Author SHA1 Message Date
John Reck
7c103a36f6 Remove Bitmap#getSkBitmap
Change-Id: Ifb9047b426122d3e5a445eb7a0eb3fce38dedf27
2015-05-01 14:38:44 -07:00
John Reck
c6e2e8ff47 Move AssetAtlas off of SkBitmap*
Switched to SkPixelRef*

Change-Id: I4a1d9dc6c55c1ebcce6b0b8c585e69559e523898
2015-05-01 14:30:21 -07:00
John Reck
78760b4ae4 Merge "A bunch more cleanups" into mnc-dev 2015-05-01 14:42:51 +00:00
Robin Lee
6e761c5d6b Merge "Device policy: use owner label instead of name" into mnc-dev 2015-05-01 12:57:37 +00:00
Narayan Kamath
a78240ba5f 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
2015-05-01 09:39:25 +00:00
Wei Wang
f2cfe6c0a9 Merge "Fix a bug in ScanSettings constructor." into mnc-dev 2015-05-01 07:51:40 +00:00
Wei Wang
c5065ee98d Fix a bug in ScanSettings constructor.
Change-Id: I36e6effe8063bacddd61fe2c47c0360d7ffaee71
2015-05-01 00:50:32 -07:00
Gus Prevas
043d7a94ab am 12b1b8ed: am 026e204e: Fixes velocity tracking bug in SwipeDismissLayout.
* commit '12b1b8ed3b5bfe623cd69d3cdafd8b6b5dfe68d8':
  Fixes velocity tracking bug in SwipeDismissLayout.
2015-05-01 07:36:43 +00:00
Wei Wang
c90c760431 Merge "Honor Ble scanning settings from Settings UI." into mnc-dev 2015-05-01 05:10:18 +00:00
Lorenzo Colitti
b57f236e30 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.
2015-05-01 03:45:14 +00:00
Lorenzo Colitti
f7058f5d1d Add a hidden method to clear NetworkCapabilities.
Change-Id: Icf7d67e24a09113340e9bff2c72526760914ef48
2015-05-01 12:36:29 +09:00
Lorenzo Colitti
2ea89e59c3 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
2015-05-01 12:36:29 +09:00
Lorenzo Colitti
db95a60981 Simplify network callback handling code.
Change-Id: I2490ad754bf2a1282f27302c8556fb19983cc6b1
2015-05-01 12:36:28 +09:00
Lorenzo Colitti
0708693f1e Document and unhide CALLBACK_PRECHECK.
Bug: 20038463
Change-Id: Ie79f2d28c06cf611289504e49c471b55ffb9890f
2015-05-01 12:36:28 +09:00
Robert Shih
f12071222f Merge "MediaPlayer: provide mime type for all track types" into mnc-dev 2015-05-01 00:31:24 +00:00
Miao Wang
bbfa9b23c6 Merge "[RenderScript] typo fix in BLAS, TRMM & TSMM" into mnc-dev 2015-05-01 00:26:32 +00:00
tturney
56c58a2e27 Merge "Fix typo. bug: b/20610710" into mnc-dev 2015-05-01 00:17:41 +00:00
Miao Wang
194679ed95 [RenderScript] typo fix in BLAS, TRMM & TSMM
Change-Id: I78f014a864700369c7ccdfb46a257851a45abd7c
2015-04-30 17:14:28 -07:00
Lajos Molnar
05ebffe6bf media: Hook up MediaPlayer and MediaSync to new settings
Bug: 19666434
Change-Id: Ib815a80a991d4be9ce179514ac517c54f98234fd
2015-04-30 16:49:36 -07:00
Robert Shih
29767a8c34 MediaPlayer: provide mime type for all track types
Bug: 20729923
Change-Id: Id05ca0616a72f66abe6a541417baef491c49a417
2015-04-30 16:34:57 -07:00
Alan Viverette
aba035d2ed Merge "Fix layoutlib build breakage" into mnc-dev 2015-04-30 23:00:29 +00:00
Alan Viverette
5181f279c8 Fix layoutlib build breakage
Change-Id: Id3a9b79ac47ef27b04a96ff3ee50688bbb58f9c0
2015-04-30 15:57:42 -07:00
Andrew Lee
5b8b0df7bf Merge "Add handler parameter for callbacks." into mnc-dev 2015-04-30 22:27:24 +00:00
Andrew Lee
011728fc3a Add handler parameter for callbacks.
Bug: 20160491
Change-Id: I94639b06b8c97b6585e169d667a67ce328e716af
2015-04-30 15:24:50 -07:00
Wei Wang
67d8416b8e Honor Ble scanning settings from Settings UI.
Bug:20643039

Change-Id: Ib1465108e26b8537c9da1bfbb31a99d2e33da910
2015-04-30 14:45:17 -07:00
Rich Slogar
7dc7d09ba5 am a1c7176b: am a03e2658: am 7c267f66: am f4b1df34: am 2a3aa2d3: docs: studio 1.2 updates
* commit 'a1c7176bdcc810000f782460dd02d99fda5e0250':
2015-04-30 21:37:11 +00:00
Rich Slogar
8febd74eaf am 7fbde8f5: am 408aeb05: am b6ad1ce8: am 541dda1c: am 999b08b7: Merge "docs: studio 1.2 downloads" into lmp-docs
* commit '7fbde8f508cf5148f395280753c99b63cc525e45':
2015-04-30 21:37:07 +00:00
Rich Slogar
9c6e60500d am ac9c751d: am 62cfe97d: am 2653774a: am b874dc04: am 07aca646: Merge "docs: plugin 1.2.0 revision updates" into lmp-docs
* commit 'ac9c751d74135994ddaa9ccc14e87809efc08693':
2015-04-30 21:37:02 +00:00
Rich Slogar
50c29a3e09 am 994d6ffe: am 7a258afa: am af73c6e7: am ff24e8e1: am 5b7546a6: Merge "docs: studio 1.2 revision updates" into lmp-docs
* commit '994d6ffec75b50ff199760f4c3cf464b2d0f0e83':
2015-04-30 21:36:58 +00:00
John Reck
3731dc220e A bunch more cleanups
Switch a few places to using android::canvas
instead of SkCanvas as well which eliminated
some JNI

Change-Id: I8f98b56442a06362b82b984cd1bd3a92398d8dbc
2015-04-30 14:34:55 -07:00
Rich Slogar
24863faa05 Merge "resolved conflicts for merge of edf44562 to mnc-dev" into mnc-dev 2015-04-30 21:27:45 +00:00
Miao Wang
8724d359bf Merge "[RenderScript] typo fix in rs BLAS jni, to correctly handle complex params." into mnc-dev 2015-04-30 21:25:25 +00:00
Miao Wang
01060a33a4 Merge "[RenderScript] fix edges cases about Transpose for SYMM & SYR2K" into mnc-dev 2015-04-30 21:25:03 +00:00
Rich Slogar
0820394f7e resolved conflicts for merge of edf44562 to mnc-dev
Change-Id: I2df8255d12feed8c17b9c9f009453701cd412676
2015-04-30 14:20:12 -07:00
Alan Viverette
ac7927a895 Merge "LayoutInflater should always try to generate LayoutParams for include" into mnc-dev 2015-04-30 21:03:23 +00:00
Alex Klyubin
cf2999aacf Merge "Handle KM_ERROR_CALLER_NONCE_PROHIBITED." into mnc-dev 2015-04-30 21:01:00 +00:00
John Reck
db672b03a2 Merge "Change how Java Bitmaps are accessed in a few places" into mnc-dev 2015-04-30 21:00:08 +00:00
Alex Klyubin
6358b881f2 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
2015-04-30 13:57:44 -07:00
Alex Klyubin
0069301d36 Merge "Fix thread affinity of FingerprintManager." into mnc-dev 2015-04-30 20:56:24 +00:00
Miao Wang
82585b3906 [RenderScript] typo fix in rs BLAS jni, to correctly handle complex
params.

Change-Id: Ie44f430dc7ed4155f40aa9f9c2864fb0429c97fe
2015-04-30 13:44:49 -07:00
Todd Kennedy
10a54a7989 Merge "Remove dependency upon FragmentActivity" into mnc-dev 2015-04-30 20:38:49 +00:00
Miao Wang
1e940d87c4 [RenderScript] fix edges cases about Transpose for SYMM & SYR2K
Change-Id: Id86d5fe8475060a22f49b06b6e1f8f3eae7c7e9f
2015-04-30 13:37:38 -07:00
Alex Klyubin
24e9e966a8 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
2015-04-30 13:34:58 -07:00
Glenn Kasten
2757fed2d6 Merge "Clarifying which receiver method to call." into mnc-dev 2015-04-30 20:28:00 +00:00
Todd Kennedy
a5fc6f006f 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
2015-04-30 12:52:32 -07:00
John Reck
ed207b9274 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
2015-04-30 12:46:57 -07:00
Alex Klyubin
033dc46bb9 Merge "Switch from FingerprintService to FingerprintManager." into mnc-dev 2015-04-30 19:45:55 +00:00
Alex Klyubin
3cd8ec3c68 Merge "Cleanup logic for per-op auth keys." into mnc-dev 2015-04-30 19:44:15 +00:00
Alex Klyubin
2d7a85cd2b Switch from FingerprintService to FingerprintManager.
FingerprintService is a lower layer of abstraction which should
ideally be accessed only via FingerprintManager from
AndroidKeyStore.

The main issue with the switch is that it requires a reference to a
Context. This is now obtained using ActivityThread's hidden API.

Change-Id: If921e169838ee2cc5c7690b8c8d8ea95c33248aa
2015-04-30 12:43:05 -07:00
Peter Brinkmann
d8f6363a5d Clarifying which receiver method to call.
Change-Id: Iaf89e1ff27e257fd25c54e189e8fcd1b10e8edfc
2015-04-30 12:43:02 -07:00