Commit Graph

833 Commits

Author SHA1 Message Date
Kenny Root
e26aa3f78a am 34d2b41e: Revert "Add the {get,set}PackageObbPaths calls to API"
* commit '34d2b41e48281d1df2c844e004740f008e699093':
  Revert "Add the {get,set}PackageObbPaths calls to API"
2011-01-17 12:23:43 -08:00
Kenny Root
34d2b41e48 Revert "Add the {get,set}PackageObbPaths calls to API"
This reverts commit 6c4d904851.

Going with a different tactic that doesn't dump stuff on
PackageManagerService.

Bug: 3214719
Change-Id: I0bbeccf3c21d264deda4256eb53713d2c98284f4
2011-01-17 11:49:22 -08:00
Dianne Hackborn
dd4a1e3825 am 7d234fab: Merge "Don\'t drop the drawable cache completely on configuration change"
* commit '7d234fabe61cd5f034fe4ff4484209fbf5130c4d':
  Don't drop the drawable cache completely on configuration change
2011-01-14 16:11:40 -08:00
Christopher Lais
8d71769b9b Don't drop the drawable cache completely on configuration change
There was a lot of fancy code just above the clear to ensure
that drawables that aren't affected by the change are kept,
then the entire array was cleared.  This patch removes the
clear, so that the drawables that haven't changed are really
kept, matching the logs, comments and larger part of the code.

This patch also fixes the various constant states to return
correct ChangingConfigurations.

Change-Id: Ic11f6179537318d3de16dc58286989eb62a07f15
Old-Change-Id: I22495e6ed232dfe056207ce5155405af1fa82428
2011-01-14 00:43:16 -06:00
Kenny Root
470750793b am e8c04db7: Merge "Add the {get,set}PackageObbPaths calls to API" into gingerbread
* commit 'e8c04db71e347396e9537ead7113ba9f46706e44':
  Add the {get,set}PackageObbPaths calls to API
2011-01-12 15:06:51 -08:00
Kenny Root
e8c04db71e Merge "Add the {get,set}PackageObbPaths calls to API" into gingerbread 2011-01-12 15:03:43 -08:00
Kenny Root
0ee294470d am 6688b6c3: Merge "Allow updated system apps to retain priority" into gingerbread
* commit '6688b6c31765242866fc276cea7fa241fc5b5e7b':
  Allow updated system apps to retain priority
2011-01-12 11:59:49 -08:00
Kenny Root
1c6e764275 Allow updated system apps to retain priority
Previously any updated system apps would not be able to have a greater
than 0 priority on an activity intent filter. Moving the priority check
later in the package scanning allows it to apply to updated system
packages as well.

Bug: 2572398
Change-Id: I9fdf7906809518b28b49ffec31afec1442d85d3c
2011-01-11 15:51:46 -08:00
Brad Fitzpatrick
52d7072265 am cb842753: Merge "Closing cursor in finalizer to avoid GREF and fd leak in acore"
* commit 'cb8427538dfdc5eae941e377b11bfd11a95fc5a5':
  Closing cursor in finalizer to avoid GREF and fd leak in acore
2011-01-10 08:32:35 -08:00
Johannes Carlsson
872a52c6b6 Closing cursor in finalizer to avoid GREF and fd leak in acore
The finalize() call did not clean up completely, this eventually
caused the android.process.acore to crash since it ran out of fds
and GREF to increased above 2000 if an application forgot to close
its cursor objects. A warning was also added when this happens so
that application developers can correct their mistake. The
included test case tries to verify that the finalizer works as
expected by creating a bunch of Cursor objects without closing
them (without this fix the acore process crashes after about 400
iterations and the test case ends with "Process crashed").

Change-Id: I11e485cef1ac02e718b2742108aa88793666c31d
2011-01-10 12:46:21 +01:00
Kenny Root
6c4d904851 Add the {get,set}PackageObbPaths calls to API
Add getPackageObbPaths() and setPackageObbPaths() to the public API.

Bug: 3214719
Change-Id: Icb9f2f92f8c59bb3d31317f609854e81abbd1449
2011-01-09 13:20:28 -08:00
Dianne Hackborn
412ebd6f9d am 433863b1: Fix issue #3333958: Package Manager can sometimes mistakenly think...
* commit '433863b1085248a8fdc9bcd0ac8501cc6a7b8ace':
  Fix issue #3333958: Package Manager can sometimes mistakenly think...
