OSDN Git Service
Roman Nurik [Thu, 23 Aug 2012 21:16:35 +0000 (14:16 -0700)]
am
6a9f0ec8: am
1caca0a1: am
2b4b1afc: am
6d672214: Merge "Update TabCompat training sample code download." into jb-dev
* commit '
6a9f0ec8e4fa9e4158bda130ad02f8c870117b61':
Update TabCompat training sample code download.
Jean-Baptiste Queru [Thu, 23 Aug 2012 21:16:31 +0000 (14:16 -0700)]
am
bb38dfd2: am
013ff819: am
0a72b3e1: ignore merge of
2e2849a5 to jb-dev-plus-aosp
* commit '
bb38dfd204097746e96b7b49ddd8f6766e35a47d':
Empty DC's apnList when the DC is free.
Roman Nurik [Thu, 23 Aug 2012 21:14:21 +0000 (14:14 -0700)]
am
1caca0a1: am
2b4b1afc: am
6d672214: Merge "Update TabCompat training sample code download." into jb-dev
* commit '
1caca0a1f23b9ed679e953bfc1fd6b20edd7d3ad':
Update TabCompat training sample code download.
Jean-Baptiste Queru [Thu, 23 Aug 2012 21:14:18 +0000 (14:14 -0700)]
am
013ff819: am
0a72b3e1: ignore merge of
2e2849a5 to jb-dev-plus-aosp
* commit '
013ff819618614f07f279ee31ce3c52f931851fc':
Empty DC's apnList when the DC is free.
Roman Nurik [Thu, 23 Aug 2012 21:11:45 +0000 (14:11 -0700)]
am
2b4b1afc: am
6d672214: Merge "Update TabCompat training sample code download." into jb-dev
* commit '
2b4b1afcfa75dc2a3d9436bcde5538a49c56d124':
Update TabCompat training sample code download.
Jean-Baptiste Queru [Thu, 23 Aug 2012 21:11:38 +0000 (14:11 -0700)]
am
0a72b3e1: ignore merge of
2e2849a5 to jb-dev-plus-aosp
* commit '
0a72b3e12ca96d830ce6639f045d1f4decf9e748':
Empty DC's apnList when the DC is free.
Dianne Hackborn [Thu, 23 Aug 2012 21:05:25 +0000 (14:05 -0700)]
am
489a185b: am
5d1122a3: Merge "Fix issue #
7016987: Unable to attach a picture in gmail/emaill composer action." into jb-mr1-dev
* commit '
489a185bb8aa9983207e8c6a38bbdd7be3966aed':
Fix issue #
7016987: Unable to attach a picture in gmail/emaill composer action.
Dianne Hackborn [Thu, 23 Aug 2012 21:02:57 +0000 (14:02 -0700)]
am
5d1122a3: Merge "Fix issue #
7016987: Unable to attach a picture in gmail/emaill composer action." into jb-mr1-dev
* commit '
5d1122a3f84e1df80c63aca56310f2cf29bea7dc':
Fix issue #
7016987: Unable to attach a picture in gmail/emaill composer action.
Dianne Hackborn [Thu, 23 Aug 2012 21:00:22 +0000 (14:00 -0700)]
Merge "Fix issue #
7016987: Unable to attach a picture in gmail/emaill composer action." into jb-mr1-dev
Dianne Hackborn [Thu, 23 Aug 2012 20:54:58 +0000 (13:54 -0700)]
Fix issue #
7016987: Unable to attach a picture in gmail/emaill composer action.
Change-Id: I0c9336bb072b4622a5eab6d3ec104c4cc38e367a
John Spurlock [Thu, 23 Aug 2012 20:38:42 +0000 (13:38 -0700)]
am
7dac3f0c: am
156c9cc2: Merge "Disable screensavers if below first battery warning level." into jb-mr1-dev
* commit '
7dac3f0c3e9ba117ef05c64529915b4cb7fbd055':
Disable screensavers if below first battery warning level.
John Spurlock [Thu, 23 Aug 2012 20:37:12 +0000 (13:37 -0700)]
am
156c9cc2: Merge "Disable screensavers if below first battery warning level." into jb-mr1-dev
* commit '
156c9cc2bfda211132a6c3a6d990702e1f317a8f':
Disable screensavers if below first battery warning level.
John Spurlock [Thu, 23 Aug 2012 20:34:05 +0000 (13:34 -0700)]
Merge "Disable screensavers if below first battery warning level." into jb-mr1-dev
John Spurlock [Thu, 23 Aug 2012 19:32:28 +0000 (15:32 -0400)]
Disable screensavers if below first battery warning level.
Don't activate on sleep if below the threshold, and quit any currently
running dream when the threshold is reached.
Bug:
6999949
Change-Id: I961b350d24ee6f95e502228aaa57312b0ffbadc1
Doug Zongker [Thu, 23 Aug 2012 20:21:57 +0000 (13:21 -0700)]
am
af4a0f1d: am
d8b6fa29: Merge "pass --locale argument to recovery" into jb-mr1-dev
* commit '
af4a0f1d864de49d43b0c4924285f0699d4b7b89':
pass --locale argument to recovery
Doug Zongker [Thu, 23 Aug 2012 20:20:17 +0000 (13:20 -0700)]
am
d8b6fa29: Merge "pass --locale argument to recovery" into jb-mr1-dev
* commit '
d8b6fa293133324d77040e45d0d4625fc90917ba':
pass --locale argument to recovery
Doug Zongker [Thu, 23 Aug 2012 20:17:25 +0000 (13:17 -0700)]
Merge "pass --locale argument to recovery" into jb-mr1-dev
Stephen Hines [Thu, 23 Aug 2012 19:40:06 +0000 (12:40 -0700)]
am
4b456c8a: (-s ours) am
bb121d56: am
7cb7292f: (-s ours) am
56c6392f: (-s ours) am
9f7fa4c4: (-s ours) Merge "DO NOT MERGE - Fix readback lengths"
* commit '
4b456c8a025d94aa65e0e92fc368f43fc5aeb37d':
DO NOT MERGE - Fix readback lengths
Justin Ho [Thu, 23 Aug 2012 19:40:02 +0000 (12:40 -0700)]
am
c2bde010: am
fd9619f6: am
3bc03666: am
72404a82: Merge "Update Back softkey icon Bug:
6020915" into jb-dev
* commit '
c2bde01014aa03a2d2a9257a322e127f74d9913e':
Update Back softkey icon Bug:
6020915
Irfan Sheriff [Thu, 23 Aug 2012 19:39:55 +0000 (12:39 -0700)]
am
1afb5af1: am
b25617e7: am
46b29d8d: (-s ours) am
e5773274: Merge "WifiWatchdog: handle exception from ArpPeer"
* commit '
1afb5af16e41d02c85905637b440614711f2a63e':
WifiWatchdog: handle exception from ArpPeer
Stephen Hines [Thu, 23 Aug 2012 19:37:38 +0000 (12:37 -0700)]
am
bb121d56: am
7cb7292f: (-s ours) am
56c6392f: (-s ours) am
9f7fa4c4: (-s ours) Merge "DO NOT MERGE - Fix readback lengths"
* commit '
bb121d569cd6bc7bf4018ef12756247009988863':
DO NOT MERGE - Fix readback lengths
Justin Ho [Thu, 23 Aug 2012 19:37:31 +0000 (12:37 -0700)]
am
fd9619f6: am
3bc03666: am
72404a82: Merge "Update Back softkey icon Bug:
6020915" into jb-dev
* commit '
fd9619f647a618b7bded59875186d1bcdde32ba1':
Update Back softkey icon Bug:
6020915
Irfan Sheriff [Thu, 23 Aug 2012 19:37:27 +0000 (12:37 -0700)]
am
b25617e7: am
46b29d8d: (-s ours) am
e5773274: Merge "WifiWatchdog: handle exception from ArpPeer"
* commit '
b25617e72e10f9b8ffd1d9ca6db5414db6a02e92':
WifiWatchdog: handle exception from ArpPeer
Stephen Hines [Thu, 23 Aug 2012 19:34:40 +0000 (12:34 -0700)]
am
7cb7292f: (-s ours) am
56c6392f: (-s ours) am
9f7fa4c4: (-s ours) Merge "DO NOT MERGE - Fix readback lengths"
* commit '
7cb7292f046bb860069a0881fc45753872551079':
DO NOT MERGE - Fix readback lengths
Justin Ho [Thu, 23 Aug 2012 19:34:37 +0000 (12:34 -0700)]
am
3bc03666: am
72404a82: Merge "Update Back softkey icon Bug:
6020915" into jb-dev
* commit '
3bc03666ccd322f8ebc0c303dabe920b2ae6944c':
Update Back softkey icon Bug:
6020915
Irfan Sheriff [Thu, 23 Aug 2012 19:34:19 +0000 (12:34 -0700)]
am
46b29d8d: (-s ours) am
e5773274: Merge "WifiWatchdog: handle exception from ArpPeer"
* commit '
46b29d8dd558c734f058b3806a0b56a2a23b33fd':
WifiWatchdog: handle exception from ArpPeer
John Grossman [Thu, 23 Aug 2012 18:18:08 +0000 (11:18 -0700)]
am
bbb570b9: common_time: Move default election config to bcast.
* commit '
bbb570b91edb6f591fe25de2079d49e8d545f763':
common_time: Move default election config to bcast.
John Spurlock [Thu, 23 Aug 2012 17:49:32 +0000 (10:49 -0700)]
am
d8351a48: am
21b53df7: Merge "Add framework support for multiple dreams." into jb-mr1-dev
* commit '
d8351a48b0836a43e8522d373cc43603c9f92e11':
Add framework support for multiple dreams.
John Spurlock [Thu, 23 Aug 2012 17:46:55 +0000 (10:46 -0700)]
am
21b53df7: Merge "Add framework support for multiple dreams." into jb-mr1-dev
* commit '
21b53df7c3fc7501c9c9e238eb820a6dcf992650':
Add framework support for multiple dreams.
John Spurlock [Thu, 23 Aug 2012 17:44:04 +0000 (10:44 -0700)]
Merge "Add framework support for multiple dreams." into jb-mr1-dev
Amith Yamasani [Thu, 23 Aug 2012 17:18:20 +0000 (10:18 -0700)]
am
eea5e1f5: am
41d4332a: Merge "Handle null cache directory" into jb-mr1-dev
* commit '
eea5e1f504e2c578c4881dd0a0dd4ef45e506da1':
Handle null cache directory
Amith Yamasani [Thu, 23 Aug 2012 17:15:35 +0000 (10:15 -0700)]
am
41d4332a: Merge "Handle null cache directory" into jb-mr1-dev
* commit '
41d4332ab0641d3f5dd2ad8da7e325cd9f81f3c1':
Handle null cache directory
Amith Yamasani [Thu, 23 Aug 2012 17:13:42 +0000 (10:13 -0700)]
Merge "Handle null cache directory" into jb-mr1-dev
Amith Yamasani [Thu, 23 Aug 2012 17:07:52 +0000 (10:07 -0700)]
Handle null cache directory
data/android directory doesn't exist sometimes, and hence cache
directory creation fails. Don't crash the process due to that.
Change-Id: I22d7ed5df9c70f021a87029e89a13a11b4b0303b
Doug Zongker [Thu, 23 Aug 2012 16:52:14 +0000 (09:52 -0700)]
pass --locale argument to recovery
When RecoverySystem boots into recovery (to install an update or wipe
data and/or cache), pass the --locale argument with the currently
selected locale.
Change-Id: Ib280330932a402be2011207bff8f05caa9b999cd
Craig Mautner [Thu, 23 Aug 2012 15:49:11 +0000 (08:49 -0700)]
am
dbc93bf2: am
6715d1ef: Merge "Clean up displayId and layerStack usage." into jb-mr1-dev
* commit '
dbc93bf2406f9af5303660b932c78ebd4b0d4737':
Clean up displayId and layerStack usage.
Craig Mautner [Thu, 23 Aug 2012 15:47:11 +0000 (08:47 -0700)]
am
6715d1ef: Merge "Clean up displayId and layerStack usage." into jb-mr1-dev
* commit '
6715d1effaa70abf261112d2771d4d555cc109c2':
Clean up displayId and layerStack usage.
Craig Mautner [Thu, 23 Aug 2012 15:44:53 +0000 (08:44 -0700)]
Merge "Clean up displayId and layerStack usage." into jb-mr1-dev
Craig Mautner [Thu, 23 Aug 2012 00:41:48 +0000 (17:41 -0700)]
Clean up displayId and layerStack usage.
Make better use of Display object by saving it in DisplayContent.
Only use layerStack when referring to Surfaces. Get displayId from
default Display or default DisplayContent. Remove warnings.
Fixes bug
7038151.
Change-Id: Ie493f0f5e755dc9b91ee969ff561c2a098283ead
Michael Jurka [Thu, 23 Aug 2012 12:19:24 +0000 (05:19 -0700)]
am
0cee05b4: am
03f482c3: Merge "Recents: apps scale down to thumbnails now" into jb-mr1-dev
* commit '
0cee05b4c03872a52435a6d6f88802faff94a14d':
Recents: apps scale down to thumbnails now
Michael Jurka [Thu, 23 Aug 2012 12:05:24 +0000 (05:05 -0700)]
am
03f482c3: Merge "Recents: apps scale down to thumbnails now" into jb-mr1-dev
* commit '
03f482c34d7e0d2917e7f53006ee2fc9736e8773':
Recents: apps scale down to thumbnails now
Michael Jurka [Thu, 23 Aug 2012 11:57:54 +0000 (04:57 -0700)]
Merge "Recents: apps scale down to thumbnails now" into jb-mr1-dev
Michael Jurka [Fri, 13 Apr 2012 16:32:47 +0000 (09:32 -0700)]
Recents: apps scale down to thumbnails now
As a part of this change, Recents is now an
activity.
Known issues:
* Jank: jump-cut as app icon appears suddenly
after the aniamtion
* Preloading recents is broken on phones without
soft nav bar and on tablets
* Thumbnail window from animation lingers/flashes
sometimes
Change-Id: Ie6f991f3c2e1e67f9ed84eb6adba9174ed957248
Ben Murdoch [Thu, 23 Aug 2012 09:23:00 +0000 (02:23 -0700)]
am
a6b7bb21: am
ed965a2c: Merge "Make HttpAuthHandler ctor public/@hide." into jb-mr1-dev
* commit '
a6b7bb2131805e88a1e87c1b80b65da896819e6e':
Make HttpAuthHandler ctor public/@hide.
Ben Murdoch [Thu, 23 Aug 2012 09:21:14 +0000 (02:21 -0700)]
am
ed965a2c: Merge "Make HttpAuthHandler ctor public/@hide." into jb-mr1-dev
* commit '
ed965a2cd1e5880e47c40ccc8394fcfa5ef0c153':
Make HttpAuthHandler ctor public/@hide.
Ben Murdoch [Thu, 23 Aug 2012 09:17:32 +0000 (02:17 -0700)]
Merge "Make HttpAuthHandler ctor public/@hide." into jb-mr1-dev
Kenny Root [Thu, 23 Aug 2012 05:59:48 +0000 (22:59 -0700)]
am
3d862322: am
618641f2: Merge "Add ability to replace chain for PrivateKeyEntry" into jb-mr1-dev
* commit '
3d8623225658084ae3ab7c8213799405b3e6c726':
Add ability to replace chain for PrivateKeyEntry
Kenny Root [Thu, 23 Aug 2012 05:58:47 +0000 (22:58 -0700)]
am
618641f2: Merge "Add ability to replace chain for PrivateKeyEntry" into jb-mr1-dev
* commit '
618641f26627e1398650e8c1b51e9cd568b13728':
Add ability to replace chain for PrivateKeyEntry
Kenny Root [Thu, 23 Aug 2012 05:55:21 +0000 (22:55 -0700)]
Merge "Add ability to replace chain for PrivateKeyEntry" into jb-mr1-dev
Baligh Uddin [Thu, 23 Aug 2012 03:28:12 +0000 (20:28 -0700)]
am
47bcc630: (-s ours) am
12850a93: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
47bcc6305dcdf8532e2380fc99b8c2992d15fb3f':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 23 Aug 2012 03:26:38 +0000 (20:26 -0700)]
am
12850a93: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
12850a93cafa755f4d14656f8c6016f37a9a975b':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 23 Aug 2012 03:23:55 +0000 (20:23 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Thu, 23 Aug 2012 03:21:03 +0000 (20:21 -0700)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 23 Aug 2012 02:54:23 +0000 (19:54 -0700)]
am
f20c8ace: (-s ours) am
48df8729: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
f20c8ace12b3148313c02ab5f318112c570c9372':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 23 Aug 2012 02:52:34 +0000 (19:52 -0700)]
am
48df8729: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
48df87298a072dc94559528f678d952cf66ce5e5':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 23 Aug 2012 02:50:05 +0000 (19:50 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Thu, 23 Aug 2012 02:48:22 +0000 (19:48 -0700)]
Merge "Import translations. DO NOT MERGE"
Amith Yamasani [Thu, 23 Aug 2012 01:25:11 +0000 (18:25 -0700)]
am
b0363bec: am
2c1dfa29: Merge "Fix deadlock in removing a user" into jb-mr1-dev
* commit '
b0363bec92313bb82645a5bdaeb624aa666902cb':
Fix deadlock in removing a user
Amith Yamasani [Thu, 23 Aug 2012 01:23:07 +0000 (18:23 -0700)]
am
2c1dfa29: Merge "Fix deadlock in removing a user" into jb-mr1-dev
* commit '
2c1dfa29b40a988e3ea8f6922768465743aafddc':
Fix deadlock in removing a user
Jeff Sharkey [Thu, 23 Aug 2012 01:23:02 +0000 (18:23 -0700)]
am
af29c279: am
3451dc90: Merge "Iteration on multi-user external storage." into jb-mr1-dev
* commit '
af29c2797634675280c3e695d8b68674c8490507':
Iteration on multi-user external storage.
Jeff Sharkey [Thu, 23 Aug 2012 01:20:52 +0000 (18:20 -0700)]
am
3451dc90: Merge "Iteration on multi-user external storage." into jb-mr1-dev
* commit '
3451dc90648b8bd176030425ce91c019460ba88c':
Iteration on multi-user external storage.
Amith Yamasani [Thu, 23 Aug 2012 01:19:19 +0000 (18:19 -0700)]
Merge "Fix deadlock in removing a user" into jb-mr1-dev
Jeff Sharkey [Thu, 23 Aug 2012 01:17:29 +0000 (18:17 -0700)]
Merge "Iteration on multi-user external storage." into jb-mr1-dev
Amith Yamasani [Wed, 22 Aug 2012 23:45:47 +0000 (16:45 -0700)]
Fix deadlock in removing a user
Cleanup PackageManager settings after the package directories are removed.
Change-Id: I264bc95ea21da653a234d7c81df5b25d4de7aa9e
Roman Nurik [Wed, 22 Aug 2012 23:21:40 +0000 (16:21 -0700)]
am
6d672214: Merge "Update TabCompat training sample code download." into jb-dev
* commit '
6d672214ae04e7d8d239c322ec4c79f9ee1feea9':
Update TabCompat training sample code download.
The Android Open Source Project [Wed, 22 Aug 2012 22:37:23 +0000 (15:37 -0700)]
am
1ac4ba19: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
1ac4ba19778d3aafc84ad240e38657807e2a7aad':
Fix NPE.
Make animators more robust against ending mid-stream
Jean-Baptiste Queru [Wed, 22 Aug 2012 22:35:57 +0000 (15:35 -0700)]
ignore merge of
2e2849a5 to jb-dev-plus-aosp
Change-Id: Ie13c209a6646a08107ffecc9e63610fd5b9fab55
The Android Open Source Project [Wed, 22 Aug 2012 22:35:18 +0000 (15:35 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Ic44b998aee206c0a43d1da8cbf35e961745cb6f3
Ying Wang [Wed, 22 Aug 2012 22:27:43 +0000 (15:27 -0700)]
am
510aa89c: am
9f814ac5: Merge "Remove obsolete variables." into jb-mr1-dev
* commit '
510aa89ca32d120f60fd8186b9575dc74b57aada':
Remove obsolete variables.
Ying Wang [Wed, 22 Aug 2012 22:23:10 +0000 (15:23 -0700)]
am
9f814ac5: Merge "Remove obsolete variables." into jb-mr1-dev
* commit '
9f814ac5fc0df77527d69710e8c1efa9d9d6f495':
Remove obsolete variables.
Ying Wang [Wed, 22 Aug 2012 22:19:44 +0000 (15:19 -0700)]
Merge "Remove obsolete variables." into jb-mr1-dev
Chet Haase [Wed, 22 Aug 2012 22:11:22 +0000 (15:11 -0700)]
am
2a100873: am
5f9e92f4: Merge "Fix animation of notification handle bar when panel changes height" into jb-mr1-dev
* commit '
2a100873adb5500122887a0f30331788830eca1b':
Fix animation of notification handle bar when panel changes height
Chet Haase [Wed, 22 Aug 2012 22:09:19 +0000 (15:09 -0700)]
am
5f9e92f4: Merge "Fix animation of notification handle bar when panel changes height" into jb-mr1-dev
* commit '
5f9e92f46fe06689a3018929590ef5f79688f0bc':
Fix animation of notification handle bar when panel changes height
Chet Haase [Wed, 22 Aug 2012 22:06:56 +0000 (15:06 -0700)]
Merge "Fix animation of notification handle bar when panel changes height" into jb-mr1-dev
Jeff Brown [Wed, 22 Aug 2012 20:12:48 +0000 (13:12 -0700)]
Fix NPE.
Bug:
7034583
Change-Id: Ie6b436492d12b0dd6bbe1c25d9b7ac35b74095d3
James Dong [Wed, 22 Aug 2012 21:55:54 +0000 (14:55 -0700)]
am
309f099b: am
d78fc5b9: Merge "Let getOriginalMimeType() take a fd passed from drm java applications" into jb-mr1-dev
* commit '
309f099bda05dc213f1c0545fe5e21c2b37be815':
Let getOriginalMimeType() take a fd passed from drm java applications
James Dong [Wed, 22 Aug 2012 21:53:46 +0000 (14:53 -0700)]
am
d78fc5b9: Merge "Let getOriginalMimeType() take a fd passed from drm java applications" into jb-mr1-dev
* commit '
d78fc5b94d1bb3dab509ca55d09052821c51412b':
Let getOriginalMimeType() take a fd passed from drm java applications
James Dong [Wed, 22 Aug 2012 21:50:27 +0000 (14:50 -0700)]
Merge "Let getOriginalMimeType() take a fd passed from drm java applications" into jb-mr1-dev
Stephen Hines [Wed, 22 Aug 2012 21:24:39 +0000 (14:24 -0700)]
am
56c6392f: (-s ours) am
9f7fa4c4: (-s ours) Merge "DO NOT MERGE - Fix readback lengths"
* commit '
56c6392fefba53e72c9effb7b5c92c64e03ecfd5':
DO NOT MERGE - Fix readback lengths
Stephen Hines [Wed, 22 Aug 2012 21:23:01 +0000 (14:23 -0700)]
am
9f7fa4c4: (-s ours) Merge "DO NOT MERGE - Fix readback lengths"
* commit '
9f7fa4c4177c405566445760ec7f4c27e812cd7f':
DO NOT MERGE - Fix readback lengths
Craig Mautner [Wed, 22 Aug 2012 21:19:55 +0000 (14:19 -0700)]
am
c91e00c8: am
b9b56954: Merge "Eliminate special battery calls by WindowManager" into jb-mr1-dev
* commit '
c91e00c8b4a223a022289b675cee4b3316122786':
Eliminate special battery calls by WindowManager
Craig Mautner [Wed, 22 Aug 2012 21:17:38 +0000 (14:17 -0700)]
am
b9b56954: Merge "Eliminate special battery calls by WindowManager" into jb-mr1-dev
* commit '
b9b56954ec5a242f7c4945942539106539f98ffb':
Eliminate special battery calls by WindowManager
Craig Mautner [Wed, 22 Aug 2012 21:14:54 +0000 (14:14 -0700)]
Merge "Eliminate special battery calls by WindowManager" into jb-mr1-dev
Stephen Hines [Wed, 22 Aug 2012 21:06:37 +0000 (14:06 -0700)]
Merge "DO NOT MERGE - Fix readback lengths"
Jeff Sharkey [Wed, 22 Aug 2012 20:59:58 +0000 (13:59 -0700)]
Iteration on multi-user external storage.
Remove single-user bind mounts, since they need to remain as raw
mounts to correctly propagate when remounted. This means we're back
to using sdcard_r GID to enforce READ_EXTERNAL_STORAGE.
Bug:
6925012
Change-Id: I41b5d7ddc985a5df2e288632a0a80d4724089e00
John Spurlock [Wed, 22 Aug 2012 13:56:51 +0000 (09:56 -0400)]
Add framework support for multiple dreams.
Bug:
7028665
Change-Id: I4fba6b8e39dc07af4490c621ac3bc7b3867371b2
James Dong [Thu, 9 Aug 2012 00:45:59 +0000 (17:45 -0700)]
Let getOriginalMimeType() take a fd passed from drm java applications
At present, we did not actually pass the fd. This patch allows us to
make the changes necessary in the future without worrying too much
about broken build.
related-to-bug:
6426185
Change-Id: I125decff9be621a72f2631fd439994a94a526606
Jeff Brown [Wed, 22 Aug 2012 20:35:10 +0000 (13:35 -0700)]
am
de053978: am
6cf3b925: Merge "Fix auto-brightness adjustment sentinel value." into jb-mr1-dev
* commit '
de0539781533c46c10b00d2f068766fcdd284394':
Fix auto-brightness adjustment sentinel value.
Jeff Brown [Wed, 22 Aug 2012 20:32:46 +0000 (13:32 -0700)]
am
6cf3b925: Merge "Fix auto-brightness adjustment sentinel value." into jb-mr1-dev
* commit '
6cf3b925ca2640c5c5e7e91ffd91749c0b5b2560':
Fix auto-brightness adjustment sentinel value.
Jeff Brown [Wed, 22 Aug 2012 20:31:08 +0000 (13:31 -0700)]
Merge "Fix auto-brightness adjustment sentinel value." into jb-mr1-dev
Jeff Brown [Wed, 22 Aug 2012 20:22:02 +0000 (13:22 -0700)]
Fix auto-brightness adjustment sentinel value.
Change-Id: I1b0da4566eb350333d3c3b09a96266627260baa3
Jeff Brown [Wed, 22 Aug 2012 20:21:13 +0000 (13:21 -0700)]
am
408471a2: am
6da92032: Merge "Fix NPE." into jb-mr1-dev
* commit '
408471a28b7adce10d8235cb38ed861cbfe51fb7':
Fix NPE.
Jeff Brown [Wed, 22 Aug 2012 20:19:46 +0000 (13:19 -0700)]
am
6da92032: Merge "Fix NPE." into jb-mr1-dev
* commit '
6da92032da255920d2e584f6ba2f8f9336ec9310':
Fix NPE.
Jeff Brown [Wed, 22 Aug 2012 20:17:22 +0000 (13:17 -0700)]
Merge "Fix NPE." into jb-mr1-dev
Jeff Brown [Wed, 22 Aug 2012 20:12:48 +0000 (13:12 -0700)]
Fix NPE.
Bug:
7034583
Change-Id: Ie6b436492d12b0dd6bbe1c25d9b7ac35b74095d3
Kenny Root [Tue, 21 Aug 2012 22:23:35 +0000 (15:23 -0700)]
Add ability to replace chain for PrivateKeyEntry
For the AndroidKeyStore API, allow entries to have their certificate
chain replaced without destroying the underlying PrivateKey. Since
entries are backed by unexportable private keys, requiring them to be
supplied again doesn't make sense and is impossible.
Change-Id: I629ce2a625315c8d8020a082892650ac5eba22ae
Justin Ho [Wed, 22 Aug 2012 19:58:09 +0000 (12:58 -0700)]
am
72404a82: Merge "Update Back softkey icon Bug:
6020915" into jb-dev
* commit '
72404a82d30ff0631a31aed93f221c1fdf210888':
Update Back softkey icon Bug:
6020915
Roman Nurik [Wed, 22 Aug 2012 19:30:45 +0000 (12:30 -0700)]
Merge "Update TabCompat training sample code download." into jb-dev
Wink Saville [Wed, 22 Aug 2012 18:49:47 +0000 (11:49 -0700)]
Merge "Empty DC's apnList when the DC is free." into jb-dev
Ben Murdoch [Wed, 22 Aug 2012 18:46:45 +0000 (19:46 +0100)]
Make HttpAuthHandler ctor public/@hide.
The Chromium WebView Provider needs to subclass HttpAuthHandler
so that we can adapt a ChromHttpAuthHandler into an
android.webkit.HttpAuthHandler. Currently the constructor (that
does nothing) is package private. So to satisfy the subclass
requirement, make it public, and to satisfy the API, make it
@hide.
Bug:
7034995
Change-Id: I9846aecacce078696db5be709394afb980eb25a6
OSDN Git Service
