3220 Commits

Author SHA1 Message Date
Hung-ying Tyan
755437023e am 0304325d: Remove SingleServerProfile.
Merge commit '0304325dd72ff8713c8444e909d387af1447f86f'

* commit '0304325dd72ff8713c8444e909d387af1447f86f':
  Remove SingleServerProfile.
2009-06-15 04:56:31 -07:00
Hung-ying Tyan
0304325dd7 Remove SingleServerProfile.
End of refactoring out SingleServerProfile.java.
2009-06-15 19:29:26 +08:00
Android (Google) Code Review
a28547d03f am 0fb46683: Merge change 3880 into donut
Merge commit '0fb466836bb654524683152371ecc32142cdf5de'

* commit '0fb466836bb654524683152371ecc32142cdf5de':
  Run search dialog in the system process.
2009-06-15 02:09:25 -07:00
Android (Google) Code Review
0fb466836b Merge change 3880 into donut
* changes:
  Run search dialog in the system process.
2009-06-15 02:06:39 -07:00
Bjorn Bringert
8d17f3f24b Run search dialog in the system process.
Fixes http://b/issue?id=1905863

This is needed to address two security issues with global search:
http://b/issue?id=1871088 (Apps can read content providers through GlobalSearch)
http://b/issue?id=1819627 (Apps can use GlobalSearch to launch arbirtrary intents)

This also fixes http://b/issue?id=1693153 (SearchManager.OnDismissListener
never gets called)

To fix the security issues, GlobalSearch also needs to require
a non-app permission to access its content provider and launch intents.
2009-06-15 09:05:26 +01:00
Android (Google) Code Review
4522c7dc40 am 6d78dd8e: Merge change 4147 into donut
Merge commit '6d78dd8ef833e22d73fc65df205346e657cf9850'

* commit '6d78dd8ef833e22d73fc65df205346e657cf9850':
  On the way of refactoring out SingleServerProfile.java.
2009-06-15 00:17:34 -07:00
Android (Google) Code Review
6d78dd8ef8 Merge change 4147 into donut
* changes:
  On the way of refactoring out SingleServerProfile.java.
2009-06-14 23:41:33 -07:00
Hung-ying Tyan
4c424d61c7 On the way of refactoring out SingleServerProfile.java.
+ Move mServerName from SingleServerProfile and VpnProfile.
+ Add mSavedUsername to VpnProfile.
+ Keep empty SingleServerProfile to not break the classes that use it.
+ Remove use of SingleServerProfile from VpnService.java.
2009-06-15 13:06:03 +08:00
Scott Main
27311a6253 am 3d59ee7a: am 110b50ca: AI 149839: make the home page\'s announcement block expandable... primarily, this is to handle various lengths of text due to translations, but also allows us to be more flexible WRT the content for the top section.
Merge commit '3d59ee7aa66a5b1e80f5042f8d872dd9819b5f40'

* commit '3d59ee7aa66a5b1e80f5042f8d872dd9819b5f40':
  AI 149839: make the home page's announcement block expandable...
2009-06-14 21:13:23 -07:00
Christopher Tate
daf701fa62 am 2fdd428e: Fix some backup reader/writer issues; make local transport do backup
Merge commit '2fdd428e0f18384160f7c38ce3a2cd9ba7e7b2c2'

* commit '2fdd428e0f18384160f7c38ce3a2cd9ba7e7b2c2':
  Fix some backup reader/writer issues; make local transport do backup
  Fix the jni initializer.
  Add RestoreFileHelper, BackupDataInput, and add java wrappers for the methods on BackupDataOutput.
  Fix bug #1812041: activity manager crash with bad args.
  Journal backup requests so that they won't be lost in a crash
  Fix data connection issues.
2009-06-14 21:13:03 -07:00
Android (Google) Code Review
aa73f17201 am 6599426f: Merge change 4017 into donut
Merge commit '6599426f74371c823fcfe570f61577262eb0df44'

* commit '6599426f74371c823fcfe570f61577262eb0df44':
  Make the date format preference work again.
2009-06-14 21:12:17 -07:00
The Android Open Source Project
9d2b0f4de0 merge cafdea61a85c8f5d0646cc9413a09346c637f43f w/ one minor conflict in core/java/android/view/MotionEvent.java 2009-06-14 21:09:07 -07:00
Romain Guy
3c69d554e7 am 763a5723: Hide gestures API.
Merge commit '763a5723882ec7924114ba585b49e69b3e828b4a'

* commit '763a5723882ec7924114ba585b49e69b3e828b4a':
  Hide gestures API.
2009-06-14 20:49:54 -07:00
Ramanan Rajeswaran
859f1b0b6f am e8939bb8: resolved conflicts for merge of a798dd86 to donut
Merge commit 'e8939bb8f1453b44788d4475a8263082d858e533'

* commit 'e8939bb8f1453b44788d4475a8263082d858e533':
  AI 149797: Have SetupWizard pull the Terms of Service from the web using a new URL
