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

102605 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kmccormick
fa387c5182 am 73c8a7a8: am 3789fa0f: am 8acb7166: am 8b5e342b: Merge "Doc update: clean up ubiquitous typo "the the"" into jb-mr1.1-docs 
* commit '73c8a7a8200aab208abacc42a6fcbce5d3dbc1b0':
  Doc update: clean up ubiquitous typo "the the"
 2013-04-03 13:54:16 -07:00
kmccormick
73c8a7a820 am 3789fa0f: am 8acb7166: am 8b5e342b: Merge "Doc update: clean up ubiquitous typo "the the"" into jb-mr1.1-docs 
* commit '3789fa0f6becc09055d454808fe617754b5ef1c7':
  Doc update: clean up ubiquitous typo "the the"
 2013-04-03 13:51:49 -07:00
kmccormick
3789fa0f6b am 8acb7166: am 8b5e342b: Merge "Doc update: clean up ubiquitous typo "the the"" into jb-mr1.1-docs 
* commit '8acb7166b3cbf00e6972393bc929ef7cc54c7108':
  Doc update: clean up ubiquitous typo "the the"
 2013-04-03 13:49:33 -07:00
kmccormick
8acb7166b3 am 8b5e342b: Merge "Doc update: clean up ubiquitous typo "the the"" into jb-mr1.1-docs 
* commit '8b5e342b0e24b9bb546456209d9d27480fa233e8':
  Doc update: clean up ubiquitous typo "the the"
 2013-04-03 13:47:42 -07:00
Chris Craik
ff7ae2dccd Merge "Correct save/restore match up" into jb-mr2-dev 2013-04-03 20:31:49 +00:00
ztenghui
f7d3aae328 Update the documentiation for MediaMuxer::writeSampleData() 
Change-Id: I7a5591c7b14728c1833e6401dcd8f0272c4ee56c
 2013-04-03 13:31:41 -07:00
Kenny Root
75827d4a31 Merge "Add direct API to get ManifestDigest" into jb-mr2-dev 2013-04-03 20:27:43 +00:00
Jeff Sharkey
0c1baf9dd6 Nuke heavy parts of notification before archiving. 
Bug: 8537938
Change-Id: I2e4eccc3bd6d57fe5cef340d9e67986d78d3be95
 2013-04-03 13:08:52 -07:00
kmccormick
8b5e342b0e Merge "Doc update: clean up ubiquitous typo "the the"" into jb-mr1.1-docs 2013-04-03 20:07:53 +00:00
kmccormick
76dfc02135 Doc update: clean up ubiquitous typo "the the" 
"Bug: 8531405"

Change-Id: Ib2b96dd2c1ab0f4d8abe5a8052bf2ef33f03b8be
 2013-04-03 13:04:06 -07:00
Chris Craik
e0b39fc18c Merge "Account for hairlines in quick rejection logic" into jb-mr2-dev 2013-04-03 19:43:47 +00:00
Chris Craik
1ed30c907f Correct save/restore match up 
bug:8480642

With the additional save/restore around the operations in flush, the
stored restore batches weren't matching up to the correct saves.

Change-Id: I2f48f19009bd97289b6973283f43dc8d3e35affd
 2013-04-03 12:37:35 -07:00
Baligh Uddin
bc9da0f4b5 Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-04-03 19:28:17 +00:00
Jeff Tinker
54cfbd6dc2 Implement async event callout from drm plugin to Java app 
Change-Id: I451b7c6f766aafac39ce432a71ef5a03bffe29f1
 2013-04-03 12:01:59 -07:00
Jeff Sharkey
a14acd20b8 Warn when exposing file:// Uris beyond a process. 
Check for file:// Uris inside Intents, ClipData, Notifications and
RemoteViews when StrictMode option is enabled.

Also introduces Intent.prepareToLeaveProcess() to uniformly handle
Intents about to leave an app process.

Bug: 8529070
Change-Id: I8efb43877cbc5f21eb029fc6492b3ee1415059ef
 2013-04-03 11:45:44 -07:00
Kenny Root
d72317abd7 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.

(cherry picked from commit 95e3ee3971915b323e5c13dcfe3b12a4180850cd)

Bug: 3020069
Change-Id: I374258ccc103f8cb3e238f2bf0d1afda0659db94
 2013-04-03 11:32:52 -07:00
