drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
190,131 Commits 1 Branch 0 Tags
Commit Graph

190131 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robin Lee
ef25597acf SystemUI strings: prospective VPN strings for apps 
Bug: 20516964
Change-Id: Ifaeb388896145fd71ff9aa9fab6e2b04af807631
(cherry picked from commit 63539bd5fac53d90adff35df340562a1926d610e)
 2015-04-30 17:38:29 +00:00
Jean-Michel Trivi
f764d219f0 Merge "AudioService receives callback for dynamic policy mix state changes" into mnc-dev 2015-04-30 16:43:19 +00:00
Chris Craik
ed375f269b Merge "Fix rendernode flag logging" into mnc-dev 2015-04-30 16:19:33 +00:00
Chris Craik
031e69ff81 Fix rendernode flag logging 
Change-Id: I978c54ab26ef6dc3f6caef8604ac77a883b8e913
 2015-04-30 09:12:44 -07:00
Alex Klyubin
403ac2d64f Merge "AndroidKeyStore keys should not be handled by Bouncy Castle." into mnc-dev 2015-04-30 16:12:33 +00:00
Alan Viverette
8310f87d96 Merge "ActionBar SearchView's default hint shouldn't override SearchableInfo" into mnc-dev 2015-04-30 15:59:21 +00:00
John Spurlock
8f72b40370 Merge "Zen: New event condition data model." into mnc-dev 2015-04-30 15:45:55 +00:00
John Spurlock
d60258f2d3 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
 2015-04-30 11:42:11 -04:00
Ronghua Wu
1b12db9e62 Merge "media: set codec exception reason." into mnc-dev 2015-04-30 15:40:36 +00:00
Abodunrinwa Toki
5793f22e68 Merge "Use theme attributes for FloatingToolbar colors." into mnc-dev 2015-04-30 12:18:51 +00:00
Narayan Kamath
144b0bb605 Merge "Fix incorrect javadoc for Uri.getQueryParameter." into mnc-dev 2015-04-30 11:25:37 +00:00
Narayan Kamath
b0f3d9ea6e 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
 2015-04-30 12:23:19 +01:00
Zoltan Szatmary-Ban
780a9b9e12 Merge "Fix potential NPE on devices without DPMS" into mnc-dev 2015-04-30 09:48:36 +00:00
Zoltan Szatmary-Ban
cccbe885b9 Fix potential NPE on devices without DPMS 
Bug: 20563108
Change-Id: Ie2bda65c834ddad9db8753f7616c2754072551cd
 2015-04-30 10:38:24 +01:00
Benjamin Franz
dc4ad271f9 Merge "Add package name extra to PackageInstaller callback" into mnc-dev 2015-04-30 08:33:47 +00:00
Wei Wang
05a419aed5 Merge "Temp workaround to track max beacons." into mnc-dev 2015-04-30 07:08:43 +00:00
Wei Wang
fc9f2d71a6 Temp workaround to track max beacons. 
Change-Id: Ia65a7a0ec98d0181cf62db343e00c4a0b01c32d8
 2015-04-30 00:07:53 -07:00
Shawn Willden
7230bdf23b Merge "Add missing error codes from keymaster_defs.h." into mnc-dev 2015-04-30 05:14:51 +00:00
Shawn Willden
dbc00eb0aa Add missing error codes from keymaster_defs.h. 
Bug: 20127433
Change-Id: I32eab62459003c526d3cf9ef108be7b2fd709960
 2015-04-29 23:13:20 -06:00
Jeff Sharkey
21df222fa8 Merge "New "frozen" state during app move/upgrade." into mnc-dev 2015-04-30 05:09:02 +00:00
Jeff Sharkey
e31b820dad 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
 2015-04-29 22:03:37 -07:00
Rich Slogar
c3563bf7e0 am 6891f035: am 572ecb6e: am 999b08b7: Merge "docs: studio 1.2 downloads" into lmp-docs 
* commit '6891f0359ba56c8132bb0b69595e40d7eab46a14':
  docs: studio 1.2 downloads
 2015-04-30 03:48:38 +00:00
Rich Slogar
88410eeb68 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
 2015-04-30 03:48:31 +00:00
Rich Slogar
2894c5d4de am 58b0fc56: am d8293d83: am 5b7546a6: Merge "docs: studio 1.2 revision updates" into lmp-docs 
* commit '58b0fc56ef447cb78665e9324245a0af08977b14':
  docs: studio 1.2 revision updates
 2015-04-30 03:48:26 +00:00
Alex Klyubin
459ef1e7ce Surface KeyPermanentlyInvalidatedException for per-op auth keys. 
Bug: 20642549
Change-Id: Ibda270921f13a1fd695264583b0e4bd255f63aed
 2015-04-29 20:28:41 -07:00
Rich Slogar
6891f0359b am 572ecb6e: am 999b08b7: Merge "docs: studio 1.2 downloads" into lmp-docs 
* commit '572ecb6e5e5a5ffbf2e10ef4702e9d75f097c5fe':
  docs: studio 1.2 downloads
 2015-04-30 03:28:39 +00:00
