OSDN Git Service
Alex Klyubin [Thu, 30 Apr 2015 03:10:59 +0000 (03:10 +0000)]
am
e0c70dc4: am
f0abe000: Merge "Enable per-use user authenticated keys to be used." into mnc-dev
* commit '
e0c70dc4b39319d981745cdc6610175a361ad456':
Enable per-use user authenticated keys to be used.
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.
Miao Wang [Thu, 30 Apr 2015 02:50:48 +0000 (02:50 +0000)]
am
e8e2c9e4: am
9e4dbf05: Merge changes I99f9f9ff,I559b5c56 into mnc-dev
* commit '
e8e2c9e4be7ec8c7977efba74fed1e83f7a7e38d':
[RenderScript] L2 BLAS, fix element type in ZHER
[RenderScript] fixes for L3 BLAS APIs
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
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
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
Jim Miller [Thu, 30 Apr 2015 02:22:16 +0000 (02:22 +0000)]
am
64cd70d5: am
b62dc82b: Add javax.crypto.Mac as a supported CryptoObject to Fingerprint
* commit '
64cd70d57acd171d3c0b071c04c0c972cc4dd043':
Add javax.crypto.Mac as a supported CryptoObject to Fingerprint
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
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
Svet Ganov [Thu, 30 Apr 2015 01:01:53 +0000 (01:01 +0000)]
am
5242ef65: am
82863f13: Merge "Add permission to ap op mappings for all runtime permissions." into mnc-dev
* commit '
5242ef65bed03eaf8ef61261853f09efc8566118':
Add permission to ap op mappings for all runtime permissions.
Jeff Sharkey [Thu, 30 Apr 2015 01:01:48 +0000 (01:01 +0000)]
am
1df4dca2: am
9e98dce6: Merge "Returning to wizard, split move events." into mnc-dev
* commit '
1df4dca2982acecb526495b30a605d97786df0de':
Returning to wizard, split move events.
Andy Hung [Thu, 30 Apr 2015 01:01:41 +0000 (01:01 +0000)]
am
f388c9e6: am
f3d3856f: Merge "Check for null codec from AMediaCodec_createDecoderByType" into mnc-dev
* commit '
f388c9e654781c26debe53a0eecce5b6d9234373':
Check for null codec from AMediaCodec_createDecoderByType
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
Mike Lockwood [Thu, 30 Apr 2015 00:27:36 +0000 (00:27 +0000)]
am
c7bf0a6a: am
3f9dc836: Merge "MidiFramer: Support realtime messages contained within SysEx messages." into mnc-dev
* commit '
c7bf0a6afb8918fa6fdd469cbd6383188b1d2564':
MidiFramer: Support realtime messages contained within SysEx messages.
Dianne Hackborn [Thu, 30 Apr 2015 00:27:31 +0000 (00:27 +0000)]
am
4d146ed2: am
f7b795ca: Merge "Update use of procstate for services." into mnc-dev
* commit '
4d146ed236b700da85197242b557c052032d16da':
Update use of procstate for services.
Miao Wang [Thu, 30 Apr 2015 00:27:25 +0000 (00:27 +0000)]
am
5545d518: am
508a2870: Merge "[RenderScript] Enable L2 BLAS APIs" into mnc-dev
* commit '
5545d518534b619f7d865b93d4b2d73abcd3a4a6':
[RenderScript] Enable L2 BLAS APIs
Miao Wang [Thu, 30 Apr 2015 00:27:14 +0000 (00:27 +0000)]
am
f8e9fd2c: am
a57a8a8c: Merge "[RenderScript] improve & minor fixes of L2 BLAS validation." into mnc-dev
* commit '
f8e9fd2c8b629eeb91cb8f2986227392e621622b':
[RenderScript] improve & minor fixes of L2 BLAS validation.
Miao Wang [Thu, 30 Apr 2015 00:27:09 +0000 (00:27 +0000)]
am
e2341e2b: am
634160a0: Merge "[RenderScript] Fix HEMM and SYRK in IntrinscBLAS to correctly handle complex \'Alpha\' and \'Beta\'" into mnc-dev
* commit '
e2341e2b0532b0f50c91419432c82aefc1ef8eb4':
[RenderScript] Fix HEMM and SYRK in IntrinscBLAS to correctly handle complex 'Alpha' and 'Beta'
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'
Alan Viverette [Thu, 30 Apr 2015 00:16:27 +0000 (00:16 +0000)]
am
d232e636: am
0f1a3972: Merge "Stash modulation alpha until ColorStateList has resolved base color" into mnc-dev
* commit '
d232e636f24b8bc67dde8decd006d542bafb15f8':
Stash modulation alpha until ColorStateList has resolved base color
Vinit Deshpande [Thu, 30 Apr 2015 00:16:21 +0000 (00:16 +0000)]
am
ad8aa59f: am
8cc1d3db: Merge changes from topic \'PasspointUI\' into mnc-dev
* commit '
ad8aa59f70e2a27cf6b12a982f536d158f219ac4':
Implement 'Available via Passpoint' feature [DO NOT MERGE]
Fix settings UI for passpoint networks [DO NOT MERGE]
Andy Hung [Thu, 30 Apr 2015 00:16:16 +0000 (00:16 +0000)]
am
f17dd0b4: am
1afdbe3b: Merge "Pass PlaybackSettings as class object for AudioTrack JNI" into mnc-dev
* commit '
f17dd0b48c894fda00b1d2068ef54b05221b1d7a':
Pass PlaybackSettings as class object for AudioTrack JNI
Alex Klyubin [Thu, 30 Apr 2015 00:16:10 +0000 (00:16 +0000)]
am
789d9dc7: am
33c9dde9: Merge "Add KeyPermanentlyInvalidatedException." into mnc-dev
* commit '
789d9dc733d4a3a15e83eb2aa0e49f548fe81618':
Add KeyPermanentlyInvalidatedException.
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: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:28:16 +0000 (23:28 +0000)]
am
850c1888: am
490d23bf: Merge "[Update API]: Rename accountAuthenticated to notifyAccountAuthenticated and other changes." into mnc-dev
* commit '
850c1888f5855b340e8e26c4d7bc0580644dbcb8':
[Update API]: Rename accountAuthenticated to notifyAccountAuthenticated and other changes.
destradaa [Wed, 29 Apr 2015 23:28:10 +0000 (23:28 +0000)]
am
8fcd6951: am
db2af234: Merge "Update use of A-GPS modes in GpsLocationProvider b/
20664846" into mnc-dev
* commit '
8fcd695187c2895e2dd0a1a15994a730501d19c2':
Update use of A-GPS modes in GpsLocationProvider b/
20664846
John Spurlock [Wed, 29 Apr 2015 23:27:55 +0000 (23:27 +0000)]
am
914967ab: am
b351db72: Merge "Volume: dismiss volume UI to avoid HUNs." into mnc-dev
* commit '
914967ab0c0193eac92507e5644d27045d2b9f85':
Volume: dismiss volume UI to avoid HUNs.
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 23:09:51 +0000 (23:09 +0000)]
am
adbbb18f: am
09404dd1: Merge "Rename FONT_NOTOSANS_FULL to FONT_NOTOSANS_JP_FULL." into mnc-dev
* commit '
adbbb18fe3a851f60ebaaabeeb2ee8bd5277cf98':
Rename FONT_NOTOSANS_FULL to FONT_NOTOSANS_JP_FULL.
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.
John Spurlock [Wed, 29 Apr 2015 22:57:17 +0000 (22:57 +0000)]
Merge "Volume: dismiss volume UI to avoid HUNs." into mnc-dev
Amith Yamasani [Wed, 29 Apr 2015 22:52:08 +0000 (22:52 +0000)]
am
3184b286: am
fa4eda44: Merge "Remove network access for idle apps" into mnc-dev
* commit '
3184b28648a782a3a037de90bc76f64839b91560':
Remove network access for idle apps
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
Chris Craik [Wed, 29 Apr 2015 22:40:33 +0000 (22:40 +0000)]
am
775e94cb: am
e74ff81e: Merge "Remove concept of layer alpha override" into mnc-dev
* commit '
775e94cbf1536ec18449ae85b3c174633e8b1d31':
Remove concept of layer alpha override
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
Ben Kwa [Wed, 29 Apr 2015 22:40:29 +0000 (22:40 +0000)]
am
ac151b1e: am
94d07cb7: Merge "Properly unparcel the PFDs passed to android.content.ContentProviderProxy.openFile." into mnc-dev
* commit '
ac151b1e9945599982c6cf871fd82817db7297fb':
Properly unparcel the PFDs passed to android.content.ContentProviderProxy.openFile.
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.
Adrian Roos [Wed, 29 Apr 2015 22:22:17 +0000 (22:22 +0000)]
am
b00540dc: am
e632dc35: Merge "Clarify javadoc of isKeyguardSecure and isDeviceSecure" into mnc-dev
* commit '
b00540dc5c2d475fd6a6833f1a805cb0a683e264':
Clarify javadoc of isKeyguardSecure and isDeviceSecure
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
Alan Viverette [Wed, 29 Apr 2015 21:39:55 +0000 (21:39 +0000)]
am
46d8644e: am
edcaf7c9: Merge "Don\'t propagate level or RTL in LayerDrawable.setDrawable()" into mnc-dev
* commit '
46d8644e42f79b70fd6efdeb1f93935f7d21fe93':
Don't propagate level or RTL in LayerDrawable.setDrawable()
Wale Ogunwale [Wed, 29 Apr 2015 21:39:41 +0000 (21:39 +0000)]
am
1ee30f6a: am
00758a3b: Merge "Some code clean-up." into mnc-dev
* commit '
1ee30f6a7f61c0f4ae79f9f7f6e829c96f91870f':
Some code clean-up.
Svet Ganov [Wed, 29 Apr 2015 21:39:35 +0000 (21:39 +0000)]
am
104a23c5: am
e3538083: Merge "Add API to get app op for a permission" into mnc-dev
* commit '
104a23c544f2841a752bf0c004483ead5edd34ff':
Add API to get app op for a permission
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
Mike Lockwood [Wed, 29 Apr 2015 21:15:25 +0000 (21:15 +0000)]
am
bcec6a49: am
e1d00395: Merge "MidiDeviceInfo: Add version string property" into mnc-dev
* commit '
bcec6a4980366f10182c8dc09ec1eff6f78d7043':
MidiDeviceInfo: Add version string property
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
Dianne Hackborn [Wed, 29 Apr 2015 20:51:04 +0000 (20:51 +0000)]
am
599a4e0e: am
9ac2718e: Merge "Implement user-settable power save whitelist." into mnc-dev
* commit '
599a4e0ea864769e6cd1d04bd766c472b16be4c7':
Implement user-settable power save whitelist.
Mike Lockwood [Wed, 29 Apr 2015 20:50:58 +0000 (20:50 +0000)]
am
973a70d7: am
f105f61d: Merge "UsbDevice: Add support for retrieving version string for a USB device" into mnc-dev
* commit '
973a70d7c9dd2cda38500880bbc3873f238f1fe3':
UsbDevice: Add support for retrieving version string for a USB device
Junda Liu [Wed, 29 Apr 2015 20:50:53 +0000 (20:50 +0000)]
am
df3a6f3e: am
bd0ffb8e: Merge "Moving all Telephony overlays to CarrierConfigManager." into mnc-dev
* commit '
df3a6f3e8d416956763ddaa74f65104d28dcbdfb':
Moving all Telephony overlays to CarrierConfigManager.
Mike Lockwood [Wed, 29 Apr 2015 20:50:34 +0000 (20:50 +0000)]
Merge "MidiDeviceInfo: Add version string property" into mnc-dev