OSDN Git Service
Chris Craik [Thu, 30 Apr 2015 16:25:39 +0000 (16:25 +0000)]
am
ed375f26: Merge "Fix rendernode flag logging" into mnc-dev
* commit '
ed375f269bab6fb9f0dc224defae8099b2b1a7f7':
Fix rendernode flag logging
Alex Klyubin [Thu, 30 Apr 2015 16:25:33 +0000 (16:25 +0000)]
am
403ac2d6: Merge "AndroidKeyStore keys should not be handled by Bouncy Castle." into mnc-dev
* commit '
403ac2d64f7ad53ecf9ccd713951cf151ea2f2bc':
AndroidKeyStore keys should not be handled by Bouncy Castle.
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 16:07:36 +0000 (16:07 +0000)]
am
8310f87d: Merge "ActionBar SearchView\'s default hint shouldn\'t override SearchableInfo" into mnc-dev
* commit '
8310f87d96791e8b864df5e821fe65273c2dd874':
ActionBar SearchView's default hint shouldn't override SearchableInfo
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:58:27 +0000 (15:58 +0000)]
am
8f72b403: Merge "Zen: New event condition data model." into mnc-dev
* commit '
8f72b4037022c4f860caafa296e2ac309bde177f':
Zen: New event condition data model.
Ronghua Wu [Thu, 30 Apr 2015 15:58:22 +0000 (15:58 +0000)]
am
1b12db9e: Merge "media: set codec exception reason." into mnc-dev
* commit '
1b12db9e6225171da87ed9586daeabf76b53c05a':
media: set codec exception reason.
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:33:04 +0000 (12:33 +0000)]
am
5793f22e: Merge "Use theme attributes for FloatingToolbar colors." into mnc-dev
* commit '
5793f22e68f74522dfe5780b96b22d18617467be':
Use theme attributes for FloatingToolbar colors.
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:35:58 +0000 (11:35 +0000)]
am
144b0bb6: Merge "Fix incorrect javadoc for Uri.getQueryParameter." into mnc-dev
* commit '
144b0bb6053010f0e0da65cee89401b87633bbff':
Fix incorrect javadoc for Uri.getQueryParameter.
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:59:18 +0000 (09:59 +0000)]
am
780a9b9e: Merge "Fix potential NPE on devices without DPMS" into mnc-dev
* commit '
780a9b9e12228402144f5c88917875c9da226cbf':
Fix potential NPE on devices without DPMS
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
Benjamin Franz [Thu, 30 Apr 2015 09:40:39 +0000 (09:40 +0000)]
am
dc4ad271: Merge "Add package name extra to PackageInstaller callback" into mnc-dev
* commit '
dc4ad271f931eca48ab8ef22ef76db740d179d99':
Add package name extra to PackageInstaller callback
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:13:18 +0000 (07:13 +0000)]
am
05a419ae: Merge "Temp workaround to track max beacons." into mnc-dev
* commit '
05a419aed54da30999a3831d8da6e2e72f85bd40':
Temp workaround to track max beacons.
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:18:27 +0000 (05:18 +0000)]
am
7230bdf2: Merge "Add missing error codes from keymaster_defs.h." into mnc-dev
* commit '
7230bdf23bf905a60ac2c209f04fcf83264fec56':
Add missing error codes from keymaster_defs.h.
Jeff Sharkey [Thu, 30 Apr 2015 05:18:23 +0000 (05:18 +0000)]
am
21df222f: Merge "New "frozen" state during app move/upgrade." into mnc-dev
* commit '
21df222fa8f3fdeb38dc7d59b6bcba15971d340b':
New "frozen" state during app move/upgrade.
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:53:19 +0000 (03:53 +0000)]
am
c3563bf7: am
6891f035: am
572ecb6e: am
999b08b7: Merge "docs: studio 1.2 downloads" into lmp-docs
* commit '
c3563bf7e07ba7f307d681aefacf2850f9e6d557':
docs: studio 1.2 downloads
Rich Slogar [Thu, 30 Apr 2015 03:53:15 +0000 (03:53 +0000)]
am
88410eeb: am
cd63231f: am
47bd51e6: am
07aca646: Merge "docs: plugin 1.2.0 revision updates" into lmp-docs
* commit '
88410eeb68fd280197fbef18fe31419a4848b9dd':
docs: plugin 1.2.0 revision updates
Rich Slogar [Thu, 30 Apr 2015 03:53:10 +0000 (03:53 +0000)]
am
2894c5d4: am
58b0fc56: am
d8293d83: am
5b7546a6: Merge "docs: studio 1.2 revision updates" into lmp-docs
* commit '
2894c5d4de3886a48ff87c799148e72f287639e9':
docs: studio 1.2 revision updates
Alex Klyubin [Thu, 30 Apr 2015 03:53:06 +0000 (03:53 +0000)]
am
459ef1e7: Surface KeyPermanentlyInvalidatedException for per-op auth keys.
* commit '
459ef1e7ce2a128f194087f9689df830b7870884':
Surface KeyPermanentlyInvalidatedException for per-op auth keys.
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
Andrew Solovay [Thu, 30 Apr 2015 03:30:51 +0000 (03:30 +0000)]
am
4fbdbbe8: am
c15736b9: am
c2e2c7d5: Merge "docs: Minor formatting cleanup." into lmp-mr1-ub-docs
* commit '
4fbdbbe8f1bbf743ea730774173667835749787e':
docs: Minor formatting cleanup.
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:57:00 +0000 (02:57 +0000)]
am
f0abe000: Merge "Enable per-use user authenticated keys to be used." into mnc-dev
* commit '
f0abe000eb491f8b990d99d3159dc949f3c8e0e3':
Enable per-use user authenticated keys to be used.
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
Miao Wang [Thu, 30 Apr 2015 02:35:47 +0000 (02:35 +0000)]
am
9e4dbf05: Merge changes I99f9f9ff,I559b5c56 into mnc-dev
* commit '
9e4dbf05573dc81b3138ac455cfdfa07f63a9d08':
[RenderScript] L2 BLAS, fix element type in ZHER
[RenderScript] fixes for L3 BLAS APIs
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
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
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
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