Rich Slogar
cd63231f90 am 47bd51e6: am 07aca646: Merge "docs: plugin 1.2.0 revision updates" into lmp-docs 
* commit '47bd51e63c3b3c59c354af86f400fd00a4afecae':
  docs: plugin 1.2.0 revision updates
 2015-04-30 03:28:30 +00:00
Rich Slogar
58b0fc56ef am d8293d83: am 5b7546a6: Merge "docs: studio 1.2 revision updates" into lmp-docs 
* commit 'd8293d837e50a8aaf8b365ee08f96e9d5ce26625':
  docs: studio 1.2 revision updates
 2015-04-30 03:28:26 +00:00
Andrew Solovay
4fbdbbe8f1 am c15736b9: am c2e2c7d5: Merge "docs: Minor formatting cleanup." into lmp-mr1-ub-docs 
* commit 'c15736b95d61033f03b1446371315bfa46252aaf':
  docs: Minor formatting cleanup.
 2015-04-30 03:14:13 +00:00
Andrew Solovay
c15736b95d am c2e2c7d5: Merge "docs: Minor formatting cleanup." into lmp-mr1-ub-docs 
* commit 'c2e2c7d5f5b8bf699d7177a4dc7694719323fd87':
  docs: Minor formatting cleanup.
 2015-04-30 02:58:08 +00:00
Rich Slogar
572ecb6e5e am 999b08b7: Merge "docs: studio 1.2 downloads" into lmp-docs 
* commit '999b08b74c29937b49c4106a784117eed6168045':
  docs: studio 1.2 downloads
 2015-04-30 02:57:52 +00:00
Rich Slogar
47bd51e63c am 07aca646: Merge "docs: plugin 1.2.0 revision updates" into lmp-docs 
* commit '07aca646e43ea27329c079d8ff6549127e4fcc25':
  docs: plugin 1.2.0 revision updates
 2015-04-30 02:57:45 +00:00
Rich Slogar
d8293d837e am 5b7546a6: Merge "docs: studio 1.2 revision updates" into lmp-docs 
* commit '5b7546a67b5fef2adab70d95da4879381b9b0e92':
  docs: studio 1.2 revision updates
 2015-04-30 02:57:38 +00:00
Alex Klyubin
f0abe000eb Merge "Enable per-use user authenticated keys to be used." into mnc-dev 2015-04-30 02:46:31 +00:00
Rich Slogar
999b08b74c Merge "docs: studio 1.2 downloads" into lmp-docs 2015-04-30 02:40:26 +00:00
Rich Slogar
07aca646e4 Merge "docs: plugin 1.2.0 revision updates" into lmp-docs 2015-04-30 02:39:58 +00:00
Rich Slogar
5b7546a67b Merge "docs: studio 1.2 revision updates" into lmp-docs 2015-04-30 02:39:27 +00:00
Andrew Solovay
c2e2c7d5f5 Merge "docs: Minor formatting cleanup." into lmp-mr1-ub-docs 2015-04-30 02:27:01 +00:00
Alex Klyubin
058de02073 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
 2015-04-29 19:23:46 -07:00
Miao Wang
9e4dbf0557 Merge changes I99f9f9ff,I559b5c56 into mnc-dev 
* changes:
  [RenderScript] L2 BLAS, fix element type in ZHER
  [RenderScript] fixes for L3 BLAS APIs
 2015-04-30 02:20:44 +00:00
Rich Slogar
6170c00f05 docs: studio 1.2 revision updates 
Change-Id: I3bf392596d418b3bba63bbcc09663f2d3f4d6e2a
 2015-04-29 19:03:59 -07:00
Jim Miller
b62dc82b0c Add javax.crypto.Mac as a supported CryptoObject to Fingerprint 
Fixes bug 20660180

Change-Id: I421c246ef776847835ede4be1d72721c35cf951c
(cherry picked from commit 0ecd5c20d93c24251975f3ff7cb0494039e5ea20)
 2015-04-30 01:53:11 +00:00
Miao Wang
cecc00aba1 [RenderScript] L2 BLAS, fix element type in ZHER 
Change-Id: I99f9f9ff8942522d6581ff60b9a2d75e33e66ff6
 2015-04-29 18:15:36 -07:00
Rich Slogar
e4dc509393 docs: studio 1.2 downloads 
Change-Id: I43c1d1bad9c110e0e87383ce6ff95ee5706e777e
 2015-04-29 18:12:49 -07:00
Jean-Michel Trivi
5a56109d1f 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
 2015-04-29 17:56:19 -07:00
Svet Ganov
82863f137e Merge "Add permission to ap op mappings for all runtime permissions." into mnc-dev 2015-04-30 00:41:40 +00:00
Jeff Sharkey
9e98dce6ad Merge "Returning to wizard, split move events." into mnc-dev 2015-04-30 00:38:32 +00:00
Andy Hung
f3d3856f3e Merge "Check for null codec from AMediaCodec_createDecoderByType" into mnc-dev 2015-04-30 00:37:58 +00:00
Svet Ganov
6e8f67c444 Add permission to ap op mappings for all runtime permissions. 
Change-Id: I1b41fac9405352f135b3d0137cc924ce51388e1e
 2015-04-29 17:35:19 -07:00
Jeff Sharkey
50a0545479 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
 2015-04-29 17:24:12 -07:00