2011-01-09 11:49:59 -08:00
Dianne Hackborn
433863b108 Fix issue #3333958: Package Manager can sometimes mistakenly think...
...an app is disabled!

Ouch.

Change-Id: I5788c5f8edfe2a0d6f4f0f3359e1742f8ed8d98e
2011-01-09 11:46:27 -08:00
Alon Albert
2967aa3e60 am 672ebb61: Merge "Improved ignore-backoff handling Allow a non-epidited ignore-backoff op to pass through an expidited backed off op." into gingerbread
* commit '672ebb61a755e4bbe60e4e884b1adadf186733b6':
  Improved ignore-backoff handling Allow a non-epidited ignore-backoff op to pass through an expidited backed off op.
2010-12-28 14:57:09 -08:00
Jean-Baptiste Queru
e90a1b16a3 am 752942ec: Merge "The phone is crashing when unknown mime content is transferred."
* commit '752942ec4719e6a274d6ab11103ac28459cb0f0c':
  The phone is crashing when unknown mime content is transferred.
2010-12-28 10:55:04 -08:00
Alon Albert
d41fe75f09 Improved ignore-backoff handling
Allow a non-epidited ignore-backoff op to pass through
an expidited backed off op.

To do this, I first refactored the complicated if statement:

            if (best == null
                    || ((bestSyncableIsUnknownAndNotARetry == syncableIsUnknownAndNotARetry)
                        ? (best.expedited == op.expedited
                           ? opRunTime < bestRunTime
                           : op.expedited)
                        : syncableIsUnknownAndNotARetry)) {
                best = op;
                bestSyncableIsUnknownAndNotARetry = syncableIsUnknownAndNotARetry;
                bestRunTime = opRunTime;
            }

Into a more readable:
            boolean setBest = false;
            if (best == null) {
                setBest = true;
            } else if (bestSyncableIsUnknownAndNotARetry == syncableIsUnknownAndNotARetry) {
                if (best.expedited == op.expedited) {
                    if (opRunTime < bestRunTime) {
                        //  if both have same level, earlier time wins
                        setBest = true;
                    }
                } else {
                    if (op.expedited) {
                        setBest = true;
                    }
                }
            } else {
                if (syncableIsUnknownAndNotARetry) {
                    setBest = true;
                }
            }
            if (setBest) {
                best = op;
                bestSyncableIsUnknownAndNotARetry = syncableIsUnknownAndNotARetry;
                bestRunTime = opRunTime;
            }

The refactoring was all done automatically with IntelliJ to avoid human error
in the conversion.

After verifying this code still behaved as expected including the error
condition in the bug, I added handling for the cases when a non-expidited op
may override an expedited op if certain conditions occur, specificaly, if the
expidited op is backed off and the non-expidited op is not.

Finally, refactored to make it testable and added tests and logging.

Bug: 3128963

Change-Id: I131cbcec6073ea5fe425f6b5aa88ca56c02b6598
2010-12-22 14:40:43 -08:00
Ola Olsson
145e6c4975 The phone is crashing when unknown mime content is transferred.
The content resolver does not take care of the IllegalStateException
that is thrown in getType and that needs to be fixed.

Change-Id: I3e66f1aa259ab91fb9233e1ba07faa1ab6c3f2dd
2010-12-21 08:52:22 +01:00
Dianne Hackborn
78e9f4cbae am e4a59519: Fix issue #3154576: battery stats checkin should include UID -> packages+ map
* commit 'e4a5951925f16f18dae91ed65567e96528f17fee':
  Fix issue #3154576: battery stats checkin should include UID -> packages+ map
2010-12-13 14:37:09 -08:00
Dianne Hackborn
e4a5951925 Fix issue #3154576: battery stats checkin should include UID -> packages+ map
Includes some other small fixes to battery collection and a few
other things.

Output of package info looks like this:

