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

186998 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Craik
ec3c97d27f Merge "Add compat path for restore underflow" 2015-04-02 22:38:49 +00:00
Chris Craik
3891f3ad59 Add compat path for restore underflow 
bug:19829784

Change-Id: Ia761664208ab80c055ca11174db3ddc74457b92b
 2015-04-02 15:30:32 -07:00
Alex Klyubin
36662ba6ae Add fingerprint-specific API to KeyPairGeneratorSpec. 
This is identical to the existing API in KeyStoreParameter and
KeyGeneratorSpec.

Bug: 18088752
Change-Id: I8aad4fdeb858cc9586f46d5a81561505914ac334
 2015-04-02 15:15:27 -07:00
Alex Klyubin
f4c301bdf5 am 58031d5e: am 378df98e: am 3cc9e5d6: Merge "Improve the AndroidKeyStore-backed HMAC state machine." 
* commit '58031d5eb5531f8bc45ac1789ea1cc9134591358':
  Improve the AndroidKeyStore-backed HMAC state machine.
 2015-04-02 22:02:45 +00:00
Alex Klyubin
7f5b87692b resolved conflicts for merge of e7e705d4 to master 
Change-Id: If3e8c985f4f122f9fb36aab206787aac1407a74e
 2015-04-02 14:58:27 -07:00
Tor Norbye
c91531a863 Fix resource type annotations for obtainStyledAttributes 
Change-Id: I7681249ff46d687675d0dcd7d4f077646efba687
 2015-04-02 14:51:16 -07:00
Chad Brubaker
ce7ad24b63 Mark all test keys as no auth required 
Now that auth token checks are in keystore keys without any auth tags
are invalid.

Also adds a test to check that a key with auth required fails when none
is present.

Change-Id: I0d5d44d70a849978e9b2e809675b8343c6650ff2
 2015-04-02 14:41:37 -07:00
Alex Klyubin
58031d5eb5 am 378df98e: am 3cc9e5d6: Merge "Improve the AndroidKeyStore-backed HMAC state machine." 
* commit '378df98eab65547f62cb900e9dca0b7419095755':
  Improve the AndroidKeyStore-backed HMAC state machine.
 2015-04-02 21:34:52 +00:00
Alex Klyubin
e7e705d494 am acee5b2b: am 9635a56a: Merge "Expose new key use constraints in KeyPairGeneratorSpec." 
* commit 'acee5b2b4902479fabfb557aba745d352d49ce1a':
  Expose new key use constraints in KeyPairGeneratorSpec.
 2015-04-02 21:34:48 +00:00
Alex Klyubin
378df98eab am 3cc9e5d6: Merge "Improve the AndroidKeyStore-backed HMAC state machine." 
* commit '3cc9e5d68d89ea1ffa79ad6981585bc46362c4a7':
  Improve the AndroidKeyStore-backed HMAC state machine.
 2015-04-02 21:25:56 +00:00
Nancy Chen
096413da72 Include the source package in the voicemail URI. 
This means that the source package can be determined without having to
query the database, thus making it easier to short circuit code on
voicemails that do not belong to a package.

Bug: 19236241
Change-Id: If9c3924a5365d5c3e87bff68609b5e7aee8eb218
 2015-04-02 14:25:50 -07:00
Alex Klyubin
acee5b2b49 am 9635a56a: Merge "Expose new key use constraints in KeyPairGeneratorSpec." 
* commit '9635a56acfe3318d9ae5020727090a2dc8c118d0':
  Expose new key use constraints in KeyPairGeneratorSpec.
 2015-04-02 21:25:50 +00:00
Alex Klyubin
3cc9e5d68d Merge "Improve the AndroidKeyStore-backed HMAC state machine." 2015-04-02 21:06:28 +00:00
Alex Klyubin
f4f0671618 am a44e7fd6: am 957e982c: am d2eec1a7: Merge "Add exception types for AndroidKeyStore key validity issues." 
* commit 'a44e7fd6228638f25472e331241a5d1f5cfaacbf':
  Add exception types for AndroidKeyStore key validity issues.
 2015-04-02 21:04:08 +00:00
Alex Klyubin
9635a56acf Merge "Expose new key use constraints in KeyPairGeneratorSpec." 2015-04-02 21:03:11 +00:00
Simon Wilson
fb397cf827 Merge "Frameworks/base: Support dex2oat threads system property" into lmp-mr1-modular-dev 2015-04-02 20:57:53 +00:00
Alex Klyubin
a44e7fd622 am 957e982c: am d2eec1a7: Merge "Add exception types for AndroidKeyStore key validity issues." 
* commit '957e982cd5fdbf45817500abf68fe8a0689adc34':
  Add exception types for AndroidKeyStore key validity issues.
 2015-04-02 20:53:05 +00:00
