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

190197 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
a1c7176bdc am a03e2658: am 7c267f66: am f4b1df34: am 2a3aa2d3: docs: studio 1.2 updates 
* commit 'a03e2658af7a3d223655e77725e2be6d0863455b':
 2015-04-30 03:55:54 +00:00
Rich Slogar
7fbde8f508 am 408aeb05: am b6ad1ce8: am 541dda1c: am 999b08b7: Merge "docs: studio 1.2 downloads" into lmp-docs 
* commit '408aeb05e4edb75801f63d22771d6726a4d46ed4':
 2015-04-30 03:55:50 +00:00
Rich Slogar
ac9c751d74 am 62cfe97d: am 2653774a: am b874dc04: am 07aca646: Merge "docs: plugin 1.2.0 revision updates" into lmp-docs 
* commit '62cfe97d38a94bc32af9773c7f880723a7bf2f08':
 2015-04-30 03:55:43 +00:00
Rich Slogar
994d6ffec7 am 7a258afa: am af73c6e7: am ff24e8e1: am 5b7546a6: Merge "docs: studio 1.2 revision updates" into lmp-docs 
* commit '7a258afa65a8b9174b9080dc931add9a27c62256':
 2015-04-30 03:55:38 +00: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
Rich Slogar
a03e2658af am 7c267f66: am f4b1df34: am 2a3aa2d3: docs: studio 1.2 updates 
* commit '7c267f663a39c314bd4ca5d831cc5cbac0d37260':
  docs: studio 1.2 updates
 2015-04-30 03:32:18 +00:00
Rich Slogar
408aeb05e4 am b6ad1ce8: am 541dda1c: am 999b08b7: Merge "docs: studio 1.2 downloads" into lmp-docs 
* commit 'b6ad1ce8cb434d01e564b217c7de89fd2192c43f':
  docs: studio 1.2 downloads
 2015-04-30 03:31:59 +00:00
Rich Slogar
62cfe97d38 am 2653774a: am b874dc04: am 07aca646: Merge "docs: plugin 1.2.0 revision updates" into lmp-docs 
* commit '2653774af297de133669136976418729a9f71aca':
  docs: plugin 1.2.0 revision updates
 2015-04-30 03:31:51 +00:00
Rich Slogar
7a258afa65 am af73c6e7: am ff24e8e1: am 5b7546a6: Merge "docs: studio 1.2 revision updates" into lmp-docs 
* commit 'af73c6e70c24f6786997d9fdb90d6a51a2a83883':
  docs: studio 1.2 revision updates
 2015-04-30 03:31:09 +00:00
Rich Slogar
edf44562b5 am b4430aa3: am 2a3aa2d3: docs: studio 1.2 updates 
* commit 'b4430aa33fa0a0a7631850d2da7112319a9ca4c7':
  docs: studio 1.2 updates
 2015-04-30 03:28:43 +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
Rich Slogar
7c267f663a am f4b1df34: am 2a3aa2d3: docs: studio 1.2 updates 
* commit 'f4b1df340379b08d6b12d0c6247e13c54de319ef':
  docs: studio 1.2 updates
 2015-04-30 03:13:47 +00:00
Rich Slogar
b6ad1ce8cb am 541dda1c: am 999b08b7: Merge "docs: studio 1.2 downloads" into lmp-docs 
* commit '541dda1cd652e733feb5acd6acd5752aa7f8b190':
  docs: studio 1.2 downloads
 2015-04-30 03:13:43 +00:00
Rich Slogar
2653774af2 am b874dc04: am 07aca646: Merge "docs: plugin 1.2.0 revision updates" into lmp-docs 
* commit 'b874dc04db075be7acab02fb067ec2c191a3a569':
  docs: plugin 1.2.0 revision updates
 2015-04-30 03:13:38 +00:00
Rich Slogar
af73c6e70c am ff24e8e1: am 5b7546a6: Merge "docs: studio 1.2 revision updates" into lmp-docs 
* commit 'ff24e8e165f128335b77b316d878a0c6579d2061':
  docs: studio 1.2 revision updates
 2015-04-30 03:13:34 +00:00
Rich Slogar
b4430aa33f am 2a3aa2d3: docs: studio 1.2 updates 
* commit '2a3aa2d343820be9e05101a25b955d525e9bfa54':
  docs: studio 1.2 updates
 2015-04-30 03:03:15 +00:00
Rich Slogar
f4b1df3403 am 2a3aa2d3: docs: studio 1.2 updates 
* commit '2a3aa2d343820be9e05101a25b955d525e9bfa54':
  docs: studio 1.2 updates
 2015-04-30 03:01:14 +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
Rich Slogar
541dda1cd6 am 999b08b7: Merge "docs: studio 1.2 downloads" into lmp-docs 
* commit '999b08b74c29937b49c4106a784117eed6168045':
  docs: studio 1.2 downloads
 2015-04-30 02:53:22 +00:00
Rich Slogar
b874dc04db 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:53:17 +00:00
Rich Slogar
ff24e8e165 am 5b7546a6: Merge "docs: studio 1.2 revision updates" into lmp-docs 
* commit '5b7546a67b5fef2adab70d95da4879381b9b0e92':
  docs: studio 1.2 revision updates
 2015-04-30 02:53:13 +00:00
Rich Slogar
2a3aa2d343 docs: studio 1.2 updates 
Change-Id: I893af7af0f686d0eeab11f881256c0cf26eb4605
 2015-04-29 19:47:25 -07: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