5,0,i,uid,1000,com.android.settings
5,0,i,uid,1000,com.android.providers.subscribedfeeds
5,0,i,uid,1000,com.android.providers.settings
5,0,i,uid,1000,com.android.server.vpn
5,0,i,uid,1000,android
5,0,i,uid,1000,com.android.systemui
5,0,i,uid,1000,com.google.android.backup
5,0,i,uid,1001,com.android.phone
5,0,i,uid,1001,com.android.providers.telephony
5,0,i,uid,1022,com.android.nfc
5,0,i,uid,10021,com.google.android.location
5,0,i,uid,10021,com.google.android.syncadapters.calendar
5,0,i,uid,10021,com.google.android.gsf
5,0,i,uid,10021,com.google.android.syncadapters.contacts
5,0,i,uid,10026,com.android.providers.downloads.ui
5,0,i,uid,10026,com.android.providers.media
5,0,i,uid,10026,com.android.providers.drm
5,0,i,uid,10026,com.android.providers.downloads
5,0,i,uid,10032,com.android.launcher
5,0,i,uid,10039,com.google.android.gm
5,0,i,uid,10041,com.google.android.gallery3d
5,0,i,uid,10049,com.android.providers.calendar

Change-Id: I9e38f254eef146339113ad270f5c6e8b60fb7a1d
2010-12-13 14:31:40 -08:00
Nick Pelly
1d0d1188d7 am ae56a851: Merge "Make getSystemService(NFC_SERVICE) the NFC entry point." into gingerbread
* commit 'ae56a851624c2b2e78da8a2c339d2caa64c4f981':
  Make getSystemService(NFC_SERVICE) the NFC entry point.
2010-12-10 17:19:45 -08:00
Nick Pelly
50b4d8f643 Make getSystemService(NFC_SERVICE) the NFC entry point.
This gives NFC service a handle to the application context.

Deprecate NfcAdapter.getDefaultAdapter(), it does not provide a context.
Using this method will print a warning, and will later throw an exception
if a method that requires a context is called. No 2.3 API's will fail, but
new API's that do require a context might fail.

Also add helper NfcAdapter.getDefaultAdapter(Context).

Change-Id: I9a6378de4ef4b61ad922f8d53e64e2a1a1d5d60c
2010-12-10 17:12:33 -08:00
Brad Fitzpatrick
5f8524d446 am 36af7943: Fix malformed Javadoc.
* commit '36af79434fb62c26238132eaeda2ec5e732f3c2f':
  Fix malformed Javadoc.
2010-12-08 13:23:03 -08:00
Brad Fitzpatrick
36af79434f Fix malformed Javadoc.
Change-Id: I5cfbd49272117defce5226da0f40a8392457a2e2
2010-12-08 11:31:07 -08:00
Brad Fitzpatrick
096c4c448d am 251384a7: Merge "Improve performance when getting styled string."
* commit '251384a7595022ddbc53f4ab0fa386f9c040f1f5':
  Improve performance when getting styled string.
2010-11-19 10:25:09 -08:00
Peter Eliasson
ac4a181d2e Improve performance when getting styled string.
The style used in the composing text for input methods
takes a long time to create. This is experienced as a
lag when composing the first word.

The bottleneck lies in the 10 calls to
nativeIndexOfString which does a linear search through
thousands of strings.