2009-06-14 20:49:44 -07:00
Scott Main
3d59ee7aa6 am 110b50ca: AI 149839: make the home page\'s announcement block expandable... primarily, this is to handle various lengths of text due to translations, but also allows us to be more flexible WRT the content for the top section.
Merge commit '110b50ca5158f75abdead740f0956600da2f212d' into donut

* commit '110b50ca5158f75abdead740f0956600da2f212d':
  AI 149839: make the home page's announcement block expandable...
2009-06-14 20:45:27 -07:00
Christopher Tate
2fdd428e0f Fix some backup reader/writer issues; make local transport do backup
As of this change, LocalTransport is successfully propagating data changes from
the backup data format into a repository stored in /cache/backup/[packagename].
Each backup key gets a separate file there for ease of manipulation and testing.

The general semantics of BackupDataReader have been tweaked, too; it now just
returns simple "we're done with the data" when it hits the end, even if no
footer has been found, because on the writing side the footer isn't being
written.  Also, reading an entity now merely requires a "big enough" buffer, not
an exactly-sized one.

This is all a work in progress, but this is at least working now for purposes of
this local transport.

Still to do: proper change vs deletion detection, as well as expanding the data
format itself to include necessary metadata etc.
2009-06-14 19:39:29 -07:00
Android (Google) Code Review
31390c7528 Merge change 4131 into donut
* changes:
  Fix the jni initializer.
2009-06-12 19:00:22 -07:00
Joe Onorato
03f4df4b3b Fix the jni initializer. 2009-06-12 18:59:25 -07:00
Android (Google) Code Review
be3615bded Merge change 4112 into donut
* changes:
  Fix bug #1812041: activity manager crash with bad args.
2009-06-12 18:03:11 -07:00
Android (Google) Code Review
bf0010b5e2 Merge change 4085 into donut
* changes:
  Add RestoreFileHelper, BackupDataInput, and add java wrappers for the methods on BackupDataOutput.
2009-06-12 16:22:55 -07:00
Joe Onorato
1cf587496f Add RestoreFileHelper, BackupDataInput, and add java wrappers for the methods on BackupDataOutput. 2009-06-12 16:21:24 -07:00
Eric Fischer
7351dd113f Use locale-appropriate formatting to display application sizes like "252KB".
In particular allow the French and Polish translators to put a space between
the number and the unit.
2009-06-12 16:06:37 -07:00
Dianne Hackborn
75b038545e Fix bug #1812041: activity manager crash with bad args.
There was old code that would kill the system process in some cases when there
was a bad activity token.  This is really no longer used, except in a few
places where it allows apps to kill the system.  So just get rid of it and
make the world a better place.
2009-06-12 15:43:26 -07:00
Ken Shirriff
7014a96145 Move meta feed handling to CalendarSyncAdapter
Removes obsolete LIVE_CONTENT_URI.  Now calendar list updates are obtained
through a sync.
bug=1886271
2009-06-12 15:43:00 -07:00
Android (Google) Code Review
6c98c13b2e Merge change 4104 into donut
* changes:
  Journal backup requests so that they won't be lost in a crash
2009-06-12 15:19:50 -07:00
Guang Zhu
903f311fdc Adjust order of file/section list in output diff 2009-06-12 15:03:45 -07:00
Cary Clark
f958fccf47 send click in webview before sending key
Add click check to passToJavaScript if webTextView
receives a key but the field does not yet have webkit focus.
2009-06-12 17:33:37 -04:00
Amith Yamasani
430555acae Add a Gservices setting to have a "use location for better search". 2009-06-12 14:19:00 -07:00
Scott Main
110b50ca51 AI 149839: make the home page's announcement block expandable...
primarily, this is to handle various lengths of text due to translations,
  but also allows us to be more flexible WRT the content for the top section.

Automated import of CL 149839
2009-06-12 14:02:42 -07:00
Christopher Tate
cde87f45e0 Journal backup requests so that they won't be lost in a crash
When an application requests a backup via dataChanged(), we now journal that
fact on disk.  The journal persists and is only removed following a successful
backup pass.  When the backup manager is started at boot time, it looks for any
existing journal files and schedules a backup for the apps listed in them, on
the expectation that the device shut down or crashed before a backup could be
performed.
2009-06-12 13:57:39 -07:00
Android (Google) Code Review
7504da0368 Merge change 4080 into donut
* changes:
  Fix data connection issues.
2009-06-12 13:46:00 -07:00
Jaikumar Ganesh
bbf7c00e06 Fix data connection issues.
a)Fix cleanup connection being called twice when switching to wifi.
b) Reset the reconnect timer when voice call ends and APN is changed.
2009-06-12 12:14:08 -07:00
Grace Kloba
7180efed89 Add <keygen> support for VPN. 2009-06-12 11:55:20 -07:00
Android (Google) Code Review
cca860fa6b am 3d4b7065: Merge change 4047 into donut
Merge commit '3d4b7065e960cdaecc8d9fd609c2e508a1f9d8f5'

