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

54054 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Glenn Kasten
4431c05f13 Merge "Thread ID zero for androidSetThreadSchedulingGroup" 2011-07-05 15:08:31 -07: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
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
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
Chia-chi Yeh
31c10a9587 Merge "Promote ip-up-vpn into the framework." 2011-07-02 16:54:37 -07:00
Chia-chi Yeh
6278d5ef05 Promote ip-up-vpn into the framework. 
pppd needs it, and racoon will also use it soon.

Change-Id: I7fc40a709f7d44f75cd3683ab77d90cbc29cd765
 2011-07-02 16:41:59 -07:00
Chia-chi Yeh
8bc003e2f6 Merge "VPN: merge JNI methods." 2011-07-02 16:37:25 -07:00
Chia-chi Yeh
3281034c1c VPN: merge JNI methods. 
Legacy VPN needs to change routes by itself.

Change-Id: I4cf6639f2b00225810f49704ae05797fc70921d9
 2011-07-02 16:16:03 -07:00
Chia-chi Yeh
d6315c0ebb Merge "VPN: give legacy VPN a fake package name." 2011-07-02 03:19:48 -07:00
Chia-chi Yeh
e9107901ae VPN: give legacy VPN a fake package name. 
And add more comments.

Change-Id: I0cbc495fcb2c8dd105e16a841619b3b9bd227eae
 2011-07-02 01:48:50 -07:00
Svetoslav Ganov
51ac0e94a8 Adding a ShareView and ActionProvider for menus. 
1. Adding a widget for sharing contenet with other applications.
   The widget orders the share targets based on previous shares.
   It displays the share target list as either a popup anchored to
   itslef or as a dialog.

2. Added a ShareDataModel that will back widgets or other classes
   that are interested in share targets for a given intent ordered
   according to share history. This class is backing the ShareView

3. Added ActionProvider mechanism for the MenuItems. The action
   provider of a menu creates the action view as well as performs
   a default action if the menu item is on the overflow menu and
   is triggered but none of the menu callback has handled that.

bug:4590827

Change-Id: Iaa4add2df2538b8c6c7edbeaf2880486d4fd75c5
 2011-07-01 23:35:26 -07:00
Jeff Brown
b4c5fbff77 Merge "Drop obsolete touch screen hacks." 2011-07-01 19:25:46 -07:00
Jeff Brown
a4d1bc5172 Drop obsolete touch screen hacks. 
Change-Id: I47354c37ee2cc2b36340eb709bb5043b3ba78ed9
 2011-07-01 19:23:40 -07:00
Jeff Brown
230a1ffcb0 Merge "Workaround apps that make assumptions about pointer ids." 2011-07-01 19:17:21 -07:00
Dianne Hackborn
f58e09e5ac Merge "Don't crash when the load average service is started." 2011-07-01 19:09:03 -07:00
Jeff Brown
6894a2947e 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
2ed9946441 Don't crash when the load average service is started. 
Change-Id: Ie40f549d50942793c940f8728ce9c392c25f4c60
 2011-07-01 19:02:52 -07:00
Dianne Hackborn
63acea6ad4 Merge "When removing a task, also kill its processes." 2011-07-01 17:13:40 -07:00
Dianne Hackborn
8894cc5ed4 When removing a task, also kill its processes. 
Change-Id: I5945fef21ad6f028e71e36d3cb55d35e0b6401a6
 2011-07-01 17:12:04 -07:00
Fabrice Di Meglio
f03712bf54 Merge "Fix default TextView textDirection heuristic" 2011-07-01 15:35:52 -07:00
Brian Carlstrom
82376c8267 Merge "Build cert chain in KeyChain.getCertificateChain" 2011-07-01 15:31:30 -07:00
Glenn Kasten
03f9435273 Merge "Bug 4571308 Provide correct video frame timestamps" 2011-07-01 15:02:33 -07:00
Jake Hamby
02cc72c100 Merge "Fix IllegalStateException when A2DP connects before boot completes." 2011-07-01 14:47:50 -07:00
Fabrice Di Meglio
0b28c757ad Fix default TextView textDirection heuristic 
- use "first strong" instead of "locale"
- optimize "any rtl" heuristic too
- fix a few wording issues too

Change-Id: I239a11a49a7a6a6d45165f593c96e8b6b84f0661
 2011-07-01 14:44:29 -07:00
Brian Carlstrom
db93b78385 Build cert chain in KeyChain.getCertificateChain 
Bug: 4970298
Change-Id: Id91391233528edc2a4da5ebe92ec85d381f170de
 2011-07-01 14:41:56 -07:00
Andreas Huber
dfba1773c9 Merge "Charge network traffic to the uid of the process using the MediaPlayer." 2011-07-01 14:28:10 -07:00