OSDN Git Service
Selim Cinek [Mon, 24 Mar 2014 19:45:07 +0000 (12:45 -0700)]
am
4c01eccb: am
38fc02d4: am
d9e5761a: am
04ea3ca0: am
50ac19e9: am
ba126c09: Disable Set Wallpaper button while loading image
* commit '
4c01eccb0c06fb83532cad00cbf9a4b47b6dc1f8':
Disable Set Wallpaper button while loading image
Chad Brubaker [Mon, 24 Mar 2014 19:45:04 +0000 (12:45 -0700)]
am
87f738d2: am
51e93804: am
05e4dc96: am
850eb678: am
eb3c0d9a: am
1aad3ad4: Merge "Fix support for simultaneous VPN tuns" into klp-dev
* commit '
87f738d2787444854cd15695b599b84b25027167':
Fix support for simultaneous VPN tuns
Chad Brubaker [Mon, 24 Mar 2014 19:45:01 +0000 (12:45 -0700)]
am
ff3bb2fe: am
7f623d6b: am
9506e84b: am
c7726147: am
1fce89d9: am
de4e7b49: Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev
* commit '
ff3bb2fe95a7d0158f5a456368eb7fa91069bc23':
Include the interface for clearDnsInterfaceForUidRange
Ricardo Cervera [Mon, 24 Mar 2014 19:44:58 +0000 (12:44 -0700)]
am
b7fe3363: am
1575e1a1: (-s ours) am
419b17ec: am
1d77a874: am
588300cb: am
2e929658: Merge "docs: Added new sensor types. Bug:
10674725" into klp-docs
* commit '
b7fe33633b49924c35751d4e5796f8add4ad623c':
docs: Added new sensor types. Bug:
10674725
Selim Cinek [Mon, 24 Mar 2014 19:36:14 +0000 (19:36 +0000)]
am
38fc02d4: am
d9e5761a: am
04ea3ca0: am
50ac19e9: am
ba126c09: Disable Set Wallpaper button while loading image
* commit '
38fc02d4efa9e943ab38306d466c5fe2786f1bb7':
Disable Set Wallpaper button while loading image
Chad Brubaker [Mon, 24 Mar 2014 19:35:25 +0000 (19:35 +0000)]
am
51e93804: am
05e4dc96: am
850eb678: am
eb3c0d9a: am
1aad3ad4: Merge "Fix support for simultaneous VPN tuns" into klp-dev
* commit '
51e938041e72f29c4e776a8627ea9d8a70d62728':
Fix support for simultaneous VPN tuns
Chad Brubaker [Mon, 24 Mar 2014 19:35:20 +0000 (19:35 +0000)]
am
7f623d6b: am
9506e84b: am
c7726147: am
1fce89d9: am
de4e7b49: Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev
* commit '
7f623d6b9459bc982c49f0a74aa2c9911f8e1dd8':
Include the interface for clearDnsInterfaceForUidRange
Ricardo Cervera [Mon, 24 Mar 2014 19:35:11 +0000 (19:35 +0000)]
am
1575e1a1: (-s ours) am
419b17ec: am
1d77a874: am
588300cb: am
2e929658: Merge "docs: Added new sensor types. Bug:
10674725" into klp-docs
* commit '
1575e1a1f5c6a0e1d870af88cba8d54023dfbcab':
docs: Added new sensor types. Bug:
10674725
Chris Wren [Mon, 24 Mar 2014 19:00:43 +0000 (12:00 -0700)]
am
8ed3b587: Merge "add more dump info for heads up notifications"
* commit '
8ed3b587f00ccb1b4264d2ee3590af32464428c9':
add more dump info for heads up notifications
Chris Wren [Mon, 24 Mar 2014 18:57:06 +0000 (18:57 +0000)]
Merge "add more dump info for heads up notifications"
John Reck [Mon, 24 Mar 2014 18:48:42 +0000 (11:48 -0700)]
am
1e1f4d70: am
02e99e27: am
ae316643: am
aff40e25: am
fc603ca6: am
abf701e6: Merge "Eliminate mHasAlpha" into klp-dev
* commit '
1e1f4d705edaad3700b49c730bc8a22c522cb46b':
Eliminate mHasAlpha
John Reck [Mon, 24 Mar 2014 18:44:01 +0000 (18:44 +0000)]
am
02e99e27: am
ae316643: am
aff40e25: am
fc603ca6: am
abf701e6: Merge "Eliminate mHasAlpha" into klp-dev
* commit '
02e99e272dbfedf5d9ba1ae91fa2b83cab5b3d07':
Eliminate mHasAlpha
Dianne Hackborn [Mon, 24 Mar 2014 18:43:17 +0000 (11:43 -0700)]
am
48600b95: Merge "Fix issue #
13564072: Back button no longer dismisses IME after voice usage"
* commit '
48600b95cad8d49772ca5634a317b893d2346f42':
Fix issue #
13564072: Back button no longer dismisses IME after voice usage
Dianne Hackborn [Mon, 24 Mar 2014 18:43:14 +0000 (11:43 -0700)]
am
7d867342: Merge "Get rid of not specifying a user errors in bluetooth."
* commit '
7d86734297bf6c2f71404498567cc92576591b8c':
Get rid of not specifying a user errors in bluetooth.
Dianne Hackborn [Mon, 24 Mar 2014 18:37:50 +0000 (18:37 +0000)]
Merge "Fix issue #
13564072: Back button no longer dismisses IME after voice usage"
Dianne Hackborn [Mon, 24 Mar 2014 18:37:18 +0000 (18:37 +0000)]
Merge "Get rid of not specifying a user errors in bluetooth."
Yorke Lee [Mon, 24 Mar 2014 18:35:57 +0000 (18:35 +0000)]
Merge "Add gateway support to frameworks/base/telecomm" into master-nova
Dianne Hackborn [Mon, 24 Mar 2014 18:27:18 +0000 (11:27 -0700)]
Fix issue #
13564072: Back button no longer dismisses IME after voice usage
Calling identity wasn't being cleared in an incoming code path.
Change-Id: Ib32060a91bf81531de049fafde69835b5382a25f
Unsuk Jung [Mon, 24 Mar 2014 17:39:02 +0000 (10:39 -0700)]
am
1d22bd19: am
8ae2ce76: am
7bde0fc7: am
2270ac96: am
8114c3d0: am
1a70f391: Merge "Change wallpaper sizing" into klp-dev
* commit '
1d22bd1986ced3c5396dea83d2d04f84457953ee':
Change wallpaper sizing
Will Haldean Brown [Mon, 24 Mar 2014 17:38:54 +0000 (10:38 -0700)]
am
bdb78d82: am
ede2a729: am
ccd55a92: am
f8c78b50: Update current.txt to include windowSwipeToDismiss
* commit '
bdb78d8261c61e8b1c30af7ff2a39cc91026aa02':
Update current.txt to include windowSwipeToDismiss
Alex Klyubin [Mon, 24 Mar 2014 17:38:51 +0000 (10:38 -0700)]
am
f96bfe86: am
7ae93b1d: am
92ec0a0c: am
d8c32164: am
88517170: Merge "Adjust to the change in the private SSLParameterImpl API."
* commit '
f96bfe86a68bfd0491a76cf6dfa515dc58f027bb':
Adjust to the change in the private SSLParameterImpl API.
Jeff Sharkey [Mon, 24 Mar 2014 17:38:48 +0000 (10:38 -0700)]
am
6640f6be: am
b8846c81: am
cf0c4a59: am
4868da52: am
c620ec36: am
3f523222: Merge "Lock down MANAGE_DOCUMENTS permission." into klp-dev
* commit '
6640f6be412e7454bfa7d457670e83aba46ea28c':
Lock down MANAGE_DOCUMENTS permission.
Will Haldean Brown [Mon, 24 Mar 2014 17:38:45 +0000 (10:38 -0700)]
am
02893315: am
d3e33cc2: am
aa0fa8eb: am
cedbfad4: Fix link in documentation for SWIPE_TO_DISMISS.
* commit '
0289331500457837f8ec20eea42f7bbbc2c3f479':
Fix link in documentation for SWIPE_TO_DISMISS.
Will Haldean Brown [Mon, 24 Mar 2014 17:38:42 +0000 (10:38 -0700)]
am
125f2155: am
e3d4f6c1: (-s ours) am
8f2c3252: am
496e8178: Merge "Make windowSwipeToDismiss a public attribute." into klp-modular-dev
* commit '
125f2155bedf37841d7c9a9b59fb2680e41cfcef':
Make windowSwipeToDismiss a public attribute.
Unsuk Jung [Mon, 24 Mar 2014 17:34:22 +0000 (17:34 +0000)]
am
8ae2ce76: am
7bde0fc7: am
2270ac96: am
8114c3d0: am
1a70f391: Merge "Change wallpaper sizing" into klp-dev
* commit '
8ae2ce76e3d44f9b25f8121c693a1e21fef3bbe0':
Change wallpaper sizing
Will Haldean Brown [Mon, 24 Mar 2014 17:34:18 +0000 (17:34 +0000)]
am
ede2a729: am
ccd55a92: am
f8c78b50: Update current.txt to include windowSwipeToDismiss
* commit '
ede2a729c394461e5b3ea674e4762e7e6feed81d':
Update current.txt to include windowSwipeToDismiss
Alex Klyubin [Mon, 24 Mar 2014 17:34:11 +0000 (17:34 +0000)]
am
7ae93b1d: am
92ec0a0c: am
d8c32164: am
88517170: Merge "Adjust to the change in the private SSLParameterImpl API."
* commit '
7ae93b1d0cd1eb43b5fc8248dfc2703608a461f3':
Adjust to the change in the private SSLParameterImpl API.
Jeff Sharkey [Mon, 24 Mar 2014 17:34:02 +0000 (17:34 +0000)]
am
b8846c81: am
cf0c4a59: am
4868da52: am
c620ec36: am
3f523222: Merge "Lock down MANAGE_DOCUMENTS permission." into klp-dev
* commit '
b8846c819e43535250b004dde593892fa305b7e7':
Lock down MANAGE_DOCUMENTS permission.
Will Haldean Brown [Mon, 24 Mar 2014 17:33:58 +0000 (17:33 +0000)]
am
d3e33cc2: am
aa0fa8eb: am
cedbfad4: Fix link in documentation for SWIPE_TO_DISMISS.
* commit '
d3e33cc25d638cced9c17822db21e6c32e00f461':
Fix link in documentation for SWIPE_TO_DISMISS.
Will Haldean Brown [Mon, 24 Mar 2014 17:33:55 +0000 (17:33 +0000)]
am
e3d4f6c1: (-s ours) am
8f2c3252: am
496e8178: Merge "Make windowSwipeToDismiss a public attribute." into klp-modular-dev
* commit '
e3d4f6c19bb21dd20d95446def9a8872ecab2721':
Make windowSwipeToDismiss a public attribute.
Will Haldean Brown [Mon, 24 Mar 2014 17:29:01 +0000 (10:29 -0700)]
am
70d78bbe: Make windowSwipeToDismiss a public attribute.
* commit '
70d78bbeecc491ebb0a30ee650d2445145992514':
Make windowSwipeToDismiss a public attribute.
Will Haldean Brown [Thu, 20 Mar 2014 23:31:48 +0000 (16:31 -0700)]
Make windowSwipeToDismiss a public attribute.
resolved conflicts for merge of
e3d4f6c1 to master
Bug:
13348970
Change-Id: I695139376fc7f38b3438ab38659ca15490ce8f7c
George Mount [Mon, 24 Mar 2014 16:51:55 +0000 (09:51 -0700)]
am
fea8d956: Merge "Fix null ActivityOptions when starting an Activity in a new Process."
* commit '
fea8d956649589f1cfd378571cc9ad61a92cd480':
Fix null ActivityOptions when starting an Activity in a new Process.
George Mount [Mon, 24 Mar 2014 16:51:52 +0000 (09:51 -0700)]
am
07e1b900: Merge "Fix problem on Animator with a start delay."
* commit '
07e1b9002a51032a7dc782178d3c29d3417ab266':
Fix problem on Animator with a start delay.
George Mount [Mon, 24 Mar 2014 16:47:08 +0000 (16:47 +0000)]
Merge "Fix null ActivityOptions when starting an Activity in a new Process."
George Mount [Mon, 24 Mar 2014 16:46:59 +0000 (16:46 +0000)]
Merge "Fix problem on Animator with a start delay."
Przemyslaw Szczepaniak [Mon, 24 Mar 2014 12:28:44 +0000 (05:28 -0700)]
am
7638b1f3: Merge "Do not reset language in case of the TTS service reconnect."
* commit '
7638b1f3b56d8176e401a4067b18749682635f0c':
Do not reset language in case of the TTS service reconnect.
Mathew Inwood [Mon, 24 Mar 2014 12:28:40 +0000 (05:28 -0700)]
am
a73b0c54: Merge "Fix log spam from View.toString()."
* commit '
a73b0c54b3f8c00028ff9b39aa1e0f5556d7c6f2':
Fix log spam from View.toString().
Przemyslaw Szczepaniak [Mon, 24 Mar 2014 10:08:36 +0000 (10:08 +0000)]
Merge "Do not reset language in case of the TTS service reconnect."
Mathew Inwood [Mon, 24 Mar 2014 09:46:22 +0000 (09:46 +0000)]
Merge "Fix log spam from View.toString()."
Craig Mautner [Sun, 23 Mar 2014 01:24:22 +0000 (18:24 -0700)]
am
296f1a91: Merge "Revert "Apply FLAG_SHOW_WHEN_LOCKED within tasks.""
* commit '
296f1a9130cc5d5339ab1d1c3cfc7324920acf8a':
Revert "Apply FLAG_SHOW_WHEN_LOCKED within tasks."
Craig Mautner [Sun, 23 Mar 2014 01:20:41 +0000 (01:20 +0000)]
Merge "Revert "Apply FLAG_SHOW_WHEN_LOCKED within tasks.""
Craig Mautner [Sun, 23 Mar 2014 00:10:33 +0000 (00:10 +0000)]
Revert "Apply FLAG_SHOW_WHEN_LOCKED within tasks."
This reverts commit
f7ad855718dc576a1618a54035b82e92356aa0d8.
After careful consideration this would prove to be a security leak to leave it in. Tasks could deliberately launch dialog activities that don't want to be seen in an unsecure setting. These would then be visible over the task background.
Change-Id: Ia7e984bc9616573af6c7772f6ea0f2dd588bb85d
Craig Mautner [Sat, 22 Mar 2014 23:50:28 +0000 (16:50 -0700)]
am
61ada5d3: Merge "Add Activity methods for icons and labels."
* commit '
61ada5d330e10a738ba5f085cae5b9b339895d19':
Add Activity methods for icons and labels.
Craig Mautner [Sat, 22 Mar 2014 23:44:37 +0000 (23:44 +0000)]
Merge "Add Activity methods for icons and labels."
Craig Mautner [Fri, 21 Mar 2014 16:34:07 +0000 (09:34 -0700)]
Add Activity methods for icons and labels.
New Activity methods setRecentsLabel(CharSequence) and
setRecentsIcon(Bitmap) have been added. The topmost
activity with either of these set will be returned in
RecentTaskInfo members activityLabel and activityIcon.
Fixes bug
13562992.
Change-Id: Ic15d1d27b733b892a2a940063b105ac48f1ffee5
John Spurlock [Sat, 22 Mar 2014 01:40:38 +0000 (18:40 -0700)]
am
9ae0c8ff: Merge "Add notification category for recommendations."
* commit '
9ae0c8ffba5ab50fb02d319a00e56fe42960cb4a':
Add notification category for recommendations.
Yorke Lee [Wed, 19 Mar 2014 18:47:02 +0000 (11:47 -0700)]
Add gateway support to frameworks/base/telecomm
Add parcelable GatewayInfo class used to store gateway info in
Call and CallInfo.
Add gateway-related string constants to TelecommConstants
Bug:
13477768
Change-Id: I35b2de2d66edeed6273f6cba5329ca0f26264db6
John Spurlock [Sat, 22 Mar 2014 01:35:46 +0000 (01:35 +0000)]
Merge "Add notification category for recommendations."
John Spurlock [Fri, 21 Mar 2014 17:30:57 +0000 (13:30 -0400)]
Add notification category for recommendations.
Change-Id: I3718b8273c3f901aee1b2c2cdc4fcdae25fadcad
Dianne Hackborn [Sat, 22 Mar 2014 00:30:55 +0000 (17:30 -0700)]
am
e9c9c441: Merge "Battery stats: track actually running time"
* commit '
e9c9c441346586e26eccc0523fcf12f5158e53f7':
Battery stats: track actually running time
Dianne Hackborn [Sat, 22 Mar 2014 00:26:19 +0000 (00:26 +0000)]
Merge "Battery stats: track actually running time"
Christopher Tate [Fri, 21 Mar 2014 23:37:06 +0000 (16:37 -0700)]
am
18a65ad0: Merge "Cap the size of app-defined permission trees"
* commit '
18a65ad09d9a245266874015e5aacb05d868a534':
Cap the size of app-defined permission trees
Christopher Tate [Fri, 21 Mar 2014 23:32:58 +0000 (23:32 +0000)]
Merge "Cap the size of app-defined permission trees"
George Mount [Thu, 20 Mar 2014 16:38:23 +0000 (09:38 -0700)]
Fix null ActivityOptions when starting an Activity in a new Process.
Bug
13563265
Change-Id: Ie56cd6d55f13dbf68bafb82ab4bd6b27fde60df6
Dianne Hackborn [Fri, 21 Mar 2014 18:07:11 +0000 (11:07 -0700)]
Battery stats: track actually running time
Use the uptime while creating the battery stats history to
generate a new event indicating when the CPU is actually running.
We can do this in combination with the new event reporting when
the CPU comes awake, looking at the difference between the
uptime and elapsed time at that point to determine when it last
when to sleep.
Also use this information to generate a new set of aggregated
states, the uptime caused by each wake reason.
Finally use new radio down timestamp to adjust the times we
compute for radio use. Note that this information is not (yet)
being used to adjust how these are recorded in the history.
Change-Id: I723b3b526c8e7d64de0cac9d1193e04132d5a3e4
George Mount [Fri, 21 Mar 2014 23:13:37 +0000 (16:13 -0700)]
Fix problem on Animator with a start delay.
Bug
13589060
Change-Id: I05b9421fa141466bdbfe19f1bd5d993fa23982cb
Winson Chung [Fri, 21 Mar 2014 23:07:22 +0000 (16:07 -0700)]
am
e9c77aee: Merge "Fixing crash with multiple touch pointers"
* commit '
e9c77aee60fbb781db916d32fe1db81e1d973f8f':
Fixing crash with multiple touch pointers
Winson Chung [Fri, 21 Mar 2014 23:03:15 +0000 (23:03 +0000)]
Merge "Fixing crash with multiple touch pointers"
Selim Cinek [Fri, 21 Mar 2014 23:01:24 +0000 (23:01 +0000)]
am
d9e5761a: am
04ea3ca0: am
50ac19e9: am
ba126c09: Disable Set Wallpaper button while loading image
* commit '
d9e5761a4e62d49212ed22e20840ddb4413ae9e0':
Disable Set Wallpaper button while loading image
Winson Chung [Fri, 21 Mar 2014 22:15:11 +0000 (15:15 -0700)]
Fixing crash with multiple touch pointers
- Adding support for force-reloading certain thumbnails (in prep for fix to Bug.
13587139)
- Use withLayer and withEndAction on ViewPropertyAnimator animations
- Ensuring that we close the notifications panel when we toggle recents
Change-Id: Ied2d841de42046fcb09fffb615156b07b4a67136
Selim Cinek [Fri, 21 Mar 2014 22:52:52 +0000 (22:52 +0000)]
am
04ea3ca0: am
50ac19e9: am
ba126c09: Disable Set Wallpaper button while loading image
* commit '
04ea3ca000312f4eccc44347c37c49471081b852':
Disable Set Wallpaper button while loading image
Selim Cinek [Fri, 21 Mar 2014 22:46:33 +0000 (22:46 +0000)]
am
50ac19e9: am
ba126c09: Disable Set Wallpaper button while loading image
* commit '
50ac19e9b8d3435eab44cacbb62c5081f44df910':
Disable Set Wallpaper button while loading image
Selim Cinek [Fri, 21 Mar 2014 22:41:07 +0000 (22:41 +0000)]
am
ba126c09: Disable Set Wallpaper button while loading image
* commit '
ba126c09a5c00cb0a96da6ece0b4ab4d7ed2d8cb':
Disable Set Wallpaper button while loading image
Christopher Tate [Fri, 21 Mar 2014 22:16:14 +0000 (15:16 -0700)]
Cap the size of app-defined permission trees
Bug
13529742
Change-Id: I46c2ebc39caf4a9eacbffbb35fc386c2a1cedc12
Selim Cinek [Fri, 21 Mar 2014 18:19:08 +0000 (19:19 +0100)]
Disable Set Wallpaper button while loading image
Bug:
13534714
Change-Id: I45ff3436de40ea85fb22d776584d9f30f0795898
(cherry picked from commit
0fa6c1b146f7ed1aba335c30878e2c1b2bf2a8f1)
Matthew Williams [Fri, 21 Mar 2014 22:07:19 +0000 (15:07 -0700)]
am
cde7086b: Merge "Downgrade expedited to normal on reschedule."
* commit '
cde7086b900fd192a8e389f62ab5007d351d86b8':
Downgrade expedited to normal on reschedule.
Matthew Williams [Fri, 21 Mar 2014 21:59:07 +0000 (21:59 +0000)]
Merge "Downgrade expedited to normal on reschedule."
Chad Brubaker [Fri, 21 Mar 2014 21:16:46 +0000 (21:16 +0000)]
am
05e4dc96: am
850eb678: am
eb3c0d9a: am
1aad3ad4: Merge "Fix support for simultaneous VPN tuns" into klp-dev
* commit '
05e4dc96fbe47480fcd639ac679683c90ba07484':
Fix support for simultaneous VPN tuns
Chad Brubaker [Fri, 21 Mar 2014 21:16:43 +0000 (21:16 +0000)]
am
9506e84b: am
c7726147: am
1fce89d9: am
de4e7b49: Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev
* commit '
9506e84b6f1b8a63abd5c7ecd580548386cc9aae':
Include the interface for clearDnsInterfaceForUidRange
Chad Brubaker [Fri, 21 Mar 2014 21:09:44 +0000 (21:09 +0000)]
am
850eb678: am
eb3c0d9a: am
1aad3ad4: Merge "Fix support for simultaneous VPN tuns" into klp-dev
* commit '
850eb678d7356ea60925dc6fa450e213d5cea2d5':
Fix support for simultaneous VPN tuns
Chad Brubaker [Fri, 21 Mar 2014 21:09:41 +0000 (21:09 +0000)]
am
c7726147: am
1fce89d9: am
de4e7b49: Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev
* commit '
c77261471432e1577586395dd0a6a481ef7431b5':
Include the interface for clearDnsInterfaceForUidRange
Chad Brubaker [Fri, 21 Mar 2014 21:02:47 +0000 (21:02 +0000)]
am
eb3c0d9a: am
1aad3ad4: Merge "Fix support for simultaneous VPN tuns" into klp-dev
* commit '
eb3c0d9ac387bb0aea5b4956daac1403253bc76d':
Fix support for simultaneous VPN tuns
Chad Brubaker [Fri, 21 Mar 2014 21:02:43 +0000 (21:02 +0000)]
am
1fce89d9: am
de4e7b49: Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev
* commit '
1fce89d946760a1bcf3a733f55494f963eab00c2':
Include the interface for clearDnsInterfaceForUidRange
Chad Brubaker [Fri, 21 Mar 2014 20:56:41 +0000 (20:56 +0000)]
am
1aad3ad4: Merge "Fix support for simultaneous VPN tuns" into klp-dev
* commit '
1aad3ad4ec2137c5aa043f96ccc621a4faffeb56':
Fix support for simultaneous VPN tuns
Chad Brubaker [Fri, 21 Mar 2014 20:56:37 +0000 (20:56 +0000)]
am
de4e7b49: Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev
* commit '
de4e7b4947998638e0345ab9a181bf35a8827bef':
Include the interface for clearDnsInterfaceForUidRange
Chad Brubaker [Fri, 21 Mar 2014 20:52:14 +0000 (20:52 +0000)]
Merge "Fix support for simultaneous VPN tuns" into klp-dev
Chad Brubaker [Fri, 21 Mar 2014 20:52:04 +0000 (20:52 +0000)]
Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev
Paul Lawrence [Fri, 21 Mar 2014 20:45:20 +0000 (13:45 -0700)]
am
717e0f5d: Merge "Don\'t prompt at boot if we already did that when decrypting"
* commit '
717e0f5db7161ddfff98f21fe1cdb2a3b1a6c8b7':
Don't prompt at boot if we already did that when decrypting
Paul Lawrence [Fri, 21 Mar 2014 20:40:46 +0000 (20:40 +0000)]
Merge "Don't prompt at boot if we already did that when decrypting"
Jinsuk Kim [Fri, 21 Mar 2014 20:30:02 +0000 (13:30 -0700)]
Ricardo Cervera [Fri, 21 Mar 2014 20:24:13 +0000 (20:24 +0000)]
am
419b17ec: am
1d77a874: am
588300cb: am
2e929658: Merge "docs: Added new sensor types. Bug:
10674725" into klp-docs
* commit '
419b17ec9e8520b8d38b3f8db6d6fe5b0fce1211':
docs: Added new sensor types. Bug:
10674725
Jinsuk Kim [Fri, 21 Mar 2014 20:23:45 +0000 (20:23 +0000)]
Colin Cross [Fri, 21 Mar 2014 20:23:05 +0000 (13:23 -0700)]
am
8a60ded0: Merge "resolved conflicts for merge of
a67e34c8 to master"
* commit '
8a60ded02614bc8358f89aa9b7cf3f8e7b1383a2':
Add HDMI-CEC service
Colin Cross [Fri, 21 Mar 2014 20:19:54 +0000 (20:19 +0000)]
Merge "resolved conflicts for merge of
a67e34c8 to master"
Ricardo Cervera [Fri, 21 Mar 2014 20:18:29 +0000 (20:18 +0000)]
am
1d77a874: am
588300cb: am
2e929658: Merge "docs: Added new sensor types. Bug:
10674725" into klp-docs
* commit '
1d77a8741c8b08c2b911e714c56521483e23bdac':
docs: Added new sensor types. Bug:
10674725
Ricardo Cervera [Fri, 21 Mar 2014 20:11:48 +0000 (20:11 +0000)]
am
588300cb: am
2e929658: Merge "docs: Added new sensor types. Bug:
10674725" into klp-docs
* commit '
588300cb5211f7217b81683f8a76bdf95c7bfa8d':
docs: Added new sensor types. Bug:
10674725
Colin Cross [Fri, 21 Mar 2014 20:11:02 +0000 (13:11 -0700)]
resolved conflicts for merge of
a67e34c8 to master
Change-Id: I597525886260884c9b2dfc7945e01eb8138a58c2
Ricardo Cervera [Fri, 21 Mar 2014 20:06:06 +0000 (20:06 +0000)]
am
2e929658: Merge "docs: Added new sensor types. Bug:
10674725" into klp-docs
* commit '
2e92965820d61b704e0eb307da70825c46d899d3':
docs: Added new sensor types. Bug:
10674725
Bo Liu [Fri, 21 Mar 2014 20:05:57 +0000 (13:05 -0700)]
am
caf94773: Merge "Convert a attach/detach functor in ViewRootImpl to x64"
* commit '
caf947737d3e94d2f5d839ec1fa951df7937fdb2':
Convert a attach/detach functor in ViewRootImpl to x64
Ricardo Cervera [Fri, 21 Mar 2014 20:01:31 +0000 (20:01 +0000)]
Merge "docs: Added new sensor types. Bug:
10674725" into klp-docs
Bo Liu [Fri, 21 Mar 2014 20:00:34 +0000 (20:00 +0000)]
Merge "Convert a attach/detach functor in ViewRootImpl to x64"
Adam Cohen [Fri, 21 Mar 2014 20:00:08 +0000 (13:00 -0700)]
am
fb40d78c: Merge "Catch exceptions if Exif is malformed"
* commit '
fb40d78c57711585c9eaed467601bf3adb4f60f9':
Catch exceptions if Exif is malformed
John Reck [Fri, 21 Mar 2014 19:59:38 +0000 (19:59 +0000)]
am
ae316643: am
aff40e25: am
fc603ca6: am
abf701e6: Merge "Eliminate mHasAlpha" into klp-dev
* commit '
ae31664390a95b1a0b80bf7aa246b8413b469ea7':
Eliminate mHasAlpha
Adam Cohen [Fri, 21 Mar 2014 19:56:46 +0000 (12:56 -0700)]
am
146af201: Merge "Catching security exception when activity destroyed"
* commit '
146af201d380cffa6a540fd0d52590bd9d30b614':
Catching security exception when activity destroyed
John Spurlock [Fri, 21 Mar 2014 19:56:43 +0000 (12:56 -0700)]
am
3daafcd7: Merge "Annotate framework vibrate calls with stream hints."
* commit '
3daafcd7bab6e3ace72396576529e3049ab4c066':
Annotate framework vibrate calls with stream hints.
Adam Cohen [Fri, 21 Mar 2014 19:55:53 +0000 (19:55 +0000)]
Merge "Catch exceptions if Exif is malformed"
Adam Cohen [Fri, 21 Mar 2014 19:54:54 +0000 (19:54 +0000)]
Merge "Catching security exception when activity destroyed"
John Reck [Fri, 21 Mar 2014 19:53:17 +0000 (19:53 +0000)]
am
aff40e25: am
fc603ca6: am
abf701e6: Merge "Eliminate mHasAlpha" into klp-dev
* commit '
aff40e25e8f16c3ecd20376901d7062774850023':
Eliminate mHasAlpha
John Spurlock [Fri, 21 Mar 2014 19:51:44 +0000 (19:51 +0000)]
Merge "Annotate framework vibrate calls with stream hints."