Svetoslav Ganov
a3fa300bfe
Merge "Addressing comments during security review of the interrogation feature."
2011-07-06 17:27:21 -07:00
Christopher Tate
a63917ce2e
Merge "Remove unused object"
2011-07-06 15:31:56 -07:00
Brian Carlstrom
aa0fa62164
Merge "New KeyChain API for credential installation"
2011-07-06 14:59:21 -07:00
Christopher Tate
e341676010
Merge "Make full backup API available to apps"
2011-07-06 14:48:43 -07:00
Shimeng (Simon) Wang
d9f93bdfd6
Merge "Treat restored defaultScale as overview."
2011-07-06 14:40:53 -07:00
Irfan Sheriff
c33c7281cc
Merge "Log supplicant restart count correctly"
2011-07-06 13:42:42 -07:00
Jason Sams
f95b206400
Merge "docs: Re-write of OpenGL Framework topic bug 4285030"
2011-07-06 13:29:29 -07:00
Brian Carlstrom
9573a61400
Merge "Adding additional details to ssl_certificate view"
2011-07-06 12:39:25 -07:00
Glenn Kasten
be3c018f8b
Merge "Add Thread::join"
2011-07-06 11:37:53 -07:00
Mathias Agopian
7e918860f9
Merge "don't kill surfaceflinger when system process dies"
2011-07-06 11:10:31 -07:00
Mathias Agopian
429526c326
Merge "fix ScreenshotsOfProtectedBuffersFail"
2011-07-06 11:10:06 -07:00
Mathias Agopian
7946e416b6
Merge "return an error code with gralloc buffer allocation failures"
2011-07-06 11:09:55 -07:00
Chet Haase
d696ee4990
Merge "Minor ADK guide doc fixes."
2011-07-06 11:00:19 -07:00
Gloria Wang
f0459dc807
Merge "- Retrieve is_drm in MediaMetadataRetriever. - Add one more column in MediaStore to indicate whether a media file is drm-protected. - Remove old DRM code from Ringtone - Use the new DRM code in RingtoneManager"
2011-07-06 09:22:05 -07:00
Justin Ho
0dedc8b8dc
Merge "Updated Action Bar up affordance and menu button, refresh of ic_menu from designer tree Adding all xhdpi versions of these assets as well."
2011-07-06 08:04:06 -07:00
Mike Lockwood
923a74e9ed
Merge "UsbService: USB connected notification now redirects to USB screen in Settings"
2011-07-06 07:59:47 -07:00
Mike Lockwood
3df3955a40
Merge "Revert "USB connected notification and temporary USB options dialog""
2011-07-06 07:59:36 -07:00
Mike Lockwood
6d8e4b8068
Merge "Associate WebP Mime-Type with FILE_TYPE_WEBP."
2011-07-06 05:05:32 -07:00
Narayan Kamath
57fbf13748
Merge "Add a sample app for the TTS engine API"
2011-07-06 02:01:59 -07:00
Narayan Kamath
265334281a
Merge "Minor changes to AudioTrack handling"
2011-07-06 02:01:48 -07:00
Glenn Kasten
f44c896b09
Merge "Thread ID zero for androidSetThreadSchedulingGroup"
2011-07-05 15:08:31 -07:00
Steve Block
3135e6e0f0
Merge "Clarify the documentation for WebView.loadDataWithBaseURL() when the base URL uses the 'data' scheme"
2011-07-05 07:43:56 -07:00
Steve Block
181eb35275
Merge "Maintain a reference to the Java object when WebView.removeJavascriptInterface() is called"
2011-07-05 06:34:57 -07:00
Debashish Chatterjee
b92da209fb
Merge "Introduced a common SOURCE_PACKAGE_FIELD in VoicemailContract class."
2011-07-05 01:45:44 -07:00
satok
33ed52c710
Merge "Fix NPE in getLastInputMethodSubtype"
2011-07-04 21:48:47 -07:00
Hung-ying Tyan
46f6859a12
Merge "Keep last known keepalive interval to avoid duplicate effort."
2011-07-04 20:37:33 -07:00
Debashish Chatterjee
2b970a879d
Merge "Got rid of deprecated fields from VoicemailContract api."
2011-07-04 10:45:33 -07:00
Steve Block
bda64acb0c
Merge "Clarify documentation for WebView.loadData()"
2011-07-04 10:06:31 -07:00
Chia-chi Yeh
392b683169
Merge "VPN: implement status report for legacy VPN."
2011-07-04 03:38:16 -07:00
Steve Block
d91e09f831
Merge "Fix WebViewFragment to avoid detroying the WebView too early"
2011-07-04 02:11:38 -07:00
Hung-ying Tyan
dbd8e0c32a
Merge "Do not hold wifi lock when SIP is also available over mobile network."
2011-07-03 20:01:55 -07:00
Hung-ying Tyan
8292a42dad
Merge "Do not keep alive for re-established call."
2011-07-03 19:53:35 -07:00
Chia-chi Yeh
a20e76abb1
Merge "Add CleanSpec.mk for change If98e456e779f8e97f562d99c57d909b1f5d9db55."
2011-07-03 17:09:41 -07:00
Chia-chi Yeh
63ddfd9e19
VPN: remove the old VpnService.
...
Now VPN is (kind of) integrated into ConnectivityService.
Change-Id: If98e456e779f8e97f562d99c57d909b1f5d9db55
2011-07-02 20:21:09 -07:00
Chia-chi Yeh
4c868b23b7
Merge "VPN: export legacy VPN in IConnectivityManager."
2011-07-02 17:28:45 -07:00
Chia-chi Yeh
938e00a4a9
Merge "Promote ip-up-vpn into the framework."
2011-07-02 16:54:37 -07:00
Chia-chi Yeh
7c1771c05f
Merge "VPN: merge JNI methods."
2011-07-02 16:37:25 -07:00
Chia-chi Yeh
53f1b567a8
Merge "VPN: give legacy VPN a fake package name."
2011-07-02 03:19:48 -07:00
Jeff Brown
2baa5a1735
Merge "Drop obsolete touch screen hacks."
2011-07-01 19:25:46 -07:00
Jeff Brown
35a8602302
Merge "Workaround apps that make assumptions about pointer ids."
2011-07-01 19:17:21 -07:00
Dianne Hackborn
ea5361f6d9
Merge "Don't crash when the load average service is started."
2011-07-01 19:09:03 -07:00
Jeff Brown
2e0b543c09
Workaround apps that make assumptions about pointer ids.
...
Modified the touch input mapper to assign pointer ids sequentially
starting from 0 instead of using the tracking id or slot index
supplied by the driver. Applications should not depend on this
ordering but some do. (sigh)
Bug: 4980884
Change-Id: I0dfeb3ac27c57a7102a13c960c760e2a02eb7669
2011-07-01 19:08:15 -07:00
Dianne Hackborn
975749c55e
Merge "When removing a task, also kill its processes."
2011-07-01 17:13:40 -07:00
Mathias Agopian
1f339ff387
don't kill surfaceflinger when system process dies
...
Change-Id: I2d3ed87b590f9ccea3fa4af41d92911de070b315
2011-07-01 17:09:24 -07:00
Mathias Agopian
9303eee7dc
fix ScreenshotsOfProtectedBuffersFail
...
- put the test window at the front most screen position
- use RGBA_8888 which is a mandatory format
- handle devices that don't support the protected usage flags
Bug: 4950464
Change-Id: I0005fb667cfe094e5978816e2924b294c5ef817e
2011-07-01 15:41:32 -07:00
Fabrice Di Meglio
69df051a8b
Merge "Fix default TextView textDirection heuristic"
2011-07-01 15:35:52 -07:00
Brian Carlstrom
d9c0cc2fe7
Merge "Build cert chain in KeyChain.getCertificateChain"
2011-07-01 15:31:30 -07:00
Glenn Kasten
530035abca
Merge "Bug 4571308 Provide correct video frame timestamps"
2011-07-01 15:02:33 -07:00
Mathias Agopian
d9e8c64c3d
return an error code with gralloc buffer allocation failures
...
Change-Id: I471e5d37ea7a42fc8a0f93446ee3b4229da37807
2011-07-01 14:53:49 -07:00
Jake Hamby
05432c6df4
Merge "Fix IllegalStateException when A2DP connects before boot completes."
2011-07-01 14:47:50 -07:00