Justin Koh
d378ad74c6
Add global key configuration file
...
Add global key configuration file. A global key is one that is handled by
PhoneWindowManager before dispatching and sent to a given component via
broadcast instead of going to the foreground app.
Bug: 8510681
Change-Id: Ic6a8e559680d005613ed22874b27eb78bbfc4499
2013-04-02 18:09:27 -07:00
Jim Miller
e884f6b850
am dbd9c337: Merge "Change time format for default clock in keyguard" into jb-mr2-dev
...
* commit 'dbd9c337eddadccc04d4b4311261710ee38c23da':
Change time format for default clock in keyguard
2013-04-02 17:29:14 -07:00
Jim Miller
dbd9c337ed
Merge "Change time format for default clock in keyguard" into jb-mr2-dev
2013-04-03 00:24:52 +00:00
kmccormick
5da7840887
am 75022d1d: am 7cf6aaf9: am 70e99bfe: am b50f2406: am 050f6611: am 78e5d183: Merge "Doc update: Misc doc bugs" into jb-mr1.1-docs
...
* commit '75022d1d86f73308ed1cb23220e97ba7865b06f6':
Doc update: Misc doc bugs
2013-04-02 16:57:42 -07:00
kmccormick
75022d1d86
am 7cf6aaf9: am 70e99bfe: am b50f2406: am 050f6611: am 78e5d183: Merge "Doc update: Misc doc bugs" into jb-mr1.1-docs
...
* commit '7cf6aaf9bca84b4f01b55088cf4d3f705577a0cb':
Doc update: Misc doc bugs
2013-04-02 16:54:52 -07:00
kmccormick
7cf6aaf9bc
am 70e99bfe: am b50f2406: am 050f6611: am 78e5d183: Merge "Doc update: Misc doc bugs" into jb-mr1.1-docs
...
* commit '70e99bfe409b5cb116bf3f0512e3d05c13240eea':
Doc update: Misc doc bugs
2013-04-02 16:51:06 -07:00
kmccormick
70e99bfe40
am b50f2406: am 050f6611: am 78e5d183: Merge "Doc update: Misc doc bugs" into jb-mr1.1-docs
...
* commit 'b50f24066a559268fc39319cdf3af273146a0d5f':
Doc update: Misc doc bugs
2013-04-02 16:48:16 -07:00
Jeff Tinker
30b95a606a
am 5c0ce512: Merge "MediaDrm API update" into jb-mr2-dev
...
* commit '5c0ce512c5782eb79c7b907e2dd20aa3896dd068':
MediaDrm API update
2013-04-02 16:45:15 -07:00
kmccormick
b50f24066a
am 050f6611: am 78e5d183: Merge "Doc update: Misc doc bugs" into jb-mr1.1-docs
...
* commit '050f661173979b95e52f5020c8dd8adc09e8badd':
Doc update: Misc doc bugs
2013-04-02 16:44:24 -07:00
kmccormick
050f661173
am 78e5d183: Merge "Doc update: Misc doc bugs" into jb-mr1.1-docs
...
* commit '78e5d1834ea1271b17410962f6640deb04a59300':
Doc update: Misc doc bugs
2013-04-02 16:41:41 -07:00
kmccormick
78e5d1834e
Merge "Doc update: Misc doc bugs" into jb-mr1.1-docs
2013-04-02 23:26:30 +00:00
kmccormick
3b9f0aa058
Doc update: Misc doc bugs
...
"Bug: 6515524"
Change-Id: I1c8334e22637e9b55377a8743178bd5aa34ee9cd
2013-04-02 16:22:39 -07:00
Jim Miller
c801b21b42
Change time format for default clock in keyguard
...
This changes the default clock format from "kk:mm" to "HH:mm"
Fixes bug 8447801
Change-Id: I25f0c406dbecba8288773c9d13d0092485274af5
2013-04-02 16:03:02 -07:00
Jeff Tinker
5c0ce512c5
Merge "MediaDrm API update" into jb-mr2-dev
2013-04-02 22:49:19 +00:00
Kenny Root
6c918cec31
Add direct API to get ManifestDigest
...
This makes it faster for applications that don't want to collect all the
certificates but do want the AndroidManifest.xml digest.
Bug: 8528639
Change-Id: Ide9498d0981188960af194a9568387337c075bcc
2013-04-02 14:22:03 -07:00
Michael Wright
bfdec89085
am 75e181dd: Merge "Lock when obtaining the current monitor name." into jb-mr2-dev
...
* commit '75e181ddfec2166026a0ce553eca2a339e21b968':
Lock when obtaining the current monitor name.
2013-04-02 14:06:03 -07:00
Scott Main
73be8e6c41
am 03073519: am 7d230196: am 065cdf93: am be71cf4e: am 5fd986bc: am 3cd0b46c: update dashboards for 4/1. Now charts are generated from JSON data.
...
* commit '03073519ce9b4009aabba2a03f5feab42bab7c80':
update dashboards for 4/1. Now charts are generated from JSON data.
2013-04-02 14:02:33 -07:00
Michael Wright
75e181ddfe
Merge "Lock when obtaining the current monitor name." into jb-mr2-dev
2013-04-02 21:01:27 +00:00
Scott Main
03073519ce
am 7d230196: am 065cdf93: am be71cf4e: am 5fd986bc: am 3cd0b46c: update dashboards for 4/1. Now charts are generated from JSON data.
...
* commit '7d2301965621ccd10b0ab7afba37fffcc566b05a':
update dashboards for 4/1. Now charts are generated from JSON data.
2013-04-02 13:59:18 -07:00
Scott Main
7d23019656
am 065cdf93: am be71cf4e: am 5fd986bc: am 3cd0b46c: update dashboards for 4/1. Now charts are generated from JSON data.
...
* commit '065cdf93a08eb65239f37b3837ca95f31fddad8b':
update dashboards for 4/1. Now charts are generated from JSON data.
2013-04-02 13:55:12 -07:00
Scott Main
065cdf93a0
am be71cf4e: am 5fd986bc: am 3cd0b46c: update dashboards for 4/1. Now charts are generated from JSON data.
...
* commit 'be71cf4e21a2cbb95cf6475b89d064d8a571181b':
update dashboards for 4/1. Now charts are generated from JSON data.
2013-04-02 13:53:01 -07:00
Scott Main
be71cf4e21
am 5fd986bc: am 3cd0b46c: update dashboards for 4/1. Now charts are generated from JSON data.
...
* commit '5fd986bcb38dabfa8e79d026d4d3f287ae975f3b':
update dashboards for 4/1. Now charts are generated from JSON data.
2013-04-02 13:51:00 -07:00
Scott Main
5fd986bcb3
am 3cd0b46c: update dashboards for 4/1. Now charts are generated from JSON data.
...
* commit '3cd0b46ca4a4ab5ec597fe42f8637d0df5d83e5a':
update dashboards for 4/1. Now charts are generated from JSON data.
2013-04-02 13:47:54 -07:00
Scott Main
3cd0b46ca4
update dashboards for 4/1.
...
Now charts are generated from JSON data.
Change-Id: I17180b993a9ba50daf8a269ad26093079fd1da65
2013-04-02 13:29:54 -07:00
Brian Colonna
5856ee4bd6
am 1eccc0cf: Merge "FUL now restarts when flipping tablet 180 (bug 7484464)" into jb-mr2-dev
...
* commit '1eccc0cf5f7f33203091c0b475a4ad91570c85cd':
FUL now restarts when flipping tablet 180 (bug 7484464)
2013-04-02 13:26:23 -07:00
Brian Colonna
1eccc0cf5f
Merge "FUL now restarts when flipping tablet 180 (bug 7484464)" into jb-mr2-dev
2013-04-02 20:19:24 +00:00
Nick Kralevich
d2cc888cb9
am 55cfcd75: Merge "doSignaturePermission -> grantSignaturePermission" into jb-mr2-dev
...
* commit '55cfcd75691581ffc4f88034711a2442db619a53':
doSignaturePermission -> grantSignaturePermission
2013-04-02 12:48:26 -07:00
Nick Kralevich
c77d3b16d7
am f667c8d3: Merge "grantPermissionsLPw: introduce isNewPlatformPermissionForPackage" into jb-mr2-dev
...
* commit 'f667c8d327a6ae236468cbcf9f7536cf6d17e578':
grantPermissionsLPw: introduce isNewPlatformPermissionForPackage
2013-04-02 12:48:23 -07:00
Nick Kralevich
0f67b2550c
am 5b7d1481: Merge "grantPermissionsLPw: get rid of a level of curly braces" into jb-mr2-dev
...
* commit '5b7d1481936b1c41da01cbf763c09266dd13e6f1':
grantPermissionsLPw: get rid of a level of curly braces
2013-04-02 12:44:44 -07:00
Nick Kralevich
b590b80e36
am bb7ba4ae: Merge "grantPermissionsLPw: introduce doSignaturePermission" into jb-mr2-dev
...
* commit 'bb7ba4ae67e486166547865b56efbd99e51f039a':
grantPermissionsLPw: introduce doSignaturePermission
2013-04-02 12:44:40 -07:00
Nick Kralevich
55cfcd7569
Merge "doSignaturePermission -> grantSignaturePermission" into jb-mr2-dev
2013-04-02 19:44:02 +00:00
Nick Kralevich
f667c8d327
Merge "grantPermissionsLPw: introduce isNewPlatformPermissionForPackage" into jb-mr2-dev
2013-04-02 19:43:09 +00:00
Nick Kralevich
5b7d148193
Merge "grantPermissionsLPw: get rid of a level of curly braces" into jb-mr2-dev
2013-04-02 19:41:46 +00:00
Nick Kralevich
bb7ba4ae67
Merge "grantPermissionsLPw: introduce doSignaturePermission" into jb-mr2-dev
2013-04-02 19:40:23 +00:00
Robert Greenwalt
a51a638184
am 279e22bd: Merge "make new API to retrieve group identifier level1" into jb-mr2-dev
...
* commit '279e22bd35a97cc2676872fbc841b5f3bb060abf':
make new API to retrieve group identifier level1
2013-04-02 12:21:51 -07:00
Elliott Hughes
1113956349
am dbca824d: Merge "Add DateFormat.getBestDateTimePattern." into jb-mr2-dev
...
* commit 'dbca824dc00209c603a956f45bb684e57ee3e478':
Add DateFormat.getBestDateTimePattern.
2013-04-02 12:21:48 -07:00
Robert Greenwalt
279e22bd35
Merge "make new API to retrieve group identifier level1" into jb-mr2-dev
2013-04-02 19:17:23 +00:00
Elliott Hughes
dbca824dc0
Merge "Add DateFormat.getBestDateTimePattern." into jb-mr2-dev
2013-04-02 19:16:17 +00:00
Dianne Hackborn
69fe406929
am 006c6338: Merge "Fix bug in initializing preferred activities." into jb-mr2-dev
...
* commit '006c633896e6738297e7bc96128c56b03fbf8d01':
Fix bug in initializing preferred activities.
2013-04-02 12:09:13 -07:00
Kenny Root
d62554eaeb
am a3598346: Merge "Add API to query KeyChain algorithm support, pt. 2" into jb-mr2-dev
...
* commit 'a35983469b40ad697af5f1ea1ead41e0e5649f10':
Add API to query KeyChain algorithm support, pt. 2
2013-04-02 12:09:08 -07:00
Mita Yun
4b808adc44
am ed181586: Merge "Fixed a NPE in AccountManagerService" into jb-mr2-dev
...
* commit 'ed181586a7ef0229edb27ba33d087d199ec81d53':
Fixed a NPE in AccountManagerService
2013-04-02 12:05:32 -07:00
Dianne Hackborn
006c633896
Merge "Fix bug in initializing preferred activities." into jb-mr2-dev
2013-04-02 19:01:18 +00:00
Elliott Hughes
031b581af2
Add DateFormat.getBestDateTimePattern.
...
Bug: 8283323
Change-Id: Id8d94456b93555d799229b7dd88fcbcf5c6bf7ff
2013-04-02 12:00:47 -07:00
Kenny Root
95e3ee3971
Remove keystore entries when package removed
...
Add a hook into PackageManagerService so that when app IDs are
completely removed, we erase all entries from keystore for those UIDs
that have gone away.
Bug: 3020069
Change-Id: Id4b1d51a5fa4c418865055635a84bebcf5b65ec8
2013-04-02 11:50:16 -07:00
Kenny Root
a35983469b
Merge "Add API to query KeyChain algorithm support, pt. 2" into jb-mr2-dev
2013-04-02 18:40:54 +00:00
Mita Yun
ed181586a7
Merge "Fixed a NPE in AccountManagerService" into jb-mr2-dev
2013-04-02 18:33:03 +00:00
Mita Yun
f4c240e68a
Fixed a NPE in AccountManagerService
...
Bug: 8518620
Change-Id: Idf9b5864896ec57c63e3987fc01c73a5c983b5e2
2013-04-02 11:32:27 -07:00
Kenny Root
5b7e90ac93
Add API to query KeyChain algorithm support, pt. 2
...
Late-breaking comments on API name. Revised.
Bug: 7095660
Change-Id: I7224d9c8a4f84a272360ede78a18bfb72d8aeb77
2013-04-02 11:23:41 -07:00
Kenny Root
5c45d95b83
am 1ea4a5ba: Merge "Add API to query KeyChain algorithm support" into jb-mr2-dev
...
* commit '1ea4a5ba859c70b7e7414e1f6a2a772cf9dd5cfb':
Add API to query KeyChain algorithm support
2013-04-02 10:55:23 -07:00
Kenny Root
1ea4a5ba85
Merge "Add API to query KeyChain algorithm support" into jb-mr2-dev
2013-04-02 17:52:26 +00:00