Robert Ly
3e02d13040
am ad2724de: cherrypicking from hc-mr1 Change-Id: I4f4ccbd73db94070274d4e6195df38b19b2245b8
...
* commit 'ad2724de956955b0ddf95491f6cb378f54dafde5':
cherrypicking from hc-mr1 Change-Id: I4f4ccbd73db94070274d4e6195df38b19b2245b8
2011-07-06 18:17:53 -07:00
Elliott Hughes
c5b8a10ad5
Merge "Add the "debug.jni.logging" property so third-party developers can debug their JNI problems."
2011-07-06 18:11:20 -07:00
Kazuhiro Ondo
927ed58ff7
am c8e2916d: Bring back ERI into CDMA-LTE mode
...
* commit 'c8e2916d0bdbbda5fb6faf61d6f24100641d19f5':
Bring back ERI into CDMA-LTE mode
2011-07-06 18:04:30 -07:00
Mike Lockwood
608a6c0e4c
Merge "UsbDeviceManager: Initialize RNDIS ethernet address based on device serial number"
2011-07-06 17:54:08 -07:00
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
Jamie Gennis
47dd726460
SurfaceTexture: enable newly passing tests.
...
This change enables the following four SurfaceTextures tests:
UpdateTexImageBeforeFrameFinishedWorks
UpdateTexImageAfterFrameFinishedWorks
RepeatedUpdateTexImageBeforeFrameFinishedWorks
RepeatedUpdateTexImageAfterFrameFinishedWorks
Change-Id: I7632630bc97873e50d4a765ffc44a86f16ae62f1
2011-07-06 14:47:47 -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
Wink Saville
c6066148b5
am 97667d0c: Merge "Allow vril-dump to work on user builds" into honeycomb-LTE
...
* commit '97667d0cb3d5aecca7210c70a302f7a667330708':
Allow vril-dump to work on user builds
2011-07-06 12:09:48 -07:00
Wink Saville
53fef10a0d
Merge "Allow vril-dump to work on user builds" into honeycomb-LTE
2011-07-06 12:08:05 -07:00
Glenn Kasten
be3c018f8b
Merge "Add Thread::join"
2011-07-06 11:37:53 -07:00
Robert Ly
b9a3225622
am bc45fcbb: am 205d1c34: cherrypicking tools and adt r12 relnotes from hc-mr1 Change-Id: I0ea492417581c062f6433e23345fe3fe398709c0
...
* commit 'bc45fcbb44fb6af0e99446c0e56eba8238de9e90':
cherrypicking tools and adt r12 relnotes from hc-mr1 Change-Id: I0ea492417581c062f6433e23345fe3fe398709c0
2011-07-06 11:26:27 -07:00
Robert Ly
e5fc60cb24
am 205d1c34: cherrypicking tools and adt r12 relnotes from hc-mr1 Change-Id: I0ea492417581c062f6433e23345fe3fe398709c0
...
* commit '205d1c34e3289b05700e6caab718de169ad82b90':
cherrypicking tools and adt r12 relnotes from hc-mr1 Change-Id: I0ea492417581c062f6433e23345fe3fe398709c0
2011-07-06 11:22:20 -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
Robert Greenwalt
5752111d6e
am 7022db4c: am 2b62c4fb: am 38bb0123: Merge "Added methods to support dns cache per interface"
...
* commit '7022db4cd2ca3721631595d7379eabb2cc77f6a9':
Added methods to support dns cache per interface
2011-07-06 07:48:21 -07:00
Robert Greenwalt
7a49c9129b
am 2b62c4fb: am 38bb0123: Merge "Added methods to support dns cache per interface"
...
* commit '2b62c4fbfeb7df0988bf216c50cd4a24f05add9f':
Added methods to support dns cache per interface
2011-07-06 07:42:19 -07:00
Robert Greenwalt
25fbdf5ecf
am 38bb0123: Merge "Added methods to support dns cache per interface"
...
* commit '38bb0123b8b9857c3119fd359739daf872f619d6':
Added methods to support dns cache per interface
2011-07-06 07:35:02 -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