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

104114 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Carlstrom
6fdcb168a7 Merge "Adjust the HttpResponseCache for OkHttp." 2013-04-03 20:17:25 +00:00
jwilson
dea64ad715 Adjust the HttpResponseCache for OkHttp. 
Change-Id: I2a80f3c3f30a3d15673d797fa3d1211286f75030
 2013-04-03 20:15:36 +00:00
Craig Mautner
8d1a32a413 Merge commit 'ddc16ef4387ca25c607348f6155771f17a049763' into bogus 2013-04-03 13:14:30 -07: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
Baligh Uddin
5178b48720 Merge "Import translations. DO NOT MERGE" 2013-04-03 19:51:54 +00:00
Chris Craik
e0b39fc18c Merge "Account for hairlines in quick rejection logic" into jb-mr2-dev 2013-04-03 19:43:47 +00:00
Baligh Uddin
5d3ca394e5 am f523ee8e: am bc9da0f4: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit 'f523ee8ea6a4b38f4d42e1d4b5a4da7493a8d31c':
  Import translations. DO NOT MERGE
 2013-04-03 12:40:40 -07:00
Kenny Root
2aeb228989 am 6812059b: am d72317ab: Remove keystore entries when package removed 
* commit '6812059b2d4aecb732ce3c94c58f2494ddc4ff6a':
  Remove keystore entries when package removed
 2013-04-03 12:40:37 -07: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
f523ee8ea6 am bc9da0f4: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit 'bc9da0f4b5584d52b966b445deb2c4f9d87dd070':
  Import translations. DO NOT MERGE
 2013-04-03 12:35:47 -07:00
Kenny Root
6812059b2d am d72317ab: Remove keystore entries when package removed 
* commit 'd72317abd79ddf95d48c8f35bf1070900ff55b5e':
  Remove keystore entries when package removed
 2013-04-03 12:35:43 -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
Kenny Root
a7e4795bb3 Merge "Remove keystore entries when package removed" 2013-04-03 18:29:24 +00:00
Derek Sollenberger
109109cdd5 Refactoring code to support r8352 of Skia. 
Change-Id: Ica1463c84edaf7a46566d1ff792f7f73cef31997
 2013-04-03 14:22:01 -04:00
Scott Kennedy
7ee8002aab resolved conflicts for merge of b5d6b3fe to master 
Change-Id: Ib7beb5c22fadd7aae5039d49a819fbc91d355b6b
 2013-04-03 11:15:50 -07:00
Craig Mautner
00633e0270 Merge "Move startActivityUncheckedLocked to Supervisor" 2013-04-03 17:59:21 +00:00
Craig Mautner
4f42c174ad Merge "Move startActivity from ActivityStack to Supervisor" 2013-04-03 17:57:57 +00: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
b5d6b3fec0 am 688c3344: am 23eda7cd: am 76f9a0a6: am c318dbcf: am 2dd01a0b: am 555c82cd: am f7c06ddb: Merge "docs: Typos and other fixes" into jb-mr1-dev 
* commit '688c33448572fa3879b1486d8fa1bf16cd946211':
  docs: Typos and other fixes
 2013-04-03 09:42:06 -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
Baligh Uddin
8b2e3189bd Import translations. DO NOT MERGE 
Change-Id: I708e495e579be3f02ea6a53445b9a6288d4bb237
Auto-generated-cl: translation import
 2013-04-03 09:25:45 -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
6c61a9cd2f Import translations. DO NOT MERGE 
Change-Id: Id1c70c846d44c081145c0a2cfeaeef4f4baca5a4
Auto-generated-cl: translation import
 2013-04-03 09:11:23 -07:00
Andreas Huber
c9a1ca3c1a Merge "MediaCodec: docs: Clarify that audio/mp4a-latm is plain AAC, not in LATM" 2013-04-03 16:09:16 +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
Craig Mautner
3361c7dfc4 Merge "Fix potential synch problems." 2013-04-03 15:41:36 +00:00
The Android Automerger
24ae1eaf3c merge in jb-mr2-release history after reset to jb-mr2-dev 2013-04-03 06:02:30 -07:00
Craig Mautner
3ee1a66c1e Merge "Perform activityIdleInternal in correct order." 2013-04-03 05:40:08 +00:00
Craig Mautner
8be5ea3bdb Perform activityIdleInternal in correct order. 
Refactor of ActivityManagerService.activityIdle left
activityIdleInternalLocked called only if stopProfiling was true.
Calling it in all situations is the correct behavior.

Fixes bug 8532130.

Change-Id: Ibd7f112bab104094ff1b1f3a2fb8c03b527ec453
 2013-04-02 22:37:45 -07:00
Lorenzo Colitti
3131580086 am 92871140: am 6c2e8fb4: Merge "Fix LinkProperties\'s equals() method." into jb-mr2-dev 
* commit '92871140e2f667743212bdbe418aa833142b73bb':
  Fix LinkProperties's equals() method.
 2013-04-02 22:35:48 -07:00
Lorenzo Colitti
92871140e2 am 6c2e8fb4: Merge "Fix LinkProperties\'s equals() method." into jb-mr2-dev 
* commit '6c2e8fb4d530c5fb1352e8667449591b39d89c5a':
  Fix LinkProperties's equals() method.
 2013-04-02 22:32:34 -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
fc00755627 am 4c20e618: am a4ca8ea0: Fix reference cycle in InputEventReceiver and Sender. 
* commit '4c20e61808a75f217e99b589261821ca453cea1b':
  Fix reference cycle in InputEventReceiver and Sender.
 2013-04-02 20:08:01 -07:00
Jeff Brown
4c20e61808 am a4ca8ea0: Fix reference cycle in InputEventReceiver and Sender. 
* commit 'a4ca8ea0ad14c509d1ced46482e83c1b8a518982':
  Fix reference cycle in InputEventReceiver and Sender.
 2013-04-02 20:05:03 -07:00
Justin Koh
ab089d4870 am 9d4ed1ec: am ddd168d6: Merge "Add global key configuration file" into jb-mr2-dev 
* commit '9d4ed1ec62a392e4b73ab7d3cd548e09bc792ab2':
  Add global key configuration file
 2013-04-02 19:25:27 -07:00
Jim Miller
f0426c6a44 am e884f6b8: am dbd9c337: Merge "Change time format for default clock in keyguard" into jb-mr2-dev 
* commit 'e884f6b8505520f6f745cc51358154bf5d89f101':
  Change time format for default clock in keyguard
 2013-04-02 19:25:17 -07:00
kmccormick
87290ccdc2 am 5da78408: am 75022d1d: am 7cf6aaf9: am 70e99bfe: am b50f2406: am 050f6611: am 78e5d183: Merge "Doc update: Misc doc bugs" into jb-mr1.1-docs 
* commit '5da7840887e2314faea451222a9721adf972f0b4':
  Doc update: Misc doc bugs
 2013-04-02 19:25:14 -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
9d4ed1ec62 am ddd168d6: Merge "Add global key configuration file" into jb-mr2-dev 
* commit 'ddd168d65f0bc9644434d18dd82fe6c994670dba':
  Add global key configuration file
 2013-04-02 18:17:01 -07:00