drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
54,084 Commits 1 Branch 0 Tags
Commit Graph

54084 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Irfan Sheriff
aadfed5308 Merge "Log supplicant restart count correctly" 2011-07-06 13:42:42 -07:00
Jason Sams
04a3ae0d30 Merge "docs: Re-write of OpenGL Framework topic bug 4285030" 2011-07-06 13:29:29 -07:00
Brian Carlstrom
be87cc945b Merge "Adding additional details to ssl_certificate view" 2011-07-06 12:39:25 -07:00
Brian Carlstrom
4a06281052 Adding additional details to ssl_certificate view 
Change-Id: I3da80988b749fe60174c3c8df856d714ede518ba
 2011-07-06 12:07:41 -07:00
Glenn Kasten
5161eb7b23 Merge "Add Thread::join" 2011-07-06 11:37:53 -07:00
Mathias Agopian
55aaccd7e8 Merge "don't kill surfaceflinger when system process dies" 2011-07-06 11:10:31 -07:00
Mathias Agopian
7893c5e83c Merge "fix ScreenshotsOfProtectedBuffersFail" 2011-07-06 11:10:06 -07:00
Mathias Agopian
7eef784ea9 Merge "return an error code with gralloc buffer allocation failures" 2011-07-06 11:09:55 -07:00
Chet Haase
5f517c149f Merge "Minor ADK guide doc fixes." 2011-07-06 11:00:19 -07:00
Gloria Wang
2da9eb7175 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
Chet Haase
ac8ebfccc3 Minor ADK guide doc fixes. 
Change-Id: I3e2966c6f6b1ef309dffdb6089abe69e36ec8bb2
 2011-07-06 08:59:14 -07:00