Alex Klyubin
957e982cd5 am d2eec1a7: Merge "Add exception types for AndroidKeyStore key validity issues." 
* commit 'd2eec1a7865dd552114b330fce1a1472a9e08806':
  Add exception types for AndroidKeyStore key validity issues.
 2015-04-02 20:42:59 +00:00
Andrew Solovay
2cc841af91 am 93b3d665: am 7818f205: am f99a16c9: am 589a272e: am f2ff12ba: Merge "docs: Fixed formatting in android:documentLaunchMode syntax section" into lmp-docs 
* commit '93b3d6658762a84b23cd3421d0f41e4d82693cc3':
  docs: Fixed formatting in android:documentLaunchMode syntax section
 2015-04-02 20:38:20 +00:00
Yuichi Araki
a4dc29a721 am 428c2fa0: am c3fbf13d: am e2fc3adb: am 61ce6c9b: am 776cf41d: Fix a broken link in javadoc 
* commit '428c2fa0f8b3c49e8bd48458c15363fcd98e8944':
  Fix a broken link in javadoc
 2015-04-02 20:38:08 +00:00
Andrew Solovay
93b3d66587 am 7818f205: am f99a16c9: am 589a272e: am f2ff12ba: Merge "docs: Fixed formatting in android:documentLaunchMode syntax section" into lmp-docs 
* commit '7818f205e5b18d8d7fddcf01736d546cb08bfd62':
  docs: Fixed formatting in android:documentLaunchMode syntax section
 2015-04-02 20:29:28 +00:00
Yuichi Araki
428c2fa0f8 am c3fbf13d: am e2fc3adb: am 61ce6c9b: am 776cf41d: Fix a broken link in javadoc 
* commit 'c3fbf13d525a0bcf1202618b197f4160750b54f1':
  Fix a broken link in javadoc
 2015-04-02 20:29:24 +00:00
Alex Klyubin
d2eec1a786 Merge "Add exception types for AndroidKeyStore key validity issues." 2015-04-02 20:24:48 +00:00
Andrew Solovay
7818f205e5 am f99a16c9: am 589a272e: am f2ff12ba: Merge "docs: Fixed formatting in android:documentLaunchMode syntax section" into lmp-docs 
* commit 'f99a16c943a4366bdfdba19534457f9e45538f7d':
  docs: Fixed formatting in android:documentLaunchMode syntax section
 2015-04-02 20:19:15 +00:00
Yuichi Araki
c3fbf13d52 am e2fc3adb: am 61ce6c9b: am 776cf41d: Fix a broken link in javadoc 
* commit 'e2fc3adbb4040400496aebdab80c4cac1083da27':
  Fix a broken link in javadoc
 2015-04-02 20:19:09 +00:00
Andrew Solovay
f99a16c943 am 589a272e: am f2ff12ba: Merge "docs: Fixed formatting in android:documentLaunchMode syntax section" into lmp-docs 
* commit '589a272e97d1f24abee1bdfce18ab88cbd5f12a9':
  docs: Fixed formatting in android:documentLaunchMode syntax section
 2015-04-02 20:10:55 +00:00
Yuichi Araki
e2fc3adbb4 am 61ce6c9b: am 776cf41d: Fix a broken link in javadoc 
* commit '61ce6c9b705e41800662b33601c01a4848c174d3':
  Fix a broken link in javadoc
 2015-04-02 20:10:48 +00:00
Andrew Solovay
589a272e97 am f2ff12ba: Merge "docs: Fixed formatting in android:documentLaunchMode syntax section" into lmp-docs 
* commit 'f2ff12ba00ba7c290bc15ea28fdcf3c6d6d1029a':
  docs: Fixed formatting in android:documentLaunchMode syntax section
 2015-04-02 19:56:41 +00:00
Yuichi Araki
61ce6c9b70 am 776cf41d: Fix a broken link in javadoc 
* commit '776cf41d7c8f239d20397886f2120407396cfc87':
  Fix a broken link in javadoc
 2015-04-02 19:56:35 +00:00
Andrew Solovay
f2ff12ba00 Merge "docs: Fixed formatting in android:documentLaunchMode syntax section" into lmp-docs 2015-04-02 19:25:25 +00:00
Dongwon Kang
6f0240cf63 TIF: Add time shift APIs. 
Change-Id: I4faecd99d9e565c7228fc4b9da99e2adf1e67f19
 2015-04-02 12:11:25 -07:00
