kmccormick
b471da283e
am b85e328d: am bbcf0852: am 9d936591: am f5726617: am 2144eee3: am 3fb5536d: am 91e01a4d: Merge "Doc update: fix broken code sample" into jb-mr1.1-docs
...
* commit 'b85e328d380f3cd992302d3d36fbdce454990e64':
Doc update: fix broken code sample
2013-04-03 15:03:53 -07:00
kmccormick
b85e328d38
am bbcf0852: am 9d936591: am f5726617: am 2144eee3: am 3fb5536d: am 91e01a4d: Merge "Doc update: fix broken code sample" into jb-mr1.1-docs
...
* commit 'bbcf0852f786ea1c9cf6dca85f45487b7739bfab':
Doc update: fix broken code sample
2013-04-03 14:34:07 -07:00
kmccormick
bbcf0852f7
am 9d936591: am f5726617: am 2144eee3: am 3fb5536d: am 91e01a4d: Merge "Doc update: fix broken code sample" into jb-mr1.1-docs
...
* commit '9d9365916def1a60d98cab7d59a4c98d9e7f6f42':
Doc update: fix broken code sample
2013-04-03 14:30:09 -07:00
kmccormick
9d9365916d
am f5726617: am 2144eee3: am 3fb5536d: am 91e01a4d: Merge "Doc update: fix broken code sample" into jb-mr1.1-docs
...
* commit 'f57266175dffe68c5709f432dd6983c314d164f4':
Doc update: fix broken code sample
2013-04-03 14:26:34 -07:00
kmccormick
f57266175d
am 2144eee3: am 3fb5536d: am 91e01a4d: Merge "Doc update: fix broken code sample" into jb-mr1.1-docs
...
* commit '2144eee3576e3fb382170f502e41f1aae572559a':
Doc update: fix broken code sample
2013-04-03 14:23:54 -07:00
kmccormick
91e01a4d2e
Merge "Doc update: fix broken code sample" into jb-mr1.1-docs
2013-04-03 21:16:08 +00:00
kmccormick
e4ce502d77
Doc update: fix broken code sample
...
"Bug: 8537853"
Change-Id: Ieedfd24c39725ce7c6975300b6471ab3ef5884ee
2013-04-03 14:13:36 -07:00
Brian Carlstrom
96242a1b17
am 3c7df09d: am 6fdcb168: Merge "Adjust the HttpResponseCache for OkHttp."
...
* commit '3c7df09d4dd00fb23da888726182f00788957cd9':
Adjust the HttpResponseCache for OkHttp.
2013-04-03 14:12:27 -07:00
Brian Carlstrom
3c7df09d4d
am 6fdcb168: Merge "Adjust the HttpResponseCache for OkHttp."
...
* commit '6fdcb168a7a0a4f508063019ca4d2ec35458f892':
Adjust the HttpResponseCache for OkHttp.
2013-04-03 14:06:55 -07:00
Kenny Root
de1175db67
resolved conflicts for merge of 0afa8b36 to master
...
Change-Id: I09a453ab5dbad58e3dc0858972e222a34d53b282
2013-04-03 14:04:14 -07:00
Kenny Root
0afa8b3694
am 75827d4a: Merge "Add direct API to get ManifestDigest" into jb-mr2-dev
...
* commit '75827d4a3155c190f455329a67c84ac8fbb9bda0':
Add direct API to get ManifestDigest
2013-04-03 13:50:22 -07:00
Kenny Root
75827d4a31
Merge "Add direct API to get ManifestDigest" into jb-mr2-dev
2013-04-03 20:27:43 +00:00
jwilson
dea64ad715
Adjust the HttpResponseCache for OkHttp.
...
Change-Id: I2a80f3c3f30a3d15673d797fa3d1211286f75030
2013-04-03 20:15:36 +00: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
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
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 95e3ee3971
2013-04-03 11:32:52 -07:00
Scott Kennedy
7ee8002aab
resolved conflicts for merge of b5d6b3fe to master
...
Change-Id: Ib7beb5c22fadd7aae5039d49a819fbc91d355b6b
2013-04-03 11:15:50 -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
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
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
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
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
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
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
Brian Colonna
c849fbcf3d
resolved conflicts for merge of 5856ee4b to master
...
Change-Id: I60ba85bc246b9cf25d467b2099535aad47f82ca7
2013-04-02 17:16:55 -04: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
Elliott Hughes
435d11205a
am 11139563: am dbca824d: Merge "Add DateFormat.getBestDateTimePattern." into jb-mr2-dev
...
* commit '1113956349e25bd081590842ec6f6b300765d786':
Add DateFormat.getBestDateTimePattern.
2013-04-02 12:25:35 -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
Elliott Hughes
dbca824dc0
Merge "Add DateFormat.getBestDateTimePattern." into jb-mr2-dev
2013-04-02 19:16:17 +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
Chet Haase
d4c5453464
am 7aab1134: am c99d3c1f: Stop jank from window animations overlapping activity animations
...
* commit '7aab1134236a30aa2e595be55fcc7b5c90982413':
Stop jank from window animations overlapping activity animations
2013-04-02 11:03:16 -07:00
Chris Craik
92ce5e95b8
am bb3c5e18: am 94d6170b: Merge "Update view\'s alpha and layer docs" into jb-mr2-dev
...
* commit 'bb3c5e184a41ec3ad7d11c3a0a66439edda4f74d':
Update view's alpha and layer docs
2013-04-02 11:03:09 -07:00
Jeff Brown
76703d8fe5
am 21b41af7: am d42ae93c: Merge "Make MessageQueue and Looper final." into jb-mr2-dev
...
* commit '21b41af7ea418be8e0ec94800bb2d0cc12c4965e':
Make MessageQueue and Looper final.
2013-04-02 11:03:04 -07:00
Michael Wright
bc15cf55f5
am ef588f73: am 54531f81: Merge "Flush pending input events immediately upon channel dispose" into jb-mr2-dev
...
* commit 'ef588f73cf9bf01a693f468f597239e27834c730':
Flush pending input events immediately upon channel dispose
2013-04-02 08:26:04 -07:00
Chet Haase
7aab113423
am c99d3c1f: Stop jank from window animations overlapping activity animations
...
* commit 'c99d3c1fd618c1f64103b4f39dd95330309be5a3':
Stop jank from window animations overlapping activity animations
2013-04-02 08:24:48 -07:00
Chris Craik
bb3c5e184a
am 94d6170b: Merge "Update view\'s alpha and layer docs" into jb-mr2-dev
...
* commit '94d6170b67bcfb5dc5a0c988752d34e64a5f5272':
Update view's alpha and layer docs
2013-04-02 08:24:32 -07:00
Jeff Brown
21b41af7ea
am d42ae93c: Merge "Make MessageQueue and Looper final." into jb-mr2-dev
...
* commit 'd42ae93c44a28f63d8f266277644864bfd0f4a16':
Make MessageQueue and Looper final.
2013-04-02 08:24:15 -07:00
Michael Wright
ef588f73cf
am 54531f81: Merge "Flush pending input events immediately upon channel dispose" into jb-mr2-dev
...
* commit '54531f819567066fe4a5219eb445a453551be374':
Flush pending input events immediately upon channel dispose
2013-04-02 08:23:38 -07:00
Chet Haase
c99d3c1fd6
Stop jank from window animations overlapping activity animations
...
Relaunching a running activity will sometimes cause animations in that
activity to run, causing jank due to too much happening (window animations
on that same window running at the same time).
An earlier fix pauses application rendering while window animations are running,
but only the first time the activity comes up. If the window is animated
after that (such as is the case with re-launching it while it is running
in the background), rendering, and therefore animations, happen as usual,
causing the jank.
The fix is to simply broaden the scope of when application rendering is
paused to include anytime the window is animating.
Issue #8472972 Make app animations play nice with window animations
Change-Id: I1dd8da039fcb4d1faf6c0811bae97ef2847deb84
2013-04-02 07:30:52 -07:00