Change-Id: I3184b2be3673d384cca19e9a70ad94b4d3085576
2010-11-18 07:28:06 +01:00
Jean-Baptiste Queru
a87cdd398f am b1fa549a: Merge "Fixes Issue 7907 in the public bugs database (http://code.google.com/p/android/issues/detail?id=7907)."
* commit 'b1fa549a49fd8fa2fe67ee30d107cc2d1486645f':
  Fixes Issue 7907 in the public bugs database (http://code.google.com/p/android/issues/detail?id=7907).
2010-11-01 10:39:01 -07:00
Daniel Trebbien
0a675fd8fe Fixes Issue 7907 in the public bugs database (http://code.google.com/p/android/issues/detail?id=7907).
The Javadoc comment for class `android.content.UriMatcher` had four issues:
1. The example calls to `addURI` should not be using a leading forward slash in
   the path parameter (reported by Ester Ytterbrink).
2. The sample code to construct a `UriMatcher` was incorrect because the
   `UriMatcher` constructor takes a parameter (reported by Ross Light).
3. The code example for using `match` was incorrect because it showed two
   parameters being passed, when `match` only takes one (reported by
   Ross Light).
4. The sample `getType` implementations were incorrect because `getType` takes
   a `Uri` object, not an array of `String`s.

Change-Id: I560bff6f021c13cabf736f40ff0f47a205074291
2010-10-31 07:42:35 -07:00
Jeff Hamilton
ae5ace55d9 am bd8ff5b5: Merge "DO NOT MERGE. Fix asset file descriptor for pipe based fds." into gingerbread
* commit 'bd8ff5b5d4f4c74889ce20a0c7a2f8e0ab7b6ea9':
  DO NOT MERGE. Fix asset file descriptor for pipe based fds.
2010-10-28 14:03:40 -07:00
Jeff Hamilton
145fe77dbf DO NOT MERGE. Fix asset file descriptor for pipe based fds.
Change-Id: Ic366d01f91017109abfcfa65bd2231dd7416ce71
2010-10-28 15:05:27 -05:00
Scott Main
177b05d614 am abb50f15: Merge "docs: fix a couple api links" into gingerbread
Merge commit 'abb50f152879cc8dff1bf5cbc4d6375e959305cd' into gingerbread-plus-aosp

* commit 'abb50f152879cc8dff1bf5cbc4d6375e959305cd':
  docs: fix a couple api links
2010-10-25 11:27:55 -07:00
Scott Main
abb50f1528 Merge "docs: fix a couple api links" into gingerbread 2010-10-25 11:18:28 -07:00
Dianne Hackborn
9c7489f8bd am 38993d8d: Merge "Fix issue #3122240: Expose xlarge in GB." into gingerbread 2010-10-22 14:03:08 -07:00
Dianne Hackborn
5383f502e4 Fix issue #3122240: Expose xlarge in GB.
Plus some other small API cleanup.

Change-Id: I1a3c60f510f99224cccac9cc3f838f04141064f8
2010-10-22 12:59:20 -07:00
Dianne Hackborn
101f14b275 am ba501785: Merge "Implement issue #3116702: New manifest tags for supported screen sizes DO NOT MERGE" into gingerbread
Merge commit 'ba501785c7b298198d1c6e4787fd40e98f97da67' into gingerbread-plus-aosp

* commit 'ba501785c7b298198d1c6e4787fd40e98f97da67':
  Implement issue #3116702: New manifest tags for supported screen sizes  DO NOT MERGE
2010-10-21 20:17:56 -07:00
Dianne Hackborn
a6d9c7c04c Implement issue #3116702: New manifest tags for supported screen sizes DO NOT MERGE
Change-Id: Iabf64d86c89d387ffbfbc39f950d308a73fe17eb
2010-10-21 15:32:06 -07:00
Scott Main
4b5da6829a docs: fix a couple api links
Change-Id: If0e35011a28dc87324e2d53e856cfcdb35236061
2010-10-21 11:49:12 -07:00
Dianne Hackborn
674b856c15 am fb2cd0aa: Merge "Fix java doc on FLAG_EXTERNAL." into gingerbread
Merge commit 'fb2cd0aa9d140efdf78f0d920d8e3bb7db39c8de' into gingerbread-plus-aosp

* commit 'fb2cd0aa9d140efdf78f0d920d8e3bb7db39c8de':
  Fix java doc on FLAG_EXTERNAL.
2010-10-20 17:14:59 -07:00
Dianne Hackborn
eddfc04a08 Fix java doc on FLAG_EXTERNAL.
Change-Id: Ic533b3a6c3300a986dd8d0da04243d723cf393ef
2010-10-20 16:03:37 -07:00
Jean-Baptiste Queru
36e7790b6b Merge a851d8d0 from gingerbread
Change-Id: Iea0e3fa1662d6326ab337821fe52a65a9dfd989a
2010-10-15 17:02:57 -07:00
Nick Pelly
bc21fdefdf NFC: Move NFC service implementation out of system_server.
NFC service is now an application service in packages/apps/Nfc.

NFC service is registered through ServiceManager.addService(), and the proxy
object NfcAdapter obtains a handle to it through ServiceManager.getService().

**Important** Had to add new symbols AID_NFC / NFC_UID / android.uid.nfc and
modify service_manager.c, Process.java and PackageManagerService.java in order
to force the com.android.nfc process to take a fixed uid, so that it can use
ServiceManager.addService().

Most of the JNI has moved to packages/apps/Nfc/jni. However NdefRecord and
NdefMessage require some in-process native code, so android_com_NdefMessage.cpp
and android_com_NdefRecord.cpp stay in frameworks/base/core/jni. They link to
a very small library libnfc_ndef.so that implements NDEF message parsing. This
has been added to core.mk so all devices (even without NFC hardware) can work
with NDEF data.

Bug: 3041259
Bug: 3097445
Change-Id: If8f00ce8f2053acfc9319ca366d4a9c02bd396e6
Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-15 02:12:32 -07:00
Kenny Root
8fda1636e3 am bdf8034c: Merge "OBB: use PBKDF2 for key generation." into gingerbread
Merge commit 'bdf8034c657147226b2390eef113ff841e0d6065' into gingerbread-plus-aosp

* commit 'bdf8034c657147226b2390eef113ff841e0d6065':
  OBB: use PBKDF2 for key generation.
2010-10-13 22:54:10 -07:00
Kenny Root
bdf8034c65 Merge "OBB: use PBKDF2 for key generation." into gingerbread 2010-10-13 18:29:43 -07:00
Kenny Root
3b1abba6bb OBB: use PBKDF2 for key generation.
Switch to using PBKDF2 for the key generation for OBBs. Any previously
generated OBBs will stop being read correctly. A small pbkdf2gen program
is available to allow generation of appropriate keys with the salts.

Bug: 3059950
Change-Id: If4305c989fd692fd1150eb270dbf751e09c37295
2010-10-13 18:25:33 -07:00
Wink Saville
94980e0f76 am 07e1be62: Merge "Fix NPE caused by Change I4df27119." into gingerbread
Merge commit '07e1be62c7a8650313e7ad8690968c58ec8e88ad' into gingerbread-plus-aosp

* commit '07e1be62c7a8650313e7ad8690968c58ec8e88ad':
  Fix NPE caused by Change I4df27119.
2010-10-13 12:27:22 -07:00
Wink Saville
c491ee0223 Fix NPE caused by Change I4df27119.
This change caused Music APP to throw an NPE the fix
is to test that scheme is not null before using it.

Bug: 3092886
Change-Id: Ib29f944cbd9a9ff628462bdd6f4b68a308468536
2010-10-13 11:40:10 -07:00
Wink Saville
090ac9f7dd am a3100314: Merge "Remove some PII." into gingerbread
Merge commit 'a310031438877a7b70a6ac30eb2f2b33e06907e6' into gingerbread-plus-aosp

* commit 'a310031438877a7b70a6ac30eb2f2b33e06907e6':
  Remove some PII.
2010-10-12 14:21:10 -07:00
Wink Saville
a42880749b Remove some PII.
Change-Id: I4df27119b6bbd28bf950516fd6f44676a8e04f06
2010-10-12 12:36:38 -07:00
Brad Fitzpatrick
ca1db5ae68 am dd644c17: Fallback to SharedPreferences.commit() when no apply() exists.
Merge commit 'dd644c179c1bf47d82d776d7f644e4fc1467159d' into gingerbread-plus-aosp

* commit 'dd644c179c1bf47d82d776d7f644e4fc1467159d':
  Fallback to SharedPreferences$Editor.commit() when no apply() exists.
2010-10-10 15:30:55 -07:00
Brad Fitzpatrick
dd644c179c Fallback to SharedPreferences$Editor.commit() when no apply() exists.
Gingerbread widened the SharedPreferences.Editor interface, adding an
apply() method.  Most people don't implement this interface
themselves, but a couple apps do.

A few spots in the core framework take a SharedPreferences[.Editor]
from apps, which might be a pre-Gingerbread implementation without an
apply() method.  This patch makes sure we never depend on the presence
of an apply() method, falling back to commit() if apply() isn't
available.

Change-Id: I32693ac9227a60b694526a26a30234fb17a40581
2010-10-10 15:26:24 -07:00
Dianne Hackborn
b77455ee29 am 78d68836: Implement tracking of package install times.
Merge commit '78d688369a2240009d3bbe4126996a973b2e2fe2' into gingerbread-plus-aosp

* commit '78d688369a2240009d3bbe4126996a973b2e2fe2':
  Implement tracking of package install times.
2010-10-07 20:13:24 -07:00