OSDN Git Service
Jim Miller [Thu, 30 Apr 2015 02:08:16 +0000 (02:08 +0000)]
am
b62dc82b: Add javax.crypto.Mac as a supported CryptoObject to Fingerprint
* commit '
b62dc82b0c7208f106077b46fc7118da6baa6e13':
Add javax.crypto.Mac as a supported CryptoObject to Fingerprint
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:48:15 +0000 (00:48 +0000)]
am
82863f13: Merge "Add permission to ap op mappings for all runtime permissions." into mnc-dev
* commit '
82863f137e2af5ef0f3ac3d30f2afaf4b2dca3f3':
Add permission to ap op mappings for all runtime permissions.
Jeff Sharkey [Thu, 30 Apr 2015 00:48:10 +0000 (00:48 +0000)]
am
9e98dce6: Merge "Returning to wizard, split move events." into mnc-dev
* commit '
9e98dce6ad7b4dd1ec4beda8a9af4ecd4efcf027':
Returning to wizard, split move events.
Andy Hung [Thu, 30 Apr 2015 00:48:04 +0000 (00:48 +0000)]
am
f3d3856f: Merge "Check for null codec from AMediaCodec_createDecoderByType" into mnc-dev
* commit '
f3d3856f3e7b76765dfef6e94a4031c008f53b99':
Check for null codec from AMediaCodec_createDecoderByType
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:23:45 +0000 (00:23 +0000)]
am
3f9dc836: Merge "MidiFramer: Support realtime messages contained within SysEx messages." into mnc-dev
* commit '
3f9dc836c41ef6bdf812acc1803c849389ee6294':
MidiFramer: Support realtime messages contained within SysEx messages.
Dianne Hackborn [Thu, 30 Apr 2015 00:18:41 +0000 (00:18 +0000)]
am
f7b795ca: Merge "Update use of procstate for services." into mnc-dev
* commit '
f7b795ca1a552909d333ed3f2d5ec881a8b23144':
Update use of procstate for services.
Miao Wang [Thu, 30 Apr 2015 00:18:36 +0000 (00:18 +0000)]
am
508a2870: Merge "[RenderScript] Enable L2 BLAS APIs" into mnc-dev
* commit '
508a2870e97531133d2e9690e7fc3bb6d7685d11':
[RenderScript] Enable L2 BLAS APIs
Miao Wang [Thu, 30 Apr 2015 00:18:31 +0000 (00:18 +0000)]
am
a57a8a8c: Merge "[RenderScript] improve & minor fixes of L2 BLAS validation." into mnc-dev
* commit '
a57a8a8cc9e39da2c5f82db3c90cd534bf93fe94':
[RenderScript] improve & minor fixes of L2 BLAS validation.
Miao Wang [Thu, 30 Apr 2015 00:18:27 +0000 (00:18 +0000)]
am
634160a0: Merge "[RenderScript] Fix HEMM and SYRK in IntrinscBLAS to correctly handle complex \'Alpha\' and \'Beta\'" into mnc-dev
* commit '
634160a0567be4c8184e074f38d9f8daa9303983':
[RenderScript] Fix HEMM and SYRK in IntrinscBLAS to correctly handle complex 'Alpha' and 'Beta'
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
Alan Viverette [Thu, 30 Apr 2015 00:02:23 +0000 (00:02 +0000)]
am
0f1a3972: Merge "Stash modulation alpha until ColorStateList has resolved base color" into mnc-dev
* commit '
0f1a3972c18371359c39e6789607621bf0989181':
Stash modulation alpha until ColorStateList has resolved base color
Vinit Deshpande [Thu, 30 Apr 2015 00:02:18 +0000 (00:02 +0000)]
am
8cc1d3db: Merge changes from topic \'PasspointUI\' into mnc-dev
* commit '
8cc1d3dba4e06c47669c5b0c0d12b24ba70cd57a':
Implement 'Available via Passpoint' feature [DO NOT MERGE]
Fix settings UI for passpoint networks [DO NOT MERGE]
Andy Hung [Thu, 30 Apr 2015 00:02:13 +0000 (00:02 +0000)]
am
1afdbe3b: Merge "Pass PlaybackSettings as class object for AudioTrack JNI" into mnc-dev
* commit '
1afdbe3b77959c4b37d33c19727651ca2046a0ff':
Pass PlaybackSettings as class object for AudioTrack JNI
Alex Klyubin [Thu, 30 Apr 2015 00:01:59 +0000 (00:01 +0000)]
am
33c9dde9: Merge "Add KeyPermanentlyInvalidatedException." into mnc-dev
* commit '
33c9dde90d480fe457295dde37baa730d0cbc819':
Add KeyPermanentlyInvalidatedException.
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:23:29 +0000 (23:23 +0000)]
am
490d23bf: Merge "[Update API]: Rename accountAuthenticated to notifyAccountAuthenticated and other changes." into mnc-dev
* commit '
490d23bf55360219652d5177baefcba9377e2f4d':
[Update API]: Rename accountAuthenticated to notifyAccountAuthenticated and other changes.
destradaa [Wed, 29 Apr 2015 23:23:25 +0000 (23:23 +0000)]
am
db2af234: Merge "Update use of A-GPS modes in GpsLocationProvider b/
20664846" into mnc-dev
* commit '
db2af23408a5b92011f9384bfb320ac8843f22b3':
Update use of A-GPS modes in GpsLocationProvider b/
20664846
Yorke Lee [Wed, 29 Apr 2015 23:16:50 +0000 (16:16 -0700)]
Add default dialer checks to Telecom/Telephony
Check for the default dialer or the modify phone state permission
for various TelecomManager/TelephonyManager methods.
Make sure to check the user-selected default rather than the
hardcoded package name.
Exercise this code in TestDialerActivity.
Bug:
20304458
Change-Id: Ic04cd8f2ba98e1d54c39549ae89d3e11cd5cdafb
John Spurlock [Wed, 29 Apr 2015 23:13:41 +0000 (23:13 +0000)]
am
b351db72: Merge "Volume: dismiss volume UI to avoid HUNs." into mnc-dev
* commit '
b351db7239ee1c0cb9561f92efc19d4e95eba367':
Volume: dismiss volume UI to avoid HUNs.
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
Roozbeh Pournader [Wed, 29 Apr 2015 22:58:42 +0000 (22:58 +0000)]
am
09404dd1: Merge "Rename FONT_NOTOSANS_FULL to FONT_NOTOSANS_JP_FULL." into mnc-dev
* commit '
09404dd159d7ad7ade0c70f95a24d357d56bcdb4':
Rename FONT_NOTOSANS_FULL to FONT_NOTOSANS_JP_FULL.
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
Amith Yamasani [Wed, 29 Apr 2015 22:40:31 +0000 (22:40 +0000)]
am
fa4eda44: Merge "Remove network access for idle apps" into mnc-dev
* commit '
fa4eda443e32bf050721148c1ec5c6602246835a':
Remove network access for idle apps
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:25:59 +0000 (22:25 +0000)]
am
e74ff81e: Merge "Remove concept of layer alpha override" into mnc-dev
* commit '
e74ff81e0575bbe4361960739131a0256167f7c8':
Remove concept of layer alpha override
Ben Kwa [Wed, 29 Apr 2015 22:25:55 +0000 (22:25 +0000)]
am
94d07cb7: Merge "Properly unparcel the PFDs passed to android.content.ContentProviderProxy.openFile." into mnc-dev
* commit '
94d07cb7efbdd50b72d7f17e7c9596b789ebad4c':
Properly unparcel the PFDs passed to android.content.ContentProviderProxy.openFile.
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 22:08:24 +0000 (22:08 +0000)]
am
e632dc35: Merge "Clarify javadoc of isKeyguardSecure and isDeviceSecure" into mnc-dev
* commit '
e632dc35d8dcad7a09f9abefd5f9fcf2103f3b69':
Clarify javadoc of isKeyguardSecure and isDeviceSecure
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:34:14 +0000 (21:34 +0000)]
am
edcaf7c9: Merge "Don\'t propagate level or RTL in LayerDrawable.setDrawable()" into mnc-dev
* commit '
edcaf7c9338d4b3b78766ccec9c1e2c4dcd75cf2':
Don't propagate level or RTL in LayerDrawable.setDrawable()
Wale Ogunwale [Wed, 29 Apr 2015 21:34:10 +0000 (21:34 +0000)]
am
00758a3b: Merge "Some code clean-up." into mnc-dev
* commit '
00758a3b370879ac1f21fc85c291f741f947eca3':
Some code clean-up.
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
Svet Ganov [Wed, 29 Apr 2015 21:27:22 +0000 (21:27 +0000)]
am
e3538083: Merge "Add API to get app op for a permission" into mnc-dev
* commit '
e35380839e582a98477ba9181460ebfee1c74a9f':
Add API to get app op for a permission
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 21:02:39 +0000 (21:02 +0000)]
am
e1d00395: Merge "MidiDeviceInfo: Add version string property" into mnc-dev
* commit '
e1d003958de51c135ef92ae49ebdaa0f07d959dc':
MidiDeviceInfo: Add version string property
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:40:12 +0000 (20:40 +0000)]
am
9ac2718e: Merge "Implement user-settable power save whitelist." into mnc-dev
* commit '
9ac2718e7dcf274ad41fbb374bedabadc558634b':
Implement user-settable power save whitelist.
Mike Lockwood [Wed, 29 Apr 2015 20:40:07 +0000 (20:40 +0000)]
am
f105f61d: Merge "UsbDevice: Add support for retrieving version string for a USB device" into mnc-dev
* commit '
f105f61dd9ff790c6ace406e73c3bddac87a8925':
UsbDevice: Add support for retrieving version string for a USB device
Junda Liu [Wed, 29 Apr 2015 20:40:01 +0000 (20:40 +0000)]
am
bd0ffb8e: Merge "Moving all Telephony overlays to CarrierConfigManager." into mnc-dev
* commit '
bd0ffb8e34a91735e73fbc680539382dd5691191':
Moving all Telephony overlays to CarrierConfigManager.
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
Mike Lockwood [Wed, 29 Apr 2015 20:27:49 +0000 (20:27 +0000)]
Merge "UsbDevice: Add support for retrieving version string for a USB device" into mnc-dev
Junda Liu [Wed, 29 Apr 2015 20:25:24 +0000 (20:25 +0000)]
Merge "Moving all Telephony overlays to CarrierConfigManager." into mnc-dev
Jonathan Basseri [Mon, 27 Apr 2015 21:14:38 +0000 (14:14 -0700)]
Moving all Telephony overlays to CarrierConfigManager.
This adds every variable and its default value from
packages/services/Telephony/res/values/config.xml to the new
CarrierConfigManager API. Variable docstrings are also taken from
config.xml, with minimal edits.
These variables were not included because either they are not carrier
specific, or they are device specific:
OtaPlaySuccessFailureTone
OtaShowActivateFailTimes
OtaShowActivationScreen
OtaShowListeningScreen
carrier_settings
carrier_settings_menu
config_allow_hfa_outside_of_setup_wizard
config_enabled_lte
csp_enabled
dialer_default_class
dtmf_type_enabled
hac_enabled
send_mic_mute_to_AudioManager
ui_default_package
This also adds BOOL_HIDE_CARRIER_NETWORK_SETTINGS which is a replacement
for android.provider.Settings.Global.HIDE_CARRIER_NETWORK_SETTINGS.
Bug:
20270007
Change-Id: I985a55cf88d3bd1863e28af7790b59eef01d6504
Chris Craik [Wed, 29 Apr 2015 20:21:44 +0000 (20:21 +0000)]
am
81bd735a: Merge "Require minimum 4 bit stencil for layers." into mnc-dev
* commit '
81bd735a010771ab502dabe7ef4d20ea520cf6ac':
Require minimum 4 bit stencil for layers.
John Reck [Wed, 29 Apr 2015 20:21:39 +0000 (20:21 +0000)]
am
b2cec86a: Merge "Skip frames with no damage" into mnc-dev
* commit '
b2cec86a44f3fe937079b26827bdc031f5aec731':
Skip frames with no damage
Chris Craik [Wed, 29 Apr 2015 20:17:42 +0000 (20:17 +0000)]
Merge "Require minimum 4 bit stencil for layers." into mnc-dev
John Reck [Wed, 29 Apr 2015 20:10:25 +0000 (20:10 +0000)]
Merge "Skip frames with no damage" into mnc-dev
Abodunrinwa Toki [Wed, 29 Apr 2015 20:09:20 +0000 (20:09 +0000)]
am
05a56db3: Merge "DO NOT MERGE: Minor fixes to FloatingToolbar." into mnc-dev
* commit '
05a56db39d26e1e6ee160e82b79df39c15d1804c':
DO NOT MERGE: Minor fixes to FloatingToolbar.
Mike Lockwood [Wed, 29 Apr 2015 20:05:55 +0000 (13:05 -0700)]
UsbDevice: Add support for retrieving version string for a USB device
Change-Id: Ia8630f5ffd05f90347b971110a81f4927060cc4b
Chris Craik [Wed, 29 Apr 2015 00:55:50 +0000 (17:55 -0700)]
Require minimum 4 bit stencil for layers.
bug:
19270131
Change-Id: I81367179d268e7c1642259c456c1f3d0018f6c0d
Abodunrinwa Toki [Wed, 29 Apr 2015 19:57:46 +0000 (19:57 +0000)]
Merge "DO NOT MERGE: Minor fixes to FloatingToolbar." into mnc-dev
Wale Ogunwale [Wed, 29 Apr 2015 19:55:46 +0000 (12:55 -0700)]
Some code clean-up.
Change-Id: I626c4c40c32dbf43408e0649364dfe8be2bb2321
Eino-Ville Talvala [Wed, 29 Apr 2015 18:37:00 +0000 (11:37 -0700)]
Camera2: LEGACY: Support prepare(), sort of.
It doesn't actually do any work, but pretends to.
Bug:
20537146
Change-Id: I48c08936b96ba1a0623cff19eb5c521d1dd50129
Abodunrinwa Toki [Wed, 29 Apr 2015 19:52:58 +0000 (20:52 +0100)]
Use theme attributes for FloatingToolbar colors.
Bug:
20148220
Change-Id: Idc64313040f873dadf05a8c777343c67538199a6
Svet Ganov [Wed, 29 Apr 2015 19:44:33 +0000 (19:44 +0000)]
am
56867804: Merge "Respect the record audio app op - framework" into mnc-dev
* commit '
5686780404a41901d226cc7ba506c1c0ba284713':
Respect the record audio app op - framework
Alex Klyubin [Wed, 29 Apr 2015 01:58:47 +0000 (18:58 -0700)]
Add KeyPermanentlyInvalidatedException.
This enables users of AndroidKeyStore crypto to differentiate between
the key being unusable until the user is authenticated
(UserNotAuthenticatedException) and the key being permanently unusable
(KeyPermanentlyInvalidatedException). The latter is the case when the
secure lock screen has been disabled or reset, and, for keys that
require user authentication for every use, when a new fingerprint is
enrolled or all fingerprints are unenrolled.
NOTE: The KeyPermanentlyInvalidatedException subsumes/replaces the
NewFingerprintEnrolledException which has thus been removed. There
is no way to find out whether a key was permenently invalidated
specifically because a new fingerprint was added.
Bug:
20642549
Bug:
20526234
Change-Id: I0206cd99eef5c605c9c4d6afc5eea02eb3b1fe6b
Dianne Hackborn [Mon, 27 Apr 2015 16:47:32 +0000 (09:47 -0700)]
Implement user-settable power save whitelist.
The whitelist is now maintained by DeviceIdleController,
which is moving out into its own independent system service.
Network stats now queries it for the whitelist, instead of
collecting that itself.
Also did a few improvements in alarm manager -- made the
code for moving alarms out of the pending list more robust,
and fixed the debug output to always print the contents of
the pending list even if we aren't in a pending state. (That
would have helped me identify the problem much earlier.)
Change-Id: I0f7119d4c553c3af4d77b2f71246fa6e2c13c561
Svet Ganov [Wed, 29 Apr 2015 19:34:05 +0000 (19:34 +0000)]
Merge "Respect the record audio app op - framework" into mnc-dev