Chris Craik
e7c69c6fe3 Account for hairlines in quick rejection logic 
bug:8531373
Change-Id: I35444014f23fc61da687694fccc0d13bce718793
 2013-04-03 09:55:48 -07:00
Scott Kennedy
688c334485 am 23eda7cd: am 76f9a0a6: am c318dbcf: am 2dd01a0b: am 555c82cd: am f7c06ddb: Merge "docs: Typos and other fixes" into jb-mr1-dev 
* commit '23eda7cd0a2b80bafcba7c24f49a73a2f11f782f':
  docs: Typos and other fixes
 2013-04-03 09:38:49 -07:00
Scott Kennedy
23eda7cd0a am 76f9a0a6: am c318dbcf: am 2dd01a0b: am 555c82cd: am f7c06ddb: Merge "docs: Typos and other fixes" into jb-mr1-dev 
* commit '76f9a0a6800d8a8945156a95dea79f16ec704b3d':
  docs: Typos and other fixes
 2013-04-03 09:35:18 -07:00
Scott Kennedy
76f9a0a680 am c318dbcf: am 2dd01a0b: am 555c82cd: am f7c06ddb: Merge "docs: Typos and other fixes" into jb-mr1-dev 
* commit 'c318dbcf358772ab53b0380edb3e487a773ad2d8':
  docs: Typos and other fixes
 2013-04-03 09:31:32 -07:00
Scott Kennedy
c318dbcf35 am 2dd01a0b: am 555c82cd: am f7c06ddb: Merge "docs: Typos and other fixes" into jb-mr1-dev 
* commit '2dd01a0b5b08a0ccd7b2932707ce58dd959ac3f8':
  docs: Typos and other fixes
 2013-04-03 09:27:46 -07:00
Scott Kennedy
2dd01a0b5b am 555c82cd: am f7c06ddb: Merge "docs: Typos and other fixes" into jb-mr1-dev 
* commit '555c82cd43ef8d11bcf54f023864619869c06411':
  docs: Typos and other fixes
 2013-04-03 09:24:42 -07:00
Scott Kennedy
555c82cd43 am f7c06ddb: Merge "docs: Typos and other fixes" into jb-mr1-dev 
* commit 'f7c06ddbfc79921d389ed6699df17e54c428571e':
  docs: Typos and other fixes
 2013-04-03 09:20:38 -07:00
Scott Kennedy
f7c06ddbfc Merge "docs: Typos and other fixes" into jb-mr1-dev 2013-04-03 16:16:35 +00:00
Baligh Uddin
572c241047 Import translations. DO NOT MERGE 
Change-Id: I75964c44ea483a91bc9e4be7433055be4cca57cf
Auto-generated-cl: translation import
 2013-04-03 09:02:22 -07:00
Lorenzo Colitti
6c2e8fb4d5 Merge "Fix LinkProperties's equals() method." into jb-mr2-dev 2013-04-03 05:28:52 +00:00
Ben Gruver
4efe9403af Initial implementation of IntentFirewall functionality 
This has the full filter functionality, but is currently only
able to block Activity intents. Logging intents, or blocking
service/broadcast intents is not yet implemented.

Change-Id: Ied3d8dedf982e17bcbdff3e328eeb87477954df7
 2013-04-02 21:18:41 -07:00
Jeff Brown
a4ca8ea0ad Fix reference cycle in InputEventReceiver and Sender. 
If the receiver or sender was not properly disposed, then
the underlying input channel might be leaked because the
native peer was holding a strong reference to the object.

Switched to using a weak reference.

Also updated Binder to use a new helper created for this purpose.

Change-Id: I19680bf96d0548777bff02aa1d91874d1e8e41da
 2013-04-02 18:59:15 -07:00
Justin Koh
ddd168d65f Merge "Add global key configuration file" into jb-mr2-dev 2013-04-03 01:11:53 +00:00
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
dbd9c337ed Merge "Change time format for default clock in keyguard" into jb-mr2-dev 2013-04-03 00:24:52 +00: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
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
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
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
55cfcd7569 Merge "doSignaturePermission -> grantSignaturePermission" into jb-mr2-dev 2013-04-02 19:44:02 +00:00