OSDN Git Service
Alex Klyubin [Thu, 30 Apr 2015 18:15:23 +0000 (18:15 +0000)]
Merge "Track Keymaster changes." into mnc-dev
Alex Klyubin [Thu, 30 Apr 2015 17:50:45 +0000 (10:50 -0700)]
Track Keymaster changes.
* MAC length is now specified as a parameters to the begin operation
instead of as a parameter at key generation/import time.
* KM_TAG_MAC_LENGTH is now in bits instead of in bytes.
Change-Id: I752fe232d11d3ac39a575a48948215d84ded8fb9
Eino-Ville Talvala [Thu, 30 Apr 2015 18:10:29 +0000 (18:10 +0000)]
Merge "Camera2: LEGACY: Support prepare(), sort of." into mnc-dev
Svetoslav [Thu, 30 Apr 2015 18:05:17 +0000 (18:05 +0000)]
Merge "Add use fingerprint app op - framework" into mnc-dev
Svetoslav [Thu, 30 Apr 2015 18:02:54 +0000 (18:02 +0000)]
Merge "Add process outgoing calls app op - framework" into mnc-dev
Svetoslav [Thu, 30 Apr 2015 18:01:50 +0000 (18:01 +0000)]
Merge "Add SIP app op - framework." into mnc-dev
Andreas Gampe [Thu, 30 Apr 2015 17:53:48 +0000 (17:53 +0000)]
Merge "am
b6d14a00: resolved conflicts for merge of
c29791d5 to mnc-dev-plus-aosp" into mnc-dev
Robin Lee [Wed, 29 Apr 2015 16:15:49 +0000 (17:15 +0100)]
SystemUI strings: prospective VPN strings for apps
Bug:
20516964
Change-Id: Ifaeb388896145fd71ff9aa9fab6e2b04af807631
(cherry picked from commit
63539bd5fac53d90adff35df340562a1926d610e)
Jean-Michel Trivi [Thu, 30 Apr 2015 16:43:17 +0000 (16:43 +0000)]
Merge "AudioService receives callback for dynamic policy mix state changes" into mnc-dev
Chris Craik [Thu, 30 Apr 2015 16:19:32 +0000 (16:19 +0000)]
Merge "Fix rendernode flag logging" into mnc-dev
Chris Craik [Thu, 30 Apr 2015 16:12:39 +0000 (09:12 -0700)]
Fix rendernode flag logging
Change-Id: I978c54ab26ef6dc3f6caef8604ac77a883b8e913
Alex Klyubin [Thu, 30 Apr 2015 16:12:32 +0000 (16:12 +0000)]
Merge "AndroidKeyStore keys should not be handled by Bouncy Castle." into mnc-dev
Alan Viverette [Thu, 30 Apr 2015 15:59:20 +0000 (15:59 +0000)]
Merge "ActionBar SearchView's default hint shouldn't override SearchableInfo" into mnc-dev
John Spurlock [Thu, 30 Apr 2015 15:45:53 +0000 (15:45 +0000)]
Merge "Zen: New event condition data model." into mnc-dev
John Spurlock [Thu, 30 Apr 2015 13:30:52 +0000 (09:30 -0400)]
Zen: New event condition data model.
- Add system condition provider for calendar event-based rules.
- Add stub condition provider for handling event conditions.
- Add various shared items to support new settings subpage.
Bug:
20064962
Change-Id: I6f5afe0f1444976f0dc6807048e0580e8a28070e
Ronghua Wu [Thu, 30 Apr 2015 15:40:35 +0000 (15:40 +0000)]
Merge "media: set codec exception reason." into mnc-dev
Abodunrinwa Toki [Thu, 30 Apr 2015 12:18:48 +0000 (12:18 +0000)]
Merge "Use theme attributes for FloatingToolbar colors." into mnc-dev
Narayan Kamath [Thu, 30 Apr 2015 11:25:35 +0000 (11:25 +0000)]
Merge "Fix incorrect javadoc for Uri.getQueryParameter." into mnc-dev
Narayan Kamath [Mon, 27 Apr 2015 10:00:54 +0000 (11:00 +0100)]
Fix incorrect javadoc for Uri.getQueryParameter.
This first went out with Jelly Bean and not ICS.
bug: https://code.google.com/p/android/issues/detail?id=61651
(cherry picked from commit
4356c95354d28b8ceb1b04e97c53c2ba3b3faa93)
Change-Id: I5b96bcb20aa3a1d227dd5b00926af077276fc666
Zoltan Szatmary-Ban [Thu, 30 Apr 2015 09:48:34 +0000 (09:48 +0000)]
Merge "Fix potential NPE on devices without DPMS" into mnc-dev
Zoltan Szatmary-Ban [Thu, 30 Apr 2015 09:38:24 +0000 (10:38 +0100)]
Fix potential NPE on devices without DPMS
Bug:
20563108
Change-Id: Ie2bda65c834ddad9db8753f7616c2754072551cd
Benjamin Franz [Thu, 30 Apr 2015 08:33:45 +0000 (08:33 +0000)]
Merge "Add package name extra to PackageInstaller callback" into mnc-dev
Wei Wang [Thu, 30 Apr 2015 07:08:42 +0000 (07:08 +0000)]
Merge "Temp workaround to track max beacons." into mnc-dev
Wei Wang [Wed, 29 Apr 2015 18:14:18 +0000 (11:14 -0700)]
Temp workaround to track max beacons.
Change-Id: Ia65a7a0ec98d0181cf62db343e00c4a0b01c32d8
Shawn Willden [Thu, 30 Apr 2015 05:14:50 +0000 (05:14 +0000)]
Merge "Add missing error codes from keymaster_defs.h." into mnc-dev
Shawn Willden [Tue, 28 Apr 2015 06:05:03 +0000 (00:05 -0600)]
Add missing error codes from keymaster_defs.h.
Bug:
20127433
Change-Id: I32eab62459003c526d3cf9ef108be7b2fd709960
Jeff Sharkey [Thu, 30 Apr 2015 05:09:01 +0000 (05:09 +0000)]
Merge "New "frozen" state during app move/upgrade." into mnc-dev
Jeff Sharkey [Thu, 30 Apr 2015 04:44:57 +0000 (21:44 -0700)]
New "frozen" state during app move/upgrade.
This replaces mOperationPending, which was in an odd place. It adds
a new PackageSetting.frozen flag that is a last-ditch effort to
prevent ActivityManager from starting an app while it's being moved
or upgraded.
Also provides clearer guarding around all upgrades by freezing,
killing, upgrading, then unfreezing.
Bug:
20275579
Change-Id: I28bb0359a6f4e05080fb336b18dd2a249509d989
Rich Slogar [Thu, 30 Apr 2015 03:48:38 +0000 (03:48 +0000)]
am
6891f035: am
572ecb6e: am
999b08b7: Merge "docs: studio 1.2 downloads" into lmp-docs
* commit '
6891f0359ba56c8132bb0b69595e40d7eab46a14':
docs: studio 1.2 downloads
Rich Slogar [Thu, 30 Apr 2015 03:48:31 +0000 (03:48 +0000)]
am
cd63231f: am
47bd51e6: am
07aca646: Merge "docs: plugin 1.2.0 revision updates" into lmp-docs
* commit '
cd63231f9015c8da0e1f57809f171e25d7cdd75a':
docs: plugin 1.2.0 revision updates
Rich Slogar [Thu, 30 Apr 2015 03:48:26 +0000 (03:48 +0000)]
am
58b0fc56: am
d8293d83: am
5b7546a6: Merge "docs: studio 1.2 revision updates" into lmp-docs
* commit '
58b0fc56ef447cb78665e9324245a0af08977b14':
docs: studio 1.2 revision updates
Alex Klyubin [Thu, 30 Apr 2015 03:28:41 +0000 (20:28 -0700)]
Surface KeyPermanentlyInvalidatedException for per-op auth keys.
Bug:
20642549
Change-Id: Ibda270921f13a1fd695264583b0e4bd255f63aed
Rich Slogar [Thu, 30 Apr 2015 03:28:39 +0000 (03:28 +0000)]
am
572ecb6e: am
999b08b7: Merge "docs: studio 1.2 downloads" into lmp-docs
* commit '
572ecb6e5e5a5ffbf2e10ef4702e9d75f097c5fe':
docs: studio 1.2 downloads
Rich Slogar [Thu, 30 Apr 2015 03:28:30 +0000 (03:28 +0000)]
am
47bd51e6: am
07aca646: Merge "docs: plugin 1.2.0 revision updates" into lmp-docs
* commit '
47bd51e63c3b3c59c354af86f400fd00a4afecae':
docs: plugin 1.2.0 revision updates
Rich Slogar [Thu, 30 Apr 2015 03:28:26 +0000 (03:28 +0000)]
am
d8293d83: am
5b7546a6: Merge "docs: studio 1.2 revision updates" into lmp-docs
* commit '
d8293d837e50a8aaf8b365ee08f96e9d5ce26625':
docs: studio 1.2 revision updates
Andrew Solovay [Thu, 30 Apr 2015 03:14:13 +0000 (03:14 +0000)]
am
c15736b9: am
c2e2c7d5: Merge "docs: Minor formatting cleanup." into lmp-mr1-ub-docs
* commit '
c15736b95d61033f03b1446371315bfa46252aaf':
docs: Minor formatting cleanup.
Andrew Solovay [Thu, 30 Apr 2015 02:58:08 +0000 (02:58 +0000)]
am
c2e2c7d5: Merge "docs: Minor formatting cleanup." into lmp-mr1-ub-docs
* commit '
c2e2c7d5f5b8bf699d7177a4dc7694719323fd87':
docs: Minor formatting cleanup.
Rich Slogar [Thu, 30 Apr 2015 02:57:52 +0000 (02:57 +0000)]
am
999b08b7: Merge "docs: studio 1.2 downloads" into lmp-docs
* commit '
999b08b74c29937b49c4106a784117eed6168045':
docs: studio 1.2 downloads
Rich Slogar [Thu, 30 Apr 2015 02:57:45 +0000 (02:57 +0000)]
am
07aca646: Merge "docs: plugin 1.2.0 revision updates" into lmp-docs
* commit '
07aca646e43ea27329c079d8ff6549127e4fcc25':
docs: plugin 1.2.0 revision updates
Rich Slogar [Thu, 30 Apr 2015 02:57:38 +0000 (02:57 +0000)]
am
5b7546a6: Merge "docs: studio 1.2 revision updates" into lmp-docs
* commit '
5b7546a67b5fef2adab70d95da4879381b9b0e92':
docs: studio 1.2 revision updates
Alex Klyubin [Thu, 30 Apr 2015 02:46:29 +0000 (02:46 +0000)]
Merge "Enable per-use user authenticated keys to be used." into mnc-dev
Rich Slogar [Thu, 30 Apr 2015 02:40:25 +0000 (02:40 +0000)]
Merge "docs: studio 1.2 downloads" into lmp-docs
Rich Slogar [Thu, 30 Apr 2015 02:39:57 +0000 (02:39 +0000)]
Merge "docs: plugin 1.2.0 revision updates" into lmp-docs
Rich Slogar [Thu, 30 Apr 2015 02:39:25 +0000 (02:39 +0000)]
Merge "docs: studio 1.2 revision updates" into lmp-docs
Andrew Solovay [Thu, 30 Apr 2015 02:27:00 +0000 (02:27 +0000)]
Merge "docs: Minor formatting cleanup." into lmp-mr1-ub-docs
Alex Klyubin [Thu, 30 Apr 2015 00:32:00 +0000 (17:32 -0700)]
Enable per-use user authenticated keys to be used.
This makes symmetric Cipher and Mac implementations backed by
AndroidKeyStore succeed in their initialization when the key is
configured to require user authentication for every use. Users
of such keys should obtain an instance of Cipher or Mac, initialize
it with the key, and then authorize the operation by passing this
Cipher or Mac instance to FingerprintManager.authenticate.
Bug:
18088752
Change-Id: Ia15a1e5f8274c3623f665dae1f400ff539639ab1
Miao Wang [Thu, 30 Apr 2015 02:20:43 +0000 (02:20 +0000)]
Merge changes I99f9f9ff,I559b5c56 into mnc-dev
* changes:
[RenderScript] L2 BLAS, fix element type in ZHER
[RenderScript] fixes for L3 BLAS APIs
Rich Slogar [Thu, 19 Mar 2015 00:33:23 +0000 (17:33 -0700)]
docs: studio 1.2 revision updates
Change-Id: I3bf392596d418b3bba63bbcc09663f2d3f4d6e2a
Jim Miller [Wed, 29 Apr 2015 03:05:53 +0000 (20:05 -0700)]
Add javax.crypto.Mac as a supported CryptoObject to Fingerprint
Fixes bug
20660180
Change-Id: I421c246ef776847835ede4be1d72721c35cf951c
(cherry picked from commit
0ecd5c20d93c24251975f3ff7cb0494039e5ea20)
Miao Wang [Thu, 30 Apr 2015 01:14:55 +0000 (18:14 -0700)]
[RenderScript] L2 BLAS, fix element type in ZHER
Change-Id: I99f9f9ff8942522d6581ff60b9a2d75e33e66ff6
Rich Slogar [Fri, 3 Apr 2015 22:44:12 +0000 (15:44 -0700)]
docs: studio 1.2 downloads
Change-Id: I43c1d1bad9c110e0e87383ce6ff95ee5706e777e
Jean-Michel Trivi [Fri, 24 Apr 2015 01:48:08 +0000 (18:48 -0700)]
AudioService receives callback for dynamic policy mix state changes
AudioService registers a callback for dynamic policies from
AudioSystem.
AudioSystem keeps track of a single callback for dynamic policies.
Bug
20226914
Change-Id: I48899d20d1dbb47bb680e733a3bc9fd064b60f07
Svet Ganov [Thu, 30 Apr 2015 00:41:38 +0000 (00:41 +0000)]
Merge "Add permission to ap op mappings for all runtime permissions." into mnc-dev
Jeff Sharkey [Thu, 30 Apr 2015 00:38:30 +0000 (00:38 +0000)]
Merge "Returning to wizard, split move events." into mnc-dev
Andy Hung [Thu, 30 Apr 2015 00:37:57 +0000 (00:37 +0000)]
Merge "Check for null codec from AMediaCodec_createDecoderByType" into mnc-dev
Svet Ganov [Thu, 30 Apr 2015 00:35:19 +0000 (17:35 -0700)]
Add permission to ap op mappings for all runtime permissions.
Change-Id: I1b41fac9405352f135b3d0137cc924ce51388e1e
Jeff Sharkey [Wed, 29 Apr 2015 18:24:52 +0000 (11:24 -0700)]
Returning to wizard, split move events.
Finish wiring up notifications to jump back into in-progress wizard
flow, using moveId as identifier.
Split move events back into separate creation and progress events,
and pass details as bundle to pass extra stuff like UUID. Null
package still means moving primary storage.
Add explicit "volume forgotten" event for PackageManager to clean
up internal state with.
Plumb through internal path reported by vold, and bring back FUSE
bypass rewriting optimization.
Bug:
19993667
Change-Id: I0f43edbba36c58c5cd33550022c54c4eb9f01a48
Mike Lockwood [Thu, 30 Apr 2015 00:14:25 +0000 (00:14 +0000)]
Merge "MidiFramer: Support realtime messages contained within SysEx messages." into mnc-dev
Dianne Hackborn [Thu, 30 Apr 2015 00:08:44 +0000 (00:08 +0000)]
Merge "Update use of procstate for services." into mnc-dev
Miao Wang [Thu, 30 Apr 2015 00:07:29 +0000 (00:07 +0000)]
Merge "[RenderScript] Enable L2 BLAS APIs" into mnc-dev
Miao Wang [Thu, 30 Apr 2015 00:06:35 +0000 (00:06 +0000)]
Merge "[RenderScript] improve & minor fixes of L2 BLAS validation." into mnc-dev
Dianne Hackborn [Fri, 24 Apr 2015 16:54:54 +0000 (09:54 -0700)]
Update use of procstate for services.
Now that we have a separate foreground service proc state
(above a sleeping top app), update various system services
to put their bindings into this state when appropriate.
There are two new bind flags for this -- one that just always
makes it a foreground service, another that only does it when
the device is awake (useful for things like the wallpaper).
And with all of that, tweak network policy manager to only
include apps that are at least foreground service state when
in power save and device idle modes. This will allow us to
further reduce the set of apps that have network access
(in particular not giving access to the current top app when
the screen is off), hopefully leading to even better battery
life.
Change-Id: I91d85a5c5ed64e856149e9a5d94a634a7925ec7f
Miao Wang [Thu, 30 Apr 2015 00:04:11 +0000 (00:04 +0000)]
Merge "[RenderScript] Fix HEMM and SYRK in IntrinscBLAS to correctly handle complex 'Alpha' and 'Beta'" into mnc-dev
Miao Wang [Fri, 24 Apr 2015 18:19:53 +0000 (11:19 -0700)]
[RenderScript] fixes for L3 BLAS APIs
- Typo for validateUplo
- Typo in ZHEMM, element should be FLOAT64_2.
- For GEMM and SYMM, SYRK, 'CONJ_TRANSPOSE' should also be handled in the
validation process.
- For SYMM, check matrix A is symmetric.
- For HERK, the dimension validation was switched for Transpose case.
Also, only Conj Trans is allowed in this case.
- FOR SYR2K, fix the dimension check for Matrix C.
- For TRMM & TRSM, fix the validation part for dimension check.
Change-Id: I559b5c5695aa82604de2955ae2327b694236d3ed
Alan Viverette [Wed, 29 Apr 2015 23:55:42 +0000 (16:55 -0700)]
ActionBar SearchView's default hint shouldn't override SearchableInfo
Moves the queryHint to defaultQueryHint, specifies the override order
as queryHint > SearchableInfo > defaultQueryHint.
Cleans up annotations and comments for several related methods.
Bug:
20614122
Change-Id: Ib58ec309e6814cd512df147d789ec0cd546018af
Alan Viverette [Wed, 29 Apr 2015 23:53:18 +0000 (23:53 +0000)]
Merge "Stash modulation alpha until ColorStateList has resolved base color" into mnc-dev
Vinit Deshpande [Wed, 29 Apr 2015 23:51:55 +0000 (23:51 +0000)]
Merge changes from topic 'PasspointUI' into mnc-dev
* changes:
Implement 'Available via Passpoint' feature [DO NOT MERGE]
Fix settings UI for passpoint networks [DO NOT MERGE]
Andy Hung [Wed, 29 Apr 2015 23:50:44 +0000 (23:50 +0000)]
Merge "Pass PlaybackSettings as class object for AudioTrack JNI" into mnc-dev
Alex Klyubin [Wed, 29 Apr 2015 23:48:13 +0000 (23:48 +0000)]
Merge "Add KeyPermanentlyInvalidatedException." into mnc-dev
Vinit Deshpande [Thu, 16 Apr 2015 01:32:09 +0000 (18:32 -0700)]
Implement 'Available via Passpoint' feature [DO NOT MERGE]
This also fixes the issues related to explicit connection
to passpoint AP, and fixes occassional mention of
'connected via Wi-Fi Assistent'
Change-Id: I152cebafa6259194f1d09a6972a3508156335cb6
(cherry picked from commit
ff783cd6cfc82870a6126fe1ef019d21131423fc)
Vinit Deshpande [Thu, 16 Apr 2015 01:10:55 +0000 (18:10 -0700)]
Fix settings UI for passpoint networks [DO NOT MERGE]
This change includes showing the friendly name in saved
networks list and 'Connected via provider' addition for
passpoint connections.
Change-Id: If330baa96dedb099d5989b3df5b9778bbbcb15e3
(cherry picked from commit
597f49cdda63fef1b583e2053341485e8d4e2371)
Simranjit Singh Kohli [Wed, 29 Apr 2015 23:13:33 +0000 (23:13 +0000)]
Merge "[Update API]: Rename accountAuthenticated to notifyAccountAuthenticated and other changes." into mnc-dev
destradaa [Wed, 29 Apr 2015 23:09:52 +0000 (23:09 +0000)]
Merge "Update use of A-GPS modes in GpsLocationProvider b/
20664846" into mnc-dev
Rich Slogar [Mon, 30 Mar 2015 20:33:38 +0000 (13:33 -0700)]
docs: plugin 1.2.0 revision updates
Change-Id: Ic58da005e16c4a51dacff741ac3e5a7856ac3edb
John Spurlock [Wed, 29 Apr 2015 22:57:17 +0000 (22:57 +0000)]
Merge "Volume: dismiss volume UI to avoid HUNs." into mnc-dev
Roozbeh Pournader [Wed, 29 Apr 2015 22:47:59 +0000 (22:47 +0000)]
Merge "Rename FONT_NOTOSANS_FULL to FONT_NOTOSANS_JP_FULL." into mnc-dev
Svetoslav [Wed, 29 Apr 2015 22:29:46 +0000 (15:29 -0700)]
Add use fingerprint app op - framework
Change-Id: Ibbd1c70e1fc771b804a8b0099d29d4fbd8360966
Svetoslav [Wed, 29 Apr 2015 21:08:16 +0000 (14:08 -0700)]
Add process outgoing calls app op - framework
Change-Id: If662b47372a1ddb6ff60ccdbd910192577abc924
Svetoslav [Wed, 29 Apr 2015 19:00:51 +0000 (12:00 -0700)]
Add SIP app op - framework.
Change-Id: Iac552a12e0ed5d1cf585179430c468d8603b6c01
Roozbeh Pournader [Wed, 29 Apr 2015 22:38:07 +0000 (15:38 -0700)]
Rename FONT_NOTOSANS_FULL to FONT_NOTOSANS_JP_FULL.
This clarifies the meaning of the variable, that this switch only
affects the Noto Sans Japanese font.
Change-Id: I28043ed41ec51af0273a071692426d51352ef849
Alan Viverette [Wed, 29 Apr 2015 22:36:11 +0000 (15:36 -0700)]
Stash modulation alpha until ColorStateList has resolved base color
Fixes an issue where specifying an explicit modulation alpha and a
theme-dependent base color discarded the modulation alpha during
applyTheme().
Sets the YOU MESSED UP YOUR THEME color to magenta, which matches the
behavior for RippleDrawable and should expose any remaining issues in
a painfully obvious way.
Bug:
20690409
Change-Id: I7a44f4bc4a5a85be6d3f27087b2d6c9ea12e1d29
Amith Yamasani [Wed, 29 Apr 2015 22:31:17 +0000 (22:31 +0000)]
Merge "Remove network access for idle apps" into mnc-dev
Chris Craik [Wed, 29 Apr 2015 22:16:10 +0000 (22:16 +0000)]
Merge "Remove concept of layer alpha override" into mnc-dev
Ben Kwa [Wed, 29 Apr 2015 22:12:06 +0000 (22:12 +0000)]
Merge "Properly unparcel the PFDs passed to android.content.ContentProviderProxy.openFile." into mnc-dev
Adrian Roos [Wed, 29 Apr 2015 21:57:51 +0000 (21:57 +0000)]
Merge "Clarify javadoc of isKeyguardSecure and isDeviceSecure" into mnc-dev
destradaa [Wed, 29 Apr 2015 21:42:35 +0000 (14:42 -0700)]
Update use of A-GPS modes in GpsLocationProvider
b/
20664846
This change reflects the documentation changes made in gps.h for the
upcoming Android release.
Change-Id: Id3e04492febdabd42e91a12e221d1192947b8061
Andrew Solovay [Wed, 29 Apr 2015 21:37:22 +0000 (14:37 -0700)]
docs: Minor formatting cleanup.
Code sample had an overlong line, which caused a horizontal scroll-
bar in the generated doc.
Change-Id: I55b0318049be9e4ff473bdc739bb8265ca2da248
Alan Viverette [Wed, 29 Apr 2015 21:29:29 +0000 (21:29 +0000)]
Merge "Don't propagate level or RTL in LayerDrawable.setDrawable()" into mnc-dev
Alan Viverette [Wed, 29 Apr 2015 21:28:25 +0000 (14:28 -0700)]
Don't propagate level or RTL in LayerDrawable.setDrawable()
The developer used to be responsible for this and automatically
propagating the values breaks some use cases (ex. in Camera).
Bug:
20696311
Change-Id: Ia8ddc132c6d629bcc27d66f654baf30d9f078568
Wale Ogunwale [Wed, 29 Apr 2015 21:24:45 +0000 (21:24 +0000)]
Merge "Some code clean-up." into mnc-dev
Amith Yamasani [Sat, 25 Apr 2015 02:06:07 +0000 (19:06 -0700)]
Remove network access for idle apps
Track apps going in and out of idle in the NetworkPolicyManagerService.
Apply DROP rules in firewall controller if app is to be blacklisted
for network access.
Firewall can now be in whitelist (old) or blacklist mode. When in
blacklist, it allows all by default and we can selectively DENY
some uids.
Track app idle in UsageStats and update periodically.
Track charging/discharging states.
TODO: Check for appidle temporary parole state
Bug:
20066058
Change-Id: Ia65d7544204b3bcb78a517310ef4adcc05aac6fb
Svet Ganov [Wed, 29 Apr 2015 21:15:24 +0000 (21:15 +0000)]
Merge "Add API to get app op for a permission" into mnc-dev
Andy Hung [Wed, 29 Apr 2015 01:43:03 +0000 (18:43 -0700)]
Check for null codec from AMediaCodec_createDecoderByType
NULL codec can now occur if codec cannot be created.
Bug:
20566134
Change-Id: I08d54e733a01d0614313673dc49a6f5e702633ac
Andy Hung [Tue, 28 Apr 2015 01:14:02 +0000 (18:14 -0700)]
Pass PlaybackSettings as class object for AudioTrack JNI
Change-Id: Ic7fb5f84ed1fc4cc2286e5c207fee5298a64a5a4
Adrian Roos [Tue, 28 Apr 2015 22:48:00 +0000 (15:48 -0700)]
Clarify javadoc of isKeyguardSecure and isDeviceSecure
Bug:
20642788
Change-Id: I1114150cd645ee3de8e4617cdb79ff351e01b9df
Mike Lockwood [Wed, 29 Apr 2015 20:50:34 +0000 (20:50 +0000)]
Merge "MidiDeviceInfo: Add version string property" into mnc-dev
Mike Lockwood [Wed, 29 Apr 2015 20:44:34 +0000 (13:44 -0700)]
MidiDeviceInfo: Add version string property
For USB devices, this is populated with the USB device version string.
Change-Id: Ia9286d5f41783e4e960a9c724bf6b85b6599fe12
Dianne Hackborn [Wed, 29 Apr 2015 20:33:50 +0000 (20:33 +0000)]
Merge "Implement user-settable power save whitelist." into mnc-dev
Ben Kwa [Wed, 29 Apr 2015 20:28:25 +0000 (13:28 -0700)]
Properly unparcel the PFDs passed to
android.content.ContentProviderProxy.openFile.
BUG=
20693984
Change-Id: Id089d218057d5439da1bd5bf0ce3991059c1ecad
Alex Klyubin [Wed, 29 Apr 2015 20:16:30 +0000 (13:16 -0700)]
AndroidKeyStore keys should not be handled by Bouncy Castle.
Bouncy Castle JCA provider incorrectly declares that its Cipher, Mac,
Signature, and KeyAgreement implementations accept arbitrary keys (
including AndroidKeyStore keys). As a result, when a Cipher, Mac,
Signature, or KeyAgreement instance is requested from JCA without
explicitly specifying the provider (which follows best practices)
and then initialied with an AndroidKeyStore key, JCA chooses the
BouncyCastle's implementation, which in turn blows up because it
can't handle such keys.
The workaround is to install Cipher, Mac, Signature, and
KeyAgreement implementations backed by AndroidKeyStore as a
higher-priority JCA provider than the Bouncy Castle one. This is
achieved by splitting out the above implementations from
AndroidKeyStoreProvider into AndroidKeyStoreBCWorkaroundProvider
and installing the AndroidKeyStoreProvider at the usual priority
(below Bouncy Castle) and the AndroidKeyStoreBCWorkaroundProvider
at above Bouncy Castle priority.
Bug:
20691708
Change-Id: I336464f4a49bc30c6845ddc4e84b07f4105424dd