Commit Graph

237 Commits

Author SHA1 Message Date
Bjorn Bringert
e85fbcb3cd am b0ae27f4: Store correct state in SearchDialog.onSaveInstanceState()
Merge commit 'b0ae27f4e10a9e5fe56b9ca549718051fe342bba'

* commit 'b0ae27f4e10a9e5fe56b9ca549718051fe342bba':
  Store correct state in SearchDialog.onSaveInstanceState()
2009-06-23 13:08:01 -07:00
Bjorn Bringert
b0ae27f4e1 Store correct state in SearchDialog.onSaveInstanceState()
Adds this to the instance state bundle:
- mStoredComponentName
- mStoredAppSearchData
- mPreviousComponents

All the UI selection fields that were previously saved were removed.
It's not necessarily useful to restore the
selection, and it's hard to get right. The old code was buggy
(see http://b/issue?id=1911660) and did not restore the
list selection because that's quite hard.

Fixes http://b/issue?id=1926174
2009-06-23 13:47:31 +01:00
Android (Google) Code Review
3edc89fc57 am 54f156c7: Merge change 5006 into donut
Merge commit '54f156c7c47bd5b5f2c9675f56bddaaa43ad162e'

* commit '54f156c7c47bd5b5f2c9675f56bddaaa43ad162e':
  Pass the originating app's versionCode along with a restore set
2009-06-22 19:47:24 -07:00
Android (Google) Code Review
54f156c7c4 Merge change 5006 into donut
* changes:
  Pass the originating app's versionCode along with a restore set
2009-06-22 16:47:06 -07:00
Christopher Tate
5cbbf5652a Pass the originating app's versionCode along with a restore set
This change amends the doRestore() / onRestore() interface to backup agents to
provide the integer android:versionCode of the app that stored the backup set.
This should help agents figure out how to handle whatever historical data set
they're handed at restore time.
2009-06-22 16:44:51 -07:00
Satish Sampath
f50020b34c am 662df0b9: Launch user-entered URLs directly without a web search.
Merge commit '662df0b9630fd685a7cf86bbfec15ac6b6c286c6'

* commit '662df0b9630fd685a7cf86bbfec15ac6b6c286c6':
  Launch user-entered URLs directly without a web search.
2009-06-22 15:44:06 -07:00
Satish Sampath
662df0b963 Launch user-entered URLs directly without a web search.
This is to fix bug http://b/issue?id=1931983

Instead of changing the keyboard button from search to carriage return,
I have changed it from search to 'Go' which I find more useful since
it indicates that the user can now go to that URL.
2009-06-22 23:40:10 +01:00
Android (Google) Code Review
4527acb0c3 am 856dd8a6: Merge change 4952 into donut
Merge commit '856dd8a60a70a5b7dca2bf2114872ce063e2ad60'

* commit '856dd8a60a70a5b7dca2bf2114872ce063e2ad60':
  Helper API cleanup.  Allows multiple helpers to function,
2009-06-22 13:20:31 -07:00
Joe Onorato
06290a4bb9 Helper API cleanup. Allows multiple helpers to function,
because they'll always go in the same order, and this lets
us not have to write headers to keep them paired.
2009-06-22 13:02:24 -07:00
Android (Google) Code Review
2b31fec39c am 2c10b5f4: Merge change 4914 into donut
Merge commit '2c10b5f483f832523305c11d44035fc7f5d9a54b'

* commit '2c10b5f483f832523305c11d44035fc7f5d9a54b':
  Make all static methods in SearchManager non-static.
2009-06-22 07:26:36 -07:00
Android (Google) Code Review
fe74d46376 am 7306d248: Merge change 4913 into donut
Merge commit '7306d248feb2e52593e51944bcaf98c11974e988'

* commit '7306d248feb2e52593e51944bcaf98c11974e988':
  Add non-static version of SearchManager.getSuggestions().
2009-06-22 05:55:59 -07:00
Bjorn Bringert
8d15382378 Make all static methods in SearchManager non-static.
They were only static because of a now removed restriction that
only activity contexts could instantiate SearchManager.
This only changes hidden APIs, but all users of the changed methods
must be updated to use them non-statically before this is submitted.
2009-06-22 13:51:48 +01:00
Bjorn Bringert
97325db856 Add non-static version of SearchManager.getSuggestions(). 2009-06-22 13:51:35 +01:00
Android (Google) Code Review
792f4be7f3 am 9c1b1872: Merge change 4908 into donut
Merge commit '9c1b1872faf028bcd70fb3e17eeb29d86ce6bd9a'

* commit '9c1b1872faf028bcd70fb3e17eeb29d86ce6bd9a':
  Remove checks for Activity Context when creating SearchManager
2009-06-22 04:48:12 -07:00
Bjorn Bringert
a68ca641e6 Remove checks for Activity Context when creating SearchManager
Since https://android-git.corp.google.com/g/3880
all activities create a SearchManager object, to handle
saving and restoring the search dialog. This broke
ActivityUnitTestCase, since ApplicationContext.getSearchManager()
threw an exception in non-activity contexts.
This change removes the activity context check from
getSearchManager(). Since SearchManager is now just a thin
wrapper for SearchManagerService, there shouldn't be anything
activity-specific in it.

Fixes http://b/issue?id=1926254
2009-06-22 10:05:48 +01:00
Android (Google) Code Review
47e4d45cb6 am b4e456bf: Merge change 4785 into donut
Merge commit 'b4e456bf1823e2dd8c975ae02451b7b72541c236'

* commit 'b4e456bf1823e2dd8c975ae02451b7b72541c236':
  Fix issue #1753079: running instrumentation in shared processes.
2009-06-19 16:43:39 -07:00
Android (Google) Code Review
9c07cab32d am 4d1b5bd1: Merge change 4808 into donut
Merge commit '4d1b5bd148d0830d2acc03bafbe58dfd17e5b3f8'

* commit '4d1b5bd148d0830d2acc03bafbe58dfd17e5b3f8':
  Fixes #1928566. Prevents runtime restart upon configuration change.
2009-06-19 14:49:49 -07:00
Android (Google) Code Review
b4e456bf18 Merge change 4785 into donut
* changes:
  Fix issue #1753079: running instrumentation in shared processes.
2009-06-19 14:24:39 -07:00
Android (Google) Code Review
4d1b5bd148 Merge change 4808 into donut
* changes:
  Fixes #1928566. Prevents runtime restart upon configuration change.
2009-06-19 13:31:14 -07:00
Romain Guy
e35c235145 Fixes #1928566. Prevents runtime restart upon configuration change.
Managed dialogs could cause dispatchOnCreate() to be called twice, which
would cause an exception.
2009-06-19 13:18:12 -07:00
Dianne Hackborn
d97c7adfc2 Fix issue #1753079: running instrumentation in shared processes.
The check for allowing the start of an activity was broken, it was
comparing the process of that activity's application vs. the current
instrumentation target package name.  Okay it was utterly insane.

Now this check is that the target activity will be running in the
same process as the instrumentation, which is really what we want.
2009-06-19 11:37:35 -07:00
Suchi Amalapurapu
c73e9ad55a am bc806f65: Remove deprecated api. Aptly rename freeStorageWithIntent to freeStorage.
Merge commit 'bc806f65edc33f6eda0f475ac84e5e037a013a90'

* commit 'bc806f65edc33f6eda0f475ac84e5e037a013a90':
  Remove deprecated api. Aptly rename freeStorageWithIntent to freeStorage.
2009-06-19 10:38:45 -07:00
Suchi Amalapurapu
bc806f65ed Remove deprecated api. Aptly rename freeStorageWithIntent to freeStorage. 2009-06-19 10:25:37 -07:00
Android (Google) Code Review
8dbbe3b52f am 63e7155c: Merge change 4696 into donut
Merge commit '63e7155c7d1d0c3f0027400aa09e9a45f648a80d'

* commit '63e7155c7d1d0c3f0027400aa09e9a45f648a80d':
  Fix targetSdkVersion, make resize mode a flag, delayed dexopt, easy ApplicationInfo.
2009-06-18 19:35:32 -07:00
Android (Google) Code Review
63e7155c7d Merge change 4696 into donut
* changes:
  Fix targetSdkVersion, make resize mode a flag, delayed dexopt, easy ApplicationInfo.
2009-06-18 19:33:33 -07:00
Dianne Hackborn
5c1e00b14d Fix targetSdkVersion, make resize mode a flag, delayed dexopt, easy ApplicationInfo.
- Fix a bug where targetSdkVersion could not be set if minSdkVersion.  Stupid, stupid.
  Also make sure to fail if minSdkVersion is for a code name.  Really stupid.

- Change the API for resize compatibility mode to be a bit in the flags field, instead
  of a separate boolean.

- Implement delayed dexopting, to avoid the looong full dexopt during boot.  This is
  only enabled for "eng" builds.  When in this mode, the activity manager will make
  sure that a dexopt has been done before loading an .apk into a process, and will
  try to avoid displaying ANRs if they are due to the dexopt causing some operation
  to take longer than it normally would (though I make no guarantees about this
  totally working).

- Add API to Context to get the ApplicationInfo for its package, for easy access to
  things like targetSdkVersion.
2009-06-18 17:10:57 -07:00
Mike LeBeau
349569b285 am cce7dbc3: Re-enable query jamming.
Merge commit 'cce7dbc31ed100b39c3e1174dd3d9a01de648e5b'

* commit 'cce7dbc31ed100b39c3e1174dd3d9a01de648e5b':
  Re-enable query jamming.
2009-06-18 10:57:30 -07:00
Mike LeBeau
cce7dbc31e Re-enable query jamming. 2009-06-18 10:52:31 -07:00
Dianne Hackborn
abb01dba70 am c14b9ccd: Extend Intent/Uri conversion for use by Browser
Merge commit 'c14b9ccdf13163cae5ce5d21bcf377010b37594b'

* commit 'c14b9ccdf13163cae5ce5d21bcf377010b37594b':
  Extend Intent/Uri conversion for use by Browser
2009-06-17 22:45:54 -07:00
Joe Onorato
72dcea1eed am 83248c43: backup fixes:
Merge commit '83248c432ffe2e2a17abbc8e4960c26574b46bca'

* commit '83248c432ffe2e2a17abbc8e4960c26574b46bca':
  backup fixes:
2009-06-17 21:49:50 -07:00
Android (Google) Code Review
d206fb4fea am 6ce1983a: Merge change 4532 into donut
Merge commit '6ce1983a2b5e9f5e735ac09b270b400084edb7db'

* commit '6ce1983a2b5e9f5e735ac09b270b400084edb7db':
  Fixes #1924909. When restoring managed dialogs, do exactly the same thing as when showing a dialog.
2009-06-17 21:49:35 -07:00
Dianne Hackborn
c14b9ccdf1 Extend Intent/Uri conversion for use by Browser
This introduces a new Uri form of Intent with an "intent:" scheme, and a
corresponding update to the parser to handle these, so that the browser
can use this generic facility for starting activities based on the links
that are clicked and allow for web pages to link to arbitrary intents.

There is also a new "package" field on Intent which allows you to limit
the components it finds to a given package.  This replaces the new method
that was added to PackageManger for doing this when resolving activities,
and implements it for all Intent queries against the package manager.
2009-06-17 21:48:14 -07:00
Android (Google) Code Review
2420186c89 am 5553f152: Merge change 3936 into donut
Merge commit '5553f1528e94377ae5adf423e91331f5eb57dd44'

* commit '5553f1528e94377ae5adf423e91331f5eb57dd44':
  add exception message to ApplicationErrorReport
2009-06-17 18:46:17 -07:00
Suchi Amalapurapu
e1fae30e20 Merge commit '0781df94' into manualmerge
Conflicts:
	Android.mk
	api/current.xml
2009-06-17 18:24:44 -07:00
Joe Onorato
83248c432f backup fixes:
- BackupTestAgent calls the DispatchHelper
- Make BackupAgent.onRestore take a BackupDataInput, not just a
  generic ParcelFileDescriptor.
2009-06-17 17:57:30 -07:00
Romain Guy
764d5331d1 Fixes #1924909. When restoring managed dialogs, do exactly the same thing as when showing a dialog. 2009-06-17 17:04:09 -07:00
Satish Sampath
dd34fb0529 am bf23fe06: Prepare SearchManager framework for adding Genie logging.
Merge commit 'bf23fe062ab4321143717c21827d329e087cc72f'

* commit 'bf23fe062ab4321143717c21827d329e087cc72f':
  Prepare SearchManager framework for adding Genie logging.
2009-06-17 15:38:42 -07:00
Android (Google) Code Review
a06a9267fd am 528a29f8: Merge change 4326 into donut
Merge commit '528a29f886f9cb9266e1fda2d2c9e0ea7ea88faf'

* commit '528a29f886f9cb9266e1fda2d2c9e0ea7ea88faf':
  Don't get location in search dialog.
2009-06-17 15:38:36 -07:00
Mitsuru Oshima
2fc22e4f7c am d9aef73f: Squashed commit of the following:
Merge commit 'd9aef73f72cb11ba7f278a0ef13c6d02ffc95851'

* commit 'd9aef73f72cb11ba7f278a0ef13c6d02ffc95851':
  Squashed commit of the following:
2009-06-17 15:38:12 -07:00
Jacek Surazski
f829a78f6c add exception message to ApplicationErrorReport
useful signal for clustering
2009-06-17 21:48:17 +02:00
Suchi Amalapurapu
1ccac75e1f Remove circular dependency in PackageManager. api freeStorage uses PendingIntent from android.app
Create a new public IntentSender class that can be used by PackageManager instead.
This new class uses IIntentSender internally and can only be created by PendingIntent for now.
Provide a new getIntentSender api in PendingIntent to create an instance of this class.
Move IIntentSender and IIntentReceiver from android.app to android.content
Change imports of IIntentSender and IIntentReceiver to reflect the new package name
The PackageManager api has been named as freeStorageWithIntent and will be renamed as freeStorage
once the older api(which has been deprecated) will be removed shortly.
2009-06-17 11:31:26 -07:00
Satish Sampath
bf23fe062a Prepare SearchManager framework for adding Genie logging.
- Instead of passing the suggest provider component name as the field
  EXTRA_DATA, we now pass via the field COMPONENT_NAME
- Kept EXTRA_DATA field as is so we can use it for real extra data.
2009-06-17 13:33:12 +01:00
Android (Google) Code Review
528a29f886 Merge change 4326 into donut
* changes:
  Don't get location in search dialog.
2009-06-17 00:58:19 -07:00
Mitsuru Oshima
d9aef73f72 Squashed commit of the following:
commit 9798cd23605c96c1d6a29202f4d31f5454079b61
Author: Mitsuru Oshima <oshima@google.com>
Date:   Tue Jun 16 13:50:44 2009 -0700

    Made other toShortString in performDestroyActivity safe.

commit 19bf973df81d9d01210effb39c99e5236f2229c1
Author: Mitsuru Oshima <oshima@google.com>
Date:   Fri Jun 12 15:50:03 2009 -0700

    * component can be null after destory?
     This was causing NPE in catch block, which hides the actual exception.

Conflicts:

	core/java/android/app/ActivityThread.java
2009-06-16 20:22:12 -07:00
Android (Google) Code Review
dfd0363ada am 5633034f: Merge change 4115 into donut
Merge commit '5633034f79bfa67c4219f16fd6d23e962e800be2'

* commit '5633034f79bfa67c4219f16fd6d23e962e800be2':
  * component can be null after destory?
2009-06-16 16:43:01 -07:00
Android (Google) Code Review
5633034f79 Merge change 4115 into donut
* changes:
  * component can be null after destory?  This was causing NPE in catch block, which hides the actual exception.
2009-06-16 13:14:09 -07:00
Bjorn Bringert
6d3d9892c2 Don't get location in search dialog.
This change removes all location code from the
system search dialog. The code was out of sync with
the EnhancedGoogleSearchprovider, and was possibly
responsible for some network location provider
crashes.

Instead we will try to make EnhancedGoogleSearch persistent, so that
it has a reasonable location most of the time.
2009-06-16 14:50:20 +01: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
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
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