Jeff Davidson
845e196cb3 Merge "Actually allow all valid characters in a Wi-Fi SSID." 2015-04-02 18:55:15 +00:00
Jorim Jaggi
84bf582208 Merge "Change light status bar tint color to spec" 2015-04-02 18:44:36 +00:00
Jorim Jaggi
5443cc563c Change light status bar tint color to spec 
Bug: 19233606
Change-Id: I0586e006b6783d3af23defb67da666477484c1ee
 2015-04-02 11:44:16 -07:00
Dianne Hackborn
9e57a25495 Merge "Rework assist to walk down the view hierarchy." 2015-04-02 18:18:42 +00:00
John Spurlock
24d3dad8dd Add new notification category for reminders. 
Bug: 20045407
Change-Id: I5c449551fb7ec5a3e2c350f443e1a18b84b4d03f
 2015-04-02 14:14:27 -04:00
John Spurlock
4a51c4c42c Merge "Introduce new volume dialog." 2015-04-02 18:10:50 +00:00
John Spurlock
f88d8082a8 Introduce new volume dialog. 
- New VolumeDialog (presentation) + VolumeDialogController (state)
   to implement a volume dialog that keeps track of multiple audio
   streams, including all remote streams.
 - The dialog starts out with a single stream, with more detail available
   behind an expand chevron.
 - Existing zen options reorganized under a master switch bar
   named "Block interruptions", with "None" renamed to "No interruptions"
   and "Priority" renamed to "Priority only".
 - Combined "Block interruptions" icon replaces the now-obsolete star/no-smoking
   icons in the status bar.
 - New icons for all sliders.
 - All sliders present a continuous facade, mapped to discrete integer units
   under the hood.
 - All interesting volume events and state changes piped through one central
   helper for future routing.
 - VolumePanel is obsolete, still accessible via a sysprop if needed.
   Complete removal / garbage collection deferred until all needed
   functionality is ported over.

Bug: 19260237
Change-Id: I6689de3e4d14ae666d3e8da302cc9da2d4d77b9b
 2015-04-02 14:03:57 -04:00
Alan Viverette
0daa5713ee Merge "Fix issues with theming of preloaded ColorStateLists" 2015-04-02 18:02:04 +00:00
Wale Ogunwale
bcfe87f3e0 resolved conflicts for merge of 65073b91 to master 
Change-Id: I65a9d95caa98ec33e41480546b4447ec787c6840
 2015-04-02 10:34:28 -07:00
Olawale Ogunwale
65073b910c am 9987b6e8: am e4d4e22f: Merge "[ActivityManager] Avoid improper resume top activity." 
* commit '9987b6e867d862c27cd1339d7fa8135b75d565f1':
  [ActivityManager] Avoid improper resume top activity.
 2015-04-02 17:10:51 +00:00
Alex Klyubin
855fa31eb5 Expose new key use constraints in KeyPairGeneratorSpec. 
The constraints are currently ignored.

Bug: 18088752
Change-Id: Iabd2018200afb2bf8ac1748d1def47af74bfb9d3
 2015-04-02 10:04:33 -07:00
Olawale Ogunwale
9987b6e867 am e4d4e22f: Merge "[ActivityManager] Avoid improper resume top activity." 
* commit 'e4d4e22f26bfd36a553fb24232d2fd4ddf4fc907':
  [ActivityManager] Avoid improper resume top activity.
 2015-04-02 17:00:12 +00:00
Olawale Ogunwale
e4d4e22f26 Merge "[ActivityManager] Avoid improper resume top activity." 2015-04-02 16:39:18 +00:00
Filip Gruszczynski
ad0eacb917 Merge "Provide size hint inside UNSPECIFIED measure spec." 2015-04-02 15:57:08 +00:00
Jason Monk
cdf0a97f38 Merge "Change carrier text to 'airplane mode' when on" 2015-04-02 12:58:39 +00:00
riddle_hsu
558e849a77 [ActivityManager] Avoid improper resume top activity. 
When there is a process died, only resume top if
it contains visible activity.

This can fix case 1 in
https://android-review.googlesource.com/#/c/120901/

Change-Id: I45584e76f9e863980d04bbb593d7d26a8900acd0
 2015-04-02 16:43:13 +08:00
Yuichi Araki
776cf41d7c Fix a broken link in javadoc 
Bug: 19856130

Change-Id: I0456e951f8bed36e3a62ddfd882f9c2d2bef9627
 2015-04-02 04:03:07 +00:00
Jim Miller
0feaaafd7a Merge "Prepare to make Fingerprint API public." 2015-04-02 03:09:39 +00:00
Etan Cohen
36711e0e2c Merge changes from topic 'mwd-merge-040115' 
* changes:
  Merge (manually) pag/209446: Increase allowed duration to connect to HOGP profile
  Merge commit 'd91f193' into merge2
  Merge commit '5718646' into merge2
  Merge commit '7aa0345' into merge2
 2015-04-02 03:08:02 +00:00