* commit '3d4b7065e960cdaecc8d9fd609c2e508a1f9d8f5':
  Fix issue #899198	MODE_RINGER_STREAMS_AFFECTED does not restore volumes correctly
2009-06-12 11:43:59 -07:00
Android (Google) Code Review
5f80742306 am d670b8c6: Merge change 3981 into donut
Merge commit 'd670b8c61ebd13324ac21bdbc08d8a02fc0a765a'

* commit 'd670b8c61ebd13324ac21bdbc08d8a02fc0a765a':
  Removed trailing whitespaces.
2009-06-12 11:43:55 -07:00
Android (Google) Code Review
6599426f74 Merge change 4017 into donut
* changes:
  Make the date format preference work again.
2009-06-12 11:10:56 -07:00
Romain Guy
cafdea61a8 Fixes #1914574. An NPE could be causes in lists by ViewGroup.dispatchDraw().
ViewGroup was trying to access the AttachInfo without checking whether the
info object is null. The object can be null at varioous times in the lifecycle
of a list.
2009-06-12 10:51:36 -07:00
Romain Guy
763a572388 Hide gestures API. 2009-06-12 10:28:28 -07:00
Eric Fischer
3287695823 Make the date format preference work again.
It is only used for numeric dates -- spelled-out dates have such a complex
variety of formats that they can only be meaningfully formatted from
locale strings.

In addition, the preference is left null when initializing, on the assumption
that the locale will still specify a more useful numeric format than we can
guess as part of a build-wide configuration.

But if the user has specified a format, the date will be formatted in the
order they asked for, with locale-appropriate punctuation substituted in.
2009-06-12 10:06:24 -07:00
Android (Google) Code Review
451a37ed2d Merge change 3618
* changes:
  Fix bug 1875344 cut 2: adding option to show/noshow away presence when device is idle.
2009-06-12 10:03:18 -07:00
Ramanan Rajeswaran
e8939bb8f1 resolved conflicts for merge of a798dd86 to donut 2009-06-12 09:49:16 -07:00
Android (Google) Code Review
3d4b7065e9 Merge change 4047 into donut
* changes:
  Fix issue #899198	MODE_RINGER_STREAMS_AFFECTED does not restore volumes correctly
2009-06-12 08:33:59 -07:00
Android (Google) Code Review
d670b8c61e Merge change 3981 into donut
* changes:
  Removed trailing whitespaces.
2009-06-12 08:32:09 -07:00
Android (Google) Code Review
69b0db0654 am 83bb56c3: Merge change 3424 into donut
Merge commit '83bb56c389d003162093eef0aaee251cefc1deed'

* commit '83bb56c389d003162093eef0aaee251cefc1deed':
  Add the VPN services package, VPN service base classes and L2tpIpsecService.
2009-06-12 08:26:32 -07:00
Satish Sampath
64420d4f17 am 7f50c08f: Show proper suggestion item hilite on selection.
Merge commit '7f50c08fb998786a2963e979cd5b4347e64808e3'

* commit '7f50c08fb998786a2963e979cd5b4347e64808e3':
  Show proper suggestion item hilite on selection.
2009-06-12 08:26:25 -07:00
Android (Google) Code Review
bf85d63cb8 am 78f0f8cb: Merge changes 3953,3954 into donut
Merge commit '78f0f8cb2efe9410127c39201e240f6d438eb53c'

* commit '78f0f8cb2efe9410127c39201e240f6d438eb53c':
  Make the file backup helper not crash if a file you requested
  Fix SharedPrefsBackupHelper so it doesn't hard code the paths to the files.
2009-06-12 08:26:05 -07:00
Android (Google) Code Review
32c79898c0 am e8966e12: Merge change 4008 into donut
Merge commit 'e8966e126388223de119c909d572fb8d1406a3ac'

* commit 'e8966e126388223de119c909d572fb8d1406a3ac':
  Fixes #1886237. Views drawing cache was not generated properly.
2009-06-12 08:25:54 -07:00
Android (Google) Code Review
3835736988 am f229aff1: Merge change 3967 into donut
Merge commit 'f229aff118dc53c3a06f0b4120d9ce22f4c2dd6e'

* commit 'f229aff118dc53c3a06f0b4120d9ce22f4c2dd6e':
  Update control files (pass/fail/nontext/crash) to results from CRB45
2009-06-12 08:25:35 -07:00
Android (Google) Code Review
fbca18574c am cb9534f9: Merge change 3907 into donut
Merge commit 'cb9534f92007b47d86cccc306dc75ca2d64bd197'

* commit 'cb9534f92007b47d86cccc306dc75ca2d64bd197':
  Support SMS cell broadcasting for GSM in RIL.java
2009-06-12 08:25:29 -07:00
Android (Google) Code Review
ea5f83f433 am 657c80b1: (-s ours) Merge change 3775 into donut
Merge commit '657c80b146f8d6319bf059f4aea2fce3b15a50b6'

* commit '657c80b146f8d6319bf059f4aea2fce3b15a50b6':
  DO NOT MERGE.
2009-06-12 08:24:51 -07:00