Justin Ho
4481c35567 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
2776f6975d Merge "UsbService: USB connected notification now redirects to USB screen in Settings" 2011-07-06 07:59:47 -07:00
Mike Lockwood
a2e66343b6 Merge "Revert "USB connected notification and temporary USB options dialog"" 2011-07-06 07:59:36 -07:00
Mike Lockwood
07cac12ca0 Merge "Associate WebP Mime-Type with FILE_TYPE_WEBP." 2011-07-06 05:05:32 -07:00
Vikas Arora
7f61f5919d Associate WebP Mime-Type with FILE_TYPE_WEBP. 
The last change for adding WEBP Mime-Type
(https://android-git.corp.google.com/g/#change,112919) had this bug.
Fixing the bug in this change.

Change-Id: I084b66de4aabb3892fb0e6fa36062a52d4dcc224
 2011-07-06 16:48:18 +05:30
Narayan Kamath
42de13c3b0 Merge "Add a sample app for the TTS engine API" 2011-07-06 02:01:59 -07:00
Narayan Kamath
e074e221a8 Merge "Minor changes to AudioTrack handling" 2011-07-06 02:01:48 -07:00
Glenn Kasten
4431c05f13 Merge "Thread ID zero for androidSetThreadSchedulingGroup" 2011-07-05 15:08:31 -07:00
Narayan Kamath
9637198699 Minor changes to AudioTrack handling 
Based on a discussion with the media folks.

Change-Id: I290cec062fcb53fccae1fd92387439448a54e81c
 2011-07-05 15:46:53 +01:00
Steve Block
324a1f6a12 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
b4db3964f1 Merge "Maintain a reference to the Java object when WebView.removeJavascriptInterface() is called" 2011-07-05 06:34:57 -07:00
Debashish Chatterjee
331b6c4316 Merge "Introduced a common SOURCE_PACKAGE_FIELD in VoicemailContract class." 2011-07-05 01:45:44 -07:00
Debashish Chatterjee
1752ae72ce Introduced a common SOURCE_PACKAGE_FIELD in VoicemailContract class. 
This ensures that we use the same field name for both status and
voicemail tables.

Change-Id: I9f699939b8434bd41b5382e49dea63516cfce346
 2011-07-05 09:13:30 +01:00
satok
75c6ddf3fa Merge "Fix NPE in getLastInputMethodSubtype" 2011-07-04 21:48:47 -07:00
satok
0e7d7d6323 Fix NPE in getLastInputMethodSubtype 
Bug: 4991393
Change-Id: I4ced2a2ca4815c7cee84a72dc6131fb8c4ee7216
 2011-07-05 13:32:15 +09:00
Hung-ying Tyan
3eeb1a98f9 Merge "Keep last known keepalive interval to avoid duplicate effort." 2011-07-04 20:37:33 -07:00
Debashish Chatterjee
5de53944e0 Merge "Got rid of deprecated fields from VoicemailContract api." 2011-07-04 10:45:33 -07:00
Steve Block
e482d89b82 Clarify the documentation for WebView.loadDataWithBaseURL() when the base URL uses the 'data' scheme 
Bug: 4726284
Change-Id: If4fd3c1a6517a69e0b007f8a67563330eca04449
 2011-07-04 18:25:01 +01:00
Steve Block
3af08a975a Merge "Clarify documentation for WebView.loadData()" 2011-07-04 10:06:31 -07:00
Debashish Chatterjee
9b8dd63445 Got rid of deprecated fields from VoicemailContract api. 
No one should now be using these fields. SOURCE_CONTENT_URI was not
marked deprecated, but following a recent change in content provider
this field is also no more in use.

Change-Id: I58bb7872ba2f6cec169499d1a01d755232dde2f0
 2011-07-04 15:19:23 +01:00
Steve Block
b28b22af13 Clarify documentation for WebView.loadData() 
This method can access the network, but is subject to the usual same
origin policy.

Bug: 4985285
Change-Id: Ia3afa6ed1eeea9127d3ba5a2ecfead8149138b8e
 2011-07-04 13:01:25 +01:00
Steve Block
2cb978e507 Maintain a reference to the Java object when WebView.removeJavascriptInterface() is called 
The Java object should remain usable until the WebView is navigated
away from the current page. The native side holds only a weak
reference, so we need to keep a reference Java-side.

Bug: 4990734
Change-Id: I40bd078f779228480cfe6f52d9feb4e60c963b4b
 2011-07-04 12:19:17 +01:00
Chia-chi Yeh
0d244a6fea Merge "VPN: implement status report for legacy VPN." 2011-07-04 03:38:16 -07:00
Chia-chi Yeh
2e46764a70 VPN: implement status report for legacy VPN. 
Change-Id: I81c28dafd9588572df76cbc303b0d6a0f41f9bc6
 2011-07-04 03:23:12 -07:00
Steve Block
fc8a3b222a Merge "Fix WebViewFragment to avoid detroying the WebView too early" 2011-07-04 02:11:38 -07:00
satok
35412d63ee Fix NPE in InputMethodSubtype 
Change-Id: Iec8b2f95660db3edec18c2fc38db8f16395739b5
 2011-07-04 17:37:09 +09:00
Ji-Hwan Lee
c4501f7710 Log supplicant restart count correctly 
Currently, it's always 0.

Change-Id: I99b2d31e61e1ec7dfffc7a77e04f4059fd6869ef
 2011-07-04 14:27:26 +09:00
Hung-ying Tyan
9324e04dcf 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
f8c34ad3ef Merge "Do not keep alive for re-established call." 2011-07-03 19:53:35 -07:00
Chia-chi Yeh
c2b8aa0b4c VPN: rename some variables. 
Change-Id: I7f15b5ab30f591e26242fca27af25f578809534c
 2011-07-03 18:00:47 -07:00
Chia-chi Yeh
e96aae1f49 Merge "Add CleanSpec.mk for change If98e456e779f8e97f562d99c57d909b1f5d9db55." 2011-07-03 17:09:41 -07:00
Chia-chi Yeh
100155a310 VPN: convert prepare() into a form which helps solve race conditions. 
When someone tries to revoke packageA, it is possible that packageA is
already revoked by packageB. In this case packageB should not be revoked,
and the new prepare() can help solve this problem.

Change-Id: Iee056a191dd99467b8ad1b5379a17b02d404bad1
 2011-07-03 17:03:27 -07:00
Chia-chi Yeh
972d92f47c Add CleanSpec.mk for change If98e456e779f8e97f562d99c57d909b1f5d9db55. 
Change-Id: I0aeb6355ab856bdfaafba0d2ab13801c73a9cf44
 2011-07-03 17:01:12 -07:00
Chia-chi Yeh
34e7813e96 VPN: minor refinement. 
Change-Id: I2b59cbe8554b6c6f8da48c465252489394f32653
 2011-07-03 03:07:07 -07:00
Chia-chi Yeh
44e27b5c74 VPN: remove the old VpnService. 
Now VPN is (kind of) integrated into ConnectivityService.

Change-Id: If98e456e779f8e97f562d99c57d909b1f5d9db55
 2011-07-02 20:21:09 -07:00
Mike Lockwood
c50bff8528 UsbService: USB connected notification now redirects to USB screen in Settings 
Change-Id: I2dc6d1294da53acfa7589ba5b693ec671695cd21
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-07-02 22:07:35 -04:00
Mike Lockwood
3ac588b09a Revert "USB connected notification and temporary USB options dialog" 
This reverts commit 5787a2d5b4e5bd60087eb7fbb13c97c7d0ba113e.

Change-Id: Ia5f097ffaa3798a42f71d005cffd5007556882d5
 2011-07-02 22:07:25 -04:00
Chia-chi Yeh
0c6bb2737e Merge "VPN: export legacy VPN in IConnectivityManager." 2011-07-02 17:28:45 -07:00
Chia-chi Yeh
77fd485c2f VPN: export legacy VPN in IConnectivityManager. 
Change-Id: I016fe056ceab39ffc36aa235d14b30a9f094a2e1
 2011-07-02 17:15